diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-13 17:16:37 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-13 17:16:37 +0100 |
| commit | 1ad359efc2a37677213e0f478ed6c9e6a3ec45f9 (patch) | |
| tree | 8e7707ab5129eb7d21a4945b3fc0e09dde6c66e1 /tests | |
| parent | 3477b50a329fa5f60f93741884bd92a94158ce83 (diff) | |
| download | mariadb-git-1ad359efc2a37677213e0f478ed6c9e6a3ec45f9.tar.gz | |
Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libs
- Most likely caused by linking with libmysqlclient using gcc and not g++.
- Removing our "yassl_dummy_link_fix" hacks so some test programs are linked
with gcc
- Remove build of non working test programs in vio
client/Makefile.am:
Remove "yassl_dummy_link_fix"
tests/Makefile.am:
Remove "yassl_dummy_link_fix"
tools/Makefile.am:
Remove "yassl_dummy_link_fix"
vio/Makefile.am:
Remove "yassl_dummy_link_fix"
Remove non working test programs from being built
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 9f143173827..79c7535f7ba 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,11 +17,6 @@ ## Process this file with automake to create Makefile.in -if HAVE_YASSL - yassl_dummy_link_fix= $(top_srcdir)/extra/yassl/src/dummy.cpp -else - yassl_dummy_link_fix= -endif EXTRA_DIST = auto_increment.res auto_increment.tst \ function.res function.tst lock_test.pl lock_test.res \ export.pl big_record.pl \ @@ -35,9 +30,6 @@ EXTRA_DIST = auto_increment.res auto_increment.tst \ bin_PROGRAMS = mysql_client_test noinst_PROGRAMS = insert_test select_test thread_test -# -# C Test for 4.1 protocol -# INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) LIBS = @CLIENT_LIBS@ @@ -45,11 +37,11 @@ LDADD = @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql/libmysqlclient.la mysql_client_test_LDADD= $(LDADD) $(CXXLDFLAGS) -mysql_client_test_SOURCES= mysql_client_test.c $(yassl_dummy_link_fix) \ +mysql_client_test_SOURCES= mysql_client_test.c\ $(top_srcdir)/mysys/my_memmem.c -insert_test_SOURCES= insert_test.c $(yassl_dummy_link_fix) -select_test_SOURCES= select_test.c $(yassl_dummy_link_fix) +insert_test_SOURCES= insert_test.c +select_test_SOURCES= select_test.c insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) |