[Commits] Rev 2935: don't build dynamic plugins when configured with --disable-shared. in http://bazaar.launchpad.net/~maria-captains/maria/5.1/

serg at askmonty.org serg at askmonty.org
Tue Sep 14 14:29:19 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1/

------------------------------------------------------------
revno: 2935
revision-id: sergii at pisem.net-20100914112914-1hyjhmxo2sk2i5uf
parent: sergii at pisem.net-20100913195532-gafpxxmi7kjcsxhj
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.1
timestamp: Tue 2010-09-14 13:29:14 +0200
message:
  don't build dynamic plugins when configured with --disable-shared.
  libtool does not like it and fails the build.
-------------- next part --------------
=== modified file 'config/ac-macros/plugins.m4'
--- a/config/ac-macros/plugins.m4	2009-12-22 10:33:20 +0000
+++ b/config/ac-macros/plugins.m4	2010-09-14 11:29:14 +0000
@@ -390,6 +390,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
   ])
 
 



More information about the commits mailing list