Commit ffcd04c2 authored by Joerg Bruehe's avatar Joerg Bruehe

Fix Bug #47337:

innochecksum not built for --with-plugin-innodb_plugin --without-plugin-innobase

In 5.1, we can have the traditional "innobase" code
(built-in) or the new version "innodb" (plugin).
The help tool "innochecksum" is useful for both,
but its generation was coupled to "innobase" only.

Fix this by treating both "innobase" and "innodb"
equivalent in the configure phase,
this affects both "innochecksum" and the InnoDB documentation.

This patch was proposed by Mark Callaghan.
parent 622fb276
...@@ -2711,7 +2711,7 @@ then ...@@ -2711,7 +2711,7 @@ then
MAN_DROP="$MAN_DROP embedded" MAN_DROP="$MAN_DROP embedded"
grep -v 'embedded' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL grep -v 'embedded' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL
fi fi
if test X"$with_plugin_innobase" != Xyes if test X"$with_plugin_innobase" != Xyes -a X"$with_plugin_innodb_plugin" != Xyes
then then
MAN_DROP="$MAN_DROP innodb" MAN_DROP="$MAN_DROP innodb"
grep -v 'inno' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL grep -v 'inno' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL
...@@ -2790,7 +2790,7 @@ then ...@@ -2790,7 +2790,7 @@ then
fi fi
# "innochecksum" is not in the "innobase/" subdirectory, but should be switched # "innochecksum" is not in the "innobase/" subdirectory, but should be switched
AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$with_plugin_innobase" = Xyes]) AM_CONDITIONAL([BUILD_INNODB_TOOLS], [test X"$with_plugin_innobase" = Xyes -o X"$with_plugin_innodb_plugin" = Xyes ])
# IMPORTANT - do not modify LIBS past this line - this hack is the only way # IMPORTANT - do not modify LIBS past this line - this hack is the only way
# I know to add the static NSS magic if we have static NSS libraries with # I know to add the static NSS magic if we have static NSS libraries with
......
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