Merge pull request #221 from brauner/2017-11-02/cgroup_v2_fixes

[mirror_lxcfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index cb373eb8ded46ff5de93056fd3a4e4c2dce662e2..94848f01c9b0cc8c824e270209721db3ac0e7f58 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], [2.0.0.rc6], [lxc-devel@lists.linuxcontainers.org])
+AC_INIT([lxcfs], [2.0.0], [lxc-devel@lists.linuxcontainers.org])
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -22,8 +22,6 @@ AC_CONFIG_FILES([
        share/lxc.reboot.hook
        tests/Makefile ])
 
-AM_INIT_AUTOMAKE
-
 LT_INIT
 AC_PROG_CC
 
@@ -68,6 +66,7 @@ if test "z$with_distro" = "z"; then
        AC_CHECK_FILE(/etc/mandrakelinux-release, with_distro="openmandriva")
        AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva")
        AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
+       AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
 fi
 with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]'`
 
@@ -78,7 +77,7 @@ case $with_distro in
        ubuntu)
                distroconf=default.conf.ubuntu
                ;;
-       redhat|centos|fedora|oracle|oracleserver)
+       redhat|centos|fedora|oracle|oracleserver|pld)
                distroconf=default.conf.libvirt
                ;;
        *)
@@ -110,6 +109,9 @@ case "$with_init_script" in
                        ubuntu)
                                init_script=upstart,systemd,sysvinit
                                ;;
+                       pld)
+                               init_script=systemd,sysvinit
+                               ;;
                        slackware)
                                echo -n "Warning: bsd init job not yet implemented"
                                init_script=
@@ -149,6 +151,7 @@ AM_CONDITIONAL([INIT_SCRIPT_UPSTART], [echo "$init_script" |grep -q "upstart"])
 AC_MSG_RESULT($init_script)
 
 
+AC_SUBST([lxcfsdir], "${libdir}/lxcfs")
 AC_ARG_WITH(
        [pamdir],
        [AS_HELP_STRING([--with-pamdir=PATH],[Specify the directory where PAM modules are stored,