From a6ef3156ec996987cd5f2ced64515c57e0f18a40 Mon Sep 17 00:00:00 2001 From: Lee Starnes Date: Sat, 31 May 2014 21:14:09 -0400 Subject: [PATCH] configure: use --with-shared-sqlite instead of --enable-shared-sqlite --- configure | 11 ++++++----- configure.ac | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 5c3fdcf9..4e1df504 100755 --- a/configure +++ b/configure @@ -734,7 +734,7 @@ enable_ipv6 enable_openssl with_zlib_path enable_zlib -enable_shared_sqlite +with_shared_sqlite enable_ports enable_poll enable_select @@ -1382,7 +1382,6 @@ Optional Features: --enable-openssl=DIR Enable OpenSSL support (DIR optional). --disable-openssl Disable OpenSSL support. --disable-zlib Disable ziplinks support - --enable-shared-sqlite Use shared sqlite --enable-ports Force solaris I/O ports subsystem usage. --enable-poll Force poll() usage. --enable-select Force select() usage. @@ -1400,6 +1399,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-zlib-path=DIR Path to libz.so for ziplinks support. + --with-shared-sqlite Use shared sqlite --with-confdir=DIR Directory to install config files [deprecated, use --sysconfdir instead]. --with-logdir=DIR Directory where to write logfiles. @@ -7248,9 +7248,10 @@ fi fi -# Check whether --enable-shared-sqlite was given. -if test "${enable_shared_sqlite+set}" = set; then : - enableval=$enable_shared_sqlite; shared_sqlite=$enableval + +# Check whether --with-shared-sqlite was given. +if test "${with_shared_sqlite+set}" = set; then : + withval=$with_shared_sqlite; shared_sqlite=$withval else shared_sqlite=no fi diff --git a/configure.ac b/configure.ac index 60706e60..c6152a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -564,9 +564,9 @@ AC_CHECK_HEADER(zlib.h, [ fi -AC_ARG_ENABLE(shared-sqlite, -AC_HELP_STRING([--enable-shared-sqlite],[Use shared sqlite]), -[shared_sqlite=$enableval],[shared_sqlite=no]) +AC_ARG_WITH(shared-sqlite, +AC_HELP_STRING([--with-shared-sqlite],[Use shared sqlite]), +[shared_sqlite=$withval],[shared_sqlite=no]) if test "$shared_sqlite" = yes; then