mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates to use db-3.2.9a.

Browse source
This commit is contained in:
tim@threads.polyesthetic.msg 2001-02-16 14:36:02 -05:00
parent a1842febe5
commit 9286527fa1
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
acinclude.m4
View file

@ -812,23 +812,24 @@ AC_DEFUN([MYSQL_CHECK_BDB_VERSION], [
test -z "$db_minor" && db_minor=0
test -z "$db_patch" && db_patch=0
if test $db_major -gt 3
then
bdb_version_ok=yes
elif test $db_major -eq 3 && test $db_minor -gt 2
then
bdb_version_ok=yes
elif test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -gt 3
then
bdb_version_ok=yes
# This is ugly, but about as good as it can get
elif test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 3 &&\
grep 'DB_VERSION_STRING.*h: ' [$1] > /dev/null
mysql_bdb=
if test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 3
then
mysql_bdb=h
elif test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 9
then
want_bdb_version="3.2.9a" # hopefully this will stay up-to-date
mysql_bdb=a
fi
if test -n "$mysql_bdb" && \
grep "DB_VERSION_STRING.*:.*$mysql_bdb: " [$1] > /dev/null
then
bdb_version_ok=yes
else
bdb_version_ok="invalid version $db_major.$db_minor.$db_patch"
bdb_version_ok="$bdb_version_ok (must be at least version 3.2.3g)"
bdb_version_ok="$bdb_version_ok (must be version 3.2.3h or $want_bdb_version)"
fi
])

5
configure.in
View file

@ -1881,7 +1881,10 @@ then
echo "Modifying Berkeley DB install target"
sed -e '/^install:/ c\
install: all # modified by MySQL configure' \
install: all # modified by MySQL configure\
dnl This is needed because in some versions of BDB the install target
dnl is continued on a second line.
mysql-noinstall-hack:' \
"$bdb/build_unix/Makefile" > ac_BDB_Makefile
rm "$bdb/build_unix/Makefile" \