summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2012-04-23 18:57:48 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2012-04-23 19:04:43 -0700
commitf44f4e265ec3ab7ef87d6d7009ec079ba4c49336 (patch)
tree4bcd6d88a1569099b22463538fcb7a26633c0651
parent01fc6f81f0a2935741dd1114aa3fa267d8be9095 (diff)
downloadxorg-lib-libXRes-f44f4e265ec3ab7ef87d6d7009ec079ba4c49336.tar.gz
Bump version to 1.1.99.0 to reflect addition of 1.2 API
As noted in configure.ac comment, we try to keep library version based on the protocol version number, so since the protocol skipped to 1.2, we'll do that with the library as well for simplicity's sake. Sets resourceproto requirement to version 1.2.0 since there were no intermediate/snapshot versions between 1.1.2 & 1.2.0. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--configure.ac8
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index bc4e8a6..0079857 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.60])
# digit in the version number to track changes which don't affect the
# protocol, so XRes version l.n.m corresponds to protocol version l.n
#
-AC_INIT([libXres], [1.0.6],
+AC_INIT([libXres], [1.1.99.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
@@ -48,12 +48,8 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
XORG_CHECK_MALLOC_ZERO
-# Check xres configuration, strip extra digits from package version to
-# find the required protocol version
-RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
-
# Obtain compiler/linker options for depedencies
-PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION])
+PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= 1.2.0])
AC_CONFIG_FILES([Makefile
src/Makefile