summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-05-18 13:12:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:53:49 -0500
commit25b69856ec2ecd7f33ea833cc8f604e08d35b6c7 (patch)
tree6d49092bde415b56ac1a63d660cd93f821fbc77f /source4
parentc650534613e1becb1a28c6d7d2a82cc7c2225d5c (diff)
downloadsamba-25b69856ec2ecd7f33ea833cc8f604e08d35b6c7.tar.gz
samba-25b69856ec2ecd7f33ea833cc8f604e08d35b6c7.tar.bz2
samba-25b69856ec2ecd7f33ea833cc8f604e08d35b6c7.zip
r765: add SMB_INCLUDE_M4() macro as wrapper arround sinclude()
metze (This used to be commit afbe692b47f4aa6ebe2155927be00197fafe13f3)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/m4/rewrite.m42
-rw-r--r--source4/build/smb_build/public.m419
-rw-r--r--source4/configure.in39
3 files changed, 39 insertions, 21 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index 20aef6f80d..0df2b7b65c 100644
--- 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 863dddc7a2..0d4be5313d 100644
--- 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 1f64826618..f7d62f8e7a 100644
--- 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"