Changing version to 4.1.3

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

diff --git a/configure.in.base b/configure.in.base
index e76e6eb954b10ab3332081399964e2a16581725f..a746e183012b22c9dd52b903e4d9ea90e2702e40 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -16,14 +16,20 @@
 #
 
 AC_INIT(src)
-AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files)
+AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED)
 AC_CANONICAL_HOST
 
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=0.0.1
+VERSION=4.1.3
+XVERSION=0x040103
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
+
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=superv
+AC_SUBST(MODULE_NAME)
 
 dnl
 dnl Initialize source and build root directories
@@ -53,6 +59,11 @@ dnl Export the AR macro so that it will be placed in the libtool file
 dnl correctly.
 export AR
 
+if test `uname -r` = "2.4.18-14" || test `uname -r` = "2.4.20-20.8"; then
+    export OS="REDHAT"
+fi
+AC_SUBST(OS)
+
 echo
 echo ---------------------------------------------
 echo testing make
@@ -140,13 +151,13 @@ echo
 
 CHECK_PYTHON
 
-echo
-echo ---------------------------------------------
-echo testing java
-echo ---------------------------------------------
-echo
+dnl echo
+dnl echo ---------------------------------------------
+dnl echo testing java
+dnl echo ---------------------------------------------
+dnl echo
 
-CHECK_JAVA
+dnl CHECK_JAVA
 
 echo
 echo ---------------------------------------------
@@ -172,13 +183,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,14 +204,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
@@ -209,13 +212,41 @@ echo
 
 CHECK_QT
 
-echo
-echo ---------------------------------------------
-echo testing VTK
-echo ---------------------------------------------
-echo
+dnl
+dnl ---------------------------------------------
+dnl testing WITHIHM
+dnl ---------------------------------------------
+dnl
+
+CHECK_WITHIHM
+
+if test "X$WITHIHM" = "Xyes"; then
+
+  echo
+  echo ---------------------------------------------
+  echo testing openGL
+  echo ---------------------------------------------
+  echo
+  
+  CHECK_OPENGL
+
+  echo
+  echo ---------------------------------------------
+  echo testing MSG2QM
+  echo ---------------------------------------------
+  echo
 
-CHECK_VTK
+  CHECK_MSG2QM
+
+  echo
+  echo ---------------------------------------------
+  echo testing VTK
+  echo ---------------------------------------------
+  echo
+
+  CHECK_VTK
+
+fi
 
 echo
 echo ---------------------------------------------
@@ -227,11 +258,11 @@ CHECK_HDF5
 
 echo
 echo ---------------------------------------------
-echo testing MED2
+echo BOOST Library
 echo ---------------------------------------------
 echo
 
-CHECK_MED2
+CHECK_BOOST
 
 echo
 echo ---------------------------------------------
@@ -249,7 +280,30 @@ echo
 
 CHECK_HTML_GENERATORS
 
-echo
+if test "X$WITHIHM" = "Xyes"; then
+ 
+  echo
+  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 SUPERV module necessary full GUI !"
+    exit
+  fi
+fi
+
 echo ---------------------------------------------
 echo Testing Kernel
 echo ---------------------------------------------
@@ -264,7 +318,12 @@ 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"
+if test "X$WITHIHM" = "Xyes"; then
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
+fi
+if test "X$WITHIHM" = "Xno"; then
+  variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok qt_ok hdf5_ok omniORB_ok boost_ok occ_ok Kernel_ok"
+fi
 
 for var in $variables
 do
@@ -294,7 +353,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
@@ -327,14 +386,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