From 1bd0211698df34ab3ec41cfd962d144be88e724b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 5 Sep 2006 23:32:01 +0000
Subject: r18108: move tdb to use the same build methods (This used to be
 commit 05521650c622c933a742b833dc38b7e9b32836be)

---
 source4/lib/tdb/Makefile.in  |  4 +---
 source4/lib/tdb/config.m4    | 37 --------------------------------
 source4/lib/tdb/configure.ac |  2 +-
 source4/lib/tdb/libtdb.m4    | 51 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 41 deletions(-)
 delete mode 100644 source4/lib/tdb/config.m4
 create mode 100644 source4/lib/tdb/libtdb.m4

(limited to 'source4/lib')

diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in
index e68f7eb8c3..1e5884a968 100644
--- a/source4/lib/tdb/Makefile.in
+++ b/source4/lib/tdb/Makefile.in
@@ -15,9 +15,7 @@ builddir = @builddir@
 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
 
diff --git a/source4/lib/tdb/config.m4 b/source4/lib/tdb/config.m4
deleted file mode 100644
index cb0801795c..0000000000
--- a/source4/lib/tdb/config.m4
+++ /dev/null
@@ -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)
diff --git a/source4/lib/tdb/configure.ac b/source4/lib/tdb/configure.ac
index bf221a0322..0943bbeeb8 100644
--- a/source4/lib/tdb/configure.ac
+++ b/source4/lib/tdb/configure.ac
@@ -11,5 +11,5 @@ AC_CHECK_SIZEOF(off_t,cross)
 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)
diff --git a/source4/lib/tdb/libtdb.m4 b/source4/lib/tdb/libtdb.m4
new file mode 100644
index 0000000000..f2d604a840
--- /dev/null
+++ b/source4/lib/tdb/libtdb.m4
@@ -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)
-- 
cgit