]> SALOME platform Git repositories - modules/multipr.git/commitdiff
Salome HOME
Another fix of hack_libtool() function for latest versions of autoconf (e.g. 2.67) V5_1_5_BR V5_1_5 V5_1_5_patch02 V5_1_5rc2 V5_1_5rc3 mergeto_V5_1_main_12Nov10 mergeto_V5_1_main_23Nov10 mergeto_V5_1_main_26Nov10 start_V5_1_6_BR
authorvsr <vsr@opencascade.com>
Wed, 3 Nov 2010 09:30:38 +0000 (09:30 +0000)
committervsr <vsr@opencascade.com>
Wed, 3 Nov 2010 09:30:38 +0000 (09:30 +0000)
configure.ac

index 5505b467924eb9a821b0be81c4c5a8bc1b93c443..41cc8d1959eb2ccd6a398152575f2449f6e13f00 100644 (file)
@@ -308,6 +308,19 @@ AC_OUTPUT_COMMANDS([ \
       chmod +x ./bin/*; \
 ])
 
+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 <filename>.in to manage. When you execute
 # autoscan, the Makefile list is generated in the output file configure.scan.
@@ -329,5 +342,3 @@ AC_OUTPUT([ \
   idl/Makefile \
   Makefile \
 ])
-
-AC_HACK_LIBTOOL