Check for crypt in external library

Check to see if we need to explicitly include a library in order
to get the crypt() function

Change-Id: I9bd1d70e420d4d1656bd86cd3215525102fa6259
Reviewed-on: http://gerrit.openafs.org/2404
Tested-by: Derrick Brashear <shadow@dementia.org>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/acinclude.m4 b/acinclude.m4
index 5ead4b2..bc50f5d 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1380,4 +1380,8 @@ AC_SUBST(HELPER_SPLINTCFG)
 
 mkdir -p ${TOP_OBJDIR}/src/JAVA/libjafs
 
+
+dnl Check to see if crypt lives in a different library
+AC_CHECK_LIB(crypt, crypt, LIB_crypt="-lcrypt")
+AC_SUBST(LIB_crypt)
 ])

diff --git a/src/config/Makefile.config.in b/src/config/Makefile.config.in
index 49ad5de..24e16fd 100644 (file)
--- a/src/config/Makefile.config.in
+++ b/src/config/Makefile.config.in
@@ -50,6 +50,7 @@ KERN_OPTMZ = @KERN_OPTMZ@
 LD = @LD@
 LEX = @LEX@
 LIB_AFSDB = @LIB_AFSDB@
+LIB_crypt = @LIB_crypt@
 LIBS = @LIBS@
 LIB_LIBINTL = @LIB_libintl@
 LINUX_KERNEL_PATH = @LINUX_KERNEL_PATH@

diff --git a/src/shlibafsauthent/Makefile.in b/src/shlibafsauthent/Makefile.in
index 3a8a402..dddff33 100644 (file)
--- a/src/shlibafsauthent/Makefile.in
+++ b/src/shlibafsauthent/Makefile.in
@@ -133,7 +133,7 @@ dest: ${LIBAFSAUTHENT} libafsauthent_pic.a
 ${LIBAFSAUTHENT}: ${LIBOBJS} libafsauthent.map
        ../config/shlib-build -d $(srcdir) -l libafsauthent \
                -M ${LIBAFSAUTHENTMAJOR} -m ${LIBAFSAUTHENTMINOR} -- \
-               -L${TOP_LIBDIR} -lafsrpc ${LIBOBJS} ${LIB_AFSDB} ${MT_LIBS}
+               -L${TOP_LIBDIR} -lafsrpc ${LIB_crypt} ${LIBOBJS} ${LIB_AFSDB} ${MT_LIBS}
 
 libafsauthent_pic.a: ${LIBOBJS}
        $(RM) -f $@