diff options
author | unknown <msvensson@neptunus.(none)> | 2006-10-24 15:46:54 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 15:46:54 +0200 |
commit | 92192355617d2efc44dc071c667c130676d62d6c (patch) | |
tree | a0aeea2659765e4badfed2a7185a285a179959e0 /netware | |
parent | 8247821b387bdff641e2060381bd2b8dfd26362f (diff) | |
parent | 752e5f1ec77f79009804a6ed316843b184b46394 (diff) | |
download | mariadb-git-92192355617d2efc44dc071c667c130676d62d6c.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
client/mysqldump.c:
Auto merged
sql/sql_show.cc:
Auto merged
configure.in:
Manual merge, the filesed of Makfile.in has been removed but needed to
add it back in to convert .la libs to .a libs
Diffstat (limited to 'netware')
-rwxr-xr-x | netware/BUILD/mwldnlm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/netware/BUILD/mwldnlm b/netware/BUILD/mwldnlm index cc8c9e63c6e..b1822827b59 100755 --- a/netware/BUILD/mwldnlm +++ b/netware/BUILD/mwldnlm @@ -3,6 +3,13 @@ # stop on errors 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=" $*" # NOTE: Option 'pipefail' is not standard sh |