diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
| commit | 1c924a165259dc8ffb9c1cdcdb1f0d43876bcb20 (patch) | |
| tree | 8edee282fc8a225a291cd9be2e44e38709e31b1a /storage/archive | |
| parent | 024dba64b64f395151f6b95650e8ee69a1591428 (diff) | |
| parent | 11fae04527098cb6c266eae41188504bd22a5b52 (diff) | |
| download | mariadb-git-1c924a165259dc8ffb9c1cdcdb1f0d43876bcb20.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am index adc11358df6..8b08105cef3 100644 --- a/storage/archive/Makefile.am +++ b/storage/archive/Makefile.am @@ -37,14 +37,14 @@ noinst_PROGRAMS = archive_test archive_reader EXTRA_LTLIBRARIES = ha_archive.la pkgplugin_LTLIBRARIES = @plugin_archive_shared_target@ ha_archive_la_LDFLAGS = -module -rpath $(pkgplugindir) -ha_archive_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ha_archive_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_archive_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_archive_la_SOURCES = ha_archive.cc azio.c EXTRA_LIBRARIES = libarchive.a noinst_LIBRARIES = @plugin_archive_static_target@ -libarchive_a_CXXFLAGS = $(AM_CFLAGS) +libarchive_a_CXXFLAGS = $(AM_CXXFLAGS) libarchive_a_CFLAGS = $(AM_CFLAGS) libarchive_a_SOURCES = ha_archive.cc azio.c |