summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/build/m4/check_cc.m48
-rw-r--r--source4/build/smb_build/TODO1
-rw-r--r--source4/lib/tls/config.m43
3 files changed, 9 insertions, 3 deletions
diff --git a/source4/build/m4/check_cc.m4 b/source4/build/m4/check_cc.m4
index 6823237805..a56627eecc 100644
--- 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 ebd595c999..be79bd984d 100644
--- 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 6ad618632e..c16da9fd46 100644
--- 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