X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=f4e10367e01425f683075b0687a538c00576d3ce;hb=41160f3dbf0cb61e23a02338da1f289a2ff00066;hp=cc0ee11722f9bc7c5a868a14cb0991c7efc1edf3;hpb=2c696a96a2bd63d2ff0d5595622124ef9270b172;p=elogind.git

diff --git a/configure.ac b/configure.ac
index cc0ee1172..f4e10367e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,15 +61,27 @@ 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)
 
-PKG_CHECK_MODULES(CGROUP, [ libcgroup ])
+PKG_CHECK_MODULES( CGROUP, [ libcgroup >= 0.35 ], [],
+    [AC_CHECK_HEADER( [libcgroup.h], [], [AC_MSG_ERROR([*** libcgroup.h not found])], )
+     save_CPPFLAGS="$CPPFLAGS"
+     save_LIBS="$LIBS"
+     CGROUP_LIBS=${CGROUP_LIBS:--lcgroup}
+     LIBS="$LIBS $CGROUP_LIBS"
+     CPPFLAGS="$CPPFLAGS $CGROUP_CFLAGS"
+     AC_MSG_CHECKING([for libcgroup >= 0.35])
+     AC_LINK_IFELSE(
+         [AC_LANG_PROGRAM([[#include <libcgroup.h>]], [[ CGFLAG_DELETE_RECURSIVE; cgroup_init(); ]])],
+         [AC_MSG_RESULT([yes])],
+         [AC_MSG_RESULT([no]); AC_MSG_ERROR([*** systemd needs libcgroup 0.35 or newer])],
+         [${CGROUP_LIBS}])
+     CPPFLAGS="$save_CPPFLAGS"
+     LIBS="$save_LIBS"
+    ])
+
 AC_SUBST(CGROUP_CFLAGS)
 AC_SUBST(CGROUP_LIBS)
 
@@ -84,6 +96,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`
@@ -113,6 +126,13 @@ case $with_distro in
                 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=/fix/the/configure/script
                 SYSTEM_SYSVRCND_PATH=/fix/the/configure/script
@@ -130,6 +150,7 @@ 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])