summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/lib/popt/libpopt.m46
-rw-r--r--source4/lib/replace/libreplace.m42
-rw-r--r--source4/lib/talloc/libtalloc.m42
-rw-r--r--source4/lib/tdb/libtdb.m42
4 files changed, 8 insertions, 4 deletions
diff --git a/source4/lib/popt/libpopt.m4 b/source4/lib/popt/libpopt.m4
index f0c683ce57..b3e2df519b 100644
--- a/source4/lib/popt/libpopt.m4
+++ b/source4/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/source4/lib/replace/libreplace.m4 b/source4/lib/replace/libreplace.m4
index de8e4ba4a3..6c26f7b904 100644
--- a/source4/lib/replace/libreplace.m4
+++ b/source4/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/source4/lib/talloc/libtalloc.m4 b/source4/lib/talloc/libtalloc.m4
index 06d5a15ff4..4a0ee3c8fc 100644
--- a/source4/lib/talloc/libtalloc.m4
+++ b/source4/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/source4/lib/tdb/libtdb.m4 b/source4/lib/tdb/libtdb.m4
index 86d42164cb..5240b32979 100644
--- a/source4/lib/tdb/libtdb.m4
+++ b/source4/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"