3 files changed, 52 insertions, 53 deletions
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4
index 0dd5a378e5..6428a0b265 100644
--- a/source4/build/m4/env.m4
+++ b/source4/build/m4/env.m4
@@ -33,9 +33,9 @@ fi
 
 AC_DEFINE([_GNU_SOURCE],[],[Pull in GNU extensions])
 
-sinclude(build/m4/check_path.m4)
-sinclude(build/m4/check_perl.m4)
-sinclude(build/m4/check_cc.m4)
-sinclude(build/m4/check_ld.m4)
-sinclude(build/m4/check_types.m4)
-sinclude(build/m4/check_doc.m4)
+m4_include(build/m4/check_path.m4)
+m4_include(build/m4/check_perl.m4)
+m4_include(build/m4/check_cc.m4)
+m4_include(build/m4/check_ld.m4)
+m4_include(build/m4/check_types.m4)
+m4_include(build/m4/check_doc.m4)
diff --git a/source4/configure.ac b/source4/configure.ac
index c7195c8146..e3244d2656 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -10,50 +10,49 @@ AC_CONFIG_SRCDIR([include/includes.h])
 AC_CONFIG_HEADER(include/config_tmp.h)
 
 # Configuration rules.
-sinclude(build/m4/env.m4)
-sinclude(lib/replace/config.m4)
-sinclude(lib/replace/win32/config.m4)
-sinclude(lib/replace/repdir/config.m4)
-sinclude(lib/smbreadline/readline.m4)
-sinclude(include/system/config.m4)
-sinclude(build/m4/rewrite.m4)
-sinclude(heimdal_build/config.m4)
-sinclude(lib/util/fault.m4)
-sinclude(lib/util/signal.m4)
-sinclude(lib/util/util.m4)
-sinclude(lib/util/fsusage.m4)
-sinclude(lib/util/xattr.m4)
-sinclude(lib/util/capability.m4)
-sinclude(lib/util/time.m4)
-sinclude(lib/popt/config.m4)
-sinclude(lib/charset/config.m4)
-sinclude(lib/socket/config.m4)
-sinclude(lib/talloc/config.m4)
-sinclude(lib/tdb/config.m4)
-sinclude(lib/ldb/sqlite3.m4)
-sinclude(lib/ldb/replace/config.m4)
-sinclude(lib/ldb/config.m4)
-sinclude(lib/tls/config.m4)
-sinclude(lib/events/config.m4)
+m4_include(build/m4/env.m4)
+m4_include(lib/replace/libreplace.m4)
+m4_include(lib/replace/win32/config.m4)
+m4_include(lib/replace/repdir/config.m4)
+m4_include(lib/smbreadline/readline.m4)
+m4_include(include/system/config.m4)
+m4_include(build/m4/rewrite.m4)
+m4_include(heimdal_build/config.m4)
+m4_include(lib/util/fault.m4)
+m4_include(lib/util/signal.m4)
+m4_include(lib/util/util.m4)
+m4_include(lib/util/fsusage.m4)
+m4_include(lib/util/xattr.m4)
+m4_include(lib/util/capability.m4)
+m4_include(lib/util/time.m4)
+m4_include(lib/popt/config.m4)
+m4_include(lib/charset/config.m4)
+m4_include(lib/socket/config.m4)
+m4_include(lib/talloc/libtalloc.m4)
+m4_include(lib/tdb/config.m4)
+m4_include(lib/ldb/sqlite3.m4)
+m4_include(lib/ldb/config.m4)
+m4_include(lib/tls/config.m4)
+m4_include(lib/events/config.m4)
 
 dnl disabled until we support external heimdal again
-dnl sinclude(auth/kerberos/config.m4)
-
-sinclude(auth/gensec/config.m4)
-sinclude(smbd/process_model.m4)
-sinclude(lib/registry/config.m4)
-sinclude(scripting/swig/config.m4)
-sinclude(gtk/config.m4)
-sinclude(ntvfs/posix/config.m4)
-sinclude(ntvfs/unixuid/config.m4)
-sinclude(lib/socket_wrapper/config.m4)
-sinclude(web_server/config.m4)
-sinclude(auth/config.m4)
-sinclude(kdc/config.m4)
-sinclude(ntvfs/sysdep/config.m4)
-sinclude(lib/appweb/config.m4)
-sinclude(nsswitch/config.m4)
-sinclude(libcli/config.m4)
+dnl m4_include(auth/kerberos/config.m4)
+
+m4_include(auth/gensec/config.m4)
+m4_include(smbd/process_model.m4)
+m4_include(lib/registry/config.m4)
+m4_include(scripting/swig/config.m4)
+m4_include(gtk/config.m4)
+m4_include(ntvfs/posix/config.m4)
+m4_include(ntvfs/unixuid/config.m4)
+m4_include(lib/socket_wrapper/config.m4)
+m4_include(web_server/config.m4)
+m4_include(auth/config.m4)
+m4_include(kdc/config.m4)
+m4_include(ntvfs/sysdep/config.m4)
+m4_include(lib/appweb/config.m4)
+m4_include(nsswitch/config.m4)
+m4_include(libcli/config.m4)
 
 AC_ARG_ENABLE(dso,
 [  --enable-dso 		Enable building internal libraries as DSO's (experimental)],
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index d2a3613390..e27a30bf22 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -173,7 +173,7 @@ fi
 AC_SUBST(VOID_RETSIGTYPE)
 
 
-sinclude(heimdal/cf/check-var.m4)
+m4_include(heimdal/cf/check-var.m4)
 
 rk_CHECK_VAR(h_errno, 
 [#ifdef HAVE_SYS_TYPES_H
@@ -183,10 +183,10 @@ rk_CHECK_VAR(h_errno,
 #include <netdb.h>
 #endif])
 
-sinclude(heimdal/cf/find-func.m4)
-sinclude(heimdal/cf/find-func-no-libs.m4)
-sinclude(heimdal/cf/find-func-no-libs2.m4)
-sinclude(heimdal/cf/resolv.m4)
+m4_include(heimdal/cf/find-func.m4)
+m4_include(heimdal/cf/find-func-no-libs.m4)
+m4_include(heimdal/cf/find-func-no-libs2.m4)
+m4_include(heimdal/cf/resolv.m4)
 
 smb_save_LIBS=$LIBS
 RESOLV_LIBS=""