diff --git a/build/curl.m4 b/build/curl.m4 index 25a8a20b..7397a221 100644 --- a/build/curl.m4 +++ b/build/curl.m4 @@ -54,11 +54,11 @@ if test -n "${curl_path}"; then fi AC_MSG_RESULT([${CURL_CONFIG}]) CURL_VERSION=`${CURL_CONFIG} --version | sed 's/^[[^0-9]][[^[:space:]]][[^[:space:]]]*[[[:space:]]]*//'` - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl VERSION: $CURL_VERSION); fi + if test ! -z "${CURL_VERSION}"; then AC_MSG_NOTICE(curl VERSION: $CURL_VERSION); fi CURL_CFLAGS="`${CURL_CONFIG} --cflags`" - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl CFLAGS: $CURL_CFLAGS); fi + if test ! -z "${CURL_CFLAGS}"; then AC_MSG_NOTICE(curl CFLAGS: $CURL_CFLAGS); fi CURL_LDADD="`${CURL_CONFIG} --libs`" - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl LDADD: $CURL_LIBS); fi + if test ! -z "${CURL_CONFIG}"; then AC_MSG_NOTICE(curl LDADD: $CURL_LIBS); fi dnl # Check version is ok AC_MSG_CHECKING([if libcurl is at least v${CURL_MIN_VERSION}]) diff --git a/build/libxml.m4 b/build/libxml.m4 index ceb8c283..ba8c50ac 100644 --- a/build/libxml.m4 +++ b/build/libxml.m4 @@ -52,11 +52,11 @@ if test -n "${libxml2_path}"; then fi AC_MSG_RESULT([${LIBXML2_CONFIG}]) LIBXML2_VERSION=`${LIBXML2_CONFIG} --version | sed 's/^[[^0-9]][[^[:space:]]][[^[:space:]]]*[[[:space:]]]*//'` - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(xml VERSION: $LIBXML2_VERSION); fi + if test ! -z "${LIBXML2_VERSION}"; then AC_MSG_NOTICE(xml VERSION: $LIBXML2_VERSION); fi LIBXML2_CFLAGS="`${LIBXML2_CONFIG} --cflags` -DWITH_LIBXML2" - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(xml CFLAGS: $LIBXML2_CFLAGS); fi + if test ! -z "${LIBXML2_CFLAGS}"; then AC_MSG_NOTICE(xml CFLAGS: $LIBXML2_CFLAGS); fi LIBXML2_LDADD="`${LIBXML2_CONFIG} --libs`" - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(xml LDADD: $LIBXML2_LDADD); fi + if test ! -z "${LIBXML2_LDADD}"; then AC_MSG_NOTICE(xml LDADD: $LIBXML2_LDADD); fi AC_MSG_CHECKING([if libxml2 is at least v2.6.29]) libxml2_min_ver=`echo 2.6.29 | awk -F. '{print (\$ 1 * 1000000) + (\$ 2 * 1000) + \$ 3}'` diff --git a/build/pcre.m4 b/build/pcre.m4 index d95d8d50..0de3c9c9 100644 --- a/build/pcre.m4 +++ b/build/pcre.m4 @@ -54,13 +54,13 @@ if test -n "${pcre_path}"; then fi AC_MSG_RESULT([${PCRE_CONFIG}]) PCRE_VERSION="`${PCRE_CONFIG} --version`" - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre VERSION: $PCRE_VERSION); fi + if test ! -z "${PCRE_VERSION}"; then AC_MSG_NOTICE(pcre VERSION: $PCRE_VERSION); fi PCRE_CFLAGS="`${PCRE_CONFIG} --cflags`" - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre CFLAGS: $PCRE_CFLAGS); fi + if test ! -z "${PCRE_CFLAGS}"; then AC_MSG_NOTICE(pcre CFLAGS: $PCRE_CFLAGS); fi PCRE_LDADD="`${PCRE_CONFIG} --libs`" - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre LDADD: $PCRE_LDADD); fi + if test ! -z "${PCRE_LDADD}"; then AC_MSG_NOTICE(pcre LDADD: $PCRE_LDADD); fi PCRE_LD_PATH="/`${PCRE_CONFIG} --libs | cut -d'/' -f2,3,4,5,6 | cut -d ' ' -f1`" - if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre PCRE_LD_PATH: $PCRE_LD_PATH); fi + if test ! -z "${PCRE_LD_PATH}"; then AC_MSG_NOTICE(pcre PCRE_LD_PATH: $PCRE_LD_PATH); fi else AC_MSG_RESULT([no]) fi diff --git a/configure.ac b/configure.ac index 88c9220a..f7a5a3dd 100644 --- a/configure.ac +++ b/configure.ac @@ -307,7 +307,9 @@ fi AM_CONDITIONAL([TEST_UTILITIES], [test $buildTestUtilities = true]) if test $buildTestUtilities = true; then if test $debugLogs = true; then - TEST_CASES=`./test/test-list.sh` + if test -f ./test/test-list.sh; then + TEST_CASES=`./test/test-list.sh` + fi fi fi