diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-06-05 00:28:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:37 -0500 |
| commit | d54c2639f57761bc69a8629e7055fa6558429006 (patch) | |
| tree | 9d70dffe7c3cc20ccc434b60de574e7bbecb262a | |
| parent | 06cc74a66cef3944573e4390af0ee101517835df (diff) | |
| download | samba-d54c2639f57761bc69a8629e7055fa6558429006.tar.gz samba-d54c2639f57761bc69a8629e7055fa6558429006.tar.bz2 samba-d54c2639f57761bc69a8629e7055fa6558429006.zip | |
r7288: Remove empty wrapper function
(This used to be commit 879f68cef72df708a6ff7a5f5818fa8478c2a6ea)
| -rw-r--r-- | source4/build/m4/public.m4 | 19 | ||||
| -rw-r--r-- | source4/build/m4/rewrite.m4 | 4 | ||||
| -rw-r--r-- | source4/configure.in | 46 |
3 files changed, 25 insertions, 44 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4 index 12238bbcc8..2a6b4e3893 100644 --- a/source4/build/m4/public.m4 +++ b/source4/build/m4/public.m4 @@ -55,11 +55,6 @@ dnl 1:name dnl 2:calledname dnl ) dnl -dnl SMB_INCLUDE_M4( -dnl 1: inputfile -dnl 2: comment -dnl ) -dnl dnl SMB_ENV_CHECK( dnl 1:dummy dnl ) @@ -264,20 +259,6 @@ 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_ENV_CHECK( dnl 1:dummy dnl ) diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4 index 9a83cb7b06..6733df988c 100644 --- a/source4/build/m4/rewrite.m4 +++ b/source4/build/m4/rewrite.m4 @@ -736,8 +736,8 @@ esac AC_SUBST(SMBD_EXTRA_OBJS) AC_SUBST(SMBD_EXTRA_LIBS) -SMB_INCLUDE_M4(lib/ldb/ldap.m4) -SMB_INCLUDE_M4(lib/ldb/sqlite3.m4) +sinclude(lib/ldb/ldap.m4) +sinclude(lib/ldb/sqlite3.m4) ############################################### # test for where we get crypt() from diff --git a/source4/configure.in b/source4/configure.in index 43b508d979..1f8af749dc 100644 --- a/source4/configure.in +++ b/source4/configure.in @@ -7,29 +7,29 @@ dnl AC_PREREQ(2.53) AC_INIT(include/includes.h) AC_CONFIG_HEADER(include/config.h) -SMB_INCLUDE_M4(build/m4/env.m4) -SMB_INCLUDE_M4(build/m4/rewrite.m4) - -SMB_INCLUDE_M4(lib/popt/config.m4) -SMB_INCLUDE_M4(lib/iconv.m4) -SMB_INCLUDE_M4(lib/socket/config.m4) -SMB_INCLUDE_M4(lib/talloc/config.m4) -SMB_INCLUDE_M4(lib/tdb/config.m4) -SMB_INCLUDE_M4(lib/ldb/config.m4) -SMB_INCLUDE_M4(lib/events/config.m4) -SMB_INCLUDE_M4(lib/cmdline/config.m4) -SMB_INCLUDE_M4(auth/kerberos/config.m4) -SMB_INCLUDE_M4(auth/gensec/config.m4) -SMB_INCLUDE_M4(libcli/config.m4) -SMB_INCLUDE_M4(smbd/process_model.m4) -SMB_INCLUDE_M4(lib/registry/config.m4) -SMB_INCLUDE_M4(scripting/config.m4) -SMB_INCLUDE_M4(gtk/config.m4) -SMB_INCLUDE_M4(ntvfs/posix/config.m4) -SMB_INCLUDE_M4(lib/socket_wrapper/config.m4) -SMB_INCLUDE_M4(web_server/config.m4) -SMB_INCLUDE_M4(auth/config.m4) -SMB_INCLUDE_M4(smbd/config.m4) +sinclude(build/m4/env.m4) +sinclude(build/m4/rewrite.m4) + +sinclude(lib/popt/config.m4) +sinclude(lib/iconv.m4) +sinclude(lib/socket/config.m4) +sinclude(lib/talloc/config.m4) +sinclude(lib/tdb/config.m4) +sinclude(lib/ldb/config.m4) +sinclude(lib/events/config.m4) +sinclude(lib/cmdline/config.m4) +sinclude(auth/kerberos/config.m4) +sinclude(auth/gensec/config.m4) +sinclude(libcli/config.m4) +sinclude(smbd/process_model.m4) +sinclude(lib/registry/config.m4) +sinclude(scripting/config.m4) +sinclude(gtk/config.m4) +sinclude(ntvfs/posix/config.m4) +sinclude(lib/socket_wrapper/config.m4) +sinclude(web_server/config.m4) +sinclude(auth/config.m4) +sinclude(smbd/config.m4) ALLLIBS_LIBS="$LIBS" ALLLIBS_CFLAGS="$CFLAGS" |