diff options
| author | mtaylor@qualinost.(none) <> | 2007-04-17 19:08:24 -0700 |
|---|---|---|
| committer | mtaylor@qualinost.(none) <> | 2007-04-17 19:08:24 -0700 |
| commit | 587cc24f7142bb641b60f2bcde17e0bc7c1597c3 (patch) | |
| tree | e888c3f9a58713c1936ad67e807b3948a68c52e7 /configure.in | |
| parent | 334dbc6d8ce4deee0998615e881485b8924d8335 (diff) | |
| parent | 357a694d4826fabf23ef1852d1a11ffb13fb7022 (diff) | |
| download | mariadb-git-587cc24f7142bb641b60f2bcde17e0bc7c1597c3.tar.gz | |
Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2
into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
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 d95b7eea0c6..84b8adf1df3 100644 --- a/configure.in +++ b/configure.in @@ -32,6 +32,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" @@ -68,6 +71,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]) @@ -2896,7 +2900,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl cmd-line-utils/libedit/Makefile dnl win/Makefile dnl zlib/Makefile dnl - debian/Makefile dnl + debian/Makefile debian/defs.mk dnl cmd-line-utils/readline/Makefile) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) AC_OUTPUT |