Author: metze Date: 2006-09-13 16:51:45 +0000 (Wed, 13 Sep 2006) New Revision: 18485
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18485 Log: include libreplace.m4 in the aclocal.m4 files and use the macros in configure.ac metze Modified: branches/SAMBA_4_0/source/aclocal.m4 branches/SAMBA_4_0/source/build/m4/check_cc.m4 branches/SAMBA_4_0/source/configure.ac branches/SAMBA_4_0/source/lib/ldb/aclocal.m4 branches/SAMBA_4_0/source/lib/ldb/configure.ac branches/SAMBA_4_0/source/lib/replace/aclocal.m4 branches/SAMBA_4_0/source/lib/replace/configure.ac branches/SAMBA_4_0/source/lib/replace/libreplace.m4 branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4 branches/SAMBA_4_0/source/lib/replace/samba.m4 branches/SAMBA_4_0/source/lib/talloc/aclocal.m4 branches/SAMBA_4_0/source/lib/talloc/configure.ac branches/SAMBA_4_0/source/lib/tdb/aclocal.m4 branches/SAMBA_4_0/source/lib/tdb/configure.ac Changeset: Modified: branches/SAMBA_4_0/source/aclocal.m4 =================================================================== --- branches/SAMBA_4_0/source/aclocal.m4 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/aclocal.m4 2006-09-13 16:51:45 UTC (rev 18485) @@ -34,7 +34,7 @@ $1=[$]ac_new_flags ]) -m4_include(lib/replace/libreplace_macros.m4) +m4_include(lib/replace/libreplace.m4) m4_include(build/m4/ax_cflags_gcc_option.m4) m4_include(build/m4/ax_cflags_irix_option.m4) m4_include(build/m4/public.m4) Modified: branches/SAMBA_4_0/source/build/m4/check_cc.m4 =================================================================== --- branches/SAMBA_4_0/source/build/m4/check_cc.m4 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/build/m4/check_cc.m4 2006-09-13 16:51:45 UTC (rev 18485) @@ -5,14 +5,7 @@ dnl ------------------------------------------------------- dnl -# don't let the AC_PROG_CC macro auto set the CFLAGS -OLD_CFLAGS="${CFLAGS}" -AC_PROG_CC -CFLAGS="${OLD_CFLAGS}" -if test x"$CC" = x""; then - AC_MSG_WARN([No c compiler was not found!]) - AC_MSG_ERROR([Please Install gcc from http://gcc.gnu.org/]) -fi +AC_LIBREPLACE_CC_CHECKS if test x"$GCC" = x"yes" ; then AC_MSG_CHECKING([for version of gcc]) @@ -29,9 +22,6 @@ CFLAGS="${CFLAGS} -g" fi -dnl needed before AC_TRY_COMPILE -AC_ISC_POSIX - ############################################ # check if the compiler handles c99 struct initialization LIBREPLACE_C99_STRUCT_INIT(samba_cv_c99_struct_initialization=yes, Modified: branches/SAMBA_4_0/source/configure.ac =================================================================== --- branches/SAMBA_4_0/source/configure.ac 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/configure.ac 2006-09-13 16:51:45 UTC (rev 18485) @@ -11,8 +11,8 @@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h]) # Configuration rules. +m4_include(build/m4/env.m4) m4_include(lib/replace/samba.m4) -m4_include(build/m4/env.m4) m4_include(lib/smbreadline/readline.m4) m4_include(heimdal_build/config.m4) m4_include(lib/util/fault.m4) Modified: branches/SAMBA_4_0/source/lib/ldb/aclocal.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/aclocal.m4 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/ldb/aclocal.m4 2006-09-13 16:51:45 UTC (rev 18485) @@ -1 +1 @@ -m4_include(libreplace_macros.m4) +m4_include(libreplace.m4) Modified: branches/SAMBA_4_0/source/lib/ldb/configure.ac =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/configure.ac 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/ldb/configure.ac 2006-09-13 16:51:45 UTC (rev 18485) @@ -13,8 +13,9 @@ AC_DEFUN([SMB_ENABLE], [echo -n ""]) AC_INIT(include/ldb.h) AC_CONFIG_SRCDIR([common/ldb.c]) -m4_include(libreplace.m4) +AC_LIBREPLACE_ALL_CHECKS + if test "$ac_cv_prog_gcc" = yes; then CFLAGS="$CFLAGS -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings" fi Modified: branches/SAMBA_4_0/source/lib/replace/aclocal.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/aclocal.m4 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/replace/aclocal.m4 2006-09-13 16:51:45 UTC (rev 18485) @@ -1 +1 @@ -m4_include(libreplace_macros.m4) +m4_include(libreplace.m4) Modified: branches/SAMBA_4_0/source/lib/replace/configure.ac =================================================================== --- branches/SAMBA_4_0/source/lib/replace/configure.ac 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/replace/configure.ac 2006-09-13 16:51:45 UTC (rev 18485) @@ -3,7 +3,7 @@ AC_CONFIG_SRCDIR([replace.c]) AC_CONFIG_HEADER(config.h) -m4_include(libreplace.m4) +AC_LIBREPLACE_ALL_CHECKS if test "$ac_cv_prog_gcc" = yes; then CFLAGS="$CFLAGS -Wall" Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4 2006-09-13 16:51:45 UTC (rev 18485) @@ -303,4 +303,6 @@ AC__LIBREPLACE_ALL_CHECKS_END ]) -AC_LIBREPLACE_ALL_CHECKS +m4_include(libreplace_cc.m4) +m4_include(libreplace_macros.m4) +m4_include(autoconf-2.60.m4) Modified: branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/replace/libreplace_macros.m4 2006-09-13 16:51:45 UTC (rev 18485) @@ -251,6 +251,3 @@ EOF ]) -m4_include(libreplace_cc.m4) -m4_include(autoconf-2.60.m4) - Modified: branches/SAMBA_4_0/source/lib/replace/samba.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/replace/samba.m4 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/replace/samba.m4 2006-09-13 16:51:45 UTC (rev 18485) @@ -1,4 +1,4 @@ -m4_include(lib/replace/libreplace.m4) +AC_LIBREPLACE_BROKEN_CHECKS SMB_EXT_LIB(LIBREPLACE_EXT, [${LIBDL}]) SMB_ENABLE(LIBREPLACE_EXT) Modified: branches/SAMBA_4_0/source/lib/talloc/aclocal.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/aclocal.m4 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/talloc/aclocal.m4 2006-09-13 16:51:45 UTC (rev 18485) @@ -1 +1 @@ -m4_include(libreplace_macros.m4) +m4_include(libreplace.m4) Modified: branches/SAMBA_4_0/source/lib/talloc/configure.ac =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/configure.ac 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/talloc/configure.ac 2006-09-13 16:51:45 UTC (rev 18485) @@ -4,7 +4,8 @@ AC_SUBST(datarootdir) AC_CONFIG_HEADER(config.h) -m4_include(libreplace.m4) +AC_LIBREPLACE_ALL_CHECKS + m4_include(libtalloc.m4) AC_PATH_PROG(XSLTPROC,xsltproc) Modified: branches/SAMBA_4_0/source/lib/tdb/aclocal.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/aclocal.m4 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/tdb/aclocal.m4 2006-09-13 16:51:45 UTC (rev 18485) @@ -1 +1 @@ -m4_include(libreplace_macros.m4) +m4_include(libreplace.m4) Modified: branches/SAMBA_4_0/source/lib/tdb/configure.ac =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/configure.ac 2006-09-13 16:39:52 UTC (rev 18484) +++ branches/SAMBA_4_0/source/lib/tdb/configure.ac 2006-09-13 16:51:45 UTC (rev 18485) @@ -5,6 +5,6 @@ AC_INIT(include/tdb.h) AC_CONFIG_SRCDIR([common/tdb.c]) AC_CONFIG_HEADER(include/config.h) -m4_include(libreplace.m4) +AC_LIBREPLACE_ALL_CHECKS m4_include(libtdb.m4) AC_OUTPUT(Makefile tdb.pc)