Attachment 591392 Details for Bug 831510 – Implement --without-pam

[patch] Implement --without-pam

pam.patch (text/plain), 2.29 KB, created by Jasper Lievisse Adriaanse on 2012-06-13 07:45:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jasper Lievisse Adriaanse

Created: 2012-06-13 07:45:16 UTC

Size: 2.29 KB

patch

obsolete

>--- configure.in.orig	Thu May 24 14:24:13 2012
>+++ configure.in	Wed Jun 13 09:10:51 2012
>@@ -78,6 +78,29 @@ AC_ARG_ENABLE([ld-version-script],
>               [ : ] )
> AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
> 
>+dnl PAM support
>+PAM_LIBS=
>+AC_ARG_WITH([pam],
>+  AS_HELP_STRING([--with-pam],[use PAM @<:@default=check@:>@]),
>+  [],
>+  [with_pam=check])
>+if test "$with_pam" != "no"; then
>+  if test "$with_pam" = "check"; then
>+      AC_CHECK_LIB([pam], [pam_start], [with_pam=yes], [with_pam=no])
>+  else
>+      fail=0
>+      AC_CHECK_LIB([pam], [pam_start], [], [fail=1])
>+      test $fail = 1 &&
>+        AC_MSG_ERROR([You must install the PAM development package in order to compile libpwquality])
>+  fi
>+fi
>+
>+if test "$with_pam" = "yes"; then
>+  PAM_LIBS="${PAM_LIBS} -lpam"
>+fi
>+AC_SUBST(PAM_LIBS)
>+AM_CONDITIONAL(HAVE_PAM, test "$with_pam" = "yes")
>+
> dnl options and defaults
> AC_ARG_WITH(securedir,
>         AS_HELP_STRING([--with-securedir=DIR],[path to location of PAMs @<:@default=$libdir/security@:>@]),
>--- doc/man/Makefile.am.orig	Wed Jun 13 09:19:46 2012
>+++ doc/man/Makefile.am	Wed Jun 13 09:20:15 2012
>@@ -1 +1,5 @@
>-dist_man_MANS = pwmake.1 pwscore.1 pam_pwquality.8 pwquality.conf.5
>+dist_man_MANS = pwmake.1 pwscore.1 pwquality.conf.5
>+
>+if HAVE_PAM
>+dist_man_MANS += pam_pwquality.8
>+endif
>--- src/Makefile.am.orig	Thu May 24 14:48:37 2012
>+++ src/Makefile.am	Wed Jun 13 09:18:04 2012
>@@ -29,12 +29,16 @@ libpwquality_la_LIBADD = @LIBCRACK@
> 
> libpwquality_la_SOURCES = generate.c check.c settings.c error.c
> 
>-pam_pwquality_la_LDFLAGS = -no-undefined -avoid-version -module
>+if HAVE_PAM
>+  pam_pwquality_la_LDFLAGS = -no-undefined -avoid-version -module
>+  pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@
>+  pam_pwquality_la_SOURCES = pam_pwquality.c
>+else
>+  pam_pwquality_la_LDFLAGS =
>+  pam_pwquality_la_LIBADD =
>+  pam_pwquality_la_SOURCES =
>+endif
> 
>-pam_pwquality_la_LIBADD = libpwquality.la -lpam
>-
>-pam_pwquality_la_SOURCES = pam_pwquality.c
>-
> pwscore_SOURCES = pwscore.c
> 
> pwscore_LDADD = libpwquality.la
>@@ -45,7 +49,11 @@ pwmake_LDADD = libpwquality.la
> 
> lib_LTLIBRARIES = libpwquality.la
> 
>-securelib_LTLIBRARIES = pam_pwquality.la
>+if HAVE_PAM
>+  securelib_LTLIBRARIES = pam_pwquality.la
>+else
>+  securelib_LTLIBRARIES =
>+endif
> 
> secureconf_DATA = pwquality.conf
>

Actions: View | Diff

Attachments on bug 831510: 591392