From 85be1e72c34137a7be3a05dff66f32354134ded8 Mon Sep 17 00:00:00 2001 From: rahuel Date: Thu, 9 Feb 2006 15:26:12 +0000 Subject: [PATCH] shell syntax errors --- salome_adm/unix/config_files/check_pyqt.m4 | 78 +++++++++++----------- salome_adm/unix/config_files/check_qwt.m4 | 6 +- salome_adm/unix/config_files/check_sip.m4 | 38 +++++------ salome_adm/unix/config_files/check_vtk.m4 | 4 +- 4 files changed, 63 insertions(+), 63 deletions(-) diff --git a/salome_adm/unix/config_files/check_pyqt.m4 b/salome_adm/unix/config_files/check_pyqt.m4 index ee024efaf..2b6ae67ea 100644 --- a/salome_adm/unix/config_files/check_pyqt.m4 +++ b/salome_adm/unix/config_files/check_pyqt.m4 @@ -37,47 +37,47 @@ if test "x$PYUIC" != x; then dnl try withval value AC_CHECK_FILE($PYUIC,pyqt_uic_ok=yes,pyqt_uic_ok=no) fi -if test "x$pyqt_uic_ok" == "xno"; then +if test "x$pyqt_uic_ok" = "xno"; then dnl try ${PYQTDIR} if test "x${PYQTDIR}" != "x"; then if test -d ${PYQTDIR} ; then AC_CHECK_FILE(${PYQTDIR}/pyuic,pyqt_uic_ok=yes,pyqt_uic_ok=no) - if test "x$pyqt_uic_ok" == "xyes"; then + if test "x$pyqt_uic_ok" = "xyes"; then PYUIC="${PYQTDIR}/pyuic" fi fi fi fi -if test "x$pyqt_uic_ok" == "xno"; then +if test "x$pyqt_uic_ok" = "xno"; then dnl try ${SIPDIR} if test "x${SIPDIR}" != "x"; then if test -d ${SIPDIR} ; then AC_CHECK_FILE(${SIPDIR}/pyuic,pyqt_uic_ok=yes,pyqt_uic_ok=no) - if test "x$pyqt_uic_ok" == "xyes"; then + if test "x$pyqt_uic_ok" = "xyes"; then PYUIC="${SIPDIR}/pyuic" fi fi fi fi -if test "x$pyqt_uic_ok" == "xno"; then +if test "x$pyqt_uic_ok" = "xno"; then dnl try ${PYTHONHOME}/bin if test "x${PYTHONHOME}" != "x"; then if test -d ${PYTHONHOME}/bin ; then AC_CHECK_FILE(${PYTHONHOME}/bin/pyuic,pyqt_uic_ok=yes,pyqt_uic_ok=no) - if test "x$pyqt_uic_ok" == "xyes"; then + if test "x$pyqt_uic_ok" = "xyes"; then PYUIC="${PYTHONHOME}/bin/pyuic" fi fi fi fi -if test "x$pyqt_uic_ok" == "xno"; then +if test "x$pyqt_uic_ok" = "xno"; then dnl try /usr/bin AC_CHECK_FILE(/usr/bin/pyuic,pyqt_uic_ok=yes,pyqt_uic_ok=no) - if test "x$pyqt_uic_ok" == "xyes"; then + if test "x$pyqt_uic_ok" = "xyes"; then PYUIC="/usr/bin/pyuic" fi fi -if test "x$pyqt_uic_ok" == "xno"; then +if test "x$pyqt_uic_ok" = "xno"; then pyqt_ok=no fi @@ -86,7 +86,7 @@ pyqt_lib_ok=no if test "x${PYQTDIR}" != "x"; then dnl try {PYQTDIR} AC_CHECK_FILE(${PYQTDIR}/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then if test "x${PYQTDIR}" = "x/usr/lib" then PYQT_LIBS="-lqtcmodule" @@ -95,7 +95,7 @@ if test "x${PYQTDIR}" != "x"; then fi else AC_CHECK_FILE(${PYQTDIR}/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then if test "x${PYQTDIR}" = "x/usr/lib" then PYQT_LIBS="" @@ -104,41 +104,41 @@ if test "x${PYQTDIR}" != "x"; then fi fi fi - if test "x$pyqt_lib_ok" == "xno"; then + if test "x$pyqt_lib_ok" = "xno"; then dnl try {PYQTDIR}/lib if test -d {PYQTDIR}/lib; then AC_CHECK_FILE(${PYQTDIR}/lib/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then PYQT_LIBS="-L${PYQTDIR}/lib -lqtcmodule" else AC_CHECK_FILE(${PYQTDIR}/lib/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then PYQT_LIBS="-L${PYQTDIR}/lib" fi fi fi fi - if test "x$pyqt_lib_ok" == "xno"; then + if test "x$pyqt_lib_ok" = "xno"; then dnl try {PYQTDIR}/lib/python${PYTHON_VERSION}/site-packages if test -d {PYQTDIR}/lib/python${PYTHON_VERSION}/site-packages; then AC_CHECK_FILE(${PYQTDIR}/lib/python${PYTHON_VERSION}/site-packages/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then PYQT_LIBS="-L${PYQTDIR}/lib/python${PYTHON_VERSION}/site-packages -lqtcmodule" else AC_CHECK_FILE(${PYQTDIR}/lib/python${PYTHON_VERSION}/site-packages/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then PYQT_LIBS="-L${PYQTDIR}/lib/python${PYTHON_VERSION}/site-packages" fi fi fi fi fi -if test "x$pyqt_lib_ok" == "xno"; then +if test "x$pyqt_lib_ok" = "xno"; then dnl try ${SIPDIR} if test "x${SIPDIR}" != "x"; then if test -d ${SIPDIR} ; then AC_CHECK_FILE(${SIPDIR}/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then if test "x${SIPDIR}" = "x/usr/lib" then PYQT_LIBS="-lqtcmodule" @@ -147,7 +147,7 @@ if test "x$pyqt_lib_ok" == "xno"; then fi else AC_CHECK_FILE(${SIPDIR}/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then if test "x${SIPDIR}" = "x/usr/lib" then PYQT_LIBS="" @@ -159,35 +159,35 @@ if test "x$pyqt_lib_ok" == "xno"; then fi fi fi -if test "x$pyqt_lib_ok" == "xno"; then +if test "x$pyqt_lib_ok" = "xno"; then dnl try ${PYTHONHOME}/lib/python${PYTHON_VERSION}/site-packages if test "x${PYTHONHOME}" != "x"; then if test -d ${PYTHONHOME}/lib/python${PYTHON_VERSION}/site-packages ; then AC_CHECK_FILE(${PYTHONHOME}/lib/python${PYTHON_VERSION}/site-packages/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then PYQT_LIBS="-L${PYTHONHOME}/lib/python${PYTHON_VERSION}/site-packages -lqtcmodule" else AC_CHECK_FILE(${PYTHONHOME}/lib/python${PYTHON_VERSION}/site-packages/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then PYQT_LIBS="-L${PYTHONHOME}/lib/python${PYTHON_VERSION}/site-packages" fi fi fi fi fi -if test "x$pyqt_lib_ok" == "xno"; then +if test "x$pyqt_lib_ok" = "xno"; then dnl try /usr/lib/python${PYTHON_VERSION}/site-packages AC_CHECK_FILE(/usr/lib/python${PYTHON_VERSION}/site-packages/libqtcmodule.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then PYQT_LIBS="-L/usr/lib/python${PYTHON_VERSION}/site-packages -lqtcmodule" else AC_CHECK_FILE(/usr/lib/python${PYTHON_VERSION}/site-packages/qt.so,pyqt_lib_ok=yes,pyqt_lib_ok=no) - if test "x$pyqt_lib_ok" == "xyes"; then + if test "x$pyqt_lib_ok" = "xyes"; then PYQT_LIBS="-L/usr/lib/python${PYTHON_VERSION}/site-packages" fi fi fi -if test "x$pyqt_lib_ok" == "xno"; then +if test "x$pyqt_lib_ok" = "xno"; then pyqt_ok=no fi @@ -196,60 +196,60 @@ pyqt_sips_ok=no dnl try ${PYQT_SIPS} or ${PYQT_SIPS}/qt if test "x${PYQT_SIPS}" != "x"; then AC_CHECK_FILE(${PYQT_SIPS}/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xno"; then + if test "x$pyqt_sips_ok" = "xno"; then AC_CHECK_FILE(${PYQT_SIPS}/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then + if test "x$pyqt_sips_ok" = "xyes"; then PYQT_SIPS="${PYQT_SIPS}/qt" fi fi fi -if test "x$pyqt_sips_ok" == "xno"; then +if test "x$pyqt_sips_ok" = "xno"; then dnl try ${PYQTDIR}/sip if test "x${PYQTDIR}" != "x"; then if test -d ${PYQTDIR}/sip ; then AC_CHECK_FILE(${PYQTDIR}/sip/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then + if test "x$pyqt_sips_ok" = "xyes"; then PYQT_SIPS="${PYQTDIR}/sip" else AC_CHECK_FILE(${PYQTDIR}/sip/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then + if test "x$pyqt_sips_ok" = "xyes"; then PYQT_SIPS="${PYQTDIR}/sip/qt" fi fi fi fi fi -if test "x$pyqt_sips_ok" == "xno"; then +if test "x$pyqt_sips_ok" = "xno"; then dnl try ${SIPDIR}/sip if test "x${SIPDIR}" != "x"; then if test -d ${SIPDIR}/sip ; then AC_CHECK_FILE(${SIPDIR}/sip/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then + if test "x$pyqt_sips_ok" = "xyes"; then PYQT_SIPS="${SIPDIR}/sip" else AC_CHECK_FILE(${SIPDIR}/sip/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then + if test "x$pyqt_sips_ok" = "xyes"; then PYQT_SIPS="${SIPDIR}/sip/qt" fi fi fi fi fi -if test "x$pyqt_sips_ok" == "xno"; then +if test "x$pyqt_sips_ok" = "xno"; then dnl try /usr/share/sip if test -d /usr/share/sip ; then AC_CHECK_FILE(/usr/share/sip/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then + if test "x$pyqt_sips_ok" = "xyes"; then PYQT_SIPS="/usr/share/sip" else AC_CHECK_FILE(/usr/share/sip/qt/qglobal.sip,pyqt_sips_ok=yes,pyqt_sips_ok=no) - if test "x$pyqt_sips_ok" == "xyes"; then + if test "x$pyqt_sips_ok" = "xyes"; then PYQT_SIPS="/usr/share/sip/qt" fi fi fi fi -if test "x$pyqt_sips_ok" == "xno"; then +if test "x$pyqt_sips_ok" = "xno"; then pyqt_ok=no else PYQT_INCLUDES="-I$PYQT_SIPS" diff --git a/salome_adm/unix/config_files/check_qwt.m4 b/salome_adm/unix/config_files/check_qwt.m4 index 13bf90914..abfccc740 100644 --- a/salome_adm/unix/config_files/check_qwt.m4 +++ b/salome_adm/unix/config_files/check_qwt.m4 @@ -21,7 +21,7 @@ AC_ARG_WITH(qwt_inc, AC_MSG_RESULT("select $withval as path to QWT includes") ]) -if test -z $QWTHOME; then +if test -z "$QWTHOME"; then AC_MSG_RESULT(QWTHOME not defined) exits_ok=no if test "x$exits_ok" = "xno"; then @@ -45,7 +45,7 @@ if test -z $QWTHOME; then done fi if test "x$exits_ok" = "xyes"; then - if test -z $QWT_INCLUDES; then + if test -z "$QWT_INCLUDES"; then QWT_INCLUDES=$QWTHOME"/include/qwt" if test ! -f $QWT_INCLUDES/qwt.h ; then QWT_INCLUDES=$QWTHOME"/include" @@ -56,7 +56,7 @@ if test -z $QWTHOME; then fi fi else - if test -z $QWT_INCLUDES; then + if test -z "$QWT_INCLUDES"; then QWT_INCLUDES="$QWTHOME/include" fi fi diff --git a/salome_adm/unix/config_files/check_sip.m4 b/salome_adm/unix/config_files/check_sip.m4 index 245f2382e..4158e9988 100644 --- a/salome_adm/unix/config_files/check_sip.m4 +++ b/salome_adm/unix/config_files/check_sip.m4 @@ -53,33 +53,33 @@ else if test "x$SIPDIR" != "x" ; then dnl look for sip.h in ${SIPDIR} AC_CHECK_FILE(${SIPDIR}/sip.h,sip_ok=yes,sip_ok=no) - if test "x$sip_ok" == "xyes" ; then + if test "x$sip_ok" = "xyes" ; then SIP_INCLUDES="-I${SIPDIR}" fi - if test "x$sip_ok" == "xno" ; then + if test "x$sip_ok" = "xno" ; then dnl look for sip.h in ${SIPDIR}/include/python${PYTHON_VERSION} if test -d ${SIPDIR}/include/python${PYTHON_VERSION} ; then AC_CHECK_FILE(${SIPDIR}/include/python${PYTHON_VERSION}/sip.h,sip_ok=yes,sip_ok=no) - if test "x$sip_ok" == "xyes" ; then + if test "x$sip_ok" = "xyes" ; then SIP_INCLUDES="-I${SIPDIR}/include/python${PYTHON_VERSION}" fi fi fi fi - if test "x$sip_ok" == "xno" ; then + if test "x$sip_ok" = "xno" ; then dnl look for sip.h in ${PYTHON_PREFIX}/include/python${PYTHON_VERSION} if test -d ${PYTHON_PREFIX}/include/python${PYTHON_VERSION} ; then AC_CHECK_FILE(${PYTHON_PREFIX}/include/python${PYTHON_VERSION}/sip.h,sip_ok=yes,sip_ok=no) - if test "x$sip_ok" == "xyes" ; then + if test "x$sip_ok" = "xyes" ; then SIP_INCLUDES="${PYTHON_INCLUDES}" fi fi fi - if test "x$sip_ok" == "xno" ; then + if test "x$sip_ok" = "xno" ; then dnl look for sip.h in /usr/include/python${PYTHON_VERSION} if test -d /usr/include/python${PYTHON_VERSION} ; then AC_CHECK_FILE(/usr/include/python${PYTHON_VERSION}/sip.h,sip_ok=yes,sip_ok=no) - if test "x$sip_ok" == "xyes" ; then + if test "x$sip_ok" = "xyes" ; then SIP_INCLUDES="/usr/include/python${PYTHON_VERSION}" fi fi @@ -90,7 +90,7 @@ else if test "x$SIPDIR" != "x" ; then dnl look for (lib)sip.so in ${SIPDIR} AC_CHECK_FILE(${SIPDIR}/libsip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then + if test "x$sip_lib_ok" = "xyes" ; then if test "x${SIPDIR}" = "x/usr/lib" then SIP_LIBS="-lsip" @@ -99,7 +99,7 @@ else fi else AC_CHECK_FILE(${SIPDIR}/sip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then + if test "x$sip_lib_ok" = "xyes" ; then if test "x${SIPDIR}" = "x/usr/lib" then SIP_LIBS="" @@ -109,50 +109,50 @@ else fi fi - if test "x$sip_lib_ok" == "xno" ; then + if test "x$sip_lib_ok" = "xno" ; then dnl look for (lib)sip.so in ${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages if test -d ${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages ; then AC_CHECK_FILE(${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages/libsip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then + if test "x$sip_lib_ok" = "xyes" ; then SIP_LIBS="-L${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages -lsip" else AC_CHECK_FILE(${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages/sip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then + if test "x$sip_lib_ok" = "xyes" ; then SIP_LIBS="-L${SIPDIR}/lib/python${PYTHON_VERSION}/site-packages" fi fi fi fi fi - if test "x$sip_lib_ok" == "xno" ; then + if test "x$sip_lib_ok" = "xno" ; then dnl look for (lib)sip.so in ${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages if test -d ${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages ; then AC_CHECK_FILE(${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/libsip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then + if test "x$sip_lib_ok" = "xyes" ; then SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages -lsip" else AC_CHECK_FILE(${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/sip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then + if test "x$sip_lib_ok" = "xyes" ; then SIP_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/site-packages" fi fi fi fi - if test "x$sip_lib_ok" == "xno" ; then + if test "x$sip_lib_ok" = "xno" ; then dnl look for (lib)sip.so in /usr/lib/python${PYTHON_VERSION}/site-packages if test -d /usr/lib/python${PYTHON_VERSION}/site-packages ; then AC_CHECK_FILE(/usr/lib/python${PYTHON_VERSION}/site-packages/libsip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then + if test "x$sip_lib_ok" = "xyes" ; then SIP_LIBS="-L$/usr/lib/python${PYTHON_VERSION}/site-packages -lsip" else AC_CHECK_FILE(/usr/lib/python${PYTHON_VERSION}/site-packages/sip.so,sip_lib_ok=yes,sip_lib_ok=no) - if test "x$sip_lib_ok" == "xyes" ; then + if test "x$sip_lib_ok" = "xyes" ; then SIP_LIBS="-L/usr/lib/python${PYTHON_VERSION}/site-packages" fi fi fi fi - if test "x$sip_lib_ok" == "xno" ; then + if test "x$sip_lib_ok" = "xno" ; then sip_ok=no fi fi diff --git a/salome_adm/unix/config_files/check_vtk.m4 b/salome_adm/unix/config_files/check_vtk.m4 index df9245b5d..5d06c9132 100644 --- a/salome_adm/unix/config_files/check_vtk.m4 +++ b/salome_adm/unix/config_files/check_vtk.m4 @@ -74,7 +74,7 @@ LOCAL_INCLUDES="$OGL_INCLUDES" LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS $LXLIB -lX11 -lXt" TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS $LXLIB -lX11 -lXt" -if test -z $VTKHOME +if test -z "$VTKHOME" then AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled) if test -f /usr/include/vtk/vtkPlane.h ; then @@ -83,7 +83,7 @@ then fi fi -if test ! -z $VTKHOME +if test ! -z "$VTKHOME" then LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES" LOCAL_LIBS="-L$VTKHOME/lib/vtk $LOCAL_LIBS" -- 2.39.2