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

Check to make sure a MySQL-specific version of Berkeley DB is used.

Browse source
This commit is contained in:
tim@cane.mysql.fi 2001-01-02 16:09:20 +02:00
parent 476d960b42
commit 0243cda8c3
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -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

15
acinclude.m4
View file

@ -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 ---------------------------------------------------------------------------