From 72556d4c8ca2bf9bc0d342b81621d4626aa96fcb Mon Sep 17 00:00:00 2001 From: "Gerald W. Carter" Date: Wed, 16 Apr 2008 15:48:00 +0200 Subject: Fix out of tree build. Remove the embedded srcdir path from talloc and tdb. (This used to be commit 359921acd436684a0b4cf76ba15f82a224d2c337) --- source3/configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index 01808a43f3..98ce92c56e 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -33,9 +33,9 @@ AC_SUBST(TALLOC_OBJS) # TODO: These should come from m4_include(lib/tdb/libtdb.m4) # but currently this fails: things have to get merged from s4. -tdbdir="${srcdir-.}/lib/tdb" +tdbdir="lib/tdb" AC_SUBST(tdbdir) -TDB_CFLAGS="-I$tdbdir/include" +TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include" AC_SUBST(TDB_CFLAGS) TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o" TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o" -- cgit From 25f9ca7b05881a4269d546929105f7f924f0c1ec Mon Sep 17 00:00:00 2001 From: Björn Jacke Date: Wed, 9 Apr 2008 16:27:20 +0200 Subject: add AC_TRY_RUN_STRICT support for Sun Studio compiler (This used to be commit ce7025df2958dac284ec9e5ce47ab172c3aa2567) --- source3/configure.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/configure.in') diff --git a/source3/configure.in b/source3/configure.in index 98ce92c56e..07e5bbe1d8 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -307,6 +307,18 @@ AC_CACHE_CHECK([that the C compiler understands -w2],samba_cv_HAVE_w2, [ samba_cv_HAVE_w2=yes,samba_cv_HAVE_w2=no,samba_cv_HAVE_w2=cross)]) if test x"$samba_cv_HAVE_w2" = x"yes"; then Werror_FLAGS="-w2" +else +dnl Check if the C compiler understands -errwarn +AC_CACHE_CHECK([that the C compiler understands -errwarn],samba_cv_HAVE_errwarn, [ + AC_TRY_RUN_STRICT([ + int main(void) + { + return 0; + }],[-errwarn=%all],[$CPPFLAGS],[$LDFLAGS], + samba_cv_HAVE_errwarn=yes,samba_cv_HAVE_errwarn=no,samba_cv_HAVE_errwarn=cross)]) +if test x"$samba_cv_HAVE_errwarn" = x"yes"; then + Werror_FLAGS="-errwarn=%all" +fi fi fi -- cgit