lib/tdb2: Convert tdb2 to a standalone library

Adds a Makefile, configure script, and tdb2.pc.in.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/lib/tdb2/Makefile b/lib/tdb2/Makefile
new file mode 100644 (file)
index 0000000..fe44ff6
--- /dev/null
+++ b/lib/tdb2/Makefile
@@ -0,0 +1,66 @@
+# simple makefile wrapper to run waf
+
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
+
+all:
+       $(WAF) build
+
+install:
+       $(WAF) install
+
+uninstall:
+       $(WAF) uninstall
+
+test: FORCE
+       $(WAF) test $(TEST_OPTIONS)
+
+testenv:
+       $(WAF) test --testenv $(TEST_OPTIONS)
+
+quicktest:
+       $(WAF) test --quick $(TEST_OPTIONS)
+
+dist:
+       touch .tmplock
+       WAFLOCK=.tmplock $(WAF) dist
+
+distcheck:
+       touch .tmplock
+       WAFLOCK=.tmplock $(WAF) distcheck
+
+clean:
+       $(WAF) clean
+
+distclean:
+       $(WAF) distclean
+
+reconfigure: configure
+       $(WAF) reconfigure
+
+show_waf_options:
+       $(WAF) --help
+
+# some compatibility make targets
+everything: all
+
+testsuite: all
+
+check: test
+
+torture: all
+
+# this should do an install as well, once install is finished
+installcheck: test
+
+etags:
+       $(WAF) etags
+
+ctags:
+       $(WAF) ctags
+
+pydoctor:
+       $(WAF) pydoctor
+
+bin/%:: FORCE
+       $(WAF) --targets=`basename $@`
+FORCE:

diff --git a/lib/tdb2/configure b/lib/tdb2/configure
new file mode 100755 (executable)
index 0000000..6a9f875
--- /dev/null
+++ b/lib/tdb2/configure
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+PREVPATH=`dirname $0`
+
+if [ -f $PREVPATH/../../buildtools/bin/waf ]; then
+       WAF=../../buildtools/bin/waf
+elif [ -f $PREVPATH/buildtools/bin/waf ]; then
+       WAF=./buildtools/bin/waf
+else
+       echo "replace: Unable to find waf"
+       exit 1
+fi
+
+# using JOBS=1 gives maximum compatibility with
+# systems like AIX which have broken threading in python
+JOBS=1
+export JOBS
+
+cd . || exit 1
+$WAF configure "$@" || exit 1
+cd $PREVPATH

diff --git a/lib/tdb2/tdb2.pc.in b/lib/tdb2/tdb2.pc.in
new file mode 100644 (file)
index 0000000..75e69d7
--- /dev/null
+++ b/lib/tdb2/tdb2.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: tdb
+Description: A trivial database
+Version: @PACKAGE_VERSION@
+Libs: @LIB_RPATH@ -L${libdir} -ltdb
+Cflags: -I${includedir}
+URL: http://tdb.samba.org/

diff --git a/lib/tdb2/wscript b/lib/tdb2/wscript
index bc11ce2cb7b7907ed2156cecc2d4185bb7c284b0..a7edda431a371562bfce3187cecc4fde46267069 100644 (file)
--- a/lib/tdb2/wscript
+++ b/lib/tdb2/wscript
@@ -92,6 +92,7 @@ def build(bld):
                               vnum=VERSION,
                               public_headers='tdb2.h',
                               public_headers_install=not private_library,
+                              pc_files='tdb2.pc',
                               private_library=private_library)
 
             bld.SAMBA_BINARY('tdbtorture',