From 37661ec88491907d51bd4722eed767402a85d3b4 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 21 Jan 2007 17:13:19 +0000 Subject: [PATCH] Add AC_MSG_RESULT([no]) to the fail branch of PKG_CHECK_MODULES tests to 2007-01-21 Tor Lillqvist * configure.in: Add AC_MSG_RESULT([no]) to the fail branch of PKG_CHECK_MODULES tests to make the output from configure cleaner. Add proper quotes around $have_gnomevfs in a test to avoid "test: too many arguments" warning. Add fail branch to the test for dbus-glib so that it isn't a hard requirement. svn path=/trunk/; revision=21748 --- ChangeLog | 8 ++++++++ configure.in | 16 ++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ee34eb940..894d6f9eae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-01-21 Tor Lillqvist + + * configure.in: Add AC_MSG_RESULT([no]) to the fail branch of + PKG_CHECK_MODULES tests to make the output from configure + cleaner. Add proper quotes around $have_gnomevfs in a test to + avoid "test: too many arguments" warning. Add fail branch to the + test for dbus-glib so that it isn't a hard requirement. + 2007-01-21 Michael Natterer * modules/controller_midi.c (midi_set_device): set the name diff --git a/configure.in b/configure.in index ad98624a1a..f36eadb90e 100644 --- a/configure.in +++ b/configure.in @@ -1171,6 +1171,7 @@ have_gtkhtml2=no if test "x$with_gtkhtml2" != xno; then PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= gtkhtml2_required_version, have_gtkhtml2=yes, + AC_MSG_RESULT([no]) have_gtkhtml2="no (GtkHtml2 not found)") else have_gtkhtml2="no (GtkHtml2 support disabled)" @@ -1191,6 +1192,7 @@ if test "x$with_librsvg" != xno; then PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version, SVG='svg$(EXEEXT)' LIBSVG=$SVG_LIBS, + AC_MSG_RESULT([no]) have_librsvg="no (librsvg not found)") else have_librsvg="no (librsvg support disabled)" @@ -1209,7 +1211,9 @@ AC_ARG_WITH(print,[ --without-print build without print support]) if test "x$with_print" != xno; then PKG_CHECK_MODULES(PRINT, gtk+-2.0 >= 2.9.3, - enable_print="yes", enable_print="no (gtk+ >= 2.9.3 not available)") + enable_print="yes", + AC_MSG_RESULT([no]) + enable_print="no (gtk+ >= 2.9.3 not available)") else enable_print="no (print support disabled)" fi @@ -1230,6 +1234,7 @@ if test "x$with_poppler" != xno; then LIBPOPPLER=$POPPLER_LIBS AC_DEFINE(HAVE_POPPLER, 1, [Define to 1 if libpoppler is available]) have_poppler=yes, + AC_MSG_RESULT([no]) have_poppler="Using PostScript plug-in (libpoppler not found)") else have_poppler="Using PostScript plug-in (libpoppler support disabled)" @@ -1274,14 +1279,16 @@ fi PKG_CHECK_MODULES(URI_GNOME_VFS, $gnome_vfs_modules, have_gnomevfs=yes, + AC_MSG_RESULT([no]) have_gnomevfs="no (gnome-vfs-2.0 not found)") -AM_CONDITIONAL(HAVE_GNOMEVFS, test x$have_gnomevfs = xyes) +AM_CONDITIONAL(HAVE_GNOMEVFS, test x"$have_gnomevfs" = xyes) libcurl_modules="libcurl >= libcurl_required_version" PKG_CHECK_MODULES(URI_LIBCURL, $libcurl_modules, have_libcurl=yes, + AC_MSG_RESULT([no]) have_libcurl="no (libcurl not found)") AM_CONDITIONAL(HAVE_LIBCURL, test "x$have_libcurl" = xyes) @@ -1307,9 +1314,10 @@ fi # Check for D-Bus glib bindings ############################### -have_dbus_glib=no PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= dbus_glib_required_version, - have_dbus_glib=yes) + have_dbus_glib=yes, + AC_MSG_RESULT([no]) + have_dbus_glib=no) if test "x$have_dbus_glib" = xyes; then AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)