Fix test_proc on s390x

[mirror_lxcfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b9a031e58d1b1b4019127bbc68db10a436783173..8684d9c3ece522f63cb2ada96034b250fb2ea4a8 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.rc5], [lxc-devel@lists.linuxcontainers.org])
+AC_INIT([lxcfs], [3.0.0.beta1], [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=
@@ -148,35 +150,7 @@ AM_CONDITIONAL([INIT_SCRIPT_SYSTEMD], [echo "$init_script" |grep -q "systemd"])
 AM_CONDITIONAL([INIT_SCRIPT_UPSTART], [echo "$init_script" |grep -q "upstart"])
 AC_MSG_RESULT($init_script)
 
-
-AC_ARG_WITH(
-       [pamdir],
-       [AS_HELP_STRING([--with-pamdir=PATH],[Specify the directory where PAM modules are stored,
-                                               or "none" if PAM modules are not to be built])],
-       [pamdir="${withval}"],
-       [
-               if test "${prefix}" = "/usr"; then
-                       pamdir="/lib${libdir##*/lib}/security"
-               else
-                       pamdir="\$(libdir)/security"
-               fi
-       ]
-)
-
-AM_CONDITIONAL([HAVE_PAM], [test x"$pamdir" != "xnone"])
-if test "z$pamdir" != "znone"; then
-       AC_ARG_VAR([PAM_CFLAGS], [C compiler flags for pam])
-       AC_ARG_VAR([PAM_LIBS], [linker flags for pam])
-       AC_CHECK_LIB(
-               [pam],
-               [pam_authenticate],
-               [PAM_LIBS="-lpam"],
-               [AC_MSG_ERROR([*** libpam not found.])
-               ])
-
-       AC_SUBST(PAM_LIBS)
-       AC_SUBST([pamdir])
-fi
+AC_SUBST([lxcfsdir], "${libdir}/lxcfs")
 
 # Rootfs path, where the container mount structure is assembled
 AC_ARG_WITH([rootfs-path],