diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-17 19:17:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:54 -0500 |
| commit | 550834c9df68377d1308084814870d45d65472df (patch) | |
| tree | 307c43f7848898bbc39f00078b6394daa13a7b2d | |
| parent | 4a854fe809ba617336db3e1d277e00c7ef95c55f (diff) | |
| download | samba-550834c9df68377d1308084814870d45d65472df.tar.gz samba-550834c9df68377d1308084814870d45d65472df.tar.bz2 samba-550834c9df68377d1308084814870d45d65472df.zip | |
r18594: fail the configure step if the required library is not found for tdb,
talloc or libreplace
(This used to be commit 9f45f970f71ee5585bf3c924b9c77188405fa246)
| -rw-r--r-- | source4/lib/replace/libreplace.m4 | 6 | ||||
| -rw-r--r-- | source4/lib/talloc/libtalloc.m4 | 6 | ||||
| -rw-r--r-- | source4/lib/tdb/libtdb.m4 | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4 index 677c5c535a..de8e4ba4a3 100644 --- a/source4/lib/replace/libreplace.m4 +++ b/source4/lib/replace/libreplace.m4 @@ -5,13 +5,17 @@ echo "LIBREPLACE_LOCATION_CHECKS: START" dnl find the libreplace sources. This is meant to work both for dnl libreplace standalone builds, and builds of packages using libreplace libreplacedir="" -for d in "$srcdir" "$srcdir/lib/replace" "$srcdir/libreplace" "$srcdir/../libreplace" "$srcdir/../replace"; do +libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace" +for d in $libreplacepaths; do if test -f "$d/replace.c"; then libreplacedir="$d" AC_SUBST(libreplacedir) break; fi done +if [ x"$libreplacedir" = "x" ]; then + AC_MSG_ERROR([cannot find libreplace in $libreplacepaths]) +fi LIBREPLACEOBJ="replace.o" AC_SUBST(LIBREPLACEOBJ) diff --git a/source4/lib/talloc/libtalloc.m4 b/source4/lib/talloc/libtalloc.m4 index 14e92b212c..06d5a15ff4 100644 --- a/source4/lib/talloc/libtalloc.m4 +++ b/source4/lib/talloc/libtalloc.m4 @@ -1,13 +1,17 @@ dnl find the talloc sources. This is meant to work both for dnl talloc standalone builds, and builds of packages using talloc tallocdir="" -for d in "$srcdir" "$srcdir/lib/talloc" "$srcdir/talloc" "$srcdir/../talloc"; do +tallocpaths="$srcdir $srcdir/lib/talloc $srcdir/talloc $srcdir/../talloc" +for d in $tallocpaths; do if test -f "$d/talloc.c"; then tallocdir="$d" AC_SUBST(tallocdir) break; fi done +if [ x"$tallocdir" = "x" ]; then + AC_MSG_ERROR([cannot find talloc source in $tallocpaths]) +fi TALLOCOBJ="talloc.o" AC_SUBST(TALLOCOBJ) diff --git a/source4/lib/tdb/libtdb.m4 b/source4/lib/tdb/libtdb.m4 index f2d604a840..86d42164cb 100644 --- a/source4/lib/tdb/libtdb.m4 +++ b/source4/lib/tdb/libtdb.m4 @@ -1,13 +1,17 @@ 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 +tdbpaths="$srcdir $srcdir/lib/tdb $srcdir/tdb $srcdir/../tdb" +for d in $tdbpaths; do if test -f "$d/common/tdb.c"; then tdbdir="$d" AC_SUBST(tdbdir) break; fi done +if [ x"$tdbdir" = "x" ]; then + AC_MSG_ERROR([cannot find tdb source in $tdbpaths]) +fi 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) |