Commit bbdbcd0e authored by Sergei Golubchik's avatar Sergei Golubchik

extended configure script to report plugin configuration summary.

corrected the manual url to point to kb
parent f3aeafe3
...@@ -367,7 +367,7 @@ AC_DEFUN([_MYSQL_EMIT_CHECK_PLUGIN],[ ...@@ -367,7 +367,7 @@ AC_DEFUN([_MYSQL_EMIT_CHECK_PLUGIN],[
AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
m4_ifdef([$5],[ m4_ifdef([$5],[
AH_TEMPLATE($5, [Include ]$4[ into mysqld]) AH_TEMPLATE($5, [Include ]$3[ into mysqld])
]) ])
AC_MSG_CHECKING([whether to use ]$3) AC_MSG_CHECKING([whether to use ]$3)
mysql_use_plugin_dir="" mysql_use_plugin_dir=""
...@@ -375,10 +375,10 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ ...@@ -375,10 +375,10 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
if test "X[$mysql_plugin_]$2" = Xyes -a \ if test "X[$mysql_plugin_]$2" = Xyes -a \
"X[$with_plugin_]$2" != Xno -o \ "X[$with_plugin_]$2" != Xno -o \
"X[$with_plugin_]$2" = Xyes; then "X[$with_plugin_]$2" = Xyes; then
AC_MSG_RESULT([error]) __MYSQL_EMIT_CHECK_RESULT($3,[error])
AC_MSG_ERROR([disabled]) AC_MSG_ERROR([disabled])
fi fi
AC_MSG_RESULT([no]) __MYSQL_EMIT_CHECK_RESULT($3,[no])
],[ ],[
# Plugin is not disabled, determine if it should be built, # Plugin is not disabled, determine if it should be built,
...@@ -389,7 +389,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ ...@@ -389,7 +389,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
# Plugin directory was removed after autoconf was run; treat # Plugin directory was removed after autoconf was run; treat
# this as a disabled plugin # this as a disabled plugin
if test "X[$with_plugin_]$2" = Xyes; then if test "X[$with_plugin_]$2" = Xyes; then
AC_MSG_RESULT([error]) __MYSQL_EMIT_CHECK_RESULT($3,[error])
AC_MSG_ERROR([disabled]) AC_MSG_ERROR([disabled])
fi fi
...@@ -400,7 +400,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ ...@@ -400,7 +400,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
m4_ifdef([$9],[ m4_ifdef([$9],[
if test "X[$with_plugin_]$2" = Xno; then if test "X[$with_plugin_]$2" = Xno; then
AC_MSG_RESULT([error]) __MYSQL_EMIT_CHECK_RESULT($3,[error])
AC_MSG_ERROR([cannot disable mandatory plugin]) AC_MSG_ERROR([cannot disable mandatory plugin])
fi fi
[mysql_plugin_]$2=yes [mysql_plugin_]$2=yes
...@@ -427,7 +427,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ ...@@ -427,7 +427,7 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
if test "X[$with_plugin_]$2" = Xno; then if test "X[$with_plugin_]$2" = Xno; then
AC_MSG_RESULT([no]) __MYSQL_EMIT_CHECK_RESULT($3,[no])
else else
m4_ifdef([$8],m4_ifdef([$7],[],[[with_plugin_]$2=''])) m4_ifdef([$8],m4_ifdef([$7],[],[[with_plugin_]$2='']))
if test "X[$mysql_plugin_]$2" != Xyes -a \ if test "X[$mysql_plugin_]$2" != Xyes -a \
...@@ -440,16 +440,16 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ ...@@ -440,16 +440,16 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
AC_SUBST([plugin_]$2[_shared_target], "$8") AC_SUBST([plugin_]$2[_shared_target], "$8")
AC_SUBST([plugin_]$2[_static_target], [""]) AC_SUBST([plugin_]$2[_static_target], [""])
[with_plugin_]$2=yes [with_plugin_]$2=yes
AC_MSG_RESULT([plugin]) __MYSQL_EMIT_CHECK_RESULT($3,[plugin])
m4_ifdef([$6],[ m4_ifdef([$6],[
else else
[mysql_plugin_]$2=no [mysql_plugin_]$2=no
AC_MSG_RESULT([no]) __MYSQL_EMIT_CHECK_RESULT($3,[no])
fi fi
]) ])
],[ ],[
[with_plugin_]$2=no [with_plugin_]$2=no
AC_MSG_RESULT([no]) __MYSQL_EMIT_CHECK_RESULT($3,[no])
]) ])
else else
m4_ifdef([$7],[ m4_ifdef([$7],[
...@@ -482,7 +482,7 @@ dnl Although this is "pretty", it breaks libmysqld build ...@@ -482,7 +482,7 @@ dnl Although this is "pretty", it breaks libmysqld build
AC_SUBST([plugin_]$2[_shared_target], [""]) AC_SUBST([plugin_]$2[_shared_target], [""])
],[ ],[
m4_ifdef([$6],[ m4_ifdef([$6],[
AC_MSG_RESULT([error]) __MYSQL_EMIT_CHECK_RESULT($3,[error])
AC_MSG_ERROR([Plugin $1 does not support static linking]) AC_MSG_ERROR([Plugin $1 does not support static linking])
],[ ],[
m4_ifdef([$5],[ m4_ifdef([$5],[
...@@ -494,7 +494,7 @@ dnl Although this is "pretty", it breaks libmysqld build ...@@ -494,7 +494,7 @@ dnl Although this is "pretty", it breaks libmysqld build
]) ])
maria_plugin_defs="$maria_plugin_defs, [builtin_maria_]$2[_plugin]" maria_plugin_defs="$maria_plugin_defs, [builtin_maria_]$2[_plugin]"
[with_plugin_]$2=yes [with_plugin_]$2=yes
AC_MSG_RESULT([yes]) __MYSQL_EMIT_CHECK_RESULT($3,[yes])
m4_ifdef([$11], [ m4_ifdef([$11], [
m4_foreach([plugin], [$11], [ m4_foreach([plugin], [$11], [
condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp(plugin, [[^/]+$], [\&])" condition_dependent_plugin_modules="$condition_dependent_plugin_modules m4_bregexp(plugin, [[^/]+$], [\&])"
...@@ -550,6 +550,12 @@ dnl ...@@ -550,6 +550,12 @@ dnl
]) ])
]) ])
AC_DEFUN([__MYSQL_EMIT_CHECK_RESULT],[
AC_MSG_RESULT($2)
plugin_report="[$plugin_report]
m4_format([ * %-32s $2],$1:)"
])
AC_DEFUN([_MYSQL_EMIT_PLUGIN_ACTIONS],[ AC_DEFUN([_MYSQL_EMIT_PLUGIN_ACTIONS],[
ifelse($#, 0, [], $#, 1, [ ifelse($#, 0, [], $#, 1, [
_MYSQL_EMIT_PLUGIN_ACTION([$1]) _MYSQL_EMIT_PLUGIN_ACTION([$1])
......
...@@ -2960,17 +2960,9 @@ AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' C ...@@ -2960,17 +2960,9 @@ AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' C
AC_OUTPUT AC_OUTPUT
echo
echo "You can find information about MariaDB at"
echo http://askmonty.org/wiki/index.php/MariaDB
echo
echo "Remember to check the platform specific part of the reference manual for"
echo "hints about installing MariaDB on your platform. Also have a look at the"
echo "files in the Docs directory."
echo
echo "---" echo "---"
echo "Configuration summary for $PACKAGE_NAME version $VERSION" echo "Configuration summary for $PACKAGE_NAME version $VERSION"
echo "$plugin_report" | sort
echo "" echo ""
echo " * Installation prefix: $prefix" echo " * Installation prefix: $prefix"
echo " * System type: $SYSTEM_TYPE" echo " * System type: $SYSTEM_TYPE"
...@@ -2981,9 +2973,16 @@ echo " * Debug enabled: $with_debug" ...@@ -2981,9 +2973,16 @@ echo " * Debug enabled: $with_debug"
echo " * Community Features: $ENABLE_COMMUNITY_FEATURES" echo " * Community Features: $ENABLE_COMMUNITY_FEATURES"
echo "" echo ""
echo "---" echo "---"
echo ""
echo "You can find information about MariaDB at"
echo "http://kb.askmonty.org/"
echo ""
echo "Remember to check the platform specific part of the reference manual for"
echo "hints about installing MariaDB on your platform. Also have a look at the"
echo "files in the Docs directory."
# The first line "Thank you ..." is checked in ./Do-compile to verify that configure # The first line "Thank you ..." is checked in ./Do-compile to verify that configure
# ended sucessfully - don't remove it. # ended sucessfully - don't remove it.
echo echo ""
echo "Thank you for choosing MariaDB!" echo "Thank you for choosing MariaDB!"
echo echo ""
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment