Improve hack_libtool utility to workaround problems on some Linux configurations

diff --git a/configure.ac b/configure.ac
index 61386b2a10929e86c664ad3c73de032be22ce303..e2c9c42d26f6f3e36ce2ef4d2be6a40515dc1a2b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -383,15 +383,10 @@ echo
 #  chmod +x ./bin/*; \
 #])
 
+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
 ],[])