From 1c15ff00fc3a1c309576c5f146f5aac2e2e8779f Mon Sep 17 00:00:00 2001
From: srittau <srittau>
Date: Wed, 11 Jun 2003 07:18:04 +0000
Subject: [PATCH] Removed --enable-pgp-uam configure option. Is there any
 reason somebody would not want to compile it as long as the dependencies
 (namely OpenSSL) are fulfilled? It's not enabled in the default configuration
 anyways, so compiling it will do no harm.

---
 configure.in         | 16 +---------------
 etc/uams/Makefile.am |  7 +------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/configure.in b/configure.in
index 0a9a7bdb..12dbce53 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.187 2003-06-08 16:04:49 srittau Exp $
+dnl $Id: configure.in,v 1.188 2003-06-11 07:18:04 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -615,19 +615,6 @@ dnl -- look for OpenSSL and other crypt libraries
 AC_PATH_GCRYPT
 AC_PATH_SSL
 
-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, [Define if the PGP UAM module should be compiled])
-			compile_pgp=yes
-			AC_MSG_RESULT([enabling build with PGP UAM module])
-		fi
-	fi
-)
-
 dnl --------------------- check for building Kerberos v4 UAM module
 
 AC_ARG_ENABLE(krb4-uam,
@@ -661,7 +648,6 @@ AM_CONDITIONAL(USE_KERBEROS, test x$compile_kerberos = xyes)
 AM_CONDITIONAL(USE_PAM_SO, test x$use_pam_so = xyes)
 AM_CONDITIONAL(USE_PAM, test x$compile_pam = xyes)
 AM_CONDITIONAL(BUILD_PAM, test x$compile_pam = xyes)
-AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes)
 AM_CONDITIONAL(USE_COBALT, test x$sysv_style = xcobalt)
 AM_CONDITIONAL(USE_NETBSD, test x$sysv_style = xnetbsd)
 AM_CONDITIONAL(USE_REDHAT, test x$sysv_style = xredhat)
diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
index 09703158..983d1657 100644
--- a/etc/uams/Makefile.am
+++ b/etc/uams/Makefile.am
@@ -9,11 +9,7 @@ SUBDIRS = uams_krb4
 UAMS_GENERIC = uams_guest.la uams_passwd.la
 
 if USE_DHX
-UAMS_DHX_GENERIC = uams_randnum.la uams_dhx_passwd.la
-endif
-
-if USE_PGP
-UAMS_PGP = uams_pgp.la
+UAMS_DHX_GENERIC = uams_randnum.la uams_pgp.la uams_dhx_passwd.la
 endif
 
 if BUILD_PAM
@@ -73,7 +69,6 @@ uams_dhx_pam_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@ -lpam
 uamsdir = @UAMS_PATH@
 uams_LTLIBRARIES =		\
 	$(UAMS_GENERIC)		\
-	$(UAMS_PGP)		\
 	$(UAMS_PAM)		\
 	$(UAMS_DHX_GENERIC)	\
 	$(UAMS_DHX_PAM)
-- 
2.39.2