bus: reuse more code

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c4503bfcb2bd628f490c60ac4ea1e4260e8c459c..ae492cfe62161ad5de6282914983ab5f00985807 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([systemd],
-        [197],
+        [198],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
         [systemd],
         [http://www.freedesktop.org/wiki/Software/systemd])
@@ -164,7 +164,7 @@ AS_IF([test "x$with_python" != "xno"], [
 AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"])
 AS_IF([test "x$PYTHON_BINARY" = "x"],
       [AS_IF([test "x$have_python" = "xyes"],
-             [PYTHON_BINARY="`which "$PYTHON"`"],
+             [PYTHON_BINARY="$(which "$PYTHON")"],
              [PYTHON_BINARY=/usr/bin/python])])
 AC_ARG_VAR(PYTHON_BINARY, [Python binary used to launch installed scripts])
 
@@ -172,8 +172,8 @@ AS_IF([test "x$with_python" != "xno"], [
         AC_PATH_PROG(PYTHON_CONFIG, python${PYTHON_VERSION}-config)
         AS_IF([test -n "$PYTHON_CONFIG"], [
               have_python_devel=yes
-              PYTHON_CFLAGS="`$PYTHON_CONFIG --cflags` $python_extra_cflags"
-              PYTHON_LIBS="`$PYTHON_CONFIG --ldflags`"
+              PYTHON_CFLAGS="$($PYTHON_CONFIG --cflags) $python_extra_cflags"
+              PYTHON_LIBS="$($PYTHON_CONFIG --ldflags)"
               AC_SUBST(PYTHON_CFLAGS)
               AC_SUBST(PYTHON_LIBS)
               AC_PATH_PROGS(SPHINX_BUILD, sphinx-build-${PYTHON_VERSION} sphinx-build)
@@ -705,8 +705,8 @@ AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
 # ------------------------------------------------------------------------------
 AC_ARG_WITH(firmware-path,
        AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
-          [Firmware search path (default=ROOTPREFIX/lib/firmware/updates:ROOTPREFIX/lib/firmware)]),
-       [], [with_firmware_path="$rootprefix/lib/firmware/updates:$rootprefix/lib/firmware"])
+          [Firmware search path (default="")]),
+       [], [with_firmware_path=""])
 OLD_IFS=$IFS
 IFS=:
 for i in $with_firmware_path; do
@@ -717,15 +717,18 @@ for i in $with_firmware_path; do
        fi
 done
 IFS=$OLD_IFS
-AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
+AC_SUBST(FIRMWARE_PATH)
+AM_CONDITIONAL(ENABLE_FIRMWARE, [test "x${FIRMWARE_PATH}" != "x"])
 
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([gudev],
        AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
        [], [enable_gudev=yes])
-AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0]) ])
+AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) ])
 AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
 
+AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
+
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE([keymap],
        AS_HELP_STRING([--disable-keymap], [disable keymap fixup support @<:@default=enabled@:>@]),
@@ -796,28 +799,28 @@ AC_ARG_WITH([tty-gid],
 AC_ARG_WITH([dbuspolicydir],
         AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]),
         [],
-        [with_dbuspolicydir=`$PKG_CONFIG --variable=sysconfdir dbus-1`/dbus-1/system.d])
+        [with_dbuspolicydir=$($PKG_CONFIG --variable=sysconfdir dbus-1)/dbus-1/system.d])
 
 AC_ARG_WITH([dbussessionservicedir],
         AS_HELP_STRING([--with-dbussessionservicedir=DIR], [D-Bus session service directory]),
         [],
-        [with_dbussessionservicedir=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`])
+        [with_dbussessionservicedir=$($PKG_CONFIG --variable=session_bus_services_dir dbus-1)])
 
 AC_ARG_WITH([dbussystemservicedir],
         AS_HELP_STRING([--with-dbussystemservicedir=DIR], [D-Bus system service directory]),
         [],
-        [with_dbussystemservicedir=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`/../system-services])
+        [with_dbussystemservicedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../system-services)])
 
 AC_ARG_WITH([dbusinterfacedir],
         AS_HELP_STRING([--with-dbusinterfacedir=DIR], [D-Bus interface directory]),
         [],
-        [with_dbusinterfacedir=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`/../interfaces])
+        [with_dbusinterfacedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../interfaces)])
 
 AC_ARG_WITH([bashcompletiondir],
         AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]),
         [],
-        [AS_IF([`$PKG_CONFIG --exists bash-completion`], [
-                with_bashcompletiondir=`$PKG_CONFIG --variable=completionsdir bash-completion`
+        [AS_IF([$($PKG_CONFIG --exists bash-completion)], [
+                with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)
         ] , [
                 with_bashcompletiondir=${datadir}/bash-completion/completions
         ])])
@@ -939,7 +942,7 @@ AC_MSG_RESULT([
         Extra stop script:       ${RC_LOCAL_SCRIPT_PATH_STOP}
 
         CFLAGS:                  ${OUR_CFLAGS} ${CFLAGS}
-        CPPLAGS:                 ${OUR_CPPFLAGS} ${CPPFLAGS}
+        CPPFLAGS:                ${OUR_CPPFLAGS} ${CPPFLAGS}
         LDFLAGS:                 ${OUR_LDFLAGS} ${LDFLAGS}
         PYTHON_CFLAGS:           ${PYTHON_CFLAGS}
         PYTHON_LIBS:             ${PYTHON_LIBS}