From 414feee0058e086bbf171e6cc66ef412dfa0794a Mon Sep 17 00:00:00 2001 From: akl Date: Fri, 1 Feb 2008 08:59:41 +0000 Subject: [PATCH] To remove obsolete scripts. --- salome_adm/unix/config_files/Makefile.am | 1 - salome_adm/unix/config_files/check_opengl.m4 | 195 ------------------ salome_adm/unix/config_files/check_qt.m4 | 206 ------------------- 3 files changed, 402 deletions(-) delete mode 100644 salome_adm/unix/config_files/check_opengl.m4 delete mode 100644 salome_adm/unix/config_files/check_qt.m4 diff --git a/salome_adm/unix/config_files/Makefile.am b/salome_adm/unix/config_files/Makefile.am index bd95886a5..09742ebfe 100644 --- a/salome_adm/unix/config_files/Makefile.am +++ b/salome_adm/unix/config_files/Makefile.am @@ -71,7 +71,6 @@ check_mpi.m4 \ check_openmpi.m4 \ check_mpich.m4 \ check_omniorb.m4 \ -check_opengl.m4 \ check_openpbs.m4 \ check_sockets.m4 \ check_swig.m4 \ diff --git a/salome_adm/unix/config_files/check_opengl.m4 b/salome_adm/unix/config_files/check_opengl.m4 deleted file mode 100644 index 8a56e0f54..000000000 --- a/salome_adm/unix/config_files/check_opengl.m4 +++ /dev/null @@ -1,195 +0,0 @@ -dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -dnl -dnl -dnl -AC_DEFUN([CHECK_OPENGL],[ -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_CPP])dnl -AC_REQUIRE([AC_LINKER_OPTIONS])dnl - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -AC_ARG_WITH(opengl, - [AC_HELP_STRING([--with-opengl=DIR],[root directory path of OpenGL installation])], - [opengl_dir="$withval"], - [dirs="/usr/lib${LIB_LOCATION_SUFFIX} /usr/local/lib${LIB_LOCATION_SUFFIX} /opt/graphics/OpenGL/lib${LIB_LOCATION_SUFFIX} /usr/openwin/lib${LIB_LOCATION_SUFFIX} /usr/X11R6/lib${LIB_LOCATION_SUFFIX}"])dnl - -AC_CHECKING(for OpenGL) -AC_CHECKING(for OpenGL headers) - -OGL_INCLUDES="" -OGL_LIBS="" - -GL_LIB_PATH="" -GLU_LIB_PATH="" - -OpenGL_ok=no -OpenGL_libs_ok=no -OpenGL_headers_ok=no - -dnl openGL headers -# by default -if test "x${opengl_dir}" != "x" ; then - AC_MSG_RESULT(for opengl_dir: $opengl_dir) - AC_CHECK_HEADER([${opengl_dir}/include/GL/gl.h], - [OpenGL_headers_ok=yes; OGL_INCLUDES="-I${opengl_dir}/include"], - [OpenGL_headers_ok=no]) - if test "x${OpenGL_headers_ok}" = "xyes" ; then - AC_CHECKING(for default OpenGL library) - if test "x${opengl_dir}" = "x/usr" ; then - OGL_LIBS="" - else - OGL_LIBS="-L${opengl_dir}/lib" - fi - LDFLAGS_old="$LDFLAGS" - LDFLAGS="$LDFLAGS $OGL_LIBS" - AC_CHECK_LIB([GL], - [glBegin], - [OpenGL_libs_ok=yes], - [OpenGL_libs_ok=no]) - if test "x${OpenGL_libs_ok}" = "xyes" ; then - AC_TRY_LINK([], - [], - [OpenGL_libs_ok=yes ; OpenGL_ok=yes; OGL_LIBS="$OGL_LIBS -lGL"], - [OpenGL_libs_ok=no]) - fi - LDFLAGS="$LDFLAGS_old" - fi -fi - -if test "x${OpenGL_headers_ok}" = "xno" ; then - AC_CHECK_HEADER(GL/gl.h, - [OpenGL_headers_ok=yes], - [OpenGL_headers_ok=no]) -fi - -# under SunOS ? -if test "x${OpenGL_headers_ok}" = "xno" ; then - AC_CHECK_HEADERS(/usr/openwin/share/include/GL/glxmd.h, - [OpenGL_headers_ok=yes; OGL_INCLUDES="-I/usr/openwin/share/include/"], - [OpenGL_headers_ok=no]) -fi - -# under IRIX ? -if test "x${OpenGL_headers_ok}" = "xno" ; then - AC_CHECK_HEADERS(/opt/graphics/OpenGL/include/GL/glxmd.h, - [OpenGL_headers_ok=yes; OGL_INCLUDES="-I/opt/graphics/OpenGL/include"], - [OpenGL_headers_ok=no]) -fi - -# some linux OpenGL servers hide the includes in /usr/X11R6/include/GL -if test "x${OpenGL_headers_ok}" = "xno" ; then - AC_CHECK_HEADERS(/usr/X11R6/include/GL/gl.h, - [OpenGL_headers_ok=yes; OGL_INCLUDES="-I/usr/X11R6/include"], - [OpenGL_headers_ok=no]) -fi - -if test "x${OpenGL_headers_ok}" = "xyes" ; then - AC_CHECKING(for OpenGL library) - for idir in $dirs; do - if test -r "${idir}/libGL.so"; then - AC_MSG_RESULT(in ${idir}) - if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then - GL_LIB_PATH="" - else - GL_LIB_PATH="-L${idir}" - fi - break - fi - # under IRIX ? - if test -r "${idir}/libGL.sl"; then - AC_MSG_RESULT(in ${idir}) - if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then - GL_LIB_PATH="" - else - GL_LIB_PATH="-L${idir}" - fi - break - fi - done - LDFLAGS_old="${LDFLAGS}" - LDFLAGS="${LDFLAGS} ${GL_LIB_PATH}" - AC_CHECK_LIB([GL], - [glBegin], - [OpenGL_libs_ok=yes], - [OpenGL_libs_ok=no]) - if test "x${OpenGL_libs_ok}" = "xyes" ; then - AC_TRY_LINK([], - [], - [OpenGL_libs_ok=yes ; OGL_LIBS="${OGL_LIBS} ${GL_LIB_PATH} -lGL"], - [OpenGL_libs_ok=no]) - fi - LDFLAGS="$LDFLAGS_old" -fi - -if test "x${OpenGL_libs_ok}" = "xyes" ; then - for idir in $dirs; do - if test -r "${idir}/libGLU.so"; then - AC_MSG_RESULT(in ${idir}) - if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then - GLU_LIB_PATH="" - else - GLU_LIB_PATH="-L${idir}" - fi - break - fi - # under IRIX ? - if test -r "${idir}/libGLU.sl"; then - AC_MSG_RESULT(in ${idir}) - if test "x${idir}" = "x/usr/lib${LIB_LOCATION_SUFFIX}" ; then - GLU_LIB_PATH="" - else - GLU_LIB_PATH="-L${idir}" - fi - break - fi - done - LDFLAGS_old="${LDFLAGS}" - LDFLAGS="${LDFLAGS} ${OGL_LIBS} ${GLU_LIB_PATH}" - AC_CHECK_LIB([GLU], - [gluBeginSurface], - [OpenGL_libs_ok=yes], - [OpenGL_libs_ok=no]) - if test "x${OpenGL_libs_ok}" = "xyes" ; then - AC_TRY_LINK([], - [], - [OpenGL_libs_ok=yes ; OGL_LIBS="${OGL_LIBS} ${GLU_LIB_PATH} -lGLU"], - [OpenGL_libs_ok=no]) - fi - LDFLAGS="$LDFLAGS_old" -fi - -if test "x${OpenGL_headers_ok}" = "xyes" ; then - if test "x${OpenGL_libs_ok}" = "xyes" ; then - OpenGL_ok=yes - fi -fi - -AC_MSG_RESULT(for OpenGL_headers_ok: $OpenGL_headers_ok) -AC_MSG_RESULT(for OpenGL_libs_ok: $OpenGL_libs_ok) -AC_MSG_RESULT(for OpenGL_ok: $OpenGL_ok) - -AC_SUBST(OGL_INCLUDES) -AC_SUBST(OGL_LIBS) - -AC_LANG_RESTORE - -])dnl diff --git a/salome_adm/unix/config_files/check_qt.m4 b/salome_adm/unix/config_files/check_qt.m4 deleted file mode 100644 index 0472d93dd..000000000 --- a/salome_adm/unix/config_files/check_qt.m4 +++ /dev/null @@ -1,206 +0,0 @@ -dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -dnl -dnl -dnl - -AC_DEFUN([CHECK_QT],[ -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_CXX])dnl -AC_REQUIRE([AC_PROG_CPP])dnl -AC_REQUIRE([AC_PROG_CXXCPP])dnl -AC_REQUIRE([CHECK_OPENGL])dnl -AC_REQUIRE([AC_LINKER_OPTIONS])dnl - -AC_CHECKING(for Qt) - -if test "x$OpenGL_ok" != "xyes" ; then - AC_MSG_WARN(Qt needs OpenGL correct configuration, check configure output) -fi - -qt_ok=yes - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -if test "x$QTDIR" = "x" -then - AC_MSG_RESULT(please define QTDIR variable) - qt_ok=no -else - AC_MSG_RESULT(QTDIR is $QTDIR) - qt_inc_ok=no - QTINC="" - AC_CHECK_FILE(${QTDIR}/include/qt3/qglobal.h,QTINC="/qt3",QTINC="") - QT_VERS=`grep "QT_VERSION_STR" ${QTDIR}/include${QTINC}/qglobal.h | sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'` - AC_MSG_RESULT(Qt version is $QT_VERS) - QT_VERS="Qt_"`echo $QT_VERS | sed -e 's%\"%%g' -e 's%\.%_%g'` -fi - -if test "x$qt_ok" = "xyes" -then - if test -f ${QTDIR}/bin/moc - then - MOC=${QTDIR}/bin/moc - else - AC_PATH_PROG(MOC, moc) - fi - if test "x$MOC" = "x" - then - qt_ok=no - AC_MSG_RESULT(moc qt-compiler not in PATH variable) - else - qt_ok=yes - AC_MSG_RESULT(moc found) - fi -fi - -if test "x$qt_ok" = "xyes" -then - if test -f ${QTDIR}/bin/uic - then - UIC=${QTDIR}/bin/uic - else - AC_PATH_PROG(UIC, uic) - fi - if test "x$UIC" = "x" - then - qt_ok=no - AC_MSG_RESULT(uic qt-interface compiler not in PATH variable) - else - qt_ok=yes - AC_MSG_RESULT(uic found) - fi -fi - -AC_SUBST(QTDIR) -QT_ROOT=$QTDIR - -if test "x$qt_ok" = "xyes" -then - CPPFLAGS_old=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$QTDIR/include${QTINC}" - - AC_LANG_CPLUSPLUS - AC_CHECK_HEADER(qaction.h,qt_ok=yes ,qt_ok=no) - - CPPFLAGS=$CPPFLAGS_old - - AC_MSG_CHECKING(include of qt headers) - - if test "x$qt_ok" = "xno" - then - AC_MSG_RESULT(qt headers not found, or too old qt version, in $QTDIR/include) - AC_MSG_RESULT(QTDIR environment variable may be wrong) - else - AC_MSG_RESULT(yes) - QT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE" - QT_MT_INCLUDES="-I${QT_ROOT}/include${QTINC} -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE" - fi -fi - -if test "x$qt_ok" = "xyes" -then - AC_MSG_CHECKING(linking qt library) - LIBS_old=$LIBS - if test "x$QTDIR" = "x/usr" - then - LIBS="$LIBS -lqt-mt $OGL_LIBS" - else - LIBS="$LIBS -L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt $OGL_LIBS" - fi - - CXXFLAGS_old=$CXXFLAGS - CXXFLAGS="$CXXFLAGS $QT_INCLUDES" - - AC_CACHE_VAL(salome_cv_lib_qt,[ - AC_TRY_LINK( -#include -, int n; - char **s; - QApplication a(n, s); - a.exec();, - eval "salome_cv_lib_qt=yes",eval "salome_cv_lib_qt=no") - ]) - qt_ok="$salome_cv_lib_qt" - - if test "x$qt_ok" = "xno" - then - #AC_MSG_RESULT(unable to link with qt library) - #AC_MSG_RESULT(QTDIR environment variable may be wrong) - # BEGIN: for CCRT (installation of qt have only a "lib" directory) - LIBS="$LIBS_old -L$QTDIR/lib -lqt-mt $OGL_LIBS" - - AC_CACHE_VAL(salome_cv_lib_qt,[ - AC_TRY_LINK( -#include -, int n; - char **s; - QApplication a(n, s); - a.exec();, - eval "salome_cv_lib_qt=yes",eval "salome_cv_lib_qt=no") - ]) - qt_ok="$salome_cv_lib_qt" - - if test "x$qt_ok" = "xno" - then - AC_MSG_RESULT(unable to link with qt library) - AC_MSG_RESULT(QTDIR environment variable may be wrong) - else - AC_MSG_RESULT(yes) - QT_LIBS="-L$QTDIR/lib -lqt-mt" - QT_MT_LIBS="-L$QTDIR/lib -lqt-mt" - fi - # END: for CCRT - else - AC_MSG_RESULT(yes) - if test "x$QTDIR" = "x/usr" - then - QT_LIBS=" -lqt-mt" - QT_MT_LIBS=" -lqt-mt" - else - QT_LIBS="-L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt" - QT_MT_LIBS="-L$QTDIR/lib${LIB_LOCATION_SUFFIX} -lqt-mt" - fi - fi - - LIBS=$LIBS_old - CXXFLAGS=$CXXFLAGS_old - -fi - -AC_SUBST(MOC) -AC_SUBST(UIC) - -AC_SUBST(QT_ROOT) -AC_SUBST(QT_INCLUDES) -AC_SUBST(QT_MT_INCLUDES) -AC_SUBST(QT_LIBS) -AC_SUBST(QT_MT_LIBS) -AC_SUBST(QT_VERS) - -AC_LANG_RESTORE - -AC_MSG_RESULT(for Qt: $qt_ok) - -# Save cache -AC_CACHE_SAVE - -])dnl -dnl -- 2.39.2