Commit 143bc9f4 authored by unknown's avatar unknown

Replace all refernces to .la libraries with direct references

to their .libs/*.a library
Add comment describing why mwldnlm is called with "x" flag


configure.in:
  Replace references to yassl .la libraries with direct reference to
  the .a libraries
netware/BUILD/mwldnlm:
  Add comment about why mwldnlm is called with the "x" flag and how
  to avoid it
parent e4bc4e91
...@@ -1176,12 +1176,16 @@ EOF ...@@ -1176,12 +1176,16 @@ EOF
cat > $filesed << EOF cat > $filesed << EOF
s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2, s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,
s,\(: conf_to_src\),\1.linux, s,\(: conf_to_src\),\1.linux,
s,libyassl.la,.libs/libyassl.a,
s,libtaocrypt.la,.libs/libtaocrypt.a,
EOF EOF
;; ;;
libmysql_r/Makefile.in) libmysql_r/Makefile.in)
cat > $filesed << EOF cat > $filesed << EOF
s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2, s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,
s,\(: conf_to_src\),\1.linux, s,\(: conf_to_src\),\1.linux,
s,libyassl.la,.libs/libyassl.a,
s,libtaocrypt.la,.libs/libtaocrypt.a,
EOF EOF
;; ;;
strings/Makefile.in) strings/Makefile.in)
......
...@@ -3,6 +3,13 @@ ...@@ -3,6 +3,13 @@
# stop on errors # stop on errors
set -e set -e
# If libtool passes "x" as the first argument to this script
# it's an indication that libtool is trying to unpack .la's
# so they can be added to a new library
# This step does not work on Netware and we avoid it by
# replacing the .la library with the path to the .a library
# in Makefile.in
args=" $*" args=" $*"
# NOTE: Option 'pipefail' is not standard sh # NOTE: Option 'pipefail' is not standard sh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment