scip/dbtool
1
0
Fork 0
mirror of https://codeberg.org/scip/dbtool.git synced 2025-12-16 19:00:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

berkeley makro still had bugs

Browse Source
This commit is contained in:
git@daemon.de
2015-05-16 09:50:43 +02:00
parent 0a153bfdb4
commit 4b6bca7b0d
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,6 +1,6 @@
1.9.1: 1.9.1:
- fixed messed up configure flags, backward - fixed messed up configure flags, backward, be compatible again
compatible again - fixed berkeley m4 makro, again
- removed bashisms in samples - removed bashisms in samples
- applied patch of freebsd port - applied patch of freebsd port

14
config/ax_berkeley_db_cxx.m4
View File

@@ -75,11 +75,11 @@ AC_DEFUN([AX_BERKELEY_DB_CXX],
AC_MSG_CHECKING([for Berkeley DB (C++)]) AC_MSG_CHECKING([for Berkeley DB (C++)])
else else
minvermajor=`echo $minversion | cut -d. -f1` minvermajor=`echo $minversion | cut -d. -f1`
minverminor=`echo $minversion | cut -d. -f2` minverminor=`echo $minversion | cut -d. -f2 -s`
minverpatch=`echo $minversion | cut -d. -f3` minverpatch=`echo $minversion | cut -d. -f3 -s`
minvermajor=${minvermajor:-0} if test -z "$minvermajor"; then minvermajor=0; fi
minverminor=${minverminor:-0} if test -z "$minverminor"; then minverminor=0; fi
minverpatch=${minverpatch:-0} if test -z "$minverpatch"; then minverpatch=0; fi
AC_MSG_CHECKING([for Berkeley DB (C++) >= $minvermajor.$minverminor.$minverpatch]) AC_MSG_CHECKING([for Berkeley DB (C++) >= $minvermajor.$minverminor.$minverpatch])
fi fi
@@ -95,12 +95,12 @@ AC_DEFUN([AX_BERKELEY_DB_CXX],
for version in "${major}.${minor}" "${major}${minor}"; do for version in "${major}.${minor}" "${major}${minor}"; do
try_libs="-ldb_cxx-${version}%-ldb-${version} -ldb${version}_cxx%-ldb${version}" try_libs="-ldb_cxx-${version}%-ldb-${version} -ldb${version}_cxx%-ldb${version}"
try_headers="db$version/db_cxx.h db`echo $version | sed -e 's,\..*,,g'`/db_cxx.h" try_headers="db${major}.${minor}/db_cxx.h db${major}${minor}/db_cxx.h db${major}/db_cxx.h"
for db_cxx_hdr in $try_headers ; do for db_cxx_hdr in $try_headers ; do
for db_cxx_lib in $try_libs; do for db_cxx_lib in $try_libs; do
db_cxx_lib="$libdbdir `echo "$db_cxx_lib" | sed 's/%/ /g'`" db_cxx_lib="$libdbdir `echo "$db_cxx_lib" | sed 's/%/ /g'`"
LIBS="$old_LIBS $db_cxx_lib" LIBS="$old_LIBS $db_cxx_lib"
#echo "Trying <$db_cxx_lib> <$db_cxx_hdr>"
if test -z $DB_CXX_HEADER ; then if test -z $DB_CXX_HEADER ; then
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM( [AC_LANG_PROGRAM(

4
configure.ac
View File

@@ -2,7 +2,7 @@
AC_PREREQ(2.61) AC_PREREQ(2.61)
define([dbtoolversion], esyscmd([sh -c "cat VERSION|head -1"])) define([dbtoolversion], esyscmd([sh -c "cat VERSION"]))dnl
# what we are compiling # what we are compiling
AC_INIT([dbtool], [dbtoolversion], [tlinden@cpan.org]) AC_INIT([dbtool], [dbtoolversion], [tlinden@cpan.org])
@@ -211,7 +211,7 @@ if test "$GDBM" = "no"; then
export LDFLAGS export LDFLAGS
export LIBS export LIBS
export CXXFLAGS export CXXFLAGS
AX_BERKELEY_DB_CXX([4.0.0],[ AX_BERKELEY_DB_CXX([4],[
LDFLAGS="$DB_CXX_LIBS $LDFLAGS" LDFLAGS="$DB_CXX_LIBS $LDFLAGS"
BERKELEY="yes" BERKELEY="yes"
],[BERKELEY="no"]) ],[BERKELEY="no"])