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

[tridge at samba.org]

Author: tridge
Date: 2006-09-18 01:31:57 +0000 (Mon, 18 Sep 2006)
New Revision: 18600

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

Log:

- fix shell syntax in tests for libraries

- add library test for libpopt

Modified:
   branches/SAMBA_4_0/source/lib/popt/libpopt.m4
   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/popt/libpopt.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/popt/libpopt.m4	2006-09-18 01:08:19 UTC (rev 18599)
+++ branches/SAMBA_4_0/source/lib/popt/libpopt.m4	2006-09-18 01:31:57 UTC (rev 18600)
@@ -25,7 +25,8 @@
 	dnl find the popt sources. This is meant to work both for 
 	dnl popt standalone builds, and builds of packages using popt
 	poptdir=""
-	for d in "$srcdir" "$srcdir/lib/popt" "$srcdir/popt" "$srcdir/../popt"; do
+	poptpaths="$srcdir $srcdir/lib/popt $srcdir/popt $srcdir/../popt"
+	for d in $poptpaths; do
 		if test -f "$d/popt.c"; then
 			poptdir="$d"		
 			POPT_CFLAGS="-I$d"
@@ -33,6 +34,9 @@
 			break
 		fi
 	done
+        if test x"$poptdir" = "x"; then
+		AC_MSG_ERROR([cannot find popt source in $poptpaths])
+	fi
 	POPTOBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o"
 	AC_SUBST(POPTOBJ)
 	AC_CHECK_HEADERS([float.h alloca.h])

Modified: branches/SAMBA_4_0/source/lib/replace/libreplace.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-18 01:08:19 UTC (rev 18599)
+++ branches/SAMBA_4_0/source/lib/replace/libreplace.m4	2006-09-18 01:31:57 UTC (rev 18600)
@@ -13,7 +13,7 @@
 		break;
 	fi
 done
-if [ x"$libreplacedir" = "x" ];  then
+if test x"$libreplacedir" = "x"; then
 	AC_MSG_ERROR([cannot find libreplace in $libreplacepaths])
 fi
 LIBREPLACEOBJ="replace.o"

Modified: branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4	2006-09-18 01:08:19 UTC (rev 18599)
+++ branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4	2006-09-18 01:31:57 UTC (rev 18600)
@@ -9,7 +9,7 @@
 		break;
 	fi
 done
-if [ x"$tallocdir" = "x" ];  then
+if test x"$tallocdir" = "x"; then
    AC_MSG_ERROR([cannot find talloc source in $tallocpaths])
 fi
 TALLOCOBJ="talloc.o"

Modified: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/libtdb.m4	2006-09-18 01:08:19 UTC (rev 18599)
+++ branches/SAMBA_4_0/source/lib/tdb/libtdb.m4	2006-09-18 01:31:57 UTC (rev 18600)
@@ -9,7 +9,7 @@
 		break;
 	fi
 done
-if [ x"$tdbdir" = "x" ];  then
+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"