From 80a066e18cc9427ad5c9ae0c60feb609d4b14b52 Mon Sep 17 00:00:00 2001 From: TMA salome Date: Wed, 16 Jun 2010 08:38:57 +0000 Subject: [PATCH] - remove msg2qm checking - add clean_configure script --- adm_local/unix/config_files/check_msg2qm.m4 | 59 --------------------- clean_configure | 23 ++++++++ configure.in | 10 +--- configure.in.base | 10 +--- 4 files changed, 25 insertions(+), 77 deletions(-) delete mode 100755 adm_local/unix/config_files/check_msg2qm.m4 create mode 100755 clean_configure diff --git a/adm_local/unix/config_files/check_msg2qm.m4 b/adm_local/unix/config_files/check_msg2qm.m4 deleted file mode 100755 index 30e63765..00000000 --- a/adm_local/unix/config_files/check_msg2qm.m4 +++ /dev/null @@ -1,59 +0,0 @@ -# Check availability of Qt's msg2qm tool binary distribution -# -# Author : Jerome Roy (CEA, 2003) -# - -AC_DEFUN([CHECK_MSG2QM],[ -AC_CHECKING(for msg2qm) - -msg2qm_ok=no - -AC_ARG_WITH(msg2qm, - [ --with-msg2qm=root_directory_path_of_MSG2QM_installation], - MSG2QM_DIR="$withval",MSG2QM_DIR="") - -if test "x$MSG2QM_DIR" == "x" ; then - # no --with-MSG2QM-dir option used - if test "x$MSG2QM_ROOT" != "x" ; then - # MSG2QM_ROOT environment variable defined - MSG2QM_DIR=$MSG2QM_ROOT - else - # search MSG2QM binaries in PATH variable - AC_PATH_PROG(TEMP, msg2qm) - if test "x$TEMP" != "x" ; then - MSG2QM_DIR=`dirname $TEMP` - fi - fi -fi - -# look for msg2qm in ${MSG2QM_DIR} directory -if test -f ${MSG2QM_DIR}/msg2qm ; then - msg2qm_ok=yes - MSG2QM="${MSG2QM_DIR}/msg2qm" - AC_MSG_RESULT(Using MSG2QM executable in ${MSG2QM_DIR}) -else - # if not found, look for msg2qm in ${MSG2QM_DIR}/bin directory - if test -f ${MSG2QM_DIR}/bin/msg2qm ; then - msg2qm_ok=yes - MSG2QM="${MSG2QM_DIR}/bin/msg2qm" - AC_MSG_RESULT(Using MSG2QM executable in ${MSG2QM_DIR}/bin) - fi -fi - -if test "$msg2qm_ok" == "no"; then - # At last, let's have a look in SALOME (until V2.2.X) - SALOME_MSG2QM=${KERNEL_ROOT_DIR}/bin/salome/msg2qm - if test -f $SALOME_MSG2QM ; then - msg2qm_ok=yes - MSG2QM=${SALOME_MSG2QM} - AC_MSG_RESULT(Using MSG2QM executable provided with SALOME KERNEL) - else - AC_MSG_WARN("Cannot find MSG2QM executable in SALOME") - fi -fi - -AC_SUBST(MSG2QM) -AC_MSG_RESULT(for MSG2QM: $msg2qm_ok) - -])dnl - diff --git a/clean_configure b/clean_configure new file mode 100755 index 00000000..e71a8bc2 --- /dev/null +++ b/clean_configure @@ -0,0 +1,23 @@ +#!/bin/sh +# Copyright (C) 2007-2010 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +rm -Rf aclocal.m4 autom4te.cache/ configure configure.in_* salome_adm +find . -name "*~" -print -exec rm {} \; +find . -name "*.pyc" -print -exec rm {} \; diff --git a/configure.in b/configure.in index 67eb32c3..5350eb97 100644 --- a/configure.in +++ b/configure.in @@ -146,14 +146,6 @@ echo CHECK_SALOME_GUI -echo -echo --------------------------------------------- -echo testing msg2qm -echo --------------------------------------------- -echo - -CHECK_MSG2QM - echo echo --------------------------------------------- echo Testing Pal @@ -176,7 +168,7 @@ echo --------------------------------------------- echo echo Configure -variables="python_ok threads_ok OpenGL_ok qt_ok omniORB_ok Kernel_ok SalomeGUI_ok msg2qm_ok" +variables="python_ok threads_ok OpenGL_ok qt_ok omniORB_ok Kernel_ok SalomeGUI_ok" for var in $variables do diff --git a/configure.in.base b/configure.in.base index 41efeccf..0f2558cf 100644 --- a/configure.in.base +++ b/configure.in.base @@ -146,14 +146,6 @@ echo CHECK_SALOME_GUI -echo -echo --------------------------------------------- -echo testing msg2qm -echo --------------------------------------------- -echo - -CHECK_MSG2QM - echo echo --------------------------------------------- echo Testing Pal @@ -176,7 +168,7 @@ echo --------------------------------------------- echo echo Configure -variables="python_ok threads_ok OpenGL_ok qt_ok omniORB_ok Kernel_ok SalomeGUI_ok msg2qm_ok" +variables="python_ok threads_ok OpenGL_ok qt_ok omniORB_ok Kernel_ok SalomeGUI_ok" for var in $variables do -- 2.39.2