From 26112ccadc35130ba122bcee5fb78287526ac882 Mon Sep 17 00:00:00 2001 From: Francesco Salvestrini Date: Sat, 8 Aug 2009 16:27:11 +0200 Subject: [PATCH 2/2] Replaced test -a with && to enhance portability --- m4/ax_boost_base.m4 | 2 +- m4/ax_check_gl.m4 | 2 +- m4/ax_check_glut.m4 | 2 +- m4/ax_check_zlib.m4 | 2 +- m4/ax_count_cpus.m4 | 4 ++-- m4/ax_gcc_archflag.m4 | 2 +- m4/ax_latex_converting_fig.m4 | 2 +- m4/ax_latex_converting_jpg_eps.m4 | 2 +- m4/ax_latex_converting_png_eps.m4 | 2 +- m4/ax_lib_beecrypt.m4 | 2 +- m4/ax_lib_crypto.m4 | 2 +- m4/ax_lib_expat.m4 | 4 ++-- m4/ax_lib_metis.m4 | 2 +- m4/ax_lib_mysql.m4 | 2 +- m4/ax_lib_nettle.m4 | 2 +- m4/ax_lib_oracle_oci.m4 | 14 +++++++------- m4/ax_lib_postgresql.m4 | 2 +- m4/ax_lib_xalan.m4 | 4 ++-- m4/ax_lib_xerces.m4 | 4 ++-- m4/ax_lib_xml_security.m4 | 4 ++-- m4/ax_lua.m4 | 2 +- m4/ax_python_devel.m4 | 5 +++-- m4/ax_with_curses.m4 | 6 +++--- m4/ax_with_prog.m4 | 2 +- 24 files changed, 39 insertions(+), 38 deletions(-) diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4 index b2a00b8..acf5aac 100644 --- a/m4/ax_boost_base.m4 +++ b/m4/ax_boost_base.m4 @@ -168,7 +168,7 @@ if test "x$want_boost" = "xyes"; then stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'` V_CHECK=`expr $stage_version_shorten \>\= $_version` - if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then + if test "$V_CHECK" = "1" && test "$ac_boost_lib_path" = "" ; then AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT) BOOST_CPPFLAGS="-I$BOOST_ROOT" BOOST_LDFLAGS="-L$BOOST_ROOT/stage/lib" diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 index d747452..573342d 100644 --- a/m4/ax_check_gl.m4 +++ b/m4/ax_check_gl.m4 @@ -114,7 +114,7 @@ AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM], [ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_dylib_flag}"; break])])]) done -AS_IF([test "X$ax_cv_check_gl_libgl" = Xno -a "X$no_x" = Xyes], +AS_IF([test "X$ax_cv_check_gl_libgl" = Xno && test "X$no_x" = Xyes], [LIBS='-framework OpenGL' AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM], [ax_cv_check_gl_libgl="$LIBS"])]) diff --git a/m4/ax_check_glut.m4 b/m4/ax_check_glut.m4 index 86e47dd..a3abe9b 100644 --- a/m4/ax_check_glut.m4 +++ b/m4/ax_check_glut.m4 @@ -95,7 +95,7 @@ for ax_lib in ${ax_check_libs}; do [ax_cv_check_glut_libglut="${ax_try_lib}"; break]) done -AS_IF([test "X$ax_cv_check_glut_libglut" = Xno -a "X$no_x" = Xyes], +AS_IF([test "X$ax_cv_check_glut_libglut" = Xno && test "X$no_x" = Xyes], [LIBS='-framework GLUT' AC_LINK_IFELSE([AX_CHECK_GLUT_PROGRAM], [ax_cv_check_glut_libglut="$LIBS"])]) diff --git a/m4/ax_check_zlib.m4 b/m4/ax_check_zlib.m4 index 488e1b2..2470752 100644 --- a/m4/ax_check_zlib.m4 +++ b/m4/ax_check_zlib.m4 @@ -97,7 +97,7 @@ then AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no]) AC_CHECK_HEADER(zlib.h, [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no]) AC_LANG_RESTORE - if test "$zlib_cv_libz" = "yes" -a "$zlib_cv_zlib_h" = "yes" + if test "$zlib_cv_libz" = "yes" && test "$zlib_cv_zlib_h" = "yes" then # # If both library and header were found, use them diff --git a/m4/ax_count_cpus.m4 b/m4/ax_count_cpus.m4 index 023dc38..52ef0e4 100644 --- a/m4/ax_count_cpus.m4 +++ b/m4/ax_count_cpus.m4 @@ -28,12 +28,12 @@ AC_DEFUN([AX_COUNT_CPUS], [ CPU_COUNT="0" #On MacOS - if test -x /usr/sbin/sysctl -a `/sbin/sysctl -a 2>/dev/null| grep -c hw.cpu`; then + if test -x /usr/sbin/sysctl && test `/sbin/sysctl -a 2>/dev/null| grep -c hw.cpu`; then CPU_COUNT=`/usr/sbin/sysctl -n hw.ncpu` fi #On Linux - if test "x$CPU_COUNT" = "x0" -a -e /proc/cpuinfo; then + if test "x$CPU_COUNT" = "x0" && test -e /proc/cpuinfo; then CPU_COUNT=`$EGREP -c '^processor' /proc/cpuinfo` fi diff --git a/m4/ax_gcc_archflag.m4 b/m4/ax_gcc_archflag.m4 index dedeef4..f39d2ba 100644 --- a/m4/ax_gcc_archflag.m4 +++ b/m4/ax_gcc_archflag.m4 @@ -184,7 +184,7 @@ esac fi # not cross-compiling fi # guess arch -if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then +if test "x$ax_gcc_arch" != x && test "x$ax_gcc_arch" != xno; then for arch in $ax_gcc_arch; do if test "x[]m4_default([$1],yes)" = xyes; then # if we require portable code flags="-mtune=$arch" diff --git a/m4/ax_latex_converting_fig.m4 b/m4/ax_latex_converting_fig.m4 index ffffacf..61ce793 100644 --- a/m4/ax_latex_converting_fig.m4 +++ b/m4/ax_latex_converting_fig.m4 @@ -64,7 +64,7 @@ if test "$fig2dev" != "no" ; then _AX_LATEX_FIG2DEV_FCT(pstex_t,[-p],pstex_t,conftest) AC_MSG_CHECKING(for a way to convert .fig file to .eps and _t file) - if test "$pstex" = "yes" -a "$pstex_t" = "yes" ; then + if test "$pstex" = "yes" && test "$pstex_t" = "yes" ; then convert_fig="%.eps %_t : %.fig ; $fig2dev -L pstex \[$]< \[$]*.eps ; $fig2dev -L pstex_t -p \[$]* \[$]< \[$]*_t" fi AC_MSG_RESULT($convert_fig) diff --git a/m4/ax_latex_converting_jpg_eps.m4 b/m4/ax_latex_converting_jpg_eps.m4 index 86ed818..cac22ab 100644 --- a/m4/ax_latex_converting_jpg_eps.m4 +++ b/m4/ax_latex_converting_jpg_eps.m4 @@ -33,7 +33,7 @@ AX_LATEX_PROG_JPEGTOPNM([AC_MSG_WARN([Unable to locate a jpegtopnm application t AX_LATEX_PROG_PNMTOPS([AC_MSG_WARN([Unable to locate a pnmtops application to convert jpg file])]) AC_MSG_CHECKING(for a way to convert jpg file to eps file) jpg_to_eps='no'; export jpg_to_eps; -if test "$jpegtopnm" != "no" -a "$pnmtops" != "no" ; then +if test "$jpegtopnm" != "no" && test "$pnmtops" != "no" ; then jpg_to_eps="%.eps : %.jpg ; $jpegtopnm \[$]*.jpg | pnmtops -noturn -nocenter -scale 1.00 - >\[$]*.eps" fi; AC_MSG_RESULT($jpg_to_eps) diff --git a/m4/ax_latex_converting_png_eps.m4 b/m4/ax_latex_converting_png_eps.m4 index 21753b2..25046e5 100644 --- a/m4/ax_latex_converting_png_eps.m4 +++ b/m4/ax_latex_converting_png_eps.m4 @@ -33,7 +33,7 @@ AX_LATEX_PROG_PNGTOPNM([AC_MSG_WARN([Unable to locate a pngtopnm application to AX_LATEX_PROG_PNMTOPS([AC_MSG_WARN([Unable to locate a pnmtops application to convert png file])]) AC_MSG_CHECKING(for a way to convert png file to eps file) png_to_eps='no'; export png_to_eps; -if test "$pngtopnm" != "no" -a "$pnmtops" != "no" ; then +if test "$pngtopnm" != "no" && test "$pnmtops" != "no" ; then png_to_eps="%.eps : %.png ; $pngtopnm \[$]*.png | pnmtops -noturn -nocenter -scale 1.00 - >\[$]*.eps" fi; AC_MSG_RESULT($png_to_eps) diff --git a/m4/ax_lib_beecrypt.m4 b/m4/ax_lib_beecrypt.m4 index 4d8ca11..6757e02 100644 --- a/m4/ax_lib_beecrypt.m4 +++ b/m4/ax_lib_beecrypt.m4 @@ -65,7 +65,7 @@ AC_DEFUN([AX_LIB_BEECRYPT],[ ]) ]) # complain only if explicitely required - if test "$ac_with_beecrypt" = "yes" -a "x$HAVE_BEECRYPT" = "x" ; then + if test "$ac_with_beecrypt" = "yes" && test "x$HAVE_BEECRYPT" = "x" ; then AC_MSG_ERROR([cannot configure required beecrypt library]) fi fi diff --git a/m4/ax_lib_crypto.m4 b/m4/ax_lib_crypto.m4 index 52712ab..e4cb2ab 100644 --- a/m4/ax_lib_crypto.m4 +++ b/m4/ax_lib_crypto.m4 @@ -75,7 +75,7 @@ AC_DEFUN([AX_LIB_CRYPTO],[ ]) ]) # complain only if crypto as *explicitely* required - if test "$ac_with_crypto" = "yes" -a "x$HAVE_CRYPTO" = "x" ; then + if test "$ac_with_crypto" = "yes" && test "x$HAVE_CRYPTO" = "x" ; then AC_MSG_ERROR([cannot configure required openssl crypto library]) fi fi diff --git a/m4/ax_lib_expat.m4 b/m4/ax_lib_expat.m4 index 2f9a6a2..f840e1a 100644 --- a/m4/ax_lib_expat.m4 +++ b/m4/ax_lib_expat.m4 @@ -108,7 +108,7 @@ AC_DEFUN([AX_LIB_EXPAT], expat_lib_flags="-L$expat_prefix/lib -lexpat" run_expat_test="yes" elif test "$expat_requested" = "yes"; then - if test -n "$expat_include_dir" -a -n "$expat_lib_flags"; then + if test -n "$expat_include_dir" && test -n "$expat_lib_flags"; then run_expat_test="yes" fi else @@ -190,7 +190,7 @@ p = NULL; AC_MSG_CHECKING([for Expat XML Parser]) if test "$run_expat_test" = "yes"; then - if test "$expat_header_found" = "yes" -a "$expat_lib_found" = "yes"; then + if test "$expat_header_found" = "yes" && test "$expat_lib_found" = "yes"; then AC_SUBST([EXPAT_CFLAGS]) AC_SUBST([EXPAT_LDFLAGS]) diff --git a/m4/ax_lib_metis.m4 b/m4/ax_lib_metis.m4 index 8c9c4b0..190703f 100644 --- a/m4/ax_lib_metis.m4 +++ b/m4/ax_lib_metis.m4 @@ -94,7 +94,7 @@ AC_DEFUN([AX_LIB_METIS], [ LDFLAGS=$old_LDFLAGS AC_MSG_CHECKING(METIS in $with_metis) - if test "$metis_lib" = "yes" -a "$metis_h" = "yes" ; then + if test "$metis_lib" = "yes" && test "$metis_h" = "yes" ; then AC_SUBST(METIS_INCLUDE, [-I$with_metis/include]) AC_SUBST(METIS_LIB, [-L$with_metis/lib]) AC_MSG_RESULT(ok) diff --git a/m4/ax_lib_mysql.m4 b/m4/ax_lib_mysql.m4 index 13c02f4..99efd61 100644 --- a/m4/ax_lib_mysql.m4 +++ b/m4/ax_lib_mysql.m4 @@ -101,7 +101,7 @@ AC_DEFUN([AX_LIB_MYSQL], mysql_version_req=ifelse([$1], [], [], [$1]) - if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then + if test "$found_mysql" = "yes" && test -n "$mysql_version_req"; then AC_MSG_CHECKING([if MySQL version is >= $mysql_version_req]) diff --git a/m4/ax_lib_nettle.m4 b/m4/ax_lib_nettle.m4 index 761a22f..c0a6aed 100644 --- a/m4/ax_lib_nettle.m4 +++ b/m4/ax_lib_nettle.m4 @@ -70,7 +70,7 @@ AC_DEFUN([AX_LIB_NETTLE],[ ]) ]) # complain only if explicitely required - if test "$ax_with_nettle" = "yes" -a "x$HAVE_NETTLE" = "x" ; then + if test "$ax_with_nettle" = "yes" && test "x$HAVE_NETTLE" = "x" ; then AC_MSG_ERROR([cannot configure required nettle library]) fi fi diff --git a/m4/ax_lib_oracle_oci.m4 b/m4/ax_lib_oracle_oci.m4 index 65fa183..bed6954 100644 --- a/m4/ax_lib_oracle_oci.m4 +++ b/m4/ax_lib_oracle_oci.m4 @@ -100,7 +100,7 @@ AC_DEFUN([AX_LIB_ORACLE_OCI], if test -n "$oracle_home_dir"; then - if test "$oracle_home_dir" != "no" -a "$oracle_home_dir" != "yes"; then + if test "$oracle_home_dir" != "no" && test "$oracle_home_dir" != "yes"; then dnl ORACLE_HOME path provided dnl Primary path to OCI headers, available in Oracle>=10 @@ -117,13 +117,13 @@ AC_DEFUN([AX_LIB_ORACLE_OCI], elif test -n "$oracle_home_include_dir" -o -n "$oracle_home_lib_dir"; then - if test "$oracle_home_include_dir" != "no" -a "$oracle_home_include_dir" != "yes"; then + if test "$oracle_home_include_dir" != "no" && test "$oracle_home_include_dir" != "yes"; then oracle_include_dir="$oracle_home_include_dir" elif test "$oracle_home_include_dir" = "yes"; then want_oracle_but_no_path="yes" fi - if test "$oracle_home_lib_dir" != "no" -a "$oracle_home_lib_dir" != "yes"; then + if test "$oracle_home_lib_dir" != "no" && test "$oracle_home_lib_dir" != "yes"; then oracle_lib_dir="$oracle_home_lib_dir" elif test "$oracle_home_lib_dir" = "yes"; then want_oracle_but_no_path="yes" @@ -139,7 +139,7 @@ Please, locate Oracle directories using --with-oci or \ dnl dnl Check OCI files dnl - if test -n "$oracle_include_dir" -a -n "$oracle_lib_dir"; then + if test -n "$oracle_include_dir" && test -n "$oracle_lib_dir"; then saved_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -I$oracle_include_dir" @@ -231,7 +231,7 @@ if (envh) OCIHandleFree(envh, OCI_HTYPE_ENV); dnl oracle_version_req=ifelse([$1], [], [], [$1]) - if test "$oci_header_found" = "yes" -a "$oci_lib_found" = "yes" -a \ + if test "$oci_header_found" = "yes" && test "$oci_lib_found" = "yes" && test \ -n "$oracle_version_req"; then oracle_version_major=`cat $oracle_include_dir/oci.h \ @@ -246,7 +246,7 @@ if (envh) OCIHandleFree(envh, OCI_HTYPE_ENV); AC_MSG_CHECKING([if Oracle OCI version is >= $oracle_version_req]) - if test -n "$oracle_version_major" -a -n $"oracle_version_minor"; then + if test -n "$oracle_version_major" && test -n $"oracle_version_minor"; then ORACLE_OCI_VERSION="$oracle_version_major.$oracle_version_minor" @@ -291,7 +291,7 @@ if (envh) OCIHandleFree(envh, OCI_HTYPE_ENV); AC_MSG_CHECKING([if Oracle support is enabled]) - if test "$oci_header_found" = "yes" -a "$oci_lib_found" = "yes"; then + if test "$oci_header_found" = "yes" && test "$oci_lib_found" = "yes"; then AC_SUBST([ORACLE_OCI_VERSION]) AC_SUBST([ORACLE_OCI_CFLAGS]) diff --git a/m4/ax_lib_postgresql.m4 b/m4/ax_lib_postgresql.m4 index 9d01979..31b919f 100644 --- a/m4/ax_lib_postgresql.m4 +++ b/m4/ax_lib_postgresql.m4 @@ -108,7 +108,7 @@ AC_DEFUN([AX_LIB_POSTGRESQL], postgresql_version_req=ifelse([$1], [], [], [$1]) - if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then + if test "$found_postgresql" = "yes" && test -n "$postgresql_version_req"; then AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req]) diff --git a/m4/ax_lib_xalan.m4 b/m4/ax_lib_xalan.m4 index 9bd76f4..1e716bb 100644 --- a/m4/ax_lib_xalan.m4 +++ b/m4/ax_lib_xalan.m4 @@ -112,7 +112,7 @@ AC_DEFUN([AX_LIB_XALAN], xalan_ldflags="-L$xalan_prefix/lib" run_xalan_test="yes" elif test "$xalan_requested" = "yes"; then - if test -n "$xalan_include_dir" -a -n "$xalan_lib_flags"; then + if test -n "$xalan_include_dir" && test -n "$xalan_lib_flags"; then xalan_include_dir2="$xalan_include_dir/xalanc" run_xalan_test="yes" fi @@ -207,7 +207,7 @@ XalanTransformer::initialize(); AC_MSG_CHECKING([for Xalan C++ XSLT processor]) if test "$run_xalan_test" = "yes"; then - if test "$xalan_header_found" = "yes" -a "$xalan_lib_found" = "yes"; then + if test "$xalan_header_found" = "yes" && test "$xalan_lib_found" = "yes"; then AC_SUBST([XALAN_CPPFLAGS]) AC_SUBST([XALAN_LDFLAGS]) diff --git a/m4/ax_lib_xerces.m4 b/m4/ax_lib_xerces.m4 index cde1eaf..d5dc92e 100644 --- a/m4/ax_lib_xerces.m4 +++ b/m4/ax_lib_xerces.m4 @@ -110,7 +110,7 @@ AC_DEFUN([AX_LIB_XERCES], xerces_ldflags="-L$xerces_prefix/lib" run_xerces_test="yes" elif test "$xerces_requested" = "yes"; then - if test -n "$xerces_include_dir" -a -n "$xerces_lib_flags"; then + if test -n "$xerces_include_dir" && test -n "$xerces_lib_flags"; then xerces_include_dir2="$xerces_include_dir/xercesc" run_xerces_test="yes" fi @@ -203,7 +203,7 @@ XMLPlatformUtils::Initialize(); AC_MSG_CHECKING([for Xerces C++ Parser]) if test "$run_xerces_test" = "yes"; then - if test "$xerces_header_found" = "yes" -a "$xerces_lib_found" = "yes"; then + if test "$xerces_header_found" = "yes" && test "$xerces_lib_found" = "yes"; then AC_SUBST([XERCES_CPPFLAGS]) AC_SUBST([XERCES_LDFLAGS]) diff --git a/m4/ax_lib_xml_security.m4 b/m4/ax_lib_xml_security.m4 index e039ef4..59b6781 100644 --- a/m4/ax_lib_xml_security.m4 +++ b/m4/ax_lib_xml_security.m4 @@ -110,7 +110,7 @@ AC_DEFUN([AX_LIB_XML_SECURITY], xml_security_lib_flags="-L$xml_security_prefix/lib -lxml-security-c -lpthread" run_xml_security_test="yes" elif test "$xml_security_requested" = "yes"; then - if test -n "$xml_security_include_dir" -a -n "$xml_security_lib_flags"; then + if test -n "$xml_security_include_dir" && test -n "$xml_security_lib_flags"; then xml_security_include_dir2="$xml_security_include_dir/xenc" run_xml_security_test="yes" fi @@ -195,7 +195,7 @@ XSECPlatformUtils::Initialise(); AC_MSG_CHECKING([for Xml-Security C++]) if test "$run_xml_security_test" = "yes"; then - if test x"$xml_security_header_found" = x"yes" -a x"$xml_security_lib_found" = x"yes"; then + if test x"$xml_security_header_found" = x"yes" && test x"$xml_security_lib_found" = x"yes"; then AC_SUBST([XML_SECURITY_CFLAGS]) AC_SUBST([XML_SECURITY_LDFLAGS]) diff --git a/m4/ax_lua.m4 b/m4/ax_lua.m4 index e333d02..baad1fd 100644 --- a/m4/ax_lua.m4 +++ b/m4/ax_lua.m4 @@ -131,7 +131,7 @@ AC_DEFUN([AX_LUA_VERSION], lua_version=-1 ;; esac - if test $lua_version -ge "$lua_min_version" -a $lua_version -lt "$lua_max_version"; then + if test $lua_version -ge "$lua_min_version" && test $lua_version -lt "$lua_max_version"; then AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 index b87304b..566cdfe 100644 --- a/m4/ax_python_devel.m4 +++ b/m4/ax_python_devel.m4 @@ -220,8 +220,9 @@ EOD` # credits goes to momjian, I think. I'd like to put the right name # in the credits, if someone can point me in the right direction... ? # - if test -n "$ac_python_libdir" -a -n "$ac_python_library" \ - -a x"$ac_python_library" != x"$ac_python_soname" + if test -n "$ac_python_libdir" && \ + test -n "$ac_python_library" && \ + test x"$ac_python_library" != x"$ac_python_soname" then # use the official shared library ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"` diff --git a/m4/ax_with_curses.m4 b/m4/ax_with_curses.m4 index 1216eff..55b0713 100644 --- a/m4/ax_with_curses.m4 +++ b/m4/ax_with_curses.m4 @@ -64,7 +64,7 @@ AC_DEFUN([AX_WITH_CURSES], ax_save_LIBS="$LIBS" AC_ARG_WITH(ncursesw, [AC_HELP_STRING([--without-ncursesw], [Don't use ncursesw (wide character support)])],,) - if test ! "$CURSES_LIB" -a "$with_ncurses" != no -a "$with_ncursesw" != "no" + if test ! "$CURSES_LIB" && test "$with_ncurses" != no && test "$with_ncursesw" != "no" then AC_CACHE_CHECK([for working ncursesw], ax_cv_ncursesw, [LIBS="$ax_save_LIBS -lncursesw" @@ -83,7 +83,7 @@ AC_DEFUN([AX_WITH_CURSES], ax_cv_curses=yes fi fi - if test ! "$CURSES_LIB" -a "$with_ncurses" != no -a "$with_ncursesw" != yes + if test ! "$CURSES_LIB" && test "$with_ncurses" != no && test "$with_ncursesw" != yes then AC_CACHE_CHECK([for working ncurses], ax_cv_ncurses, [LIBS="$ax_save_LIBS -lncurses" @@ -98,7 +98,7 @@ AC_DEFUN([AX_WITH_CURSES], fi ax_cv_curses=yes fi - if test "$ax_cv_curses" != yes -a "$with_ncurses" != yes -a "$with_ncursesw" != yes + if test "$ax_cv_curses" != yes && test "$with_ncurses" != yes && test "$with_ncursesw" != yes then if test ! "$CURSES_LIB" then diff --git a/m4/ax_with_prog.m4 b/m4/ax_with_prog.m4 index c4a91bd..52ae6b1 100644 --- a/m4/ax_with_prog.m4 +++ b/m4/ax_with_prog.m4 @@ -44,7 +44,7 @@ AC_DEFUN([AX_WITH_PROG],[ AS_IF(test -z "$VARIABLE",[ AC_MSG_CHECKING(whether EXECUTABLE executable path has been provided) AC_ARG_WITH(EXECUTABLE,AS_HELP_STRING([--with-EXECUTABLE=[[[PATH]]]],absolute path to EXECUTABLE executable), [ - AS_IF([test "$withval" != yes -a "$withval" != no],[ + AS_IF([test "$withval" != yes && test "$withval" != no],[ VARIABLE="$withval" AC_MSG_RESULT($VARIABLE) ],[ -- 1.6.3.3