X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=configure.in.base;h=d5466e49ca0f23c87a777e3ea62690ee8599a848;hp=7be3ca8d8b4dff29b28432fcd051a8a0ba218a35;hb=dc537c20a16de8e7b5d1ed271122b195cfbd6e0d;hpb=c3620fa19a68d1fbd487db903c1bf3fa5be42dc5

diff --git a/configure.in.base b/configure.in.base
index 7be3ca8d8..d5466e49c 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.7
+XVERSION=0x030207
 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,6 +136,16 @@ dnl
 
 AC_CXX_HAVE_SSTREAM
 
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
+
+CHECK_WITHIHM
+
+
+
 dnl
 dnl ---------------------------------------------
 dnl testing MPICH
@@ -142,11 +175,19 @@ CHECK_PYTHON
 
 echo
 echo ---------------------------------------------
-echo testing java
+echo Testing qwt
 echo ---------------------------------------------
 echo
 
-CHECK_JAVA
+CHECK_QWT 
+
+dnl echo
+dnl echo ---------------------------------------------
+dnl echo testing java
+dnl echo ---------------------------------------------
+dnl echo
+
+dnl CHECK_JAVA
 
 echo
 echo ---------------------------------------------
@@ -172,13 +213,13 @@ echo
 
 CHECK_OMNIORB
 
-echo
-echo ---------------------------------------------
-echo testing mico
-echo ---------------------------------------------
-echo
+dnl echo
+dnl echo ---------------------------------------------
+dnl echo testing mico
+dnl echo ---------------------------------------------
+dnl echo
 
-CHECK_MICO
+dnl CHECK_MICO
 
 echo
 echo ---------------------------------------------
@@ -193,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 ---------------------------------------------
@@ -211,11 +254,21 @@ CHECK_QT
 
 echo
 echo ---------------------------------------------
-echo testing VTK
+echo testing MSG2QM
 echo ---------------------------------------------
 echo
 
-CHECK_VTK
+CHECK_MSG2QM
+
+if test "X$WITHIHM" = "Xyes"; then
+	echo
+	echo ---------------------------------------------
+	echo testing VTK
+	echo ---------------------------------------------
+	echo
+
+	CHECK_VTK
+fi
 
 echo
 echo ---------------------------------------------
@@ -227,11 +280,11 @@ CHECK_HDF5
 
 echo
 echo ---------------------------------------------
-echo testing MED2
+echo BOOST Library
 echo ---------------------------------------------
 echo
 
-CHECK_MED2
+CHECK_BOOST
 
 echo
 echo ---------------------------------------------
@@ -249,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
@@ -273,6 +348,8 @@ echo
 
 CHECK_MED
 
+CHECK_PLATFORM
+
 echo
 echo ---------------------------------------------
 echo Summary
@@ -280,7 +357,7 @@ echo ---------------------------------------------
 echo
 
 echo Configure
-variables="cc_ok lex_yacc_ok python_ok java_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok mico_ok occ_ok doxygen_ok graphviz_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
@@ -295,7 +372,7 @@ echo
 dnl generals files which could be included in every makefile
 
 AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence
-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude
+AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude
 AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module
 
 dnl les dependences
@@ -310,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 share/salome/doc 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
@@ -343,14 +420,15 @@ dnl copy shells and utilities contained in the bin directory
 dnl excluding .in files (treated in AC-OUTPUT below) and CVS 
 dnl directory
 
-cd bin
+mkdir -p bin/salome
+cd bin/salome
 for i in $ROOT_SRCDIR/bin/*
 do
   local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
   case "$local_bin" in
         *.in | *~)                    ;;
-        ./bin/CVS)                    ;;
-        *) ln -fs $i; echo $local_bin ;;
+        ./bin/CVS | ./bin/salome)                    ;;
+        *) /usr/bin/install $i .; echo $local_bin ;;
   esac
 done
 cd $ROOT_BUILDDIR