diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-18 01:31:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:55 -0500 |
| commit | e84ee4a6fd3bb1cc0b92de89f4568e0865ccac0a (patch) | |
| tree | a3db2d3c48a3b2ee50772f49c3f5e010404c2a42 | |
| parent | e7b9aeb8833be0e7d0c16afdf014b19e787bd5ef (diff) | |
| download | samba-e84ee4a6fd3bb1cc0b92de89f4568e0865ccac0a.tar.gz samba-e84ee4a6fd3bb1cc0b92de89f4568e0865ccac0a.tar.bz2 samba-e84ee4a6fd3bb1cc0b92de89f4568e0865ccac0a.zip | |
r18600: - fix shell syntax in tests for libraries
- add library test for libpopt
(This used to be commit 13878b7e7ec65b21df954f83afc0e9ceb73e44a0)
| -rw-r--r-- | source4/lib/popt/libpopt.m4 | 6 | ||||
| -rw-r--r-- | source4/lib/replace/libreplace.m4 | 2 | ||||
| -rw-r--r-- | source4/lib/talloc/libtalloc.m4 | 2 | ||||
| -rw-r--r-- | source4/lib/tdb/libtdb.m4 | 2 |
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" |