r18594: fail the configure step if the required library is not found for tdb,

talloc or libreplace

diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index 677c5c535af6a81502a5133d075245a648d3bfe7..de8e4ba4a3270664bd0666de3747a9c4fa77ece9 100644 (file)
--- a/source/lib/replace/libreplace.m4
+++ b/source/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/source/lib/talloc/libtalloc.m4 b/source/lib/talloc/libtalloc.m4
index 14e92b212cd085ab3659b3e92c41b8195ff21989..06d5a15ff420750af3a067ed5206ea807970feed 100644 (file)
--- a/source/lib/talloc/libtalloc.m4
+++ b/source/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/source/lib/tdb/libtdb.m4 b/source/lib/tdb/libtdb.m4
index f2d604a84056fa16ae6db8b32610ba62e5c6bf28..86d42164cb8254939211d2efc155e8e92d58c128 100644 (file)
--- a/source/lib/tdb/libtdb.m4
+++ b/source/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)