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 | 2ae6d370a90e21a8d35ce8579a159601775e38df (patch) | |
| tree | 9dbc8ec42290003a408d43e791b13501506b8ae4 /libmysqld | |
| parent | 66dd2f49b63108b143c5d308e2a888500c0206d1 (diff) | |
| parent | a9b8eb4255ca8f44fd941097eba86199658ef461 (diff) | |
| download | mariadb-git-2ae6d370a90e21a8d35ce8579a159601775e38df.tar.gz | |
Automerge.
Diffstat (limited to 'libmysqld')
| -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 |