merge from V3_2_0_maintenance 17mar08

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

diff --git a/configure.in.base b/configure.in.base
index fbe274f8faca92838dff2e2c7a9d763e075006e6..ff85c761e52950fd334b4cef2166e38b9e0641a0 100644 (file)
--- 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.3
+XVERSION=0x030203
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
+
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=eficas
+AC_SUBST(MODULE_NAME)
 
 dnl
 dnl Initialize source and build root directories
@@ -86,52 +92,6 @@ case "$INSTALL" in
       ;;
 esac
 
-echo
-echo ---------------------------------------------
-echo testing C/C++
-echo ---------------------------------------------
-echo
-
-cc_ok=no
-dnl inutil car libtool
-dnl AC_PROG_CC
-AC_PROG_CXX
-AC_DEPEND_FLAG
-# AC_CC_WARNINGS([ansi])
-cc_ok=yes
-
-dnl Library libdl :
-AC_CHECK_LIB(dl,dlopen)
-
-dnl add library libm :
-AC_CHECK_LIB(m,ceil)
-
-dnl 
-dnl Well we use sstream which is not in gcc pre-2.95.3
-dnl We must test if it exists. If not, add it in include !
-dnl
-
-AC_CXX_HAVE_SSTREAM
-
-dnl
-dnl ---------------------------------------------
-dnl testing MPICH
-dnl ---------------------------------------------
-dnl
-
-CHECK_MPICH
-
-echo
-echo ---------------------------------------------
-echo testing LEX \& YACC
-echo ---------------------------------------------
-echo
-
-lex_yacc_ok=no
-AC_PROG_YACC
-AC_PROG_LEX
-lex_yacc_ok=yes
-
 echo
 echo ---------------------------------------------
 echo testing python
@@ -140,30 +100,6 @@ echo
 
 CHECK_PYTHON
 
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing java
-dnl echo ---------------------------------------------
-dnl echo
-
-dnl CHECK_JAVA
-
-echo
-echo ---------------------------------------------
-echo testing swig
-echo ---------------------------------------------
-echo
-
-CHECK_SWIG
-
-echo
-echo ---------------------------------------------
-echo testing threads
-echo ---------------------------------------------
-echo
-
-ENABLE_PTHREADS
-
 echo
 echo ---------------------------------------------
 echo testing omniORB
@@ -172,14 +108,6 @@ echo
 
 CHECK_OMNIORB
 
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing mico
-dnl echo ---------------------------------------------
-dnl echo
-
-dnl CHECK_MICO
-
 echo
 echo ---------------------------------------------
 echo default ORB : omniORB
@@ -193,61 +121,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
-echo ---------------------------------------------
-echo
-
-CHECK_QT
-
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
-
-CHECK_VTK
-
-echo
-echo ---------------------------------------------
-echo testing HDF5
-echo ---------------------------------------------
-echo
-
-CHECK_HDF5
-
-echo
-echo ---------------------------------------------
-echo testing MED2
-echo ---------------------------------------------
-echo
-
-CHECK_MED2
-
-echo
-echo ---------------------------------------------
-echo Testing OpenCascade
-echo ---------------------------------------------
-echo
-
-CHECK_CAS
-
-echo
-echo ---------------------------------------------
-echo Testing sip
-echo ---------------------------------------------
-echo
-
-CHECK_SIP
 
 echo
 echo ---------------------------------------------
@@ -259,19 +132,19 @@ CHECK_PYQT
 
 echo
 echo ---------------------------------------------
-echo Testing html generators
+echo Testing Kernel
 echo ---------------------------------------------
 echo
 
-CHECK_HTML_GENERATORS
+CHECK_KERNEL
 
 echo
 echo ---------------------------------------------
-echo Testing Kernel
+echo Testing GUI
 echo ---------------------------------------------
 echo
 
-CHECK_KERNEL
+CHECK_SALOME_GUI
 
 echo
 echo ---------------------------------------------
@@ -283,20 +156,19 @@ CHECK_MSG2QM
 
 echo
 echo ---------------------------------------------
-echo Testing Visu
+echo Testing Pal
 echo ---------------------------------------------
 echo
 
-CHECK_VISU
+CHECK_PAL
 
 echo
 echo ---------------------------------------------
-echo Testing Pal
+echo Testing Visu
 echo ---------------------------------------------
 echo
 
-CHECK_PAL
-
+CHECK_VISU
 echo
 echo ---------------------------------------------
 echo Summary
@@ -304,7 +176,7 @@ 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 occ_ok doxygen_ok graphviz_ok Kernel_ok msg2qm_ok"
+variables="python_ok threads_ok OpenGL_ok qt_ok omniORB_ok Kernel_ok  SalomeGUI_ok msg2qm_ok"
 
 for var in $variables
 do
@@ -349,7 +221,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/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep