From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 21 Oct 2019 14:55:57 +0000 (-0400)
Subject: Fix --with-dbusdir (Issue #5671)
X-Git-Tag: v2.3.1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e82c53ebcb50e53358285efeb06bcccba57f4ee;p=thirdparty%2Fcups.git

Fix --with-dbusdir (Issue #5671)
---

diff --git a/CHANGES.md b/CHANGES.md
index 02d4c56df9..c741f4f25c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.3.1 - 2019-10-15
+CHANGES - 2.3.1 - 2019-10-21
 ============================
 
 
@@ -15,6 +15,7 @@ Changes in CUPS v2.3.1
 - The libusb-based USB backend now reports an error when the distribution
   permissions are wrong (Issue #5658)
 - Added paint can labels to Dymo driver (Issue #5662)
+- The `--with-dbusdir` option was ignored by the configure script (Issue #5671)
 - The IPP backend did not detect all cases where a job should be retried using
   a raster format (rdar://56021091)
 - Fixed spelling of "fold-accordion".
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 87264d850b..27b7b27961 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -293,14 +293,14 @@ fi
 LIBS="$SAVELIBS"
 
 dnl Check for DBUS support
-AC_ARG_ENABLE(dbus, [  --disable-dbus          build without DBUS support])
-AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
-	DBUSDIR="$withval")
-
 DBUSDIR=""
 DBUS_NOTIFIER=""
 DBUS_NOTIFIERLIBS=""
 
+AC_ARG_ENABLE(dbus, [  --disable-dbus          build without DBUS support])
+AC_ARG_WITH(dbusdir, [  --with-dbusdir          set DBUS configuration directory ],
+	DBUSDIR="$withval")
+
 if test "x$enable_dbus" != xno -a "x$PKGCONFIG" != x -a "x$host_os_name" != xdarwin; then
 	AC_MSG_CHECKING(for DBUS)
 	if $PKGCONFIG --exists dbus-1; then