Merge from V5_1_main branch 24/11/2010

[modules/kernel.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 744fc49153e073d6cfd8206d33afd99a378249de..d0a11fc2e0f5d4d3c7c6d38a693203665a379917 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@
 # ================================================================
 #AC_PREREQ(2.59)
 #
-AC_INIT([Salome2 Project], [6.1.0], [paul.rascle@edf.fr], [SalomeKERNEL])
+AC_INIT([Salome2 Project], [6.2.0], [paul.rascle@edf.fr], [SalomeKERNEL])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -134,6 +134,14 @@ AC_ENABLE_DEBUG(no)
 AC_ENABLE_PRODUCTION(no)
 AC_ENABLE_MPI_SEQ_CONTAINER(no)
 
+# _GBO_SALOME_PYTHON_PACKAGING_
+if test "X$enable_debug" = "Xyes"; then
+  PYLOGLEVEL=DEBUG
+else
+  PYLOGLEVEL=WARNING
+fi
+AC_SUBST(PYLOGLEVEL)
+
 echo
 echo ---------------------------------------------
 echo testing libtool
@@ -171,8 +179,6 @@ AC_CHECK_LIB(rt,nanosleep)
 dnl add library libm :
 AC_CHECK_LIB(m,ceil)
 
-# _CS_gbo We should add all dependent libraries
-
 AC_CXX_USE_STD_IOSTREAM
 
 AC_CXX_HAVE_SSTREAM
@@ -210,8 +216,9 @@ echo testing swig
 echo ---------------------------------------------
 echo
 
-dnl _CS_gbo We should use here a variable given from the CHECK_PYTHON
-AM_PATH_PYTHON(2.3)
+# _GBO_ This definition is required. Without this definition, the pythondir
+# would not be defined. The version doesn't matter.
+AM_PATH_PYTHON(2.4)
 CHECK_SWIG
 
 echo
@@ -384,6 +391,13 @@ CHECK_HTML_GENERATORS
 # Additional conditional to avoid compilation of non-portable code
 AM_CONDITIONAL(WINDOWS, [ test ])
 
+echo
+echo ---------------------------------------------
+echo testing sphinx
+echo ---------------------------------------------
+echo
+CHECK_SPHINX
+
 echo
 echo ============================================================
 echo Summary
@@ -464,7 +478,7 @@ if test x$libbatch_ok = xno; then
   echo
 fi
 
-htmldoc_products="doxygen_ok graphviz_ok rst2html_ok"
+htmldoc_products="doxygen_ok graphviz_ok rst2html_ok sphinx_ok"
 
 echo --- Html documentation products: only required for doc production
 summary $htmldoc_products
@@ -499,6 +513,19 @@ echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
+AC_CONFIG_COMMANDS([hack_libtool],[
+sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\
+  if test \"\$(echo \$[@] | grep -E '\\\-L/usr/lib(/../lib)?(64)? ')\" == \"\" \n\
+  then\n\
+    cmd=\"\1 \$[@]\"\n\
+  else\n\
+    cmd=\"\1 \"\`echo \$[@] | sed -r -e 's|(.*)-L/usr/lib(/../lib)?(64)? (.*)|\\\1\\\4 -L/usr/lib\\\3|g'\`\n\
+  fi\n\
+  \$cmd\n\
+}\n\
+CC=\"hack_libtool\"%g" libtool
+],[])
+
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
 # autoscan, the Makefile list is generated in the output file configure.scan.
@@ -521,6 +548,7 @@ AC_OUTPUT([ \
   doc/salome/gui/Makefile \
   doc/salome/gui/doxyfile \
   doc/salome/gui/static/header.html \
+  doc/docutils/Makefile \
   idl/Makefile \
   idl/Calcium_Ports.idl \
   resources/Makefile \
@@ -549,6 +577,8 @@ AC_OUTPUT([ \
   src/GenericObj/Makefile \
   src/HDFPersist/Makefile \
   src/KERNEL_PY/Makefile \
+  src/KERNEL_PY/kernel/Makefile \
+  src/KERNEL_PY/kernel/logconfig.py \
   src/Launcher/Makefile \
   src/LifeCycleCORBA/Makefile \
   src/LifeCycleCORBA/Test/Makefile \
@@ -582,4 +612,3 @@ AC_OUTPUT([ \
   src/Utils/Makefile \
   src/Utils/Test/Makefile \
 ])
-