diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-09 02:52:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:01 -0500 |
| commit | e6b457d55031f1987c8fa5719c5bbf46743281a0 (patch) | |
| tree | 5be8b87ef4db6bc84e4a2cb8c960a0129bcc936e | |
| parent | 35f1a2c30af0cb0a677642b893ebc38579482526 (diff) | |
| download | samba-e6b457d55031f1987c8fa5719c5bbf46743281a0.tar.gz samba-e6b457d55031f1987c8fa5719c5bbf46743281a0.tar.bz2 samba-e6b457d55031f1987c8fa5719c5bbf46743281a0.zip | |
r18283: libreplace.m4 needs to be early in configure.ac in other packages too
(This used to be commit 03f9c67c066d772d9a544f1183fbee609ab8137b)
| -rw-r--r-- | source4/lib/ldb/configure.ac | 5 | ||||
| -rw-r--r-- | source4/lib/replace/configure.ac | 2 | ||||
| -rw-r--r-- | source4/lib/replace/libreplace.m4 | 2 | ||||
| -rw-r--r-- | source4/lib/talloc/configure.ac | 15 |
4 files changed, 8 insertions, 16 deletions
diff --git a/source4/lib/ldb/configure.ac b/source4/lib/ldb/configure.ac index 6aeb39475a..1666a94de1 100644 --- a/source4/lib/ldb/configure.ac +++ b/source4/lib/ldb/configure.ac @@ -13,7 +13,7 @@ AC_DEFUN([SMB_EXT_LIB], [echo -n ""]) 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 @@ if test x"$with_gcov_support" = x"yes"; then 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 @@ AC_SUBST(MODULESDIR) TESTS="" EXTRA_OBJ="" -m4_include(libreplace.m4) m4_include(libpopt.m4) m4_include(libtalloc.m4) m4_include(libtdb.m4) diff --git a/source4/lib/replace/configure.ac b/source4/lib/replace/configure.ac index bd500ae8d4..aaf404e373 100644 --- a/source4/lib/replace/configure.ac +++ b/source4/lib/replace/configure.ac @@ -5,8 +5,6 @@ AC_PREREQ(2.50) 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" diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4 index 6a24c053e3..519b911de5 100644 --- a/source4/lib/replace/libreplace.m4 +++ b/source4/lib/replace/libreplace.m4 @@ -16,6 +16,7 @@ AC_ISC_POSIX AC_USE_SYSTEM_EXTENSIONS AC_C_INLINE AC_PROG_CC +AC_PROG_INSTALL LIBREPLACE_C99_STRUCT_INIT([],[]) @@ -30,6 +31,7 @@ esac AC_C_BIGENDIAN AC_HEADER_STDC + AC_CHECK_SIZEOF(off_t,cross) AC_CHECK_SIZEOF(size_t,cross) AC_CHECK_SIZEOF(ssize_t,cross) diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index a8b446169e..acde824b87 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -2,21 +2,16 @@ AC_PREREQ(2.50) 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) |