]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
shell syntax error
authorrahuel <rahuel@opencascade.com>
Thu, 9 Feb 2006 15:18:30 +0000 (15:18 +0000)
committerrahuel <rahuel@opencascade.com>
Thu, 9 Feb 2006 15:18:30 +0000 (15:18 +0000)
salome_adm/unix/config_files/ac_cxx_option.m4
salome_adm/unix/config_files/check_Salome.m4
salome_adm/unix/config_files/check_cppunit.m4
salome_adm/unix/config_files/check_msg2qm.m4

index 72ea0ab112824338a063a7c3e6d063a015f86911..d1f43ea6aad3261cdfbf6536c5cc9ce06dbe2628 100644 (file)
@@ -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
 ])
 
index ff12fd6c3b4075ea2abb85697be545360db669be..d598c99f98e4abe3ad33ac30fb9c2cbd9835d0da 100644 (file)
@@ -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)
index 10c91812da6a5328131298de1a5ebe2a1f061458..44a1ecda4e3921eacafd9bfdc04e8ebef9a7b1d0 100644 (file)
@@ -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
index 8d0c5474f5ce7a297f17a1c9e1659d54dd8d4aa2..db3b35910059a2bb885ab852864a3b075c28b167 100755 (executable)
@@ -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