r7672: this should fix the crypt dependency problem (I hope!)

(This used to be commit 3fe00b61147e09159ef02328a7f1d8f7805abf0d)

diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index cd33ef0cceb6d745a7eb1448ae73a60681eb13a1..53010bef5ae828ec7895f88ecc540a4a3f41d916 100644 (file)
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -738,9 +738,9 @@ AC_SUBST(SMBD_EXTRA_LIBS)
 
 ###############################################
 # test for where we get crypt() from
-AC_SEARCH_LIBS(crypt, [crypt],
-  [test "$ac_cv_search_crypt" = "none required" || AUTHLIBS="-lcrypt $AUTHLIBS"
-  AC_DEFINE(HAVE_CRYPT,1,[Whether the system has the crypt() function])])
+AC_CHECK_LIB_EXT(crypt, CRYPT_LIBS, crypt)
+SMB_EXT_LIB_ENABLE(CRYPT,YES)
+SMB_EXT_LIB(CRYPT, $CRYPT_LIBS)
 
 ##
 ## moved after the check for -lcrypt in order to

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 4d7e63877af2325ecfe8bb92ab24f52eb03f7c98..66680fb8ad2b7264b5d7ab08379f514bb7f9d6b2 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -380,6 +380,6 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM KERBEROS_LIB
 [SUBSYSTEM::KERBEROS_LIB]
 #REQUIRED_SUBSYSTEMS = EXT_LIB_KRB5
-REQUIRED_SUBSYSTEMS = HEIMDAL LIBREPLACE
+REQUIRED_SUBSYSTEMS = HEIMDAL LIBREPLACE EXT_LIB_CRYPT
 # End SUBSYSTEM KERBEROS_LIB
 #######################