6 files changed, 46 insertions, 7 deletions
diff --git a/netware/BUILD/compile-netware-END b/netware/BUILD/compile-netware-END
index c5c08cea908..6c531ab5c7c 100755
--- a/netware/BUILD/compile-netware-END
+++ b/netware/BUILD/compile-netware-END
@@ -15,11 +15,16 @@ if test -e "Makefile"; then make -k clean; fi
 rm -f */.deps/*.P
 rm -rf Makefile.in.bk
 
-# Metrowerks enviornment
+# Setup Metrowerks environment
 . $path/mwenv
 
-# run auto tools
-. $path/compile-AUTOTOOLS
+# Temporary hack to allow building from source dist
+if [ ! "$USER"=pushbuild ]
+then
+  # Run autotools(use BUILD/autorun.sh)
+  echo "Running autotools again(BUILD/autorun.sh)"
+  . BUILD/autorun.sh
+fi
 
 # configure
 ./configure $base_configs $extra_configs
diff --git a/netware/BUILD/compile-netware-max b/netware/BUILD/compile-netware-max
index ec737d4615c..d8278a4e915 100644..100755
--- a/netware/BUILD/compile-netware-max
+++ b/netware/BUILD/compile-netware-max
@@ -15,7 +15,7 @@ suffix="max"
 extra_configs=" \
 	--with-innodb	\
 	--with-embedded-server \
-	--with-openssl \
+	--with-ssl \
 	"
 
 . $path/compile-netware-END
diff --git a/netware/BUILD/compile-netware-max-debug b/netware/BUILD/compile-netware-max-debug
index ea3553ae6e1..de1b5dd17cc 100644..100755
--- a/netware/BUILD/compile-netware-max-debug
+++ b/netware/BUILD/compile-netware-max-debug
@@ -15,7 +15,7 @@ extra_configs=" \
 	--with-innodb \
 	--with-debug=full	\
 	--with-embedded-server \
-	--with-openssl \
+	--with-ssl \
 	"
 
 . $path/compile-netware-END
diff --git a/netware/BUILD/compile-netware-src b/netware/BUILD/compile-netware-src
index f4e8a53ffea..f4e8a53ffea 100644..100755
--- a/netware/BUILD/compile-netware-src
+++ b/netware/BUILD/compile-netware-src
diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index f43092492bb..44497c48917 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -26,8 +26,17 @@ WINE_BUILD_DIR=`echo "$BUILD_DIR" | sed 's_'$base_unix_part'/__'`
 WINE_BUILD_DIR="$base/$WINE_BUILD_DIR"
 echo "WINE_BUILD_DIR: $WINE_BUILD_DIR"
 
-export MWCNWx86Includes="$MYDEV/libc/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.2.3;$WINE_BUILD_DIR/include;$MYDEV"
-export MWNWx86Libraries="$MYDEV/libc/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$MYDEV/openssl;$WINE_BUILD_DIR/netware/BUILD"
+# Look for libc, MySQL 5.1.x uses libc-2006 by default
+libc_dir="$MYDEV/libc-2006"
+if [ ! -d `winepath $libc_dir` ]
+then
+  # The libcdir didn't exist, set default
+  libc_dir="$MYDEV/libc"
+fi
+echo "Using libc in $libc_dir";
+
+export MWCNWx86Includes="$libc_dir/include;$MYDEV/fs64/headers;$MYDEV/zlib-1.2.3;$WINE_BUILD_DIR/include;$MYDEV"
+export MWNWx86Libraries="$libc_dir/imports;$MYDEV/mw/lib;$MYDEV/fs64/imports;$MYDEV/zlib-1.2.3;$MYDEV/openssl;$WINE_BUILD_DIR/netware/BUILD"
 export MWNWx86LibraryFiles="libcpre.o;libc.imp;netware.imp;mwcrtl.lib;mwcpp.lib;libz.a;neb.imp;zPublics.imp;knetware.imp"
 
 export WINEPATH="$MYDEV/mw/bin"
@@ -46,3 +55,21 @@ export LD='mwldnlm'
 export LDFLAGS='-entry _LibCPrelude -exit _LibCPostlude -map -flags pseudopreemption'
 export RANLIB=:
 export STRIP=:
+
+#
+# Check that TERM has been set to avoid problem "Error opening
+# terminal: unknown" when the script is executed using non interactive ssh
+#
+if test -z "$TERM" -o "$TERM"=dumb
+then
+  export TERM=linux
+fi
+
+# Temporary hack to allow building from source dist
+if [ "$USER"=pushbuild ]
+then
+  export ARFLAGS=$AR_FLAGS
+fi
+
+# Print all env. variables
+export
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