svn commit: samba r18594 - in branches/SAMBA_4_0/source/lib: replace talloc tdb

[tridge at samba.org]

Author: tridge
Date: 2006-09-17 19:17:41 +0000 (Sun, 17 Sep 2006)
New Revision: 18594

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18594

Log:

fail the configure step if the required library is not found for tdb,
talloc or libreplace

Modified:
   branches/SAMBA_4_0/source/lib/replace/libreplace.m4
   branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4
   branches/SAMBA_4_0/source/lib/tdb/libtdb.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-17 05:11:57 UTC (rev 18593)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-17 19:17:41 UTC (rev 18594)
@@ -5,13 +5,17 @@
 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)
 

Modified: branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4	2006-09-17 05:11:57 UTC (rev 18593)
+++ branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4	2006-09-17 19:17:41 UTC (rev 18594)
@@ -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)
 

Modified: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/libtdb.m4	2006-09-17 05:11:57 UTC (rev 18593)
+++ branches/SAMBA_4_0/source/lib/tdb/libtdb.m4	2006-09-17 19:17:41 UTC (rev 18594)
@@ -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)