fixed configure flags, bump version

This commit is contained in:
git@daemon.de
2015-05-16 00:15:14 +02:00
parent ad8681f0d1
commit 0a153bfdb4
3 changed files with 35 additions and 4 deletions

View File

@@ -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: 1.9:
- rewrote configure, it better finds berkeley - rewrote configure, it better finds berkeley
db or gdbm. db or gdbm.

View File

@@ -1 +1 @@
1.9 1.9.1

View File

@@ -104,8 +104,31 @@ PCRE="no"
# configure args # 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], 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])], [Use GNU gdbm library in DIR])],
[ [
AC_MSG_CHECKING([checking $with_gdbm_dir/include/gdbm.h presence]) AC_MSG_CHECKING([checking $with_gdbm_dir/include/gdbm.h presence])
@@ -114,14 +137,16 @@ AC_ARG_WITH([gdbm],
CFLAGS="$CXXFLAGS" CFLAGS="$CXXFLAGS"
LDFLAGS="-L$with_gdbm_dir/lib $LDFLAGS" LDFLAGS="-L$with_gdbm_dir/lib $LDFLAGS"
LIBS="-lgdbm" LIBS="-lgdbm"
GDBM=yes
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
GDBM=no
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
]) ])
AC_ARG_WITH([pcre], AC_ARG_WITH([pcre-dir],
[AS_HELP_STRING([--with-pcre=DIR], [AS_HELP_STRING([--with-pcre-dir=DIR],
[Use GNU pcre library in DIR])], [Use GNU pcre library in DIR])],
[ [
AC_MSG_CHECKING([checking $with_pcre_dir/include/pcre.h presence]) AC_MSG_CHECKING([checking $with_pcre_dir/include/pcre.h presence])