diff options
| author | msvensson@neptunus.(none) <> | 2006-11-13 17:16:37 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-11-13 17:16:37 +0100 |
| commit | bf020e5ea6ada0f2b3e141b6126c23a57db45000 (patch) | |
| tree | 8e7707ab5129eb7d21a4945b3fc0e09dde6c66e1 /tools | |
| parent | 68a7d45a0a32047aca52ca96765172c03a6f5db1 (diff) | |
| download | mariadb-git-bf020e5ea6ada0f2b3e141b6126c23a57db45000.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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 61b9a612dc5..845ad7cd7dc 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -15,18 +15,15 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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 INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include \ $(openssl_includes) + LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/libmysql_r/libmysqlclient_r.la \ - @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ + @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ + bin_PROGRAMS= mysqltestmanager -mysqltestmanager_SOURCES= mysqlmanager.c $(yassl_dummy_link_fix) +mysqltestmanager_SOURCES= mysqlmanager.c mysqltestmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) DEF= -DUNDEF_THREADS_HACK |