Issue 0019946: integrate fix for 0019855 to SALOME 3 maintainance branch

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

diff --git a/configure.in.base b/configure.in.base
index cab0113ce015f107be86601a6708fb2e15e8a934..d1975b72f693613ddb70ee2a64f781c84ece5f55 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -23,8 +23,14 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=0.0.1
+VERSION=3.2.10
+XVERSION=0x03020A
 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
@@ -114,6 +120,14 @@ dnl
 
 AC_CXX_HAVE_SSTREAM
 
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
+
+CHECK_WITHIHM
+
 dnl
 dnl ---------------------------------------------
 dnl testing MPICH
@@ -194,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 ---------------------------------------------
@@ -218,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 ---------------------------------------------
@@ -258,6 +276,28 @@ echo
 
 CHECK_HTML_GENERATORS
 
+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
 echo ---------------------------------------------
 echo Testing Kernel
@@ -303,7 +343,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/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