Join modifications from branch BR_DEBUG_3_2_0b1

[samples/hello.git] / configure.in.base

diff --git a/configure.in.base b/configure.in.base
index 3eba28a8eb89ca5372dc428c0819a6d132df1e3d..214efbe9ace2955797765c1c85f519ebae0b88e7 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -22,8 +22,10 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=1.2.1
+VERSION=3.2.0
+XVERSION=0x030200
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
 
 dnl
 dnl Initialize source and build root directories
@@ -130,14 +132,6 @@ echo
 
 ENABLE_PTHREADS
 
-echo
-echo ---------------------------------------------
-echo BOOST Library
-echo ---------------------------------------------
-echo
-
-CHECK_BOOST
-
 echo
 echo ---------------------------------------------
 echo testing python
@@ -162,6 +156,14 @@ echo
 
 CHECK_MSG2QM
 
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
 echo
 echo ---------------------------------------------
 echo Testing OpenCascade
@@ -264,7 +266,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 share/salome/doc idl
 do
     $INSTALL -d $rep
 done