diff options
| author | Björn Jacke <bj@sernet.de> | 2010-08-13 14:53:22 +0200 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2010-08-13 14:57:44 +0200 |
| commit | 5390baeb6b97acbfde89bdb6a2c678a516a0e360 (patch) | |
| tree | 04e115352ba9abf008d461d4975faced32bb096b /lib/tdb | |
| parent | 37177f1c05398e1d4a59bebcdb3cd16dd6e8382b (diff) | |
| download | samba-5390baeb6b97acbfde89bdb6a2c678a516a0e360.tar.gz samba-5390baeb6b97acbfde89bdb6a2c678a516a0e360.tar.bz2 samba-5390baeb6b97acbfde89bdb6a2c678a516a0e360.zip | |
tdb: add TDB_DEPS variable filled with required libraries
This is required for Solaris, which needs to link in librt to make use of
fdatasync().
Diffstat (limited to 'lib/tdb')
| -rw-r--r-- | lib/tdb/Makefile.in | 3 | ||||
| -rw-r--r-- | lib/tdb/libtdb.m4 | 6 | ||||
| -rw-r--r-- | lib/tdb/tdb.mk | 12 |
3 files changed, 14 insertions, 7 deletions
diff --git a/lib/tdb/Makefile.in b/lib/tdb/Makefile.in index dc22ee3fea..f12a27a350 100644 --- a/lib/tdb/Makefile.in +++ b/lib/tdb/Makefile.in @@ -35,6 +35,7 @@ tdbdir = @tdbdir@ EXTRA_TARGETS = @DOC_TARGET@ TDB_OBJ = @TDB_OBJ@ @LIBREPLACEOBJ@ +TDB_DEPS = @TDB_DEPS@ SONAMEFLAG = @SONAMEFLAG@ VERSIONSCRIPT = @VERSIONSCRIPT@ @@ -51,7 +52,7 @@ all:: showflags dirs $(PROGS) $(TDB_SOLIB) libtdb.a $(PYTHON_BUILD_TARGET) $(EXT install:: all $(TDB_SOLIB): $(TDB_OBJ) - $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) $(VERSIONSCRIPT) $(EXPORTSFILE) $(SONAMEFLAG)$(TDB_SONAME) + $(SHLD) $(SHLD_FLAGS) -o $@ $(TDB_OBJ) $(VERSIONSCRIPT) $(EXPORTSFILE) $(TDB_DEPS) $(SONAMEFLAG)$(TDB_SONAME) shared-build: all ${INSTALLCMD} -d $(sharedbuilddir)/lib diff --git a/lib/tdb/libtdb.m4 b/lib/tdb/libtdb.m4 index feae1c2cc6..fb8913aa16 100644 --- a/lib/tdb/libtdb.m4 +++ b/lib/tdb/libtdb.m4 @@ -20,6 +20,12 @@ AC_SUBST(LIBREPLACEOBJ) TDB_LIBS="" AC_SUBST(TDB_LIBS) +TDB_DEPS="" +if test x$libreplace_cv_HAVE_FDATASYNC_IN_LIBRT = xyes ; then + TDB_DEPS="$TDB_DEPS -lrt" +fi +AC_SUBST(TDB_DEPS) + TDB_CFLAGS="-I$tdbdir/include" AC_SUBST(TDB_CFLAGS) diff --git a/lib/tdb/tdb.mk b/lib/tdb/tdb.mk index ecc6f9fd08..0dcd419da4 100644 --- a/lib/tdb/tdb.mk +++ b/lib/tdb/tdb.mk @@ -12,19 +12,19 @@ TDB_STLIB = libtdb.a TDB_LIB = $(TDB_STLIB) bin/tdbtest$(EXEEXT): tools/tdbtest.o $(TDB_LIB) - $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm + $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm $(TDB_DEPS) bin/tdbtool$(EXEEXT): tools/tdbtool.o $(TDB_LIB) - $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb + $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb $(TDB_DEPS) bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB) - $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb + $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb $(TDB_DEPS) bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB) - $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb + $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb $(TDB_DEPS) bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB) - $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb + $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb $(TDB_DEPS) test:: abi_checks @@ -48,7 +48,7 @@ pytdb.o: $(tdbdir)/pytdb.c $(CC) $(PICFLAG) -c $(tdbdir)/pytdb.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags` tdb.$(SHLIBEXT): libtdb.$(SHLIBEXT) pytdb.o - $(SHLD) $(SHLD_FLAGS) -o $@ pytdb.o -L. -ltdb `$(PYTHON_CONFIG) --ldflags` + $(SHLD) $(SHLD_FLAGS) -o $@ pytdb.o -L. -ltdb `$(PYTHON_CONFIG) --ldflags` $(TDB_DEPS) install:: installdirs installbin installheaders installlibs \ $(PYTHON_INSTALL_TARGET) installdocs |