fix to make the compile work with --with-other-libc

parent babb78c8
...@@ -11,7 +11,7 @@ DEFS = -DEMBEDDED_LIBRARY ...@@ -11,7 +11,7 @@ DEFS = -DEMBEDDED_LIBRARY
INCLUDES = -I$(top_srcdir)/include $(openssl_includes) \ INCLUDES = -I$(top_srcdir)/include $(openssl_includes) \
-I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client
LIBS = @LIBS@ LIBS = @LIBS@
LDADD = ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)
mysqltest_SOURCES = mysqltest.c mysqltest_SOURCES = mysqltest.c
......
...@@ -15,18 +15,18 @@ ...@@ -15,18 +15,18 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
INCLUDES = -I$(srcdir)/../include -I../include $(openssl_includes) INCLUDES = -I$(srcdir)/../include -I../include $(openssl_includes)
LDADD = libvio.a $(openssl_libs) LDADD = @CLIENT_EXTRA_LDFLAGS@ libvio.a $(openssl_libs)
pkglib_LIBRARIES = libvio.a pkglib_LIBRARIES = libvio.a
noinst_PROGRAMS = test-ssl test-sslserver test-sslclient noinst_PROGRAMS = test-ssl test-sslserver test-sslclient
noinst_HEADERS = noinst_HEADERS =
test_ssl_SOURCES = test-ssl.c test_ssl_SOURCES = test-ssl.c
test_ssl_LDADD = ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \ test_ssl_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
../strings/libmystrings.a libvio.a $(openssl_libs) ../strings/libmystrings.a libvio.a $(openssl_libs)
test_sslserver_SOURCES = test-sslserver.c test_sslserver_SOURCES = test-sslserver.c
test_sslserver_LDADD = ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \ test_sslserver_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
../strings/libmystrings.a libvio.a $(openssl_libs) ../strings/libmystrings.a libvio.a $(openssl_libs)
test_sslclient_SOURCES = test-sslclient.c test_sslclient_SOURCES = test-sslclient.c
test_sslclient_LDADD = ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \ test_sslclient_LDADD = @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a ../mysys/libmysys.a \
../strings/libmystrings.a libvio.a $(openssl_libs) ../strings/libmystrings.a libvio.a $(openssl_libs)
libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c libvio_a_SOURCES = vio.c viosocket.c viossl.c viosslfactories.c
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment