From d4b79cb304a97670777f289be616bcb5415cd1b6 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 12 Nov 2010 14:29:19 +0000 Subject: [PATCH] Merge from V5_1_5_BR branch 12/11/2010 --- configure.ac | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 25dd7e5..d4fa4cd 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # --- # -AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN]) +AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [5.1.5], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -423,6 +423,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. @@ -443,5 +456,3 @@ AC_OUTPUT([ \ GHS3DPRLPLUGIN_version.h \ Makefile \ ]) - -AC_HACK_LIBTOOL -- 2.39.2