Automerge.

4dd7f870 · Ramil Kalimullin · 7e6eb10c · 37c97fd4 · 4dd7f870
Commit 4dd7f870 authored Jul 16, 2010 by Ramil Kalimullin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

libmysqld/examples/Makefile.am libmysqld/examples/Makefile.am +2 -1

No files found.
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -42,7 +42,8 @@ LDADD =		@CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @LIBDL@ $(CXXLDFLAGS) \

 mysqltest_embedded_LINK = $(CXXLINK)
 nodist_mysqltest_embedded_SOURCES =	mysqltest.cc
-mysqltest_embedded_LDADD =	$(LDADD) $(top_builddir)/regex/libregex.a
+mysqltest_embedded_LDADD =	$(LDADD) $(top_builddir)/regex/libregex.a \
+				@MYSQLD_EXTRA_LDFLAGS@

 nodist_mysql_SOURCES = mysql.cc readline.cc completion_hash.cc \
                my_readline.h sql_string.h completion_hash.h