summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-17 05:18:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:20 -0500
commit416c9068a2e2fcc50a7fdfff4c1b4dc8d99f6353 (patch)
tree780b70935f5f34eb3e0774342cfaf411ae558391
parent08e23b36cb2a7437257c399e390485f288c572a1 (diff)
downloadsamba-416c9068a2e2fcc50a7fdfff4c1b4dc8d99f6353.tar.gz
samba-416c9068a2e2fcc50a7fdfff4c1b4dc8d99f6353.tar.bz2
samba-416c9068a2e2fcc50a7fdfff4c1b4dc8d99f6353.zip
r7672: this should fix the crypt dependency problem (I hope!)
(This used to be commit 3fe00b61147e09159ef02328a7f1d8f7805abf0d)
-rw-r--r--source4/build/m4/rewrite.m46
-rw-r--r--source4/heimdal_build/config.mk2
2 files changed, 4 insertions, 4 deletions
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
#######################