diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2011-08-15 20:41:17 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2011-08-15 20:41:17 +0200 |
| commit | 7048e02a4a0fda797c9161be28dea55853936aa1 (patch) | |
| tree | c0e5e6e453ed21aaf727b0cc47af062ca6b91e38 /configure.in | |
| parent | 669ff0370347ccf18622ba7f8dbe04e04c63795d (diff) | |
| parent | 70fbfa0ce2f3310f2a80e424e0d96ff8234ed91b (diff) | |
| download | mariadb-git-7048e02a4a0fda797c9161be28dea55853936aa1.tar.gz | |
Merge bug#47337 for pushing into 5.1
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index e56a18540b5..120717d6afa 100644 --- a/configure.in +++ b/configure.in @@ -2711,7 +2711,7 @@ then MAN_DROP="$MAN_DROP embedded" grep -v 'embedded' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL fi - if test X"$with_plugin_innobase" != Xyes + if test X"$with_plugin_innobase" != Xyes -a X"$with_plugin_innodb_plugin" != Xyes then MAN_DROP="$MAN_DROP innodb" grep -v 'inno' $MANLISTFIL > $TMPLISTFIL ; mv -f $TMPLISTFIL $MANLISTFIL @@ -2790,7 +2790,7 @@ then fi # "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 # I know to add the static NSS magic if we have static NSS libraries with |