svn commit: samba r15231 - in branches/SAMBA_4_0/source: build/m4 build/smb_build lib/tls

jelmer at samba.org jelmer at samba.org
Tue Apr 25 09:21:40 GMT 2006


Author: jelmer
Date: 2006-04-25 09:21:40 +0000 (Tue, 25 Apr 2006)
New Revision: 15231

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

Log:
Try to fix detection of ability of CC to generate dependencies

Modified:
   branches/SAMBA_4_0/source/build/m4/check_cc.m4
   branches/SAMBA_4_0/source/build/smb_build/TODO
   branches/SAMBA_4_0/source/lib/tls/config.m4


Changeset:
Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-04-25 09:04:52 UTC (rev 15230)
+++ branches/SAMBA_4_0/source/build/m4/check_cc.m4	2006-04-25 09:21:40 UTC (rev 15231)
@@ -217,12 +217,16 @@
 fi
 
 
-automatic_dependencies=no
+new_make=no
 AC_MSG_CHECKING([for GNU make >= 3.81])
 if test x$GNU_MAKE = x"yes"; then
 	if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then
-		AX_CXXFLAGS_GCC_OPTION(-MT, [], [automatic_dependencies=yes], [])
+		new_make=yes
 	fi
 fi
+AC_MSG_RESULT($new_make)
+automatic_dependencies=no
+AX_CXXFLAGS_GCC_OPTION(-MT, [], [ automatic_dependencies=$new_make ], [])
+AC_MSG_CHECKING([Whether to use automatic dependencies])
 AC_MSG_RESULT($automatic_dependencies)
 AC_SUBST(automatic_dependencies)

Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/TODO	2006-04-25 09:04:52 UTC (rev 15230)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO	2006-04-25 09:21:40 UTC (rev 15231)
@@ -1,6 +1,5 @@
 - make --enable-dso the default
  - fix module loading for selftest during non-developer builds
-- per-subsystem CFLAGS (which are inherited)
 - clearer distinction between dcerpc and ndr. seperate interface tables?
 - saner names for:
 	libcli.so.0.0.1 (rename to libsmb?)

Modified: branches/SAMBA_4_0/source/lib/tls/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tls/config.m4	2006-04-25 09:04:52 UTC (rev 15230)
+++ branches/SAMBA_4_0/source/lib/tls/config.m4	2006-04-25 09:21:40 UTC (rev 15231)
@@ -1,6 +1,9 @@
 ###############################
 # start SMB_EXT_LIB_GNUTLS
 # check for gnutls/gnutls.h and -lgnutls
+#
+# Should eventually change to simply:
+# SMB_EXT_LIB_FROM_PKGCONFIG(GNUTLS, gnutls)
 AC_CHECK_HEADERS(gnutls/gnutls.h)
 AC_CHECK_LIB_EXT(gnutls, GNUTLS_LIBS, gnutls_global_init)
 if test x"$ac_cv_header_gnutls_gnutls_h" = x"yes" -a x"$ac_cv_lib_ext_gnutls_gnutls_global_init" = x"yes";then



More information about the samba-cvs mailing list