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

(This used to be commit 11353d4b47964b762a72ec0e55221811a5a3d550)

diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4
index 6823237805aa99d2f6bee64a4702d880c22c7064..a56627eecca33edc0799f356cd6914120050ac9d 100644 (file)
--- a/source4/build/m4/check_cc.m4
+++ b/source4/build/m4/check_cc.m4
@@ -217,12 +217,16 @@ if test "x$GNU_MAKE" = x"yes"; then
 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)

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index ebd595c9992bf57b53fcf0a3dd4668418ce50a81..be79bd984da7d0032468bfae6212bf8935989edc 100644 (file)
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -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?)

diff --git a/source4/lib/tls/config.m4 b/source4/lib/tls/config.m4
index 6ad618632e591635d7dff5fbe2c3242d1cb5629d..c16da9fd467ba42cc98d1b4332d6b10963b8e8d4 100644 (file)
--- a/source4/lib/tls/config.m4
+++ b/source4/lib/tls/config.m4
@@ -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