Merge from V5_1_5_BR branch 12/11/2010

diff --git a/configure.ac b/configure.ac
index 8381837add8d4b94fb59e965969f0e0dd60cd743..41cc8d1959eb2ccd6a398152575f2449f6e13f00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 # Modified by : Marc Tajchman (CEA)
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project MULTIPR module],[5.1.4], [webmaster.salome@opencascade.com], [SalomeMULTIPR])
+AC_INIT([Salome2 Project MULTIPR module],[5.1.5], [webmaster.salome@opencascade.com], [SalomeMULTIPR])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -308,6 +308,19 @@ AC_OUTPUT_COMMANDS([ \
       chmod +x ./bin/*; \
 ])
 
+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.
@@ -329,5 +342,3 @@ AC_OUTPUT([ \
   idl/Makefile \
   Makefile \
 ])
-
-AC_HACK_LIBTOOL