Join modifications from branch BR_DEBUG_3_2_0b1

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

diff --git a/configure.in.base b/configure.in.base
index 7ec53a53aa91e49aea291508b0d44a514505ae15..056ea3974d97bdd03a3f5fc2582478963084ef72 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -22,8 +22,10 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=0.0.1
+VERSION=3.2.0
+XVERSION=0x030200
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
 
 dnl
 dnl Initialize source and build root directories
@@ -53,6 +55,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
@@ -258,6 +265,26 @@ echo
 CHECK_HTML_GENERATORS
 
 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
+
 echo ---------------------------------------------
 echo Testing Kernel
 echo ---------------------------------------------
@@ -302,7 +329,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 idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep