diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 14816515e97..8f0b0ee6439 100644 --- a/configure.in +++ b/configure.in @@ -699,7 +699,7 @@ int main() AC_MSG_RESULT($atom_ops) AC_ARG_WITH(pstack, - [ --with-pstack Use the pstack backtrace library], + [ --with-pstack Use the pstack backtrace library], [ USE_PSTACK=$withval ], [ USE_PSTACK=no ]) pstack_libs= @@ -1752,17 +1752,20 @@ AC_ARG_WITH(embedded-server, ) AC_ARG_WITH(extra-tools, - [ --without-extra-tools Skip building utilites in the tools \ - directory.], + [ --without-extra-tools Skip building utilites in the tools directory.], [with_tools=$withval], [with_tools=yes] ) +tools_dirs="" if test "$with_tools" = "yes" then - tools_dirs="tools" -else - tools_dirs="" + if test "$THREAD_SAFE_CLIENT" = "no" + then + echo "Warning: extra-tools disabled because --enable-thread-safe-client wasn't used" + else + tools_dirs="tools" + fi fi AC_SUBST(tools_dirs) @@ -2178,7 +2181,17 @@ EOF then sql_server_dirs="innobase $sql_server_dirs" echo "CONFIGURING FOR INNODB" - (cd innobase && sh ./configure) \ + if test ! -d "innobase"; then + # This should only happen when doing a VPATH build + echo "NOTICE: I have to make the Innobase directory: `pwd`/innobase" + mkdir "innobase" || exit 1 + fi + rel_srcdir= + case "$srcdir" in + /* ) rel_srcdir="$srcdir" ;; + * ) rel_srcdir="../$srcdir" ;; + esac + (cd innobase && sh $rel_srcdir/innobase/configure) \ || AC_MSG_ERROR([could not configure INNODB]) echo "END OF INNODB CONFIGURATION" |