Fix dbus check in configure script (STR #3774)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9480 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt
index 0997c531fdd426a0464c91608588003eeb06fda1..b81bcf1148d60f5e31101559885ed7d32c1a75b3 100644 (file)
--- a/CHANGES-1.4.txt
+++ b/CHANGES-1.4.txt
@@ -8,7 +8,7 @@ CHANGES IN CUPS V1.4.7
        - Web interface fixes (STR #3412, STR #3345, STR #3455, STR #3707,
          STR #3755, STR #3769)
        - Configure script fixes (STR #3659, STR #3691)
-       - Compilation fixes (STR #3718, STR #3771)
+       - Compilation fixes (STR #3718, STR #3771, STR #3774)
        - The scheduler now recognizes an empty cupsCommands PPD keyword as
          meaning that CUPS commands are not supported for a printer (STR #3773)
        - Fixed a crash bug in the scheduler when the application/octet-stream

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 1eb1cc6ba84b3381626c749ee0b3a175170c9244..2a56a9aef871d414e3478fcccbbfaf3da82da3be 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -289,10 +289,11 @@ if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x; then
                SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`"
                DBUS_NOTIFIER="dbus"
                DBUS_NOTIFIERLIBS="`$PKGCONFIG --libs dbus-1`"
-               AC_CHECK_LIB(dbus-1,
-                       dbus_message_iter_init_append,
-                       AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND),,
-                       `$PKGCONFIG --libs dbus-1`)
+               SAVELIBS="$LIBS"
+               LIBS="$LIBS $DBUS_NOTIFIERLIBS"
+               AC_CHECK_FUNC(dbus_message_iter_init_append,
+                             AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_INIT_APPEND))
+               LIBS="$SAVELIBS"
        else
                AC_MSG_RESULT(no)
        fi