From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Date: Thu, 6 May 2010 19:30:01 +0000 (+0200)
Subject: build-sys: support non-git versions of libcgroup
X-Git-Tag: 0.git+20100605+dfd8ee-1~35
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41160f3dbf0cb61e23a02338da1f289a2ff00066;p=systemd

build-sys: support non-git versions of libcgroup
---

diff --git a/configure.ac b/configure.ac
index 044dc6fe..f4e10367 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,23 @@ 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)