Commit db590c18 authored by unknown's avatar unknown
Browse files

auto-set MYSQL_PLUGIN_DIRECTORY for plug.in files 


storage/archive/plug.in:
  MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically
storage/example/plug.in:
  MYSQL_PLUGIN_DIRECTORY for plug.in files is set automagically
parent b4182317

config/ac-macros/plugins.m4

+6 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ AC_DEFUN([_MYSQL_PLUGIN],[ 
  m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3])

  m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4])

  _MYSQL_PLUGAPPEND_META([$1], $5)

  ifelse(m4_bregexp(__mysql_include__,[/plug\.in$]),-1,[],[

     MYSQL_PLUGIN_DIRECTORY([$1],

         m4_bregexp(__mysql_include__,[^\(.*\)/plug\.in$],[\1]))

  ])

 ])

])
@@ -745,7 +749,9 @@ dnl 
dnl ---------------------------------------------------------------------------

AC_DEFUN([_MYSQL_INCLUDE_LIST],[

 ifelse([$1], [], [], [

  m4_define([__mysql_include__],[$1])

  sinclude($1)

  m4_undefine([__mysql_include__])

  _MYSQL_INCLUDE_LIST(m4_shift($@))

 ])

])

storage/archive/plug.in

+0 −1
Original line number Diff line number Diff line 
MYSQL_STORAGE_ENGINE(archive,,  [Archive Storage Engine],

        [Archive Storage Engine], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive])

MYSQL_PLUGIN_STATIC(archive,    [libarchive.a])

MYSQL_PLUGIN_DYNAMIC(archive,   [ha_archive.la])

storage/example/plug.in

+0 −1
Original line number Diff line number Diff line 
MYSQL_STORAGE_ENGINE(example,,  [Example Storage Engine],

        [Skeleton for Storage Engines for developers], [max,max-no-ndb])

MYSQL_PLUGIN_DIRECTORY(example, [storage/example])

MYSQL_PLUGIN_STATIC(example,    [libexample.a])

MYSQL_PLUGIN_DYNAMIC(example,   [ha_example.la])