diff options
| author | tim@threads.polyesthetic.msg <> | 2001-02-16 14:36:02 -0500 |
|---|---|---|
| committer | tim@threads.polyesthetic.msg <> | 2001-02-16 14:36:02 -0500 |
| commit | 9286527fa1f43cf384603488b19a509092217b5d (patch) | |
| tree | 6e4e37ef21f38e0ae44151d20b107bd717582ed9 /acinclude.m4 | |
| parent | a1842febe5f0da73ebd2da621166783cc850dd93 (diff) | |
| download | mariadb-git-9286527fa1f43cf384603488b19a509092217b5d.tar.gz | |
Updates to use db-3.2.9a.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 94ea5e9b0fb..dedcdce3cc8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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 + # This is ugly, but about as good as it can get + mysql_bdb= + if test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 3 then - bdb_version_ok=yes - elif test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -gt 3 + mysql_bdb=h + elif test $db_major -eq 3 && test $db_minor -eq 2 && test $db_patch -eq 9 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 + 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 ]) |