Skip to content

Commit 9dff36f

Browse files
Ervin HegedüsFelipe Zimmerle
Ervin Hegedüs
authored and
Felipe Zimmerle
committed
Added some cosmetics to autoconf related code
1 parent ccb1068 commit 9dff36f

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

build/curl.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ if test -n "${curl_path}"; then
5454
fi
5555
AC_MSG_RESULT([${CURL_CONFIG}])
5656
CURL_VERSION=`${CURL_CONFIG} --version | sed 's/^[[^0-9]][[^[:space:]]][[^[:space:]]]*[[[:space:]]]*//'`
57-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl VERSION: $CURL_VERSION); fi
57+
if test ! -z "${CURL_VERSION}"; then AC_MSG_NOTICE(curl VERSION: $CURL_VERSION); fi
5858
CURL_CFLAGS="`${CURL_CONFIG} --cflags`"
59-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl CFLAGS: $CURL_CFLAGS); fi
59+
if test ! -z "${CURL_CFLAGS}"; then AC_MSG_NOTICE(curl CFLAGS: $CURL_CFLAGS); fi
6060
CURL_LDADD="`${CURL_CONFIG} --libs`"
61-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(curl LDADD: $CURL_LIBS); fi
61+
if test ! -z "${CURL_CONFIG}"; then AC_MSG_NOTICE(curl LDADD: $CURL_LIBS); fi
6262
6363
dnl # Check version is ok
6464
AC_MSG_CHECKING([if libcurl is at least v${CURL_MIN_VERSION}])

build/libxml.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ if test -n "${libxml2_path}"; then
5252
fi
5353
AC_MSG_RESULT([${LIBXML2_CONFIG}])
5454
LIBXML2_VERSION=`${LIBXML2_CONFIG} --version | sed 's/^[[^0-9]][[^[:space:]]][[^[:space:]]]*[[[:space:]]]*//'`
55-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(xml VERSION: $LIBXML2_VERSION); fi
55+
if test ! -z "${LIBXML2_VERSION}"; then AC_MSG_NOTICE(xml VERSION: $LIBXML2_VERSION); fi
5656
LIBXML2_CFLAGS="`${LIBXML2_CONFIG} --cflags` -DWITH_LIBXML2"
57-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(xml CFLAGS: $LIBXML2_CFLAGS); fi
57+
if test ! -z "${LIBXML2_CFLAGS}"; then AC_MSG_NOTICE(xml CFLAGS: $LIBXML2_CFLAGS); fi
5858
LIBXML2_LDADD="`${LIBXML2_CONFIG} --libs`"
59-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(xml LDADD: $LIBXML2_LDADD); fi
59+
if test ! -z "${LIBXML2_LDADD}"; then AC_MSG_NOTICE(xml LDADD: $LIBXML2_LDADD); fi
6060
6161
AC_MSG_CHECKING([if libxml2 is at least v2.6.29])
6262
libxml2_min_ver=`echo 2.6.29 | awk -F. '{print (\$ 1 * 1000000) + (\$ 2 * 1000) + \$ 3}'`

build/pcre.m4

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ if test -n "${pcre_path}"; then
5454
fi
5555
AC_MSG_RESULT([${PCRE_CONFIG}])
5656
PCRE_VERSION="`${PCRE_CONFIG} --version`"
57-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre VERSION: $PCRE_VERSION); fi
57+
if test ! -z "${PCRE_VERSION}"; then AC_MSG_NOTICE(pcre VERSION: $PCRE_VERSION); fi
5858
PCRE_CFLAGS="`${PCRE_CONFIG} --cflags`"
59-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre CFLAGS: $PCRE_CFLAGS); fi
59+
if test ! -z "${PCRE_CFLAGS}"; then AC_MSG_NOTICE(pcre CFLAGS: $PCRE_CFLAGS); fi
6060
PCRE_LDADD="`${PCRE_CONFIG} --libs`"
61-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre LDADD: $PCRE_LDADD); fi
61+
if test ! -z "${PCRE_LDADD}"; then AC_MSG_NOTICE(pcre LDADD: $PCRE_LDADD); fi
6262
PCRE_LD_PATH="/`${PCRE_CONFIG} --libs | cut -d'/' -f2,3,4,5,6 | cut -d ' ' -f1`"
63-
if test "$verbose_output" -eq 1; then AC_MSG_NOTICE(pcre PCRE_LD_PATH: $PCRE_LD_PATH); fi
63+
if test ! -z "${PCRE_LD_PATH}"; then AC_MSG_NOTICE(pcre PCRE_LD_PATH: $PCRE_LD_PATH); fi
6464
else
6565
AC_MSG_RESULT([no])
6666
fi

configure.ac

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,9 @@ fi
307307
AM_CONDITIONAL([TEST_UTILITIES], [test $buildTestUtilities = true])
308308
if test $buildTestUtilities = true; then
309309
if test $debugLogs = true; then
310-
TEST_CASES=`./test/test-list.sh`
310+
if test -f ./test/test-list.sh; then
311+
TEST_CASES=`./test/test-list.sh`
312+
fi
311313
fi
312314
fi
313315

0 commit comments

Comments
 (0)