svn commit: samba r18098 - in branches/SAMBA_4_0/source/lib: ldb tdb

[metze at samba.org]

Author: metze
Date: 2006-09-05 15:26:03 +0000 (Tue, 05 Sep 2006)
New Revision: 18098

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18098

Log:
use m4_include() instead of sinclude()

this breaks ./autogen.sh in lib/ldb/, but the ldb build is broken
anyway

metze
Modified:
   branches/SAMBA_4_0/source/lib/ldb/configure.ac
   branches/SAMBA_4_0/source/lib/tdb/configure.ac


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/configure.ac	2006-09-05 15:21:12 UTC (rev 18097)
+++ branches/SAMBA_4_0/source/lib/ldb/configure.ac	2006-09-05 15:26:03 UTC (rev 18098)
@@ -48,10 +48,10 @@
 TESTS=""
 EXTRA_OBJ=""
 
-sinclude(popt.m4)
-sinclude(replace/config.m4)
+m4_include(popt.m4)
+m4_include(../replace/libreplace.m4)
 
-sinclude(ldap.m4)
+m4_include(ldap.m4)
 if test x"$with_ldap_support" = x"yes"; then
    LIBS="$LIBS -llber -lldap"
    CFLAGS="$CFLAGS -DHAVE_LDAP=1"
@@ -59,7 +59,7 @@
    TESTS="$TESTS test-ldap.sh"
 fi
 
-sinclude(sqlite3.m4)
+m4_include(sqlite3.m4)
 if test x"$with_sqlite3_support" = x"yes"; then
    LIBS="$LIBS -lsqlite3"
    CFLAGS="$CFLAGS -DHAVE_SQLITE3=1"
@@ -70,10 +70,10 @@
 AC_SUBST(TESTS)
 AC_SUBST(EXTRA_OBJ)
 
-sinclude(replace.m4)
+m4_include(replace.m4)
 SMB_REPLACE_FUNCS(strtoll)
 
-sinclude(config.m4)
-sinclude(../talloc/config.m4)
-sinclude(../tdb/config.m4)
+m4_include(config.m4)
+m4_include(../talloc/config.m4)
+m4_include(../tdb/config.m4)
 AC_OUTPUT(Makefile ldb.pc)

Modified: branches/SAMBA_4_0/source/lib/tdb/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/configure.ac	2006-09-05 15:21:12 UTC (rev 18097)
+++ branches/SAMBA_4_0/source/lib/tdb/configure.ac	2006-09-05 15:26:03 UTC (rev 18098)
@@ -11,5 +11,5 @@
 AC_CHECK_SIZEOF(size_t,cross)
 AC_CHECK_SIZEOF(ssize_t,cross)
 AC_FUNC_MMAP
-sinclude(config.m4)
+m4_include(config.m4)
 AC_OUTPUT(Makefile tdb.pc)