diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-17 05:18:08 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2005-06-17 05:18:08 +0000 |
| commit | 9b28bbb7c7dc3ec537c86dd5b8b2e44052c9bb22 (patch) | |
| tree | beb612efac8a62f312b6e4ef9b2d241998b4dcb8 /source | |
| parent | 554c4fa0c1a052f108e68e3df5dda005ee7c8794 (diff) | |
| download | samba-9b28bbb7c7dc3ec537c86dd5b8b2e44052c9bb22.tar.gz samba-9b28bbb7c7dc3ec537c86dd5b8b2e44052c9bb22.tar.xz samba-9b28bbb7c7dc3ec537c86dd5b8b2e44052c9bb22.zip | |
r7672: this should fix the crypt dependency problem (I hope!)
Diffstat (limited to 'source')
| -rw-r--r-- | source/build/m4/rewrite.m4 | 6 | ||||
| -rw-r--r-- | source/heimdal_build/config.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/build/m4/rewrite.m4 b/source/build/m4/rewrite.m4 index cd33ef0cceb..53010bef5ae 100644 --- a/source/build/m4/rewrite.m4 +++ b/source/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/source/heimdal_build/config.mk b/source/heimdal_build/config.mk index 4d7e63877af..66680fb8ad2 100644 --- a/source/heimdal_build/config.mk +++ b/source/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 ####################### |