diff options
| author | Ramil Kalimullin <ramil@mysql.com> | 2010-07-16 12:43:17 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil@mysql.com> | 2010-07-16 12:43:17 +0400 |
| commit | 4dd7f870c5c0e3a0fc3178a34b49690b720ef5d0 (patch) | |
| tree | 9dbc8ec42290003a408d43e791b13501506b8ae4 /libmysqld/examples | |
| parent | 7e6eb10c497ca31811dd4b5f3c1733498adb055a (diff) | |
| parent | 37c97fd472846fcb35575a51ab2937c0b82b9c5a (diff) | |
| download | mariadb-git-4dd7f870c5c0e3a0fc3178a34b49690b720ef5d0.tar.gz | |
Automerge.
Diffstat (limited to 'libmysqld/examples')
| -rw-r--r-- | libmysqld/examples/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index e7b053d9766..66c40d88e29 100644 --- 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 |