Manual merge
This commit is contained in:
parent
1f07de22e0
commit
e3a68d8dcc
@ -33,7 +33,7 @@ SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \
|
|||||||
$(top_builddir)/regex/libregex.a \
|
$(top_builddir)/regex/libregex.a \
|
||||||
$(top_builddir)/strings/libmystrings.a
|
$(top_builddir)/strings/libmystrings.a
|
||||||
mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS)
|
mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS)
|
||||||
LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@
|
LDADD = $(SUPPORTING_LIBS) @ZLIB_LIBS@ @NDB_SCI_LIBS@
|
||||||
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
|
mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \
|
||||||
@pstack_libs@ \
|
@pstack_libs@ \
|
||||||
@mysql_plugin_libs@ \
|
@mysql_plugin_libs@ \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user