Commit 9286527f authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

Updates to use db-3.2.9a.

parent a1842feb

acinclude.m4

+12 −11
Original line number Diff line number Diff line
@@ -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

])

configure.in

+4 −1
Original line number Diff line number Diff line
@@ -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" \