From 479958db355f5fce735fce945349e78c15ac6394 Mon Sep 17 00:00:00 2001 From: rnc Date: Thu, 22 Aug 2013 11:51:54 +0000 Subject: [PATCH] REG: removed two file added by mistake when merging BR_size_maps --- .../unix/config_files/check_GHS3DPLUGIN.m4 | 76 ----------- .../config_files/check_MESHGEMS_CADSURF.m4 | 129 ------------------ 2 files changed, 205 deletions(-) delete mode 100644 adm_local/unix/config_files/check_GHS3DPLUGIN.m4 delete mode 100644 adm_local/unix/config_files/check_MESHGEMS_CADSURF.m4 diff --git a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 deleted file mode 100644 index 0573e9f..0000000 --- a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 +++ /dev/null @@ -1,76 +0,0 @@ -dnl Copyright (C) 2007-2013 CEA/DEN, EDF R&D -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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl - -dnl File : check_GHS3DPLUGIN.m4 -dnl Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) -dnl -AC_DEFUN([CHECK_GHS3DPLUGIN],[ - -AC_CHECKING(for GHS3D mesh plugin) - -GHS3Dplugin_ok=no - -GHS3DPLUGIN_LDFLAGS="" -GHS3DPLUGIN_CXXFLAGS="" - -AC_ARG_WITH(GHS3Dplugin, - --with-GHS3Dplugin=DIR root directory path of GHS3D mesh plugin installation, - GHS3DPLUGIN_DIR="$withval",GHS3DPLUGIN_DIR="") - -if test "x$GHS3DPLUGIN_DIR" = "x" ; then - -# no --with-GHS3Dplugin option used - - if test "x$GHS3DPLUGIN_ROOT_DIR" != "x" ; then - - # SALOME_ROOT_DIR environment variable defined - GHS3DPLUGIN_DIR=$GHS3DPLUGIN_ROOT_DIR - - else - - # search Salome binaries in PATH variable - AC_PATH_PROG(TEMP, libGHS3DEngine.so) - if test "x$TEMP" != "x" ; then - GHS3DPLUGIN_DIR=`dirname $TEMP` - fi - - fi - -fi - -if test -f ${GHS3DPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libGHS3DEngine.so ; then - GHS3Dplugin_ok=yes - AC_MSG_RESULT(Using GHS3D mesh plugin distribution in ${GHS3DPLUGIN_DIR}) - - if test "x$GHS3DPLUGIN_ROOT_DIR" == "x" ; then - GHS3DPLUGIN_ROOT_DIR=${GHS3DPLUGIN_DIR} - fi - GHS3DPLUGIN_CXXFLAGS=-I${GHS3DPLUGIN_ROOT_DIR}/include/salome - GHS3DPLUGIN_LDFLAGS="-L${GHS3DPLUGIN_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome -lGHS3DEngine" -else - AC_MSG_WARN("Cannot find compiled GHS3D mesh plugin distribution") -fi - -AC_MSG_RESULT(for GHS3D mesh plugin: $GHS3Dplugin_ok) - -AC_SUBST(GHS3DPLUGIN_ROOT_DIR) -AC_SUBST(GHS3DPLUGIN_LDFLAGS) -AC_SUBST(GHS3DPLUGIN_CXXFLAGS) - -])dnl diff --git a/adm_local/unix/config_files/check_MESHGEMS_CADSURF.m4 b/adm_local/unix/config_files/check_MESHGEMS_CADSURF.m4 deleted file mode 100644 index c4ce3a5..0000000 --- a/adm_local/unix/config_files/check_MESHGEMS_CADSURF.m4 +++ /dev/null @@ -1,129 +0,0 @@ -dnl Copyright (C) 2007-2013 CEA/DEN, EDF R&D -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.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl - -dnl File : check_MESHGEMS_CADSURF.m4 -dnl Author : Gilles DAVID, Open CASCADE S.A.S (gilles.david@opencascade.com) -dnl -AC_DEFUN([CHECK_MESHGEMS_CADSURF],[ - -AC_REQUIRE([AC_PROG_CXX])dnl -AC_REQUIRE([AC_PROG_CXXCPP])dnl - -AC_CHECKING([for MeshGems-CADSurf commercial product]) - -AC_LANG_SAVE -AC_LANG_CPLUSPLUS - -MESHGEMS_CADSURF_INCLUDES="" -MESHGEMS_CADSURF_LIBS="" - -AC_ARG_WITH([meshgems], - [ --with-meshgems=DIR root directory path of MeshGems-CADSurf installation]) - -CADSURF_ok=no - -if test "$with-meshgems" != "no" ; then - if test "$with-meshgems" == "yes" || test "$with-meshgems" == "auto"; then - MESHGEMS_CADSURF_HOME="" - else - MESHGEMS_CADSURF_HOME="$with_meshgems" - fi - - if test "$MESHGEMS_CADSURF_HOME" == "" ; then - if test "x$MESHGEMS_CADSURFHOME" != "x" ; then - MESHGEMS_CADSURF_HOME=$MESHGEMS_CADSURFHOME - fi - if test "x$CADSURFHOME" != "x" ; then - MESHGEMS_CADSURF_HOME=$CADSURFHOME - fi - if test "x$MESHGEMSHOME" != "x" ; then - MESHGEMS_CADSURF_HOME=$MESHGEMSHOME - fi - fi - - if test "x$MESHGEMS_CADSURF_HOME" != "x"; then - - echo - echo ------------------------------------------------- - echo You are about to choose to use somehow the - echo MeshGems-CADSurf commercial product to generate 2D mesh. - echo - - LOCAL_INCLUDES="-I$MESHGEMS_CADSURF_HOME/include" - LOCAL_LIBS="-L$MESHGEMS_CADSURF_HOME/lib/Linux" - archtest="$(`which arch`)" - if test "x$archtest" = "x" ; then - archtest="`uname -m`" - fi - if test $archtest = "x86_64" ; then - LOCAL_LIBS="-L$MESHGEMS_CADSURF_HOME/lib/Linux_64" - fi - LOCAL_LIBS="${LOCAL_LIBS} -lmeshgems -lmg-cadsurf -lmg-precad" - - CPPFLAGS_old="$CPPFLAGS" - CXXFLAGS_old="$CXXFLAGS" - CPPFLAGS="$LOCAL_INCLUDES $CPPFLAGS" - CXXFLAGS="$LOCAL_INCLUDES $CXXFLAGS" - - AC_MSG_CHECKING([for MeshGems-CADSurf header file]) - - AC_CHECK_HEADER([meshgems/meshgems.h],[CADSURF_ok=yes],[CADSURF_ok=no]) - AC_CHECK_HEADER([meshgems/cadsurf.h],[CADSURF_ok=yes],[CADSURF_ok=no]) - - if test "x$CADSURF_ok" == "xyes"; then - - AC_MSG_CHECKING([for MeshGems-CADSurf library]) - - LIBS_old="$LIBS" - LIBS="-L. $LOCAL_LIBS $LIBS" - - AC_TRY_LINK( -extern "C" { -#include "meshgems/meshgems.h" -}, context_new(), - CADSURF_ok=yes,CADSURF_ok=no - ) - - LIBS="$LIBS_old" - - AC_MSG_RESULT([$CADSURF_ok]) - fi - - CPPFLAGS="$CPPFLAGS_old" - CXXFLAGS="$CXXFLAGS_old" - - fi -fi - -if test "x$CADSURF_ok" == xno ; then - AC_MSG_RESULT([for MeshGems-CADSurf: no]) - AC_MSG_WARN([MeshGems-CADSurf includes or libraries are not found or are not properly installed]) - AC_MSG_WARN([Cannot build without MeshGems-CADSurf. Use --with_meshgems option to define MeshGems installation.]) -else - MESHGEMS_CADSURF_INCLUDES=$LOCAL_INCLUDES - MESHGEMS_CADSURF_LIBS=$LOCAL_LIBS - AC_MSG_RESULT([for MeshGems-CADSurf: yes]) -fi - -AC_SUBST(MESHGEMS_CADSURF_INCLUDES) -AC_SUBST(MESHGEMS_CADSURF_LIBS) - -AC_LANG_RESTORE - -])dnl -- 2.39.2