diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
| commit | b170b126b02c2989e68694d6781fb48d4f316363 (patch) | |
| tree | bfc039f3ee09098fe5df5082ba6aaea56ebac313 /config | |
| parent | 41e66d57d5898ea2fa38dfb3a6b47de876efd3c9 (diff) | |
| parent | b4b6494643fa6b0eb96e6af230ab7c47e6ba1be3 (diff) | |
| download | mariadb-git-b170b126b02c2989e68694d6781fb48d4f316363.tar.gz | |
merge with 5.1
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/plugins.m4 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index ab308a1cc1f..d95b4bf502c 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -415,6 +415,14 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ fi ;; esac + # Similarly, disable shared plugins when configured with --disable-shared + # as libtool will not be able to produce them + if test "X[$enable_shared]" = Xno; then + if test "X[$mysql_plugin_]$2" != Xyes -a \ + "X[$with_plugin_]$2" != Xyes; then + [with_plugin_]$2=no + fi + fi ]) |