diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-03-23 21:00:58 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-03-23 21:00:58 +0200 |
| commit | c9ba7c5f21582136747219c0f95be9a1f7b819ee (patch) | |
| tree | 787e66d0b54da11b2c702ea361838346b574f5ff | |
| parent | 0d835dc3e5215e178bef5bca909f90e92b666f46 (diff) | |
| download | mariadb-git-c9ba7c5f21582136747219c0f95be9a1f7b819ee.tar.gz | |
making rpl000001 working
BUILD/compile-pentium-debug:
static linking
| -rw-r--r-- | BUILD/FINISH.sh | 1 | ||||
| -rw-r--r-- | BUILD/SETUP.sh | 4 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-debug | 2 | ||||
| -rw-r--r-- | configure.in | 5 |
4 files changed, 10 insertions, 2 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index fbeaf1e3c68..82f31a14dc4 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -1,5 +1,6 @@ cflags="$c_warnings $extra_flags" cxxflags="$cxx_warnings $base_cxxflags $extra_flags" +extra_configs="$extra_configs $local_infile_configs" configure="./configure $base_configs $extra_configs" for arg do diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index a69cdcb14fd..8c523fc4877 100644 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -57,6 +57,10 @@ static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static alpha_configs="" # Not used yet pentium_configs="" sparc_configs="" +# we need local-infile in all binaries for rpl000001 +# if you need to disable local-infile in the client, write a build script +# and unset local_infile_configs +local_infile_configs="--enable-local-infile" debug_configs="--with-debug" diff --git a/BUILD/compile-pentium-debug b/BUILD/compile-pentium-debug index 7d25ac4a406..ec6cf23c649 100755 --- a/BUILD/compile-pentium-debug +++ b/BUILD/compile-pentium-debug @@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings" extra_configs="$pentium_configs $debug_configs" -extra_configs="$extra_configs " +extra_configs="$extra_configs $static_link" . "$path/FINISH.sh" diff --git a/configure.in b/configure.in index 87e225afe05..ebd9bd6b4f9 100644 --- a/configure.in +++ b/configure.in @@ -587,7 +587,10 @@ AC_SUBST(MYSQLD_USER) AC_ARG_ENABLE(local-infile, [ --enable-local-infile If LOAD DATA LOCAL INFILE is enabled by default.], - [ ENABLED_LOCAL_INFILE=$enablewal ], + [ + ENABLED_LOCAL_INFILE=$enablewal + AC_DEFINE(ENABLED_LOCAL_INFILE) + ], [ ENABLED_LOCAL_INFILE=no ] ) |