From 54cab3bf6ccd3a05f11fa7be174057cde281ac43 Mon Sep 17 00:00:00 2001 From: Tim Kourt Date: Thu, 4 May 2017 15:47:40 -0700 Subject: [PATCH] configure: introduce dbusconfdir --- bootstrap-configure | 3 ++- configure.ac | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bootstrap-configure b/bootstrap-configure index b660d44a..a5b45159 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -9,4 +9,5 @@ fi --enable-debug \ --localstatedir=/var \ --prefix=/usr $* \ - --sysconfdir=/etc/iwd + --sysconfdir=/etc/iwd \ + --with-dbusconfdir=/etc diff --git a/configure.ac b/configure.ac index 68a92eb8..c861e084 100644 --- a/configure.ac +++ b/configure.ac @@ -75,6 +75,19 @@ AC_CHECK_HEADERS(linux/types.h linux/if_alg.h) AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes, AC_MSG_ERROR(readline header files are required)) +AC_ARG_WITH([dbusconfdir], AC_HELP_STRING([--with-dbusconfdir=DIR], + [path to D-Bus configuration directory]), + [path_dbusconfdir=${withval}]) +if (test -z "${path_dbusconfdir}"); then + AC_MSG_CHECKING([D-Bus configuration directory]) + path_dbusconfdir="`$PKG_CONFIG --variable=sysconfdir dbus-1`" + if (test -z "${path_dbusconfdir}"); then + AC_MSG_ERROR([D-Bus configuration directory is required]) + fi + AC_MSG_RESULT([${path_dbusconfdir}]) +fi +AC_SUBST(DBUS_CONFDIR, [${path_dbusconfdir}]) + AC_PATH_PROG(A2X, [a2x], [], $PATH:/sbin:/usr/sbin) AM_CONDITIONAL(BUILD_DOCS, test "$A2X" != "")