From 463eaa0fa9a1cd0d86c1a8c80c29d32f66c1d547 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 14 Sep 2018 15:54:20 +0200
Subject: [PATCH] build: Change order of systemd-service and dbus-policy
 options

---
 configure.ac | 62 ++++++++++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/configure.ac b/configure.ac
index b363d4cf..41c9bb87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,37 +97,6 @@ AC_ARG_ENABLE([monitor], AC_HELP_STRING([--disable-monitor],
 					[enable_monitor=${enableval}])
 AM_CONDITIONAL(MONITOR, test "${enable_monitor}" != "no")
 
-AC_ARG_ENABLE([systemd-service], AC_HELP_STRING([--disable-systemd-service],
-				[don't install systemd service file]),
-					[enable_systemd_service=${enableval}])
-AM_CONDITIONAL(SYSTEMD_SERVICE, test "${enable_systemd_service}" != "no")
-
-AC_ARG_WITH([systemd-unitdir], AC_HELP_STRING([--with-systemd-unitdir=DIR],
-				[path to systemd unit directory]),
-					[path_systemd_unitdir=${withval}])
-if (test "${enable_systemd_service}" != "no" && test -z "${path_systemd_unitdir}"); then
-	AC_MSG_CHECKING([systemd unit directory])
-	path_systemd_unitdir="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"
-	if (test -z "${path_systemd_unitdir}"); then
-		AC_MSG_ERROR([systemd unit directory is required])
-	fi
-	AC_MSG_RESULT([${path_systemd_unitdir}])
-fi
-AC_SUBST(SYSTEMD_UNITDIR, [${path_systemd_unitdir}])
-
-AC_ARG_WITH([dbus-busdir], AC_HELP_STRING([--with-dbus-busdir=DIR],
-				[path to D-Bus bus services directory]),
-					[path_dbus_busdir=${withval}])
-if (test "${enable_systemd_service}" != "no" && test -z "${path_dbus_busdir}"); then
-	AC_MSG_CHECKING([D-Bus bus services directory])
-	path_dbus_busdir="`$PKG_CONFIG --variable=system_bus_services_dir dbus-1`"
-	if (test -z "${path_dbus_busdir}"); then
-		AC_MSG_ERROR([D-Bus bus services directory is required])
-	fi
-	AC_MSG_RESULT([${path_dbus_busdir}])
-fi
-AC_SUBST(DBUS_BUSDIR, [${path_dbus_busdir}])
-
 AC_ARG_ENABLE([dbus-policy], AC_HELP_STRING([--disable-dbus-policy],
 				[don't install D-Bus system policy file]),
 					[enable_dbus_policy=${enableval}])
@@ -149,6 +118,37 @@ if (test "${enable_dbus_policy}" != "no" && test -z "${path_dbus_datadir}"); the
 fi
 AC_SUBST(DBUS_DATADIR, [${path_dbus_datadir}])
 
+AC_ARG_ENABLE([systemd-service], AC_HELP_STRING([--disable-systemd-service],
+				[don't install systemd service file]),
+					[enable_systemd_service=${enableval}])
+AM_CONDITIONAL(SYSTEMD_SERVICE, test "${enable_systemd_service}" != "no")
+
+AC_ARG_WITH([dbus-busdir], AC_HELP_STRING([--with-dbus-busdir=DIR],
+				[path to D-Bus bus services directory]),
+					[path_dbus_busdir=${withval}])
+if (test "${enable_systemd_service}" != "no" && test -z "${path_dbus_busdir}"); then
+	AC_MSG_CHECKING([D-Bus bus services directory])
+	path_dbus_busdir="`$PKG_CONFIG --variable=system_bus_services_dir dbus-1`"
+	if (test -z "${path_dbus_busdir}"); then
+		AC_MSG_ERROR([D-Bus bus services directory is required])
+	fi
+	AC_MSG_RESULT([${path_dbus_busdir}])
+fi
+AC_SUBST(DBUS_BUSDIR, [${path_dbus_busdir}])
+
+AC_ARG_WITH([systemd-unitdir], AC_HELP_STRING([--with-systemd-unitdir=DIR],
+				[path to systemd unit directory]),
+					[path_systemd_unitdir=${withval}])
+if (test "${enable_systemd_service}" != "no" && test -z "${path_systemd_unitdir}"); then
+	AC_MSG_CHECKING([systemd unit directory])
+	path_systemd_unitdir="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"
+	if (test -z "${path_systemd_unitdir}"); then
+		AC_MSG_ERROR([systemd unit directory is required])
+	fi
+	AC_MSG_RESULT([${path_systemd_unitdir}])
+fi
+AC_SUBST(SYSTEMD_UNITDIR, [${path_systemd_unitdir}])
+
 AC_ARG_ENABLE(sim_hardcoded, AC_HELP_STRING([--enable-sim-hardcoded],
 				[enabled hard coded SIM keys]),
 					[enable_sim_hardcoded=${enableval}])