diff options
| author | unknown <mtaylor@qualinost.(none)> | 2007-04-17 21:36:32 -0700 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2007-04-17 21:36:32 -0700 |
| commit | 4e6e8a399dfb583448ffa4fc6342973b03c4d83b (patch) | |
| tree | 22fe6448a03d1d5b3b8ef560726b0c64b1e81e43 /configure.in | |
| parent | 62e0d048e1ef25fd59393f6a86315411c015ad52 (diff) | |
| parent | ff2e7f450b00bf8814833f754fb624c3e239524f (diff) | |
| download | mariadb-git-4e6e8a399dfb583448ffa4fc6342973b03c4d83b.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
Makefile.am:
Auto merged
configure.in:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.in b/configure.in index df9cd30ddbc..dd107a0e916 100644 --- a/configure.in +++ b/configure.in @@ -23,6 +23,9 @@ MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"` MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"` MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION | sed -e 's|[[^0-9.]].*$||;s|$|.|' | sed -e 's/[[^0-9.]]//g; s/\./ /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'` +# Add previous major version for debian package upgrade path +MYSQL_PREVIOUS_BASE_VERSION=4.1 + # The port should be constant for a LONG time MYSQL_TCP_PORT_DEFAULT=3306 MYSQL_UNIX_ADDR_DEFAULT="/tmp/mysql.sock" @@ -52,6 +55,7 @@ romanian russian serbian slovak spanish swedish ukrainian" AC_SUBST(MYSQL_NO_DASH_VERSION) AC_SUBST(MYSQL_BASE_VERSION) AC_SUBST(MYSQL_VERSION_ID) +AC_SUBST(MYSQL_PREVIOUS_BASE_VERSION) AC_SUBST(PROTOCOL_VERSION) AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION], [mysql client protocol version]) @@ -2548,7 +2552,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl tests/Makefile Docs/Makefile support-files/Makefile dnl support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile dnl mysql-test/Makefile dnl - debian/Makefile dnl + debian/Makefile debian/defs.mk dnl mysql-test/ndb/Makefile netware/Makefile sql-bench/Makefile dnl include/mysql_version.h plugin/Makefile win/Makefile) |