From 416c9068a2e2fcc50a7fdfff4c1b4dc8d99f6353 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 17 Jun 2005 05:18:08 +0000 Subject: r7672: this should fix the crypt dependency problem (I hope!) (This used to be commit 3fe00b61147e09159ef02328a7f1d8f7805abf0d) --- source4/build/m4/rewrite.m4 | 6 +++--- source4/heimdal_build/config.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source4') diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index cd33ef0cce..53010bef5a 100644 --- 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 4d7e63877a..66680fb8ad 100644 --- 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 ####################### -- cgit