From 0a153bfdb4816de60fea5120e8a083a1e4282001 Mon Sep 17 00:00:00 2001 From: "git@daemon.de" Date: Sat, 16 May 2015 00:15:14 +0200 Subject: [PATCH] fixed configure flags, bump version --- ChangeLog | 6 ++++++ VERSION | 2 +- configure.ac | 31 ++++++++++++++++++++++++++++--- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 566ea92..dc9dd49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1.9.1: + - fixed messed up configure flags, backward + compatible again + - removed bashisms in samples + - applied patch of freebsd port + 1.9: - rewrote configure, it better finds berkeley db or gdbm. diff --git a/VERSION b/VERSION index 872765e..9ab8337 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.9 \ No newline at end of file +1.9.1 diff --git a/configure.ac b/configure.ac index 4f4fb21..72dec3c 100644 --- a/configure.ac +++ b/configure.ac @@ -104,8 +104,31 @@ PCRE="no" # configure args +AC_ARG_WITH([berkeley], + [AS_HELP_STRING([--with-berkeley], + [Use berkeley library ])]) + +if test "x$with_berkeley" = "xno"; then + BERKELEY=no + GDBM=yes +elif test "x$with_berkeley" = "xyes"; then + BERKELEY=yes + GDBM=no +fi + + AC_ARG_WITH([gdbm], - [AS_HELP_STRING([--with-gdbm=DIR], + [AS_HELP_STRING([--with-gdbm], + [Use GNU gdbm library ])]) + +if test "x$with_gdbm" = "xno"; then + GDBM=no +elif test "x$with_gdbm" = "xyes"; then + GDBM=yes +fi + +AC_ARG_WITH([gdbm-dir], + [AS_HELP_STRING([--with-gdbm-dir=DIR], [Use GNU gdbm library in DIR])], [ AC_MSG_CHECKING([checking $with_gdbm_dir/include/gdbm.h presence]) @@ -114,14 +137,16 @@ AC_ARG_WITH([gdbm], CFLAGS="$CXXFLAGS" LDFLAGS="-L$with_gdbm_dir/lib $LDFLAGS" LIBS="-lgdbm" + GDBM=yes AC_MSG_RESULT([yes]) else + GDBM=no AC_MSG_RESULT([no]) fi ]) -AC_ARG_WITH([pcre], - [AS_HELP_STRING([--with-pcre=DIR], +AC_ARG_WITH([pcre-dir], + [AS_HELP_STRING([--with-pcre-dir=DIR], [Use GNU pcre library in DIR])], [ AC_MSG_CHECKING([checking $with_pcre_dir/include/pcre.h presence])