From c9be9c7276b8ff5ffc6c081a373f64144fe1aefb Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 3 Nov 2010 09:32:08 +0000 Subject: [PATCH] Another fix of hack_libtool() function for latest versions of autoconf (e.g. 2.67) --- configure.ac | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8a0b6c785..c388519f2 100644 --- a/configure.ac +++ b/configure.ac @@ -434,6 +434,19 @@ echo # chmod +x ./bin/salome/*; \ #]) +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 .in to manage. When you execute # autoscan, the Makefile list is generated in the output file configure.scan. @@ -485,5 +498,3 @@ AC_OUTPUT([ \ idl/Makefile \ Makefile ]) - -AC_HACK_LIBTOOL -- 2.30.2