X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=5a4b5e2dc883259f0826c3c8b025762e56051393;hp=20024e68a4953beece9ec6c4d9d5db796a7939b8;hb=af25ec12e3d39d65f77633182799f3da695f2868;hpb=53f7d807bff9c39e9e565ad2fb20f29b4306af40

diff --git a/configure.ac b/configure.ac
index 20024e68a..5a4b5e2dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers n
 # This makes sure pkg.m4 is available.
 m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
 
-PKG_CHECK_MODULES(UDEV, [ libudev ])
+PKG_CHECK_MODULES(UDEV, [ libudev >= 154 ])
 AC_SUBST(UDEV_CFLAGS)
 AC_SUBST(UDEV_LIBS)
 
@@ -123,6 +123,7 @@ AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"])
 
 AM_PROG_VALAC([0.8])
 AC_SUBST(VAPIDIR)
+AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
 
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x)
@@ -178,7 +179,7 @@ case $with_distro in
                 ;;
         suse)
                 SYSTEM_SYSVRCND_PATH=/etc/init.d
-                AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLES])
+                AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLE])
                 M4_DISTRO_FLAG=-DTARGET_SUSE=1
                 ;;
         debian)
@@ -262,13 +263,32 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
 AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$SPECIAL_DBUS_SERVICE"], [D-Bus service name])
 AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])
 
+dbuspolicydir=`pkg-config --variable=sysconfdir dbus-1`/dbus-1/system.d
+AC_SUBST([dbuspolicydir], [$dbuspolicydir])
+
+dbussessionservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`
+AC_SUBST([dbussessionservicedir], [$dbussessionservicedir])
+
+dbussystemservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../system-services
+AC_SUBST([dbussystemservicedir], [$dbussystemservicedir])
+
+dbusinterfacedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../interfaces
+AC_SUBST([dbusinterfacedir], [$dbusinterfacedir])
+
 AC_ARG_WITH([udevrulesdir],
         AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]),
         [],
         [with_udevrulesdir=/lib/udev/rules.d])
 AC_SUBST([udevrulesdir], [$with_udevrulesdir])
 
-AC_OUTPUT([Makefile])
+AC_ARG_WITH([rootdir],
+        AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]),
+        [],
+        [with_rootdir=${ac_default_prefix}])
+AC_SUBST([rootdir], [$with_rootdir])
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 
 echo "
         $PACKAGE_NAME $VERSION
@@ -279,5 +299,11 @@ echo "
         Syslog service:          ${SPECIAL_SYSLOG_SERVICE}
         D-Bus service:           ${SPECIAL_DBUS_SERVICE}
         Gtk:                     ${have_gtk}
+        prefix:                  ${prefix}
+        root dir:                ${with_rootdir}
         udev rules dir:          ${with_udevrulesdir}
+        dbus policy dir:         ${dbuspolicydir}
+        dbus session dir:        ${dbussessionservicedir}
+        dbus system dir:         ${dbussystemservicedir}
+        dbus interfaces dir:     ${dbusinterfacedir}
 "