summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Daenzer <michel@daenzer.net>2006-05-21 14:33:34 +0000
committerMichel Daenzer <michel@daenzer.net>2006-05-21 14:33:34 +0000
commitf9db5595fe4d62c54b3a501b2af64b4e2b7035cd (patch)
tree1b1c8bbfd2d9d9d75c498b9e9e9f4983b1f0191e
parent25ba85cab8b3d831da646fef19f01769410fc958 (diff)
Derive ATI_VERSION_{MAJOR,MINOR,PATCH} from package version in order to
hopefully confuse bug triagers a little less.
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac9
-rw-r--r--src/ativersion.h7
3 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d768867..ef05000 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-21 Michel Dänzer <michel@tungstengraphics.com>
+
+ * configure.ac:
+ * src/ativersion.h:
+ Derive ATI_VERSION_{MAJOR,MINOR,PATCH} from package version in order to
+ hopefully confuse bug triagers a little less.
+
2006-05-09 Alex Deucher <agd5f@yahoo.com>
* man/radeon.man:
diff --git a/configure.ac b/configure.ac
index 92dc830..3d9abb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,15 @@ AC_INIT([xf86-video-ati],
6.6.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ati)
+AC_DEFINE_UNQUOTED([ATI_VERSION_MAJOR],
+ [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')],
+ [Major version])
+AC_DEFINE_UNQUOTED([ATI_VERSION_MINOR],
+ [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]]/\1/')],
+ [Minor version])
+AC_DEFINE_UNQUOTED([ATI_VERSION_PATCH],
+ [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]]\)/\1/')],
+ [Patch version])
AC_CONFIG_SRCDIR([Makefile.am])
AM_CONFIG_HEADER([config.h])
diff --git a/src/ativersion.h b/src/ativersion.h
index fa6f54a..b822072 100644
--- a/src/ativersion.h
+++ b/src/ativersion.h
@@ -26,9 +26,6 @@
#undef ATI_NAME
#undef ATI_DRIVER_NAME
-#undef ATI_VERSION_MAJOR
-#undef ATI_VERSION_MINOR
-#undef ATI_VERSION_PATCH
#undef ATI_VERSION_CURRENT
#undef ATI_VERSION_EVALUATE
#undef ATI_VERSION_STRINGIFY
@@ -37,10 +34,6 @@
#define ATI_NAME "ATI"
#define ATI_DRIVER_NAME "ati"
-#define ATI_VERSION_MAJOR 6
-#define ATI_VERSION_MINOR 5
-#define ATI_VERSION_PATCH 7
-
#ifndef ATI_VERSION_EXTRA
#define ATI_VERSION_EXTRA ""
#endif