Some updates for the Kerberos 5 UAM. We now use an autoconf macro to

[netatalk.git] / etc / uams / Makefile.am

diff --git a/etc/uams/Makefile.am b/etc/uams/Makefile.am
index a3dcfdda5c80164bb88493a18e7eace194d1fa83..336f3821b6cb56603ad95beabbf9378f1e939e39 100644 (file)
--- a/etc/uams/Makefile.am
+++ b/etc/uams/Makefile.am
@@ -6,14 +6,14 @@ SUBDIRS = uams_krb4
 # conditionally build some modules
 #
 
+if USE_GSSAPI
+UAMS_GENERIC = uams_guest.la uams_passwd.la uams_gss.la
+else
 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
+if USE_DHX
+UAMS_DHX_GENERIC = uams_randnum.la uams_pgp.la uams_dhx_passwd.la
 endif
 
 if BUILD_PAM
@@ -32,37 +32,54 @@ UAMS_CLRTXT_LINK = uams_passwd.so
 UAMS_DHX_LINK    = uams_dhx_passwd.so
 endif
 
+#
+# SSL and crypto flag setup
+#
+
+if HAVE_GCRYPT
+CRYPT_CFLAGS = $(GCRYPT_CFLAGS)
+CRYPT_LIBS = $(GCRYPT_LIBS)
+else
+CRYPT_CFLAGS = $(SSL_CFLAGS)
+CRYPT_LIBS = $(SSL_LIBS)
+endif
+
 #
 # source files
 #
 
 uams_guest_la_SOURCES      = uams_guest.c
-uams_randnum_la_SOURCES    = uams_randnum.c
+uams_randnum_la_SOURCES    = uams_randnum.c crypt.c crypt.h
 uams_passwd_la_SOURCES     = uams_passwd.c
 uams_pam_la_SOURCES        = uams_pam.c
 uams_pgp_la_SOURCES        = uams_pgp.c
-uams_dhx_passwd_la_SOURCES = uams_dhx_passwd.c
-uams_dhx_pam_la_SOURCES    = uams_dhx_pam.c
+uams_dhx_passwd_la_SOURCES = uams_dhx_passwd.c crypt.c crypt.h
+uams_dhx_pam_la_SOURCES    = uams_dhx_pam.c crypt.c crypt.h
+uams_gss_la_SOURCES       = uams_gss.c
 
 #
 # flags
 #
 
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys @SSL_CFLAGS@
+
 uams_guest_la_CFLAGS      = @CFLAGS@
-uams_randnum_la_CFLAGS    = @CFLAGS@ @SSL_CFLAGS@
+uams_randnum_la_CFLAGS    = @CFLAGS@ $(CRYPT_CFLAGS)
 uams_passwd_la_CFLAGS     = @CFLAGS@
 uams_pam_la_CFLAGS        = @CFLAGS@
-uams_pgp_la_CFLAGS        = @CFLAGS@ @SSL_CFLAGS@
+uams_pgp_la_CFLAGS        = @CFLAGS@ $(CRYPT_CFLAGS)
 uams_dhx_passwd_la_CFLAGS = @CFLAGS@ @SSL_CFLAGS@
 uams_dhx_pam_la_CFLAGS    = @CFLAGS@ @SSL_CFLAGS@
+uams_gss_la_CFLAGS       = @CFLAGS@ @GSSAPI_CFLAGS@
 
 uams_guest_la_LDFLAGS      = -module -avoid-version
-uams_randnum_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@
+uams_randnum_la_LDFLAGS    = -module -avoid-version $(CRYPT_LIBS)
 uams_passwd_la_LDFLAGS     = -module -avoid-version
 uams_pam_la_LDFLAGS        = -module -avoid-version -lpam
-uams_pgp_la_LDFLAGS        = -module -avoid-version @SSL_LIBS@
+uams_pgp_la_LDFLAGS        = -module -avoid-version $(CRYPT_LIBS)
 uams_dhx_passwd_la_LDFLAGS = -module -avoid-version @SSL_LIBS@
 uams_dhx_pam_la_LDFLAGS    = -module -avoid-version @SSL_LIBS@ -lpam
+uams_gss_la_LDFLAGS       = -module -avoid-version @GSSAPI_LIBS@
 
 #
 # module compilation
@@ -71,7 +88,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)