X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=f751526a177e79b7a93b1d70bf14d0f8d3918c6c;hb=e45d5aee405e8caa5e5a8aaa8e1f9993c98cc171;hp=f6439a26b0bfb534286de48e19a2a5a699d4f533;hpb=accaca806f3d9cdda49d1e4cee9f67d8cfe5a3d6;p=modules%2Fkernel.git

diff --git a/configure.ac b/configure.ac
index f6439a26b..f751526a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,12 +19,13 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # ================================================================
 # Process this file with autoconf to produce a configure script
 # ================================================================
 #AC_PREREQ(2.59)
 #
-AC_INIT([Salome2 Project], [5.1.3], [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, ...
@@ -133,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
@@ -170,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
@@ -209,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
@@ -383,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
@@ -463,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
@@ -498,6 +513,17 @@ echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
+AC_HACK_LIBTOOL
+AC_CONFIG_COMMANDS([hack_libtool],[
+sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\
+  $(pwd)/hack_libtool \1 \"\$[@]\" \n\
+}\n\
+CC=\"hack_libtool\"%g" libtool
+sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool
+sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool
+sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1  if ! test -d \$sss; then continue; fi\n\1  ssss=\$(cd \$sss; pwd)\n\1  if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1    case \$ssss in\n\1      /usr/lib | /usr/lib64 ) ;;\n\1      * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1    esac\n\1  fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%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.
@@ -513,11 +539,15 @@ AC_OUTPUT([ \
   bin/Makefile \
   bin/VERSION \
   doc/Makefile \
+  doc/docutils/conf.py \
   doc/salome/Makefile \
   doc/salome/tui/Makefile \
   doc/salome/tui/doxyfile \
+  doc/salome/tui/static/header.html \
   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 \
@@ -546,6 +576,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 \
@@ -579,4 +611,3 @@ AC_OUTPUT([ \
   src/Utils/Makefile \
   src/Utils/Test/Makefile \
 ])
-