Join modifications from BR_Dev_For_4_0 tag V4_1_1.

[modules/superv.git] / configure.in.base

diff --git a/configure.in.base b/configure.in.base
index 056ea3974d97bdd03a3f5fc2582478963084ef72..b4e0be05d76c93ef34dc41c8c2dee27923af4ed8 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -16,17 +16,21 @@
 #
 
 AC_INIT(src)
-AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files)
+AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED)
 AC_CANONICAL_HOST
 
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.2.0
-XVERSION=0x030200
+VERSION=4.1.1
+XVERSION=0x040101
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=superv
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -200,14 +204,6 @@ AC_SUBST_FILE(CORBA)
 corba=make_$ORB
 CORBA=adm_local/unix/$corba
 
-echo
-echo ---------------------------------------------
-echo testing openGL
-echo ---------------------------------------------
-echo
-
-CHECK_OPENGL
-
 echo
 echo ---------------------------------------------
 echo testing QT
@@ -216,21 +212,41 @@ echo
 
 CHECK_QT
 
-echo
-echo ---------------------------------------------
-echo testing MSG2QM
-echo ---------------------------------------------
-echo
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
 
-CHECK_MSG2QM
+CHECK_WITHIHM
 
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
+if test "X$WITHIHM" = "Xyes"; then
+
+  echo
+  echo ---------------------------------------------
+  echo testing openGL
+  echo ---------------------------------------------
+  echo
+  
+  CHECK_OPENGL
 
-CHECK_VTK
+  echo
+  echo ---------------------------------------------
+  echo testing MSG2QM
+  echo ---------------------------------------------
+  echo
+
+  CHECK_MSG2QM
+
+  echo
+  echo ---------------------------------------------
+  echo testing VTK
+  echo ---------------------------------------------
+  echo
+
+  CHECK_VTK
+
+fi
 
 echo
 echo ---------------------------------------------
@@ -264,25 +280,28 @@ echo
 
 CHECK_HTML_GENERATORS
 
-echo
-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 SUPERV module necessary full GUI !"
-  exit
+if test "X$WITHIHM" = "Xyes"; then
+ 
+  echo
+  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 SUPERV module necessary full GUI !"
+    exit
+  fi
 fi
 
 echo ---------------------------------------------
@@ -299,7 +318,12 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+if test "X$WITHIHM" = "Xyes"; then
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+fi
+if test "X$WITHIHM" = "Xno"; then
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok qt_ok hdf5_ok omniORB_ok boost_ok occ_ok Kernel_ok"
+fi
 
 for var in $variables
 do
@@ -329,7 +353,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep