diff options
| author | unknown <tim@cane.mysql.fi> | 2001-01-02 16:09:20 +0200 |
|---|---|---|
| committer | unknown <tim@cane.mysql.fi> | 2001-01-02 16:09:20 +0200 |
| commit | f80143079c30f6d2a746248d95e7f9874ce1d5f5 (patch) | |
| tree | 23953e684dd14d76c3a55fc26fbdde35cb3db748 | |
| parent | 0475637d5fa1ff6ac010f4b315a980d5319903d7 (diff) | |
| download | mariadb-git-f80143079c30f6d2a746248d95e7f9874ce1d5f5.tar.gz | |
Check to make sure a MySQL-specific version of Berkeley DB is used.
acinclude.m4:
check to make sure a MySQL-specific version of Berkeley DB is used.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | acinclude.m4 | 15 |
2 files changed, 14 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 179f06ae891..a19f3ceecea 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -2,3 +2,4 @@ mwagner@work.mysql.com mwagner@evoq.home.mwagner.org monty@donna.mysql.com monty@work.mysql.com +tim@cane.mysql.fi diff --git a/acinclude.m4 b/acinclude.m4 index 78fc43ba705..c0b7222dd0b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -719,7 +719,9 @@ dnl echo "DBG3: [$mode] bdb='$bdb'; incl='$bdb_includes'; lib='$bdb_libs'" ;; compile ) have_berkeley_db="$bdb" +dnl Is added to @sql_server_dirs@ in configure.in MYSQL_TOP_BUILDDIR([have_berkeley_db]) + AC_MSG_RESULT([Compiling Berekeley DB in '$have_berkeley_db']) ;; * ) AC_MSG_ERROR([impossible case condition '$mode': please report this to bugs@lists.mysql.com]) @@ -816,12 +818,17 @@ AC_DEFUN([MYSQL_CHECK_BDB_VERSION], [ 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 -ge 3 + 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\>.*g: (' [$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.3)" + bdb_version_ok="$bdb_version_ok (must be at least version 3.2.3g)" fi ]) @@ -830,6 +837,10 @@ AC_DEFUN([MYSQL_TOP_BUILDDIR], [ /* ) ;; # already an absolute path * ) [$1]="'\$(top_builddir)/'$[$1]" ;; esac + if X"$[$1]" != "/" + then + [$1]=`echo $[$1] | sed -e 's,/$,,'` + fi ]) dnl --------------------------------------------------------------------------- |