Merge pull request #245 from aither64/loadavg-leak

[mirror_lxcfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 94848f01c9b0cc8c824e270209721db3ac0e7f58..7f4d5a06ba4eecd5828c01335a27c9027b972b56 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], [lxc-devel@lists.linuxcontainers.org])
+AC_INIT([lxcfs], [3.0.0], [lxc-devel@lists.linuxcontainers.org])
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -150,36 +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_SUBST([lxcfsdir], "${libdir}/lxcfs")
-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
 
 # Rootfs path, where the container mount structure is assembled
 AC_ARG_WITH([rootfs-path],