Integrate patch for 0021149: [CEA 445] Wrong mesh dimension

[modules/smesh.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ec12977e2d913b0816c0bdc22a83471cc744f011..1ba09bb2d95cb22e936edd01869a6e666e1e95d4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project SMESH module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeSMESH])
+AC_INIT([Salome2 Project SMESH module], [5.1.6], [webmaster.salome@opencascade.com], [SalomeSMESH])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -71,9 +71,6 @@ dnl Export the AR macro so that it will be placed in the libtool file
 dnl correctly.
 export AR
 
-AC_PROG_MKDIR_P
-AC_SUBST(MKDIR_P)
-
 echo
 echo ---------------------------------------------
 echo testing make
@@ -437,6 +434,19 @@ echo
 #  chmod +x ./bin/salome/*; \
 #])
 
+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.
@@ -451,6 +461,7 @@ AC_OUTPUT([ \
   SMESH_version.h \
   doc/Makefile \
   doc/docutils/Makefile \
+  doc/docutils/conf.py  \
   doc/salome/Makefile \
   doc/salome/gui/Makefile \
   doc/salome/gui/SMESH/Makefile \
@@ -488,5 +499,3 @@ AC_OUTPUT([ \
   idl/Makefile \
   Makefile
 ])
-
-AC_HACK_LIBTOOL