Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7923b41
)
Another fix of hack_libtool() function for latest versions of autoconf (e.g. 2.67)
V5_1_5rc2
author
vsr
<vsr@opencascade.com>
Wed, 3 Nov 2010 09:32:08 +0000
(09:32 +0000)
committer
vsr
<vsr@opencascade.com>
Wed, 3 Nov 2010 09:32:08 +0000
(09:32 +0000)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index 8a0b6c785376b8c581e6dfed994046d4eab3f456..c388519f273a9e5a7d674b79d325f9e571bfb441 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-434,6
+434,19
@@
echo
# chmod +x ./bin/salome/*; \
#])
# 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 <filename>.in to manage. When you execute
# autoscan, the Makefile list is generated in the output file configure.scan.
# 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.
@@
-485,5
+498,3
@@
AC_OUTPUT([ \
idl/Makefile \
Makefile
])
idl/Makefile \
Makefile
])
-
-AC_HACK_LIBTOOL