xf86-video-ati: Branch 'master'

[George Sapountzis]

 configure.ac     |    9 ---------
 src/ativersion.h |    4 ++++
 2 files changed, 4 insertions(+), 9 deletions(-)

New commits:
diff-tree d5c6306385cbc7b13a132ae72ed04e04e24d9886 (from 97df0a32b14e34f22dce9cd3b375c1ac5fb1c5eb)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Tue Dec 19 09:45:24 2006 +0200

    Use portable XORG_RELEASE_VERSION macro.

diff --git a/configure.ac b/configure.ac
index 4aa6159..869493f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,15 +25,6 @@ AC_INIT([xf86-video-ati],
         6.6.99,
         [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 22714f2..578b3c4 100644
--- a/src/ativersion.h
+++ b/src/ativersion.h
@@ -37,6 +37,10 @@
 #define ATI_VERSION_EXTRA ""
 #endif
 
+#define ATI_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define ATI_VERSION_MINOR PACKAGE_VERSION_MINOR
+#define ATI_VERSION_PATCH PACKAGE_VERSION_PATCHLEVEL
+
 #define ATI_VERSION_CURRENT \
     ((ATI_VERSION_MAJOR << 20) | (ATI_VERSION_MINOR << 10) | ATI_VERSION_PATCH)