From 7f3f669e642c29dd4e7e12536319634ea9a59cd5 Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 1 Mar 2006 06:33:33 +0000 Subject: [PATCH] Change configuration --- Makefile.in | 2 +- adm_local/unix/config_files/check_Geom.m4 | 54 ------------------- ...{check_Netgen.m4 => check_NETGENPLUGIN.m4} | 0 adm_local/unix/config_files/check_SMESH.m4 | 54 ------------------- adm_local/unix/make_commence.in | 26 ++++++--- build_configure | 6 ++- configure.in.base | 20 +++++++ 7 files changed, 46 insertions(+), 116 deletions(-) delete mode 100644 adm_local/unix/config_files/check_Geom.m4 rename adm_local/unix/config_files/{check_Netgen.m4 => check_NETGENPLUGIN.m4} (100%) delete mode 100644 adm_local/unix/config_files/check_SMESH.m4 diff --git a/Makefile.in b/Makefile.in index bc00cd6..eb02034 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl @COMMENCE@ -SUBDIRS = idl src +SUBDIRS = idl src adm_local RESOURCES_FILES = NETGENPlugin.xml diff --git a/adm_local/unix/config_files/check_Geom.m4 b/adm_local/unix/config_files/check_Geom.m4 deleted file mode 100644 index 803ca75..0000000 --- a/adm_local/unix/config_files/check_Geom.m4 +++ /dev/null @@ -1,54 +0,0 @@ -# Check availability of Geom binary distribution -# -# Author : Nicolas REJNERI (OPEN CASCADE, 2003) -# - -AC_DEFUN([CHECK_GEOM],[ - -AC_CHECKING(for Geom) - -Geom_ok=no - -AC_ARG_WITH(geom, - [ --with-geom=DIR root directory path of GEOM installation ], - GEOM_DIR="$withval",GEOM_DIR="") - -if test "x$GEOM_DIR" == "x" ; then - -# no --with-geom-dir option used - - if test "x$GEOM_ROOT_DIR" != "x" ; then - - # GEOM_ROOT_DIR environment variable defined - GEOM_DIR=$GEOM_ROOT_DIR - - else - - # search Geom binaries in PATH variable - AC_PATH_PROG(TEMP, libGEOM_Swig.py) - if test "x$TEMP" != "x" ; then - GEOM_BIN_DIR=`dirname $TEMP` - GEOM_DIR=`dirname $GEOM_BIN_DIR` - fi - - fi -# -fi - -if test -f ${GEOM_DIR}/bin/salome/libGEOM_Swig.py ; then - Geom_ok=yes - AC_MSG_RESULT(Using Geom module distribution in ${GEOM_DIR}) - - if test "x$GEOM_ROOT_DIR" == "x" ; then - GEOM_ROOT_DIR=${GEOM_DIR} - fi - AC_SUBST(GEOM_ROOT_DIR) - -else - AC_MSG_WARN("Cannot find compiled Geom module distribution") -fi - -AC_MSG_RESULT(for Geom: $Geom_ok) - -])dnl - diff --git a/adm_local/unix/config_files/check_Netgen.m4 b/adm_local/unix/config_files/check_NETGENPLUGIN.m4 similarity index 100% rename from adm_local/unix/config_files/check_Netgen.m4 rename to adm_local/unix/config_files/check_NETGENPLUGIN.m4 diff --git a/adm_local/unix/config_files/check_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4 deleted file mode 100644 index 86a8264..0000000 --- a/adm_local/unix/config_files/check_SMESH.m4 +++ /dev/null @@ -1,54 +0,0 @@ -# Check availability of SMesh binary distribution -# -# Author : Nicolas REJNERI (OPEN CASCADE, 2003) -# - -AC_DEFUN([CHECK_SMESH],[ - -AC_CHECKING(for SMesh) - -SMesh_ok=no - -AC_ARG_WITH(smesh, - [ --with-smesh=DIR root directory path of SMESH installation ], - SMESH_DIR="$withval",SMESH_DIR="") - -if test "x$SMESH_DIR" == "x" ; then - -# no --with-smesh option used - - if test "x$SMESH_ROOT_DIR" != "x" ; then - - # SMESH_ROOT_DIR environment variable defined - SMESH_DIR=$SMESH_ROOT_DIR - - else - - # search SMESH binaries in PATH variable - AC_PATH_PROG(TEMP, libSMESH_Swig.py) - if test "x$TEMP" != "x" ; then - SMESH_BIN_DIR=`dirname $TEMP` - SMESH_DIR=`dirname $SMESH_BIN_DIR` - fi - - fi -# -fi - -if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then - SMesh_ok=yes - AC_MSG_RESULT(Using SMesh module distribution in ${SMESH_DIR}) - - if test "x$SMESH_ROOT_DIR" == "x" ; then - SMESH_ROOT_DIR=${SMESH_DIR} - fi - AC_SUBST(SMESH_ROOT_DIR) - -else - AC_MSG_WARN("Cannot find compiled SMesh module distribution") -fi - -AC_MSG_RESULT(for SMesh: $SMesh_ok) - -])dnl - diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 2d39b96..63aa2b2 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -250,18 +250,32 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base ACLOCAL_SRC = \ -ac_cxx_bool.m4 check_corba.m4 check_vtk.m4 \ +ac_cxx_bool.m4 check_corba.m4 \ ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ -ac_cxx_partial_specialization.m4 check_opengl.m4 python.m4 \ +ac_cxx_partial_specialization.m4 python.m4 \ ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ -ac_cc_warnings.m4 check_qt.m4 check_swig.m4 \ -check_boost.m4 +ac_cc_warnings.m4 check_swig.m4 check_boost.m4 #ifeq (@WITHNETGEN@,yes) # ACLOCAL_SRC += check_Netgen.m4 #endif -$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) - cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files +ACLOCAL_GUI = \ +check_vtk.m4 check_opengl.m4 check_qt.m4 \ +check_GUI.m4 check_full_GUI.m4 + +ACLOCAL_GEOM = check_GEOM.m4 + +ACLOCAL_SMESH = check_SMESH.m4 + +$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ + $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \ + $(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%) \ + $(ACLOCAL_SMESH:%=@SMESH_ROOT_DIR@/adm_local/unix/config_files/%) + cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ + -I @GUI_ROOT_DIR@/adm_local/unix/config_files \ + -I @GEOM_ROOT_DIR@/adm_local/unix/config_files \ + -I @SMESH_ROOT_DIR@/adm_local/unix/config_files + diff --git a/build_configure b/build_configure index 7a78b87..83f8cb9 100755 --- a/build_configure +++ b/build_configure @@ -203,7 +203,11 @@ else echo -n "Creating 'configure' script ... " fi -aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files +aclocal --acdir=adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files \ + -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files if autoconf then echo "done" diff --git a/configure.in.base b/configure.in.base index 10b05f1..3ffc76e 100644 --- a/configure.in.base +++ b/configure.in.base @@ -257,6 +257,26 @@ echo CHECK_HTML_GENERATORS +echo +echo --------------------------------------------- +echo Testing GUI +echo --------------------------------------------- +echo + +CHECK_SALOME_GUI + +echo +echo --------------------------------------------- +echo Testing full GUI +echo --------------------------------------------- +echo + +CHECK_FULL_GUI +if test "x${FULL_GUI}" != "xyes"; then + echo "failed : For configure NETGENPLUGIN module necessary full GUI !" + exit +fi + echo echo --------------------------------------------- echo Testing Kernel -- 2.39.2