Author: tridge Date: 2006-09-05 23:32:01 +0000 (Tue, 05 Sep 2006) New Revision: 18108
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18108 Log: move tdb to use the same build methods Added: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 Removed: branches/SAMBA_4_0/source/lib/tdb/config.m4 Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in branches/SAMBA_4_0/source/lib/tdb/configure.ac Changeset: Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-09-05 21:11:08 UTC (rev 18107) +++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2006-09-05 23:32:01 UTC (rev 18108) @@ -15,9 +15,7 @@ CFLAGS = -I$(srcdir)/include -Iinclude @CFLAGS@ PROGS = bin/tdbtool bin/tdbtorture -TDB_OBJ = common/tdb.o common/dump.o common/io.o common/lock.o \ - common/open.o common/traverse.o common/freelist.o common/error.o \ - common/transaction.o +TDB_OBJ = @TDBOBJ@ DIRS = lib bin common tools examples Deleted: branches/SAMBA_4_0/source/lib/tdb/config.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/config.m4 2006-09-05 21:11:08 UTC (rev 18107) +++ branches/SAMBA_4_0/source/lib/tdb/config.m4 2006-09-05 23:32:01 UTC (rev 18108) @@ -1,37 +0,0 @@ -AC_CHECK_FUNCS(mmap pread pwrite getpagesize utime) -AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h) - -AC_HAVE_DECL(pread, [#include <unistd.h>]) -AC_HAVE_DECL(pwrite, [#include <unistd.h>]) - -AC_MSG_CHECKING([for Python]) - -PYTHON= - -AC_ARG_WITH(python, -[ --with-python=PYTHONNAME build Python libraries], -[ case "${withval-python}" in - yes) - PYTHON=python - ;; - no) - PYTHON= - ;; - *) - PYTHON=${withval-python} - ;; - esac ]) - -if test x"$PYTHON" != "x"; then - incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'` - CPPFLAGS="$CPPFLAGS -I $incdir" -fi - -if test x"$PYTHON" != "x"; then - AC_MSG_RESULT([${withval-python}]) -else - SMB_ENABLE(swig_tdb, NO) - AC_MSG_RESULT(no) -fi - -AC_SUBST(PYTHON) Modified: branches/SAMBA_4_0/source/lib/tdb/configure.ac =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/configure.ac 2006-09-05 21:11:08 UTC (rev 18107) +++ branches/SAMBA_4_0/source/lib/tdb/configure.ac 2006-09-05 23:32:01 UTC (rev 18108) @@ -11,5 +11,5 @@ AC_CHECK_SIZEOF(size_t,cross) AC_CHECK_SIZEOF(ssize_t,cross) AC_FUNC_MMAP -m4_include(config.m4) +m4_include(libtdb.m4) AC_OUTPUT(Makefile tdb.pc) Copied: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 (from rev 18107, branches/SAMBA_4_0/source/lib/tdb/config.m4) =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/config.m4 2006-09-05 21:11:08 UTC (rev 18107) +++ branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2006-09-05 23:32:01 UTC (rev 18108) @@ -0,0 +1,51 @@ +dnl find the tdb sources. This is meant to work both for +dnl tdb standalone builds, and builds of packages using tdb +tdbdir="" +for d in "$srcdir" "$srcdir/lib/tdb" "$srcdir/tdb" "$srcdir/../tdb"; do + if test -f "$d/common/tdb.c"; then + tdbdir="$d" + AC_SUBST(tdbdir) + break; + fi +done +TDBOBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o" +TDBOBJ="$TDBOBJ common/freelist.o common/io.o common/lock.o common/open.o" +AC_SUBST(TDBOBJ) + +AC_CHECK_FUNCS(mmap pread pwrite getpagesize utime) +AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h) + +AC_HAVE_DECL(pread, [#include <unistd.h>]) +AC_HAVE_DECL(pwrite, [#include <unistd.h>]) + +AC_MSG_CHECKING([for Python]) + +PYTHON= + +AC_ARG_WITH(python, +[ --with-python=PYTHONNAME build Python libraries], +[ case "${withval-python}" in + yes) + PYTHON=python + ;; + no) + PYTHON= + ;; + *) + PYTHON=${withval-python} + ;; + esac ]) + +if test x"$PYTHON" != "x"; then + incdir=`python -c 'import sys; print "%s/include/python%d.%d" % (sys.prefix, sys.version_info[[0]], sys.version_info[[1]])'` + CPPFLAGS="$CPPFLAGS -I $incdir" +fi + +if test x"$PYTHON" != "x"; then + AC_MSG_RESULT([${withval-python}]) +else + SMB_ENABLE(swig_tdb, NO) + AC_MSG_RESULT(no) +fi + +AC_SUBST(PYTHON)
