mirror of
https://github.com/MariaDB/server.git
synced 2026-04-26 18:25:30 +02:00
BUG#25530 --with-readline fails with commercial source packages
BUILD/SETUP.sh: BUG#25530 --with-readline fails with commercial source packages The compile-* scripts should not use --with-readline explicitly when no readline is present. configure.in: BUG#25530 --with-readline fails with commercial source packages Configuring --with-readline should fail when libreadline is not bundled. A system libreadline is only used when there is a bundled libreadline too, so the commercial source code isn't linked with GPL libreadline by accident.
This commit is contained in:
parent
bb5dccf260
commit
6cfffb5005
2 changed files with 25 additions and 3 deletions
|
|
@ -84,7 +84,16 @@ debug_extra_cflags="-O1 -Wuninitialized"
|
|||
base_cxxflags="-felide-constructors -fno-exceptions -fno-rtti"
|
||||
amd64_cxxflags="" # If dropping '--with-big-tables', add here "-DBIG_TABLES"
|
||||
|
||||
base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-readline --with-big-tables"
|
||||
base_configs="$prefix_configs --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-big-tables"
|
||||
|
||||
if test -d "$path/../cmd-line-utils/readline"
|
||||
then
|
||||
base_configs="$base_configs --with-readline"
|
||||
elif test -d "$path/../cmd-line-utils/libedit"
|
||||
then
|
||||
base_configs="$base_configs --with-libedit"
|
||||
fi
|
||||
|
||||
static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static"
|
||||
amd64_configs=""
|
||||
alpha_configs="" # Not used yet
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue