svn commit: samba r18283 - in branches/SAMBA_4_0/source/lib: ldb replace talloc

[tridge at samba.org]

Author: tridge
Date: 2006-09-09 02:52:41 +0000 (Sat, 09 Sep 2006)
New Revision: 18283

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

Log:

libreplace.m4 needs to be early in configure.ac in other packages too

Modified:
   branches/SAMBA_4_0/source/lib/ldb/configure.ac
   branches/SAMBA_4_0/source/lib/replace/configure.ac
   branches/SAMBA_4_0/source/lib/replace/libreplace.m4
   branches/SAMBA_4_0/source/lib/talloc/configure.ac


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/configure.ac	2006-09-09 02:35:38 UTC (rev 18282)
+++ branches/SAMBA_4_0/source/lib/ldb/configure.ac	2006-09-09 02:52:41 UTC (rev 18283)
@@ -13,7 +13,7 @@
 AC_DEFUN([SMB_ENABLE], [echo -n ""])
 AC_INIT(include/ldb.h)
 AC_CONFIG_SRCDIR([common/ldb.c])
-AC_PROG_CC
+m4_include(libreplace.m4)
 
 if test "$ac_cv_prog_gcc" = yes; then
    CFLAGS="$CFLAGS -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings"
@@ -29,8 +29,6 @@
    LIBS="$LIBS -lgcov"
 fi
 
-AC_SYS_LARGEFILE
-AC_FUNC_MMAP
 AC_PATH_PROG(XSLTPROC,xsltproc)
 AC_PATH_PROG(DOXYGEN,doxygen)
 AC_PATH_PROG(GCOV,gcov)
@@ -48,7 +46,6 @@
 TESTS=""
 EXTRA_OBJ=""
 
-m4_include(libreplace.m4)
 m4_include(libpopt.m4)
 m4_include(libtalloc.m4)
 m4_include(libtdb.m4)

Modified: branches/SAMBA_4_0/source/lib/replace/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/configure.ac	2006-09-09 02:35:38 UTC (rev 18282)
+++ branches/SAMBA_4_0/source/lib/replace/configure.ac	2006-09-09 02:52:41 UTC (rev 18283)
@@ -5,8 +5,6 @@
 AC_INIT(dlfcn.c)
 AC_CONFIG_SRCDIR([dlfcn.c])
 AC_CONFIG_HEADER(config.h)
-AC_PROG_INSTALL
-AC_PROG_CC
 
 if test "$ac_cv_prog_gcc" = yes; then
    CFLAGS="$CFLAGS -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings"

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-09 02:35:38 UTC (rev 18282)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-09 02:52:41 UTC (rev 18283)
@@ -16,6 +16,7 @@
 AC_USE_SYSTEM_EXTENSIONS
 AC_C_INLINE
 AC_PROG_CC
+AC_PROG_INSTALL
 
 LIBREPLACE_C99_STRUCT_INIT([],[])
 
@@ -30,6 +31,7 @@
 AC_C_BIGENDIAN
 AC_HEADER_STDC
 
+
 AC_CHECK_SIZEOF(off_t,cross)
 AC_CHECK_SIZEOF(size_t,cross)
 AC_CHECK_SIZEOF(ssize_t,cross)

Modified: branches/SAMBA_4_0/source/lib/talloc/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/configure.ac	2006-09-09 02:35:38 UTC (rev 18282)
+++ branches/SAMBA_4_0/source/lib/talloc/configure.ac	2006-09-09 02:52:41 UTC (rev 18283)
@@ -2,21 +2,16 @@
 AC_INIT(talloc.h)
 AC_CONFIG_SRCDIR([talloc.c])
 AC_SUBST(datarootdir)
-AC_PROG_CC
-if test "x$GCC" = "xyes"; then
-	CFLAGS="$CFLAGS -Wall -W"
-fi
-AC_PROG_INSTALL
+AC_CONFIG_HEADER(config.h)
+
+m4_include(libreplace.m4)
+m4_include(libtalloc.m4)
+
 AC_PATH_PROG(XSLTPROC,xsltproc)
 DOC_TARGET=""
 if test -n "$XSLTPROC"; then
 	DOC_TARGET=doc
 fi
 AC_SUBST(DOC_TARGET)
-AC_CONFIG_HEADER(config.h)
-AC_SYS_LARGEFILE
 
-m4_include(libreplace.m4)
-m4_include(libtalloc.m4)
-
 AC_OUTPUT(Makefile talloc.pc)