NPAL18017: EDF GEOM V3.2.9rc1 : Exception raised when getShapeOn... function return...

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

diff --git a/configure.in.base b/configure.in.base
index 1a444a1041d14321316c45eb4ba3777d371395c2..5bf8f619d8c1b05e577f753f76465b07baa9799f 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -23,11 +23,15 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.2.0
-XVERSION=0x030200
+VERSION=3.2.9
+XVERSION=0x030209
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=geom
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -116,6 +120,14 @@ dnl
 
 AC_CXX_HAVE_SSTREAM
 
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
+
+CHECK_WITHIHM
+
 dnl
 dnl ---------------------------------------------
 dnl testing MPICH
@@ -196,13 +208,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 ---------------------------------------------
@@ -220,13 +234,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 ---------------------------------------------
@@ -260,24 +276,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 GEOM 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 GEOM module necessary full GUI !"
+       exit
+       fi
 fi
 
 echo
@@ -325,7 +343,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