diff options
| -rw-r--r-- | source3/Makefile.in | 67 | ||||
| -rw-r--r-- | source3/configure.in | 4 |
2 files changed, 3 insertions, 68 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 403c60a4a5..197578f527 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -112,7 +112,7 @@ POPT_LIBS=@POPTLIBS@ LIBTALLOC=@LIBTALLOC_STATIC@ LIBTALLOC_LIBS=@LIBTALLOC_LIBS@ LIBREPLACE_LIBS=@LIBREPLACE_LIBS@ -LIBTDB=@LIBTDB_STATIC@ @LIBTDB_SHARED@ +LIBTDB=@LIBTDB_STATIC@ LIBTDB_LIBS=@LIBTDB_LIBS@ TDB_DEPS=@TDB_DEPS@ LIBNETAPI=@LIBNETAPI_STATIC@ @LIBNETAPI_SHARED@ @@ -2133,32 +2133,7 @@ showlibs:: showlibtalloc LIBTDB_OBJ0 = @LIBTDB_OBJ0@ LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ) -LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@ -LIBTDB_SOVER=@LIBTDB_SOVER@ -LIBTDB_FULLVER=@LIBTDB_FULLVER@ -LIBTDB_SHARED_TARGET_SONAME=@LIBTDB_SHARED_TARGET_SOVER@ -LIBTDB_SHARED_TARGET_FULLVER=@LIBTDB_SHARED_TARGET_FULLVER@ LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@ -LIBTDB_SYMS=$(srcdir)/exports/libtdb.@SYMSEXT@ -LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h - -$(LIBTDB_SYMS): $(LIBTDB_HEADERS) - @$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS) - - -$(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS) - @echo Linking shared library $@ - @$(SHLD_DSO) $(LIBTDB_OBJ) $(LIBREPLACE_LIBS) $(TDB_DEPS) \ - @SONAMEFLAG@`basename $@` - -$(LIBTDB_SHARED_TARGET_FULLVER): $(LIBTDB_SHARED_TARGET_SONAME) - @rm -f $@ - @mv -f $(LIBTDB_SHARED_TARGET_SONAME) $(LIBTDB_SHARED_TARGET_FULLVER) - @ln -f -s `basename $(LIBTDB_SHARED_TARGET_FULLVER)` $(LIBTDB_SHARED_TARGET_SONAME) - -$(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_FULLVER) - @rm -f $@ - @ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@ $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0) @echo Linking non-shared library $@ @@ -2168,52 +2143,14 @@ libtdb: $(LIBTDB) cleanlibtdb:: -rm -f \ - $(LIBTDB_SYMS) \ - $(LIBTDB_STATIC_TARGET) \ - $(LIBTDB_SHARED_TARGET) \ - $(LIBTDB_SHARED_TARGET_SONAME) - - -installlibtdb:: installdirs libtdb - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR) - -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_FULLVER) $(DESTDIR)$(LIBDIR) - @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` - @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)` - -if test -r $(LIBTDB_SHARED_TARGET_FULLVER) ; then \ - ln -f -s `basename $(LIBTDB_SHARED_TARGET_FULLVER)` \ - $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)` ; \ - fi - -if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \ - ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` \ - $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \ - fi - -$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR) - @$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include - -$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include - -uninstalllibtdb:: - -rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` - -$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)` - -$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_STATIC_TARGET)` - -rm -f $(DESTDIR)${prefix}/include/tdb.h + $(LIBTDB_STATIC_TARGET) libs:: libtdb -installlibs:: @INSTALL_LIBTDB@ -uninstalllibs:: @UNINSTALL_LIBTDB@ cleanlibs:: cleanlibtdb -shlibs test_shlibs: @LIBTDB_SHARED@ showlibtdb: @echo "" - @echo "LIBTDB_SHARED = @LIBTDB_SHARED@" @echo "LIBTDB_STATIC = @LIBTDB_STATIC@" - @echo "LIBTDB_LIBS = $(LIBTDB_LIBS)" - @echo "" - @echo "LIBTDB_SHARED_TARGET = $(LIBTDB_SHARED_TARGET)" - @echo "LIBTDB_SOVER = $(LIBTDB_SOVER)" - @echo "LIBTDB_FULLVER = $(LIBTDB_FULLVER)" - @echo "LIBTDB_SHARED TARGET_SONAME = $(LIBTDB_SHARED_TARGET_SONAME)" - @echo "LIBTDB_SHARED TARGET_FULLVER = $(LIBTDB_SHARED_TARGET_FULLVER)" @echo "LIBTDB_STATIC_TARGET = $(LIBTDB_STATIC_TARGET)" @echo "LIBTDB = $(LIBTDB)" diff --git a/source3/configure.in b/source3/configure.in index 890e1fb304..324586c40d 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1954,9 +1954,7 @@ AC_SUBST(LIBTDB_OBJ0) if test "x$enable_external_libtdb" = xno then m4_include(../lib/tdb/libtdb.m4) - if test x"$USESHARED" == x"no" ; then - LINK_LIBTDB=STATIC - fi + LINK_LIBTDB=STATIC LIBTDBVERSION=`grep ^VERSION ${tdbdir}/wscript | sed -e "s/'//g" -e 's/.* //'` SMB_LIBRARY(tdb, 1, ${LIBTDBVERSION}) LIBTDB_OBJ0="" |