diff options
| author | unknown <kent@suse9-x86.mysql.com> | 2006-07-03 10:56:19 +0200 |
|---|---|---|
| committer | unknown <kent@suse9-x86.mysql.com> | 2006-07-03 10:56:19 +0200 |
| commit | 97c2188812ee3aa9b6480d412e20ecb71740bc0b (patch) | |
| tree | d190bf8cd772bb9f64caab2750b6e9eef29cd1ac | |
| parent | 2b380332609e82c5129c05d4c04d44ecef0fcdb0 (diff) | |
| download | mariadb-git-97c2188812ee3aa9b6480d412e20ecb71740bc0b.tar.gz | |
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
| -rwxr-xr-x | netware/BUILD/mwasmnlm | 2 | ||||
| -rwxr-xr-x | netware/BUILD/mwccnlm | 2 | ||||
| -rwxr-xr-x | netware/BUILD/mwldnlm | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 |
4 files changed, 9 insertions, 3 deletions
diff --git a/netware/BUILD/mwasmnlm b/netware/BUILD/mwasmnlm index 381f84ec0c8..7f2378871c6 100755 --- a/netware/BUILD/mwasmnlm +++ b/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:]]>//' diff --git a/netware/BUILD/mwccnlm b/netware/BUILD/mwccnlm index cb2d62fe8cf..44cbe810922 100755 --- a/netware/BUILD/mwccnlm +++ b/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:]]>//' diff --git a/netware/BUILD/mwldnlm b/netware/BUILD/mwldnlm index 28566fc5cb1..08df0e69e12 100755 --- a/netware/BUILD/mwldnlm +++ b/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:]]>//' diff --git a/tests/Makefile.am b/tests/Makefile.am index ebe97393045..ab747d6e4ec 100644 --- a/tests/Makefile.am +++ b/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) |