summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2006-05-06 07:43:18 -0400
committerunknown <serg@sergbook.mysql.com>2006-05-06 07:43:18 -0400
commitdb590c18973fc3890477b1d9872a5d1e1e827888 (patch)
treeceebe7c6ae0a80d9af1480e65417392e47b474d7 /config
parentb41823175db16d053b19a5fcc07e391ecc33353b (diff)
downloadmariadb-git-db590c18973fc3890477b1d9872a5d1e1e827888.tar.gz
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
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/plugins.m46
1 files changed, 6 insertions, 0 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4
index c70aba0bc34..c00741bcfc0 100644
--- a/config/ac-macros/plugins.m4
+++ b/config/ac-macros/plugins.m4
@@ -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($@))
])
])