From: vsr <vsr@opencascade.com>
Date: Wed, 3 Nov 2010 09:27:03 +0000 (+0000)
Subject: Another fix of hack_libtool() function for latest versions of autoconf (e.g. 2.67)
X-Git-Tag: V5_1_5rc2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4e9495a908db97093c787406ba9f09b2f2c779c3;p=modules%2Fkernel.git

Another fix of hack_libtool() function for latest versions of autoconf (e.g. 2.67)
---

diff --git a/configure.ac b/configure.ac
index 789557455..d7ab30eb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -513,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.
@@ -599,5 +612,3 @@ AC_OUTPUT([ \
   src/Utils/Makefile \
   src/Utils/Test/Makefile \
 ])
-
-AC_HACK_LIBTOOL