From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 21 Oct 2019 15:12:11 +0000 (-0400)
Subject: Another fix for DBUSDIR (Issue #5671)
X-Git-Tag: v2.3.1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=397eefaa69b7928bb616ecdd6e6d8a4221d2b5f3;p=thirdparty%2Fcups.git

Another fix for DBUSDIR (Issue #5671)
---

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 27b7b27961..a460a73a4f 100644
--- 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 8c6e6e8f4d..004ecee995 100755
--- 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