From 576fd5a5eee99c15923f39750ffb3a20941be705 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Wed, 11 Oct 2006 19:40:55 +0200
Subject: Check that TERM has been set to avoid problem "Error opening
 terminal: unknown" when the script is executed using non interactive ssh Set
 TERM to "linux" as default

netware/BUILD/mwenv:
  Check that TERM has been set to avoid problem "Error opening
  terminal: unknown" when the script is executed using non interactive ssh
---
 netware/BUILD/mwenv | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'netware/BUILD/mwenv')

diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index d8d53293b2c..dd055ad8270 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -46,3 +46,13 @@ 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
+
-- 
cgit v1.2.1


From c5cebf205f9eae1d9e94ee2477fab12a3fee432f Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Thu, 12 Oct 2006 13:28:18 +0200
Subject: Use libc-2003 if available else default to libc

---
 netware/BUILD/mwenv | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'netware/BUILD/mwenv')

diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index dd055ad8270..bc797c442ab 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.0.x uses libc-2003 by default
+libcdir="$MYDEV/libc-2003"
+if test ! -d $libcdir
+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"
@@ -56,3 +65,5 @@ then
   export TERM=linux
 fi
 
+# Print all env. variables
+export
-- 
cgit v1.2.1


From 3fb85dcad140fc23137525729868f0f519871964 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Thu, 12 Oct 2006 13:31:41 +0200
Subject: 5.1 should use libc-2006 by default

---
 netware/BUILD/mwenv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'netware/BUILD/mwenv')

diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index bc797c442ab..c3869d2ec90 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -26,8 +26,8 @@ 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"
 
-# Look for libc, MySQL 5.0.x uses libc-2003 by default
-libcdir="$MYDEV/libc-2003"
+# Look for libc, MySQL 5.1.x uses libc-2006 by default
+libcdir="$MYDEV/libc-2006"
 if test ! -d $libcdir
 then
   # The libcdir didn't exist, set default
-- 
cgit v1.2.1


From 88e5b3166dc4eb17bd4517fa47346ea2f6fefe4d Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Mon, 23 Oct 2006 12:56:25 +0200
Subject: When looking for libc the path need to be converted from wine to unix
 format before test that directory exists

---
 netware/BUILD/mwenv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'netware/BUILD/mwenv')

diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index bc797c442ab..a60da17d987 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -27,8 +27,8 @@ WINE_BUILD_DIR="$base/$WINE_BUILD_DIR"
 echo "WINE_BUILD_DIR: $WINE_BUILD_DIR"
 
 # Look for libc, MySQL 5.0.x uses libc-2003 by default
-libcdir="$MYDEV/libc-2003"
-if test ! -d $libcdir
+libc_dir="$MYDEV/libc-2003"
+if [ ! -d `winepath $libc_dir` ]
 then
   # The libcdir didn't exist, set default
   libc_dir="$MYDEV/libc"
-- 
cgit v1.2.1


From 375b04b9fe8826bd666b49421b5176a9316039e8 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@neptunus.(none)>
Date: Tue, 24 Oct 2006 11:16:53 +0200
Subject: Temporary fixes for building from source dist in pushbuild

netware/BUILD/compile-netware-END:
  If running as user pushbuild don't run autotools again
netware/BUILD/mwenv:
  Set ARFLAGS to value of AR_FLAGS
---
 netware/BUILD/mwenv | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'netware/BUILD/mwenv')

diff --git a/netware/BUILD/mwenv b/netware/BUILD/mwenv
index a60da17d987..a8d31949736 100755
--- a/netware/BUILD/mwenv
+++ b/netware/BUILD/mwenv
@@ -65,5 +65,11 @@ 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
-- 
cgit v1.2.1