summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@neko.keithp.com>2007-03-04 19:48:40 -0800
committerKeith Packard <keithp@neko.keithp.com>2007-03-04 19:48:40 -0800
commitcb86fced0e379badd96af5ad303710af30fafd2e (patch)
tree23002a07be82f1327d63b5ac31a8f5abfa2c5ebf
parente707604ab3fd45c1f9d07b666181fc181e68a827 (diff)
Set version to 1.3-rc1 (1.2.99.901).
-rw-r--r--configure.ac24
1 files changed, 15 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index a54e06d1d..c2909267b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,11 +25,25 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
dnl This is the not the Xorg version number, it's the server version number.
dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.2.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
+dnl
+dnl Make sure these line up with the version number above. Automatically
+dnl extracting them would be cool.
+dnl
+
+DEFAULT_VENDOR_NAME="The X.Org Foundation"
+DEFAULT_VENDOR_NAME_SHORT="X.Org"
+DEFAULT_VERSION_MAJOR=1
+DEFAULT_VERSION_MINOR=2
+DEFAULT_VERSION_PATCH=99
+DEFAULT_VERSION_SNAP=901
+DEFAULT_RELEASE_DATE="4 March 2007"
+DEFAULT_VENDOR_WEB="http://wiki.x.org"
+
dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally.
AC_CONFIG_HEADERS(include/do-not-use-config.h)
@@ -292,14 +306,6 @@ OSNAME=`uname -srm`
AC_DEFINE_UNQUOTED(OSNAME, "$OSNAME",
[Define to OS Name string to display for build OS in Xorg log])
-DEFAULT_VENDOR_NAME="The X.Org Foundation"
-DEFAULT_VENDOR_NAME_SHORT="X.Org"
-DEFAULT_VERSION_MAJOR=7
-DEFAULT_VERSION_MINOR=2
-DEFAULT_VERSION_PATCH=0
-DEFAULT_VERSION_SNAP=0
-DEFAULT_RELEASE_DATE="22 January 2007"
-DEFAULT_VENDOR_WEB="http://wiki.x.org"
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])