r18600: - fix shell syntax in tests for libraries

- add library test for libpopt

diff --git a/source/lib/popt/libpopt.m4 b/source/lib/popt/libpopt.m4
index f0c683ce57c5776b469fe9ea9deef36db8a7f61a..b3e2df519b4409bdb41ab8939ae6312caba05772 100644 (file)
--- a/source/lib/popt/libpopt.m4
+++ b/source/lib/popt/libpopt.m4
@@ -25,7 +25,8 @@ if test x"$INCLUDED_POPT" != x"no"; then
        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 @@ if test x"$INCLUDED_POPT" != x"no"; then
                        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])

diff --git a/source/lib/replace/libreplace.m4 b/source/lib/replace/libreplace.m4
index de8e4ba4a3270664bd0666de3747a9c4fa77ece9..6c26f7b9042413402652dda5ac778654153f74b5 100644 (file)
--- a/source/lib/replace/libreplace.m4
+++ b/source/lib/replace/libreplace.m4
@@ -13,7 +13,7 @@ for d in $libreplacepaths; do
                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"

diff --git a/source/lib/talloc/libtalloc.m4 b/source/lib/talloc/libtalloc.m4
index 06d5a15ff420750af3a067ed5206ea807970feed..4a0ee3c8fc5bfa7e8be4ba9f12a5dba4c7318579 100644 (file)
--- a/source/lib/talloc/libtalloc.m4
+++ b/source/lib/talloc/libtalloc.m4
@@ -9,7 +9,7 @@ for d in $tallocpaths; do
                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"

diff --git a/source/lib/tdb/libtdb.m4 b/source/lib/tdb/libtdb.m4
index 86d42164cb8254939211d2efc155e8e92d58c128..5240b329794c1feb8890925289230aa9360ba30c 100644 (file)
--- a/source/lib/tdb/libtdb.m4
+++ b/source/lib/tdb/libtdb.m4
@@ -9,7 +9,7 @@ for d in $tdbpaths; do
                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"