ebl Add tokyocabinet lib to bacula source

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6985 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 2540ac09c06743aa86d32ac0f29caf5e300fa700..cb24ca40c76d548bdc08b42fc8649378baca479f 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -2348,6 +2348,14 @@ fi
 echo "Doing make of dependencies"
 ${MAKE:-make} depend
 
+pushd src/lib/tokyocabinet > /dev/null
+tcdbm_opt=
+if test x$largefile_support = xyes; then
+   tcdbm_opt=--enable-off64
+fi
+./configure $tcdbm_opt
+popd > /dev/null
+
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer
 chmod 755 dvd-handler dvd-simulator

diff --git a/bacula/configure b/bacula/configure
index d5d7cf30177618b692dced3855717303cf96533e..9dd2d7dab683f4c3ed05be3846fc5cef6f87d1b2 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -32127,6 +32127,14 @@ fi
 echo "Doing make of dependencies"
 ${MAKE:-make} depend
 
+pushd src/lib/tokyocabinet
+tcdbm_opt=
+if test x$largefile_support = xyes; then
+   tcdbm_opt=--enable-off64
+fi
+./configure $tcdbm_opt
+popd > /dev/null
+
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer
 chmod 755 dvd-handler dvd-simulator

diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in
index fa07fdd52fd464a087c97af15dd45eaccd43f77d..3cf96fe0ffea6a10d9e57488a46d7c841798fa58 100644 (file)
--- a/bacula/src/lib/Makefile.in
+++ b/bacula/src/lib/Makefile.in
@@ -47,7 +47,6 @@ LIBOBJS = attr.o base64.o berrno.o bsys.o bget_msg.o \
 
 EXTRAOBJS = @OBJLIST@
 
-
 .SUFFIXES:     .c .o .ch .dvi .pdf .tex .view .w .1
 .PHONY:
 .DONTCARE:
@@ -62,10 +61,17 @@ EXTRAOBJS = @OBJLIST@
        $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
 #-------------------------------------------------------------------------
-all: Makefile libbac.a
+all: Makefile libbac.a libtokyocabinet.a
        @echo "==== Make of lib is good ===="
        @echo " "
 
+libtokyocabinet.a:
+       @(cd tokyocabinet ; echo "==>Entering directory `pwd`"; \
+             $(MAKE) $@ || (echo ""; echo ""; echo "  ====== Error in `pwd` ======"; \
+                           echo ""; echo "";));
+       @cp tokyocabinet/tcadb.h tokyocabinet/tcbdb.h tokyocabinet/tchdb.h .
+       @cp tokyocabinet/libtokyocabinet.a .
+
 libbac.a: $(LIBOBJS)
        @echo "Making $@ ..."
        $(AR) rc  $@ $(LIBOBJS)
@@ -113,7 +119,7 @@ plugins.o: plugins.c plugins.h
        @echo "Compiling $<"
        $(NO_ECHO)$(CXX) -fPIC $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
 
-        
+
 install:
 
 uninstall:
@@ -121,6 +127,7 @@ uninstall:
 clean:
        $(RMF) *.a core a.out *.o *.bak *.tex *.pdf *~ *.intpro *.extpro 1 2 3
        $(RMF) rwlock_test md5sum sha1sum
+       (cd tokyocabinet ; make clean)
 
 realclean: clean
        $(RMF) tags