Makefile.am:

  Avoid duplicate symbol errors on Netware
mwldnlm, mwccnlm, mwasmnlm:
  Filter garbage characters from output


netware/BUILD/mwasmnlm:
  Filter garbage characters from output
netware/BUILD/mwccnlm:
  Filter garbage characters from output
netware/BUILD/mwldnlm:
  Filter garbage characters from output
tests/Makefile.am:
  Avoid duplicate symbol errors on Netware

netware/BUILD/mwasmnlm

@@ -5,4 +5,4 @@ set -e
 
 args=" $*"
 
-wine --debugmsg -all -- mwasmnlm $args
+wine --debugmsg -all -- mwasmnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//'

netware/BUILD/mwccnlm

@@ -7,4 +7,4 @@ set -e
 # convert it to "-I../include"
 args=" "`echo $* | sed -e 's/-I.\/../-I../g'`
 
-wine --debugmsg -all -- mwccnlm $args
+wine --debugmsg -all -- mwccnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//'

netware/BUILD/mwldnlm

@@ -5,4 +5,4 @@ set -e
 
 args=" $*"
 
-wine --debugmsg -all -- mwldnlm $args
+wine --debugmsg -all -- mwldnlm $args 2>&1 | sed -e 's/^[[:cntrl:]].*[[:cntrl:]]>//'

tests/Makefile.am

@@ -42,8 +42,14 @@ INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
 LIBS =			@CLIENT_LIBS@
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ \
                         $(top_builddir)/libmysql/libmysqlclient.la
+if HAVE_NETWARE
+mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS)
+mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \
+			../mysys/my_memmem.c
+else
 mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -L../mysys -lmysys
 mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix)
+endif
 insert_test_SOURCES=       insert_test.c $(yassl_dummy_link_fix)
 select_test_SOURCES=       select_test.c $(yassl_dummy_link_fix)
 insert_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)