Improve hack_libtool utility to workaround problems on some Linux configurations

diff --git a/configure.ac b/configure.ac
index 43470326a2e7e49467fe08e9d9ddb6d6eae6241a..e3de8681b1c911ff407e9ff48d260d4be6b6e7c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -316,15 +316,10 @@ AC_OUTPUT_COMMANDS([ \
       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
 ],[])