r765: add SMB_INCLUDE_M4() macro as wrapper arround sinclude()

metze
(This used to be commit afbe692b47f4aa6ebe2155927be00197fafe13f3)

diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index 20aef6f80de6c25c9ce037a91e2e66d21287ab65..0df2b7b65c7fc51c404b820c56b891518a37613b 100644 (file)
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -1421,7 +1421,7 @@ esac
 AC_SUBST(SMBD_EXTRA_OBJS)
 AC_SUBST(SMBD_EXTRA_LIBS)
 
-sinclude(libads/config.m4)
+SMB_INCLUDE_M4(libads/config.m4)
 
 ###############################################
 # test for where we get crypt() from

diff --git a/source4/build/smb_build/public.m4 b/source4/build/smb_build/public.m4
index 863dddc7a25d4e57a6e61624a8ad3299ad2a98ff..0d4be5313d2fe10613a860042ccc42c0b9196251 100644 (file)
--- a/source4/build/smb_build/public.m4
+++ b/source4/build/smb_build/public.m4
@@ -104,6 +104,11 @@ dnl                1:name
 dnl            2:calledname
 dnl            )
 dnl
+dnl SMB_INCLUDE_M4(
+dnl            1: inputfile
+dnl            2: comment
+dnl            )
+dnl
 dnl SMB_AC_OUTPUT(
 dnl            1: outputfile
 dnl            )
@@ -493,6 +498,20 @@ AC_DEFUN([SMB_MAKE_TARGET],
        echo "#SMB_MAKE_TARGET TOTO"
 ])
 
+dnl SMB_INCLUDE_M4(
+dnl            1: inputfile
+dnl            2: comment
+dnl            )
+AC_DEFUN([SMB_INCLUDE_M4],
+[
+###################################
+# Start Include $1
+# $2
+sinclude($1)
+# End Include $1
+###################################
+])
+
 dnl SMB_AC_OUTPUT(
 dnl            1: outputfile
 dnl            )

diff --git a/source4/configure.in b/source4/configure.in
index 1f64826618e309b62409e4876e5af7a5a5445c48..f7d62f8e7aa0c05cc19174cc5b868ef1afdfdaed 100644 (file)
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -173,7 +173,7 @@ AC_ARG_ENABLE(experimental, [  --enable-experimental Turn on experimental featur
         experimental=yes
     fi])
 
-sinclude(build/m4/rewrite.m4)
+SMB_INCLUDE_M4(build/m4/rewrite.m4)
 
 dnl exclude these modules 
 AC_ARG_WITH(exclude-modules,
@@ -205,25 +205,24 @@ AC_ARG_WITH(static-modules,
        done
 fi ])
 
-sinclude(nsswitch/config.m4)
-sinclude(lib/popt/config.m4)
-sinclude(lib/iconv.m4)
-sinclude(lib/basic.m4)
-sinclude(lib/tdb/config.m4)
-sinclude(lib/ldb/config.m4)
-sinclude(lib/cmdline/config.m4)
-sinclude(param/config.m4)
-sinclude(libcli/config.m4)
-sinclude(librpc/config.m4)
-sinclude(libcli/libsmb.m4)
-sinclude(smbd/process_model.m4)
-sinclude(smb_server/config.m4)
-sinclude(auth/config.m4)
-sinclude(ntvfs/config.m4)
-sinclude(rpc_server/config.m4)
-sinclude(lib/registry/config.m4)
-sinclude(torture/config.m4)
-sinclude(scripting/config.m4)
+SMB_INCLUDE_M4(lib/popt/config.m4)
+SMB_INCLUDE_M4(lib/iconv.m4)
+SMB_INCLUDE_M4(lib/basic.m4)
+SMB_INCLUDE_M4(lib/tdb/config.m4)
+SMB_INCLUDE_M4(lib/ldb/config.m4)
+SMB_INCLUDE_M4(lib/cmdline/config.m4)
+SMB_INCLUDE_M4(param/config.m4)
+SMB_INCLUDE_M4(libcli/config.m4)
+SMB_INCLUDE_M4(librpc/config.m4)
+SMB_INCLUDE_M4(libcli/libsmb.m4)
+SMB_INCLUDE_M4(smbd/process_model.m4)
+SMB_INCLUDE_M4(smb_server/config.m4)
+SMB_INCLUDE_M4(auth/config.m4)
+SMB_INCLUDE_M4(ntvfs/config.m4)
+SMB_INCLUDE_M4(rpc_server/config.m4)
+SMB_INCLUDE_M4(lib/registry/config.m4)
+SMB_INCLUDE_M4(torture/config.m4)
+SMB_INCLUDE_M4(scripting/config.m4)
 
 ALLLIBS_LIBS="$LIBS"
 ALLLIBS_CFLAGS="$CFLAGS"