configure: add --enable-pam

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/configure.ac b/configure.ac
index 26bbe28e0067608d229cc3a871c11a2631edbee0..2df9f486b3f6b05d204a4d6da72a2c96b3da458e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -607,34 +607,42 @@ else
 fi
 AM_CONDITIONAL([IS_BIONIC], [test "x$is_bionic" = "xyes"])
 
-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
-       ]
-)
+# Configuration examples
+AC_ARG_ENABLE([pam],
+       [AC_HELP_STRING([--enable-pam], [enable pam module [default=no]])],
+       [], [enable_pam=no])
+AM_CONDITIONAL([ENABLE_PAM], [test "x$enable_pam" = "xyes"])
+
+AM_COND_IF([ENABLE_PAM],
+       [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
+AM_COND_IF([ENABLE_PAM],
+       [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])
 
 # Some systems lack PR_CAPBSET_DROP definition => HAVE_DECL_PR_CAPBSET_DROP
 AC_CHECK_DECLS([PR_CAPBSET_DROP], [], [], [#include <sys/prctl.h>])
@@ -956,6 +964,7 @@ Security features:
  - SELinux: $enable_selinux
 
 PAM:
+ - PAM module: $enable_pam
  - cgroup PAM module: $pamdir
 
 Bindings:

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index beebbbc77bf46161c1661d01a0366a3ca9871aa7..aea6ef7a67b0bea40f13b4f1b9e97c0b6796e210 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -305,6 +305,7 @@ init_lxc_static_LDADD = @CAP_LIBS@
 init_lxc_static_CFLAGS = $(AM_CFLAGS) -DNO_LXC_CONF
 endif
 
+if ENABLE_PAM
 if HAVE_PAM
 pam_LTLIBRARIES = pam_cgfs.la
 pam_cgfs_la_SOURCES = pam/pam_cgfs.c macro.h
@@ -312,6 +313,7 @@ pam_cgfs_la_CFLAGS = $(AM_CFLAGS)
 pam_cgfs_la_LIBADD = $(AM_LIBS) $(PAM_LIBS) -L$(top_srcdir)
 pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared
 endif
+endif
 
 install-exec-local: install-libLTLIBRARIES
        mkdir -p $(DESTDIR)$(datadir)/lxc
@@ -327,6 +329,7 @@ install-exec-hook:
 
 uninstall-local:
        $(RM) $(DESTDIR)$(libdir)/liblxc.so*
+if ENABLE_PAM
 if HAVE_PAM
        $(RM) $(DESTDIR)$(pamdir)/pam_cgfs.so*
 
@@ -334,3 +337,4 @@ install-data-hook: install-pamLTLIBRARIES
        $(RM) "$(DESTDIR)$(pamdir)/pam_cgfs.la"
        $(RM) "$(DESTDIR)$(pamdir)/pam_cgfs.a"
 endif
+endif