greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Require db4.2-dev, not db4.2-c++-dev

Browse source
This commit is contained in:
Sears Russell 2005-03-21 08:59:20 +00:00
parent 9656ce1a55
commit 65b613a67c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
m4/db.m4
View file

@ -54,7 +54,9 @@ AC_DEFUN([AC_CONFIG_DB], [
dnl Now check if we have a cached value, and if not, find it. dnl Now check if we have a cached value, and if not, find it.
dnl dnl
if test ! x$dtn_cv_path_db_h = x ; then if test ! x$dtn_cv_path_db_h = x ; then
echo "checking for Berkeley DB installation... (cached) $dtn_cv_path_db_h/db_cxx.h, $dtn_cv_path_db_lib -l$dtn_cv_lib_db" echo "checking for Berkeley DB installation... (cached) $dtn_cv_path_db_h/db.h, $dtn_cv_path_db_lib -l$dtn_cv_lib_db"
# echo "checking for Berkeley DB installation... (cached) $dtn_cv_path_db_h/db_cxx.h,
#$dtn_cv_path_db_lib -l$dtn_cv_lib_db"
else else
AC_FIND_DB AC_FIND_DB
fi fi
@ -122,7 +124,7 @@ AC_DEFUN([AC_FIND_DB], [
AC_LINK_IFELSE( AC_LINK_IFELSE(
AC_LANG_PROGRAM( AC_LANG_PROGRAM(
[ [
#include <db_cxx.h> #include <db.h>
#if (DB_VERSION_MAJOR != ${ac_dbver_major}) || \ #if (DB_VERSION_MAJOR != ${ac_dbver_major}) || \
(DB_VERSION_MINOR != ${ac_dbver_minor}) (DB_VERSION_MINOR != ${ac_dbver_minor})
@ -141,7 +143,7 @@ AC_DEFUN([AC_FIND_DB], [
]) ])
for ac_dblibdir in $ac_dblibdirs; do for ac_dblibdir in $ac_dblibdirs; do
for ac_dblib in db_cxx-$ac_dbver; do for ac_dblib in db-$ac_dbver; do
LDFLAGS="$ac_save_LDFLAGS -L$ac_dblibdir" LDFLAGS="$ac_save_LDFLAGS -L$ac_dblibdir"
LIBS="$ac_save_LIBS -l$ac_dblib" LIBS="$ac_save_LIBS -l$ac_dblib"
@ -150,7 +152,7 @@ AC_DEFUN([AC_FIND_DB], [
AC_LINK_IFELSE( AC_LINK_IFELSE(
AC_LANG_PROGRAM( AC_LANG_PROGRAM(
[ [
#include <db_cxx.h> #include <db.h>
], ],
[ [