rendered paste bodydiff --git configure.ac configure.acindex 607d9bb..bc62fad 100644--- configure.ac+++ configure.ac@@ -200,7 +200,7 @@ AM_CONDITIONAL(HAVE_WINDRES, test "x$WINDRES" != "x:") AC_SUBST(WINDRES) # Check for base dependencies early.-PKG_CHECK_MODULES(GNOME_PLATFORM,+PKG_CHECK_MODULES([GNOME_PLATFORM], [glib-2.0 >= glib_minimum_version gtk+-2.0 >= gtk_minimum_version gconf-2.0 >= gconf_minimum_version@@ -214,7 +214,7 @@ PKG_CHECK_MODULES(GNOME_PLATFORM, AC_SUBST(GNOME_PLATFORM_CFLAGS) AC_SUBST(GNOME_PLATFORM_LIBS) -PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER,+PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], [libebook-$EDS_PACKAGE >= eds_minimum_version libecal-$EDS_PACKAGE >= eds_minimum_version libedataserver-$EDS_PACKAGE >= eds_minimum_version@@ -537,12 +537,12 @@ AC_CHECK_FUNCS(statfs) dnl ************************************************** dnl * Gnome Icon Theme dnl **************************************************-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version)+PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version]) dnl ************************************************** dnl * Accessibility support dnl **************************************************-PKG_CHECK_MODULES(A11Y, atk)+PKG_CHECK_MODULES([A11Y], [atk]) AC_SUBST(A11Y_CFLAGS) AC_SUBST(A11Y_LIBS) @@ -711,7 +711,7 @@ AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec, AC_SUBST(REGEX_LIBS) # XXX Drop the version from the package name?-PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14 >= libgtkhtml_minimum_version)+PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-3.14 >= libgtkhtml_minimum_version]) AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.14`@@ -727,7 +727,7 @@ AC_ARG_ENABLE([pilot-conduits], [Enable support for building pilot conduits.]),, [enable_pilot_conduits=no]) if test "x$enable_pilot_conduits" = "xyes"; then- PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0 >= gnome_pilot_minimum_version)+ PKG_CHECK_MODULES([GNOME_PILOT], [gnome-pilot-2.0 >= gnome_pilot_minimum_version]) CFLAGS_save="$CFLAGS" CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS"@@ -943,7 +943,7 @@ AC_ARG_ENABLE([mono], [Add Mono embedded hooks.]), [enable_mono=$enableval],[enable_mono=no]) if test "x${enable_mono}" = "xyes"; then- PKG_CHECK_MODULES(MONO, "mono")+ PKG_CHECK_MODULES([MONO], ["mono"]) AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled]) MONO_PLUGIN="mono" fi@@ -1381,7 +1381,7 @@ dnl ************************** dnl Check for X libs and -lX11 dnl ************************** -PKG_CHECK_MODULES(X, x11, :, [+PKG_CHECK_MODULES([X], [x11], [:], [ # pkg-config modules not found (only present since X11R7 aka Xorg); use # old-style detection AC_PATH_XTRA@@ -1452,7 +1452,7 @@ AC_CHECK_HEADERS(libgnomeui/gnome-icon-lookup.h) AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h) CPPFLAGS="$CPPFLAGS_save" -PKG_CHECK_MODULES(HAL, hal >= hal_minimum_version, HAVE_HAL="yes", HAVE_HAL="no")+PKG_CHECK_MODULES([HAL], [hal >= hal_minimum_version], [HAVE_HAL="yes"], [HAVE_HAL="no"]) if test "x$HAVE_HAL" = "xyes"; then AC_DEFINE(HAVE_HAL, 1, [hal available]) HAL_REQUIREMENT="hal"@@ -1550,7 +1550,7 @@ dnl --- evolution (shell) flags NM_SUPPORT_PACKAGES="" -PKG_CHECK_MODULES(NM, dbus-glib-1, NM_SUPPORT="yes", NM_SUPPORT="no")+PKG_CHECK_MODULES([NM], [dbus-glib-1], [NM_SUPPORT="yes"], [NM_SUPPORT="no"]) AC_CHECK_HEADER(NetworkManager/NetworkManager.h, [ nm_header="yes" ] ) if test "x$NM_SUPPORT" = "xyes" -a "x$nm_header" = "xyes"; then AC_DEFINE(NM_SUPPORT, 1, [network manager available])@@ -1583,7 +1583,7 @@ fi LIBNOTIFY_CFLAGS= LIBNOTIFY_LIBS=-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= libnotify_minimum_version, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no")+PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= libnotify_minimum_version], [HAVE_LIBNOTIFY="yes"], [HAVE_LIBNOTIFY="no"]) if test "x$HAVE_LIBNOTIFY" = "xyes"; then AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available]) libnotify="libnotify"@@ -1832,7 +1832,7 @@ then dnl ********************* dnl gstreamer dnl *********************- PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10)+ PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10]) AC_SUBST(GSTREAMER_CFLAGS) AC_SUBST(GSTREAMER_LIBS) else@@ -1846,7 +1846,7 @@ if ${PKG_CONFIG} --exists dbus-glib-1 ; then dnl ************************************************** dnl * Mail Notification plugin's DBus messages dnl **************************************************- PKG_CHECK_MODULES(NMN, dbus-glib-1)+ PKG_CHECK_MODULES([NMN], [dbus-glib-1]) AC_SUBST(NMN_CFLAGS) AC_SUBST(NMN_LIBS) @@ -1866,7 +1866,7 @@ else fi if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then- PKG_CHECK_MODULES(LIBEXCHANGESTORAGE, libexchange-storage-$EDS_PACKAGE >= eds_minimum_version, have_libexchange="yes", have_libexchange="no")+ PKG_CHECK_MODULES([LIBEXCHANGESTORAGE], [libexchange-storage-$EDS_PACKAGE >= eds_minimum_version], [have_libexchange="yes"], [have_libexchange="no"]) if test "x$have_libexchange" = "xyes"; then dnl ************************************************** dnl * Exchange Operations plugin@@ -1887,7 +1887,7 @@ then dnl ********************* dnl libpst dnl *********************- PKG_CHECK_MODULES(LIBPST, libpst)+ PKG_CHECK_MODULES([LIBPST], [libpst]) AC_SUBST(LIBPST_CFLAGS) AC_SUBST(LIBPST_LIBS) else