PGP UAM module compilation support using --enable-pgp-uam

diff --git a/ChangeLog b/ChangeLog
index 99cc15a3e0c1da9f49803c2c50926760a59a5b7c..2b495990faed162903da5156b5e9a884191bbd2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,17 +5,20 @@
        * README: updated 1.5+ install instructions to include list of
        required and recommended packages
 
-       * etc/uams/uam_*.c: cleanups, addition of CVS Id tag to C source
+       * etc/uams/uams_*.c: cleanups, addition of CVS Id tag to C source
 
        * configure.in, acconfig.h: change USE_AFS to AFS to be the same as
        all of the defines in the codebase
 
-       * etc/uams/uam_dhx_pam.c: fixed DHX login using this module (last
+       * etc/uams/uams_dhx_pam.c: fixed DHX login using this module (last
        patch made with syslog()'s didn't include any brackets) 
        (Bug #233756)
 
        * distrib/initscripts/.cvsignore: removed pulling of atalk
 
+       * configure.in, etc/uams/Makefile.am: conditional compilation support
+       for PGP UAM module using --enable-pgp-uam
+
 2001-02-26  jeff b  <jeff@univrel.pr.uconn.edu>  
 
        * configure.in: added /usr/local/ssl to list of SSL paths to check, to

diff --git a/configure.in b/configure.in
index 91de62513be32ef30d22599e15277d54e947ef68..623178e3d128c413a24d0857216347902561ff9c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -494,15 +494,27 @@ for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl/ /usr/local
 
                AC_DEFINE(OPENSSL_DHX,  1)
                AC_DEFINE(UAM_DHX,      1)
-dnl            AC_DEFINE(UAM_PGP,      1)
                AC_DEFINE(UAM_RNDNUM,   1)
-               use_pgp=no
                compile_dhx=yes
+               compile_ssl=yes
                AC_MSG_RESULT([Found ssl and enabling RANDNUM and DHX support "$ssldir"])
                break
        fi
 done
 
+dnl --------------------- check for building PGP UAM module
+
+AC_ARG_ENABLE(pgp-uam,
+       [  --enable-pgp-uam        enable build of PGP UAM module],
+       if test "$enableval" = "yes"; then 
+               if test "$compile_ssl" = "yes"; then 
+                       AC_DEFINE(UAM_PGP, 1)
+                       compile_pgp=yes
+                       AC_MSG_RESULT([enabling build with PGP UAM module])
+               fi
+       fi
+)
+
 dnl --------------------- last minute substitutions
 
 AC_SUBST(LIBS)