svn commit: samba r7672 - in branches/SAMBA_4_0/source: build/m4 heimdal_build

[tridge at samba.org]

Author: tridge
Date: 2005-06-17 05:18:08 +0000 (Fri, 17 Jun 2005)
New Revision: 7672

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7672

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

Modified:
   branches/SAMBA_4_0/source/build/m4/rewrite.m4
   branches/SAMBA_4_0/source/heimdal_build/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4	2005-06-17 03:30:49 UTC (rev 7671)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4	2005-06-17 05:18:08 UTC (rev 7672)
@@ -738,9 +738,9 @@
 
 ###############################################
 # 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

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-06-17 03:30:49 UTC (rev 7671)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-06-17 05:18:08 UTC (rev 7672)
@@ -380,6 +380,6 @@
 # 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
 #######################