From: vsr <vsr@opencascade.com>
Date: Sun, 5 Dec 2010 18:13:24 +0000 (+0000)
Subject: New version of hack_libtool utility to workaround problems on some Linux configurations
X-Git-Tag: V6_2_0a1~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c8b26a7389c588bc8011741cae8d66c41beedbf1;p=modules%2Fkernel.git

New version of hack_libtool utility to workaround problems on some Linux configurations
---

diff --git a/configure.ac b/configure.ac
index d0a11fc2e..9b3df1dd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -513,15 +513,10 @@ echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
+AC_HACK_LIBTOOL
 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\
+  $(pwd)/hack_libtool \1 \"\$[@]\" \n\
 }\n\
 CC=\"hack_libtool\"%g" libtool
 ],[])
diff --git a/salome_adm/unix/config_files/hack_libtool.m4 b/salome_adm/unix/config_files/hack_libtool.m4
index 54a65dc87..c6c3c2d52 100644
--- a/salome_adm/unix/config_files/hack_libtool.m4
+++ b/salome_adm/unix/config_files/hack_libtool.m4
@@ -28,14 +28,21 @@ dnl to the native libraries (installed in /usr/lib[64]) instead of those supplie
 dnl with specific -Ldir options.
 
 AC_DEFUN([AC_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
+cat > hack_libtool <<EOF
+#! /bin/sh
+
+cmd=""
+cmd_end=""
+
+for param in "\$[@]"
+do
+    case \${param} in
+	-L* ) where=\$(echo \${param} | cut -b3-) ; if test "\${where}" != "" ; then where=\$(cd \${where}; pwd) ; if test "\${where}" = "/usr/lib" || test "\${where}" = "/usr/lib64" ; then cmd_end="\${cmd_end} \${param}" ; else cmd="\${cmd} \${param}" ; fi ; fi ;;
+	*   ) cmd="\${cmd} \${param}" ;;
+    esac
+done
+cmd="\${cmd} \${cmd_end}"
+\$cmd
+EOF
+chmod a+x hack_libtool
 ])