Another fix for DBUSDIR (Issue #5671)

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 27b7b279611f19b0ea0acf382fa3199315706ba7..a460a73a4fd62b5d1b3deb20972c488a49da4854 100644 (file)
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -317,7 +317,7 @@ if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdar
                AC_CHECK_FUNC(dbus_threads_init,
                              AC_DEFINE(HAVE_DBUS_THREADS_INIT))
                LIBS="$SAVELIBS"
-               if test -d /etc/dbus-1; then
+               if test -d /etc/dbus-1 -a "x$DBUSDIR" = x; then
                        DBUSDIR="/etc/dbus-1"
                fi
        else

diff --git a/configure b/configure
index 8c6e6e8f4d43b6fc2eefe4965698f156004cd1f0..004ecee995c338b96fbc5b5ee92c73777ef0ae1d 100755 (executable)
--- a/configure
+++ b/configure
@@ -5775,6 +5775,10 @@ fi
 fi
 LIBS="$SAVELIBS"
 
+DBUSDIR=""
+DBUS_NOTIFIER=""
+DBUS_NOTIFIERLIBS=""
+
 # Check whether --enable-dbus was given.
 if test "${enable_dbus+set}" = set; then :
   enableval=$enable_dbus;
@@ -5787,10 +5791,6 @@ if test "${with_dbusdir+set}" = set; then :
 fi
 
 
-DBUSDIR=""
-DBUS_NOTIFIER=""
-DBUS_NOTIFIERLIBS=""
-
 if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin; then
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
 $as_echo_n "checking for DBUS... " >&6; }
@@ -5818,7 +5818,7 @@ if test "x$ac_cv_func_dbus_threads_init" = xyes; then :
 fi
 
                LIBS="$SAVELIBS"
-               if test -d /etc/dbus-1; then
+               if test -d /etc/dbus-1 -a "x$DBUSDIR" = x; then
                        DBUSDIR="/etc/dbus-1"
                fi
        else