we don't actually need libgee anymore

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cffe8a259f6e28bcd867f13a22658ff1da86e2c0..044dc6febb708221b218d072217234e383a502b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -61,10 +61,6 @@ PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ])
 AC_SUBST(DBUSGLIB_CFLAGS)
 AC_SUBST(DBUSGLIB_LIBS)
 
-PKG_CHECK_MODULES(GEE, [ gee-1.0 ])
-AC_SUBST(GEE_CFLAGS)
-AC_SUBST(GEE_LIBS)
-
 PKG_CHECK_MODULES(GTK, [ gtk+-2.0 ])
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
@@ -84,6 +80,7 @@ if test "z$with_distro" = "z"; then
                 AC_CHECK_FILE(/etc/redhat-release,with_distro="fedora")
                 AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
                 AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
+                AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
         fi
         if test "z$with_distro" = "z"; then
                 with_distro=`uname -s`
@@ -95,18 +92,36 @@ case $with_distro in
         fedora)
                 SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d
                 SYSTEM_SYSVRCND_PATH=/etc/rc.d
+                special_dbus_service=messagebus.service
+                special_syslog_service=rsyslog.service
+                AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL])
                 ;;
         suse)
                 SYSTEM_SYSVINIT_PATH=/etc/init.d
                 SYSTEM_SYSVRCND_PATH=/etc/init.d
+                special_dbus_service=dbus.service
+                special_syslog_service=syslog.service
+                AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLES])
                 ;;
         debian)
                 SYSTEM_SYSVINIT_PATH=/etc/init.d
                 SYSTEM_SYSVRCND_PATH=/etc
+                special_dbus_service=dbus.service
+                special_syslog_service=sysklogd.service
+                AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian/Ubuntu])
+                ;;
+        arch)
+                SYSTEM_SYSVINIT_PATH=/etc/rc.d
+                SYSTEM_SYSVRCND_PATH=/etc
+                special_dbus_service=dbus.service
+                special_syslog_service=syslog-ng.service
+                AC_DEFINE(TARGET_ARCH, [], [Target is ArchLinux])
                 ;;
         none)
-                SYSTEM_SYSVINIT_PATH=/etc/fix/the/configure/script
-                SYSTEM_SYSVRCND_PATH=/etc/fix/the/configure/script
+                SYSTEM_SYSVINIT_PATH=/fix/the/configure/script
+                SYSTEM_SYSVRCND_PATH=/fix/the/configure/script
+                special_dbus_service=fix-the-configure-script.service
+                special_syslog_service=fix-the-configure-script.service
                 ;;
         *)
                 AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, SysV init scripts could not be found! (patches welcome); you can specify --with-distro=none to skip this check])
@@ -119,12 +134,19 @@ AC_SUBST(SYSTEM_SYSVRCND_PATH)
 AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora)
 AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
+AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
+
+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])
 
 AC_OUTPUT([Makefile])
 
 echo "
         $PACKAGE_NAME $VERSION
 
+        Distribution:            ${with_distro}
         SysV init scripts:       ${SYSTEM_SYSVINIT_PATH}
         SysV rc?.d directories:  ${SYSTEM_SYSVRCND_PATH}
+        Syslog service:          ${special_syslog_service}
+        D-Bus service:           ${special_dbus_service}
 "