simplify and fix must_strcat_pid

[mirror_lxcfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1744cb387b383d77c68a6eecc9078119cabded7b..d2ae44d0205ee8d5e7a5fdc6a32905bcebef71c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([lxcfs], [0.4], [lxc-devel@lists.linuxcontainers.org])
+AC_INIT([lxcfs], [0.15], [lxc-devel@lists.linuxcontainers.org])
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -12,6 +12,7 @@ AC_CONFIG_FILES([
        share/Makefile
        share/00-lxcfs.conf
        share/lxc.mount.hook
+       share/lxc.reboot.hook
        tests/Makefile ])
 
 AM_INIT_AUTOMAKE
@@ -21,17 +22,20 @@ AC_PROG_CC
 
 AC_PROG_CC_C99
 
-PKG_CHECK_MODULES([NIH], [libnih >= 1.0.2])
-PKG_CHECK_MODULES([NIH_DBUS], [libnih-dbus >= 1.0.0])
-PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
-PKG_CHECK_MODULES([CGMANAGER], [libcgmanager >= 0.0.0])
+AC_CHECK_LIB(pthread, main)
+
 PKG_CHECK_MODULES(FUSE, fuse)
-AC_CHECK_LIB(cgmanager, cgmanager_list_controllers_sync, [], AC_MSG_ERROR(["cgmanager 0.35 or higher is required"]))
-AC_CHECK_LIB(cgmanager, cgmanager_list_keys_sync, [], AC_MSG_ERROR(["cgmanager 0.35 or higher is required"]))
 
 AC_PATH_PROG(HELP2MAN, help2man, false // No help2man //)
 AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$HELP2MAN" != "xfalse // No help2man //" ])
 
+AC_ARG_WITH([runtime-path],
+       [AC_HELP_STRING(
+               [--with-runtime-path=dir],
+               [runtime directory (default: /run)]
+       )], [], [with_runtime_path=['/run']])
+
+AS_AC_EXPAND(RUNTIME_PATH, "$with_runtime_path")
 AS_AC_EXPAND(LXCFSSHAREDIR, "$datarootdir/lxcfs")
 AS_AC_EXPAND(LXCCONFDIR, "$datarootdir/lxc/config/common.conf.d")
 AS_AC_EXPAND(LXCFSTARGETDIR, "$localstatedir/lib/lxcfs")