Commit b89f41ef authored by Skip Montanaro's avatar Skip Montanaro

Fixes bug in --with-libdb. If --with-libdb was not specified (default is to

enable it), but db.h was not found, the WITH_LIBDB macros was still being
defined, resulting in compilation errors.  Also added a short explain when
bsddb support wasn't enabled (because db.h wasn't found) when the user
explicitly used --with-libdb on the configure command line.
parent 2cb176f3
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -813,14 +813,21 @@ AC_MSG_CHECKING(for --with-libdb) ...@@ -813,14 +813,21 @@ AC_MSG_CHECKING(for --with-libdb)
AC_ARG_WITH(libdb, AC_ARG_WITH(libdb,
[ --with(out)-libdb disable/enable bsddb module]) [ --with(out)-libdb disable/enable bsddb module])
# default is enabled # enabled by default, but db.h must be found
if test -z "$with_libdb" if test "$ac_cv_header_db_h" = "yes"
then with_libdb="yes" then
fi if test "$with_libdb" != "no"
# if we found db.h, enable, unless with_libdb is expressly set to "no" then with_libdb="yes"
if test "$ac_cv_header_db_h" = "yes" -a "$with_libdb" != "no" fi
then with_libdb="yes" else
# make sure user knows why bsddb support wasn't enabled event
# though s/he requested it
if test "$with_libdb" = "yes"
then echo $ac_n "(requested, but db.h was not found) $ac_c"
fi
with_libdb="no"
fi fi
if test "$with_libdb" = "no" if test "$with_libdb" = "no"
then then
USE_BSDDB_MODULE="#" USE_BSDDB_MODULE="#"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment