X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.in.base;h=9d330d551d1b8a5bc969fc2eb1e0d2958566a5a5;hb=e056d9de4b9bbbb46056ce5f33ad93bc90a30630;hp=d81e4977146d398af8715499cbdf160ef0e122a9;hpb=326ed6ac2c5ebb9a16e4b9cc4eeab1b96d784d54;p=modules%2Fsmesh.git

diff --git a/configure.in.base b/configure.in.base
index d81e49771..9d330d551 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -22,8 +22,14 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=0.0.1
+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=smesh
+AC_SUBST(MODULE_NAME)
 
 dnl
 dnl Initialize source and build root directories
@@ -100,6 +106,23 @@ AC_DEPEND_FLAG
 # AC_CC_WARNINGS([ansi])
 cc_ok=yes
 
+echo
+echo ---------------------------------------------
+echo testing Fortran
+echo ---------------------------------------------
+echo
+
+fortran_ok=no
+AC_PROG_F77
+AC_F77_LIBRARY_LDFLAGS
+AC_PROG_FC
+AC_FC_LIBRARY_LDFLAGS
+if test "X$FC" != "X" ; then
+   fortran_ok=yes
+fi
+
+echo 
+
 dnl Library libdl :
 AC_CHECK_LIB(dl,dlopen)
 
@@ -113,13 +136,15 @@ dnl
 
 AC_CXX_HAVE_SSTREAM
 
-echo
-echo ---------------------------------------------
-echo BOOST Library
-echo ---------------------------------------------
-echo
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
+
+CHECK_WITHIHM
+
 
-CHECK_BOOST
 
 dnl
 dnl ---------------------------------------------
@@ -209,13 +234,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 ---------------------------------------------
@@ -233,21 +260,31 @@ echo
 
 CHECK_MSG2QM
 
+if test "X$WITHIHM" = "Xyes"; then
+	echo
+	echo ---------------------------------------------
+	echo testing VTK
+	echo ---------------------------------------------
+	echo
+
+	CHECK_VTK
+fi
+
 echo
 echo ---------------------------------------------
-echo testing VTK
+echo testing HDF5
 echo ---------------------------------------------
 echo
 
-CHECK_VTK
+CHECK_HDF5
 
 echo
 echo ---------------------------------------------
-echo testing HDF5
+echo BOOST Library
 echo ---------------------------------------------
 echo
 
-CHECK_HDF5
+CHECK_BOOST
 
 echo
 echo ---------------------------------------------
@@ -265,6 +302,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 SMESH module necessary full GUI !"
+  	exit
+	fi
+fi
+
 echo
 echo ---------------------------------------------
 echo Testing Kernel
@@ -289,6 +348,8 @@ echo
 
 CHECK_MED
 
+CHECK_PLATFORM
+
 echo
 echo ---------------------------------------------
 echo Summary
@@ -296,7 +357,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok"
+variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok"
 
 for var in $variables
 do
@@ -326,7 +387,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