From efeb59f024232e7d4ce83eef8351dfdad9df2358 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 5 Jun 2007 06:21:44 +0000 Subject: [PATCH] Join modifications for CCRT by Jean Rahuel. --- adm_local/unix/make_commence.in | 30 +++++++++---- build_configure | 33 +++++++++++++-- configure.in.base | 74 ++++++++++++++++++++------------- src/Makefile.in | 8 +++- 4 files changed, 101 insertions(+), 44 deletions(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 51d300d..d7a9c63 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -280,20 +280,32 @@ ac_cc_warnings.m4 check_swig.m4 check_boost.m4 # ACLOCAL_SRC += check_Netgen.m4 #endif -ACLOCAL_GUI = \ -check_vtk.m4 check_opengl.m4 check_qt.m4 \ -check_GUI.m4 check_corba_in_GUI.m4 - ACLOCAL_GEOM = check_GEOM.m4 ACLOCAL_SMESH = check_SMESH.m4 +ifeq ($(NETGENPLUGIN_WITH_GUI),yes) +ACLOCAL_GUI = \ +check_vtk.m4 check_opengl.m4 check_qt.m4 \ +check_GUI.m4 check_corba_in_GUI.m4 + $(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL%=@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 -I 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 - + cd $(top_srcdir) ; aclocal -I 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 +endif + +ifeq ($(NETGENPLUGIN_WITH_GUI),no) +$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL%=@KERNEL_ROOT_DIR@/salome_adm/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 -I adm_local/unix/config_files \ + -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ + -I @GEOM_ROOT_DIR@/adm_local/unix/config_files \ + -I @SMESH_ROOT_DIR@/adm_local/unix/config_files +endif diff --git a/build_configure b/build_configure index cf7d322..0c58eb2 100755 --- a/build_configure +++ b/build_configure @@ -11,6 +11,7 @@ ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` +NETGENPLUGIN_WITH_GUI="yes" ######################################################################## # Test if the KERNEL_ROOT_DIR is set correctly @@ -26,12 +27,26 @@ fi # echo "failed : KERNEL_SRC variable is not correct !" # exit #fi +for option +do + case $option in + -with-ihm | --with-ihm) + NETGENPLUGIN_WITH_GUI="yes" + break;; + -without-ihm | --without-ihm | -with-ihm=no | --with-ihm=no) + NETGENPLUGIN_WITH_GUI="no" + break;; + esac +done + ######################################################################## # Test if the GUI_ROOT_DIR is set correctly -if test ! -d "${GUI_ROOT_DIR}"; then - echo "failed : GUI_ROOT_DIR variable is not correct !" - exit +if test ${NETGENPLUGIN_WITH_GUI} = yes; then + if test ! -d "${GUI_ROOT_DIR}"; then + echo "failed : GUI_ROOT_DIR variable is not correct !" + exit + fi fi ######################################################################## @@ -235,11 +250,21 @@ else echo -n "Creating 'configure' script ... " fi +if test ${NETGENPLUGIN_WITH_GUI} = yes; then aclocal -I 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 + -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files +fi + +if test ${NETGENPLUGIN_WITH_GUI} = no; then +aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/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 +fi + if autoconf then echo "done" diff --git a/configure.in.base b/configure.in.base index e813af3..22d7775 100644 --- a/configure.in.base +++ b/configure.in.base @@ -144,6 +144,14 @@ echo CHECK_BOOST +dnl +dnl --------------------------------------------- +dnl testing WITHIHM +dnl --------------------------------------------- +dnl + +CHECK_WITHIHM + dnl dnl --------------------------------------------- dnl testing MPICH @@ -224,13 +232,15 @@ AC_SUBST_FILE(CORBA) corba=make_$ORB CORBA=adm_local/unix/$corba -echo -echo --------------------------------------------- -echo testing openGL -echo --------------------------------------------- -echo +if test "X$WITHIHM" = "Xyes"; then + echo + echo --------------------------------------------- + echo testing openGL + echo --------------------------------------------- + echo -CHECK_OPENGL + CHECK_OPENGL +fi echo echo --------------------------------------------- @@ -248,13 +258,15 @@ echo CHECK_MSG2QM -echo -echo --------------------------------------------- -echo testing VTK -echo --------------------------------------------- -echo +if test "X$WITHIHM" = "Xyes"; then + echo + echo --------------------------------------------- + echo testing VTK + echo --------------------------------------------- + echo -CHECK_VTK + CHECK_VTK +fi echo echo --------------------------------------------- @@ -280,24 +292,26 @@ echo CHECK_HTML_GENERATORS -echo -echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_SALOME_GUI - -echo -echo --------------------------------------------- -echo Testing full GUI -echo --------------------------------------------- -echo - -CHECK_CORBA_IN_GUI -if test "x${CORBA_IN_GUI}" != "xyes"; then - echo "failed : For configure NETGENPLUGIN module necessary full GUI !" - exit +if test "X$WITHIHM" = "Xyes"; then + echo + echo --------------------------------------------- + echo Testing GUI + echo --------------------------------------------- + echo + + CHECK_SALOME_GUI + + echo + echo --------------------------------------------- + echo Testing full GUI + echo --------------------------------------------- + echo + + CHECK_CORBA_IN_GUI + if test "x${CORBA_IN_GUI}" != "xyes"; then + echo "failed : For configure NETGENPLUGIN module necessary full GUI !" + exit + fi fi echo diff --git a/src/Makefile.in b/src/Makefile.in index e171c7a..4c88638 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -31,6 +31,12 @@ VPATH=.:@srcdir@ @COMMENCE@ -SUBDIRS = NETGEN NETGENPlugin GUI +#SUBDIRS = NETGEN NETGENPlugin GUI + +SUBDIRS = NETGEN NETGENPlugin + +ifeq (@WITHIHM@,yes) + SUBDIRS += GUI +endif @MODULE@ -- 2.39.2