Add option --enable-bdb to configure, and tidy up configure help string

This commit is contained in:
Fish 2008-02-26 04:05:54 +00:00
parent 3055cf8b24
commit 570de662b3
4 changed files with 62 additions and 27 deletions

View file

@ -1,5 +1,5 @@
AC_DEFUN([AX_DISTVERSION], [
AC_ARG_WITH(distversion, [ --with-distversion - Version Name to use for making distributions],
AC_ARG_WITH(distversion, AC_HELP_STRING([--with-distversion], [Version Name to use for making distributions]),
[DISTDIRVERSION="$PACKAGE-$VERSION-$withval"],
[DISTDIRVERSION="$PACKAGE-$VERSION"])
AC_SUBST(DISTDIRVERSION)

View file

@ -1,7 +1,7 @@
AC_DEFUN([CHK_LIBEVNT], [
dnl Check for optional stuff
AC_ARG_WITH(rtsig,
[ --with-rtsig compile with support for real time signals (experimental)],
AC_HELP_STRING([--with-rtsig], [compile with support for real time signals (experimental)]),
[usertsig=yes], [usertsig=no])
dnl Checks for header files.

56
configure vendored
View file

@ -1495,9 +1495,10 @@ Optional Features:
--disable-ipv6 Disable ipv6 support
--disable-perl don't build the perl plugin
--disable-ccdv disable use of ccdv program in Makefiles
--enable-debug - Enable Debuging
--enable-autodebug - Enable AutoTools Debug
--enable-raw - Enable Raw command
--enable-bdb Enable Berkley Database Support
--enable-debug Enable Debuging
--enable-autodebug Enable AutoTools Debug
--enable-raw Enable Raw command
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@ -1519,10 +1520,11 @@ Optional Packages:
--without-ca-bundle Don't install the CA bundle
--with-zlib=PATH search for zlib in PATH
--without-zlib disable use of zlib
--with-rtsig compile with support for real time signals (experimental)
--with-rtsig compile with support for real time signals
(experimental)
--with-bdb-dir=DIR Berkeley DB installation directory
--with-modules - Additional Modules to compile
--with-distversion - Version Name to use for making distributions
--with-modules Additional Modules to compile
--with-distversion Version Name to use for making distributions
Some influential environment variables:
CC C compiler command
@ -4480,7 +4482,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 4483 "configure"' > conftest.$ac_ext
echo '#line 4485 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -6341,11 +6343,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:6344: $lt_compile\"" >&5)
(eval echo "\"\$as_me:6346: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:6348: \$? = $ac_status" >&5
echo "$as_me:6350: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -6609,11 +6611,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:6612: $lt_compile\"" >&5)
(eval echo "\"\$as_me:6614: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:6616: \$? = $ac_status" >&5
echo "$as_me:6618: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -6713,11 +6715,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:6716: $lt_compile\"" >&5)
(eval echo "\"\$as_me:6718: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:6720: \$? = $ac_status" >&5
echo "$as_me:6722: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -9165,7 +9167,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 9168 "configure"
#line 9170 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -9265,7 +9267,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 9268 "configure"
#line 9270 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -10399,8 +10401,8 @@ case "$system" in
"Darwin")
;;
*)
CFLAGS="$CFLAGS -g -export-dynamic"
LDFLAGS="$LDFLAGS -g -export-dynamic"
CFLAGS="$CFLAGS -g -rdynamic"
LDFLAGS="$LDFLAGS -g -rdynamic"
;;
esac
@ -26351,6 +26353,14 @@ fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ echo "$as_me:$LINENO: checking Should we try to compile BDB" >&5
echo $ECHO_N "checking Should we try to compile BDB... $ECHO_C" >&6; }
# Check whether --enable-bdb was given.
if test "${enable_bdb+set}" = set; then
enableval=$enable_bdb; case "$enableval" in
yes)
{ echo "$as_me:$LINENO: result: Yes" >&5
echo "${ECHO_T}Yes" >&6; }
echo ""
$srcdir/autotools/shtool echo -e "%BChecking for Berkeley Database%b"
@ -26526,6 +26536,18 @@ _ACEOF
fi
;;
*)
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
;;
esac
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
echo ""

View file

@ -370,10 +370,23 @@ wi_ARG_DISABLE_CCDV
wi_PROG_CCDV
AC_MSG_HEADER([Configuring LibEvent Now])
CHK_LIBEVNT
AC_MSG_HEADER([Checking for Berkeley Database])
AX_BERKELEY_DB([4.1],
[BLD_BDB=bdb
AC_SUBST(BLD_BDB)]
dnl option to disable BDB
AC_MSG_CHECKING([Should we try to compile BDB])
AC_ARG_ENABLE(bdb, AC_HELP_STRING([--enable-bdb],[Enable Berkley Database Support]),
[ case "$enableval" in
yes)
AC_MSG_RESULT([Yes])
AC_MSG_HEADER([Checking for Berkeley Database])
AX_BERKELEY_DB([4.1],
[BLD_BDB=bdb
AC_SUBST(BLD_BDB)]
)
;;
*)
AC_MSG_RESULT(no)
;;
esac],
AC_MSG_RESULT(no)
)
AC_MSG_HEADER([NeoStats Configuration Summary:])
@ -381,7 +394,7 @@ AC_MSG_HEADER([NeoStats Configuration Summary:])
dnl check if we are running with Debug....
AC_MSG_CHECKING(Whether to Enable Debuging...)
AC_ARG_ENABLE(debug,
[ --enable-debug - Enable Debuging],
AC_HELP_STRING([--enable-debug], [Enable Debuging]),
[ case "$enableval" in
yes)
AC_DEFINE(DEBUG, 1, 'Enable Debugging')
@ -400,7 +413,7 @@ AC_MSG_RESULT(no)
CFLAGS="$CFLAGS -fno-strict-aliasing"
AC_MSG_CHECKING(To Enable AutoTools Debug Mode?)
AC_ARG_ENABLE(autodebug, [ --enable-autodebug - Enable AutoTools Debug],
AC_ARG_ENABLE(autodebug, AC_HELP_STRING([--enable-autodebug], [Enable AutoTools Debug]),
[ case "$enableval" in
yes)
AC_MSG_RESULT(yes)
@ -416,7 +429,7 @@ AX_MAINTAINER_MODE_AUTO_SILENT
AC_MSG_CHECKING(To Enable Raw command?)
AC_ARG_ENABLE(raw, [ --enable-raw - Enable Raw command],
AC_ARG_ENABLE(raw, AC_HELP_STRING([--enable-raw], [Enable Raw command]),
[ case "$enableval" in
yes)
AC_DEFINE(USE_RAW, 1, 'Use Raw command')
@ -436,7 +449,7 @@ AC_MSG_CHECKING(The Modules that will be automatically compiled)
AC_MSG_RESULT($MODULES)
AC_MSG_CHECKING(The additional modules to compile?)
AC_ARG_WITH(modules, [ --with-modules - Additional Modules to compile],
AC_ARG_WITH(modules, AC_HELP_STRING([--with-modules],[Additional Modules to compile]),
MODULES="$MODULES $withval"
AC_MSG_RESULT($withval),
AC_MSG_RESULT("None"))