From 85230faf0feded1e8c8b469ee9ff8550e47c35fa Mon Sep 17 00:00:00 2001 From: rahuel Date: Thu, 9 Feb 2006 15:18:30 +0000 Subject: [PATCH] shell syntax error --- salome_adm/unix/config_files/ac_cxx_option.m4 | 9 +++++---- salome_adm/unix/config_files/check_Salome.m4 | 6 +++--- salome_adm/unix/config_files/check_cppunit.m4 | 6 +++--- salome_adm/unix/config_files/check_msg2qm.m4 | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/salome_adm/unix/config_files/ac_cxx_option.m4 b/salome_adm/unix/config_files/ac_cxx_option.m4 index 72ea0ab11..d1f43ea6a 100644 --- a/salome_adm/unix/config_files/ac_cxx_option.m4 +++ b/salome_adm/unix/config_files/ac_cxx_option.m4 @@ -32,13 +32,14 @@ int main() { return 0; } EOF $CXX $1 conftest.cxx > conftest.log 2>&1 var=`echo $1 | sed -e "s, .*$,," | sed -e "s,^-,,"` - if ! grep -e $var conftest.log > /dev/null 2>&1 ; then +#CCRT if ! grep -e $var conftest.log > /dev/null 2>&1 ; then + if grep -e $var conftest.log > /dev/null 2>&1 ; then + AC_MSG_RESULT(no) + eval $4 + else AC_MSG_RESULT(yes) $2="${$2} $1" eval $3 - else - AC_MSG_RESULT(no) - eval $4 fi ]) diff --git a/salome_adm/unix/config_files/check_Salome.m4 b/salome_adm/unix/config_files/check_Salome.m4 index ff12fd6c3..d598c99f9 100644 --- a/salome_adm/unix/config_files/check_Salome.m4 +++ b/salome_adm/unix/config_files/check_Salome.m4 @@ -33,7 +33,7 @@ AC_ARG_WITH(salome, --with-salome=DIR root directory path of SALOME installation, SALOME_DIR="$withval",SALOME_DIR="") -if test "x$SALOME_DIR" == "x" ; then +if test "x$SALOME_DIR" = "x" ; then # no --with-salome-dir option used @@ -59,10 +59,10 @@ if test -f ${SALOME_DIR}/bin/libMEDMEM_Swig.py ; then Salome_ok=yes AC_MSG_RESULT(Using Salome distribution in ${SALOME_DIR}) - if test "x$SALOME_ROOT_DIR" == "x" ; then + if test "x$SALOME_ROOT_DIR" = "x" ; then SALOME_ROOT_DIR=${SALOME_DIR} fi - if test "x$SALOME_SITE_DIR" == "x" ; then + if test "x$SALOME_SITE_DIR" = "x" ; then SALOME_SITE_DIR=${SALOME_ROOT_DIR} fi AC_SUBST(SALOME_ROOT_DIR) diff --git a/salome_adm/unix/config_files/check_cppunit.m4 b/salome_adm/unix/config_files/check_cppunit.m4 index 10c91812d..44a1ecda4 100644 --- a/salome_adm/unix/config_files/check_cppunit.m4 +++ b/salome_adm/unix/config_files/check_cppunit.m4 @@ -19,7 +19,7 @@ AC_ARG_WITH(cppunit_inc, AC_MSG_RESULT("select $withval as path to CPPUNIT includes") ]) -if test -z $CPPUNITHOME; then +if test -z "$CPPUNITHOME"; then AC_MSG_RESULT(CPPUNITHOME not defined) exits_ok=no if test "x$exits_ok" = "xno"; then @@ -48,7 +48,7 @@ if test -z $CPPUNITHOME; then fi fi else - if test -z $CPPUNIT_INCLUDES; then + if test -z "$CPPUNIT_INCLUDES"; then CPPUNIT_INCLUDES="$CPPUNITHOME/include" fi fi @@ -105,4 +105,4 @@ fi AC_LANG_RESTORE ])dnl -dnl \ No newline at end of file +dnl diff --git a/salome_adm/unix/config_files/check_msg2qm.m4 b/salome_adm/unix/config_files/check_msg2qm.m4 index 8d0c5474f..db3b35910 100755 --- a/salome_adm/unix/config_files/check_msg2qm.m4 +++ b/salome_adm/unix/config_files/check_msg2qm.m4 @@ -13,7 +13,7 @@ AC_ARG_WITH(msg2qm, [ --with-msg2qm=DIR root directory path of MSG2QM installation], MSG2QM_DIR="$withval",MSG2QM_DIR="") -if test "x$MSG2QM_DIR" == "x" ; then +if test "x$MSG2QM_DIR" = "x" ; then # no --with-MSG2QM-dir option used -- 2.39.2