From 10b2202c254b71b8d0da987a225d5e78a030bca4 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Fri, 1 Dec 2006 19:10:55 +0100 Subject: Use the XORG_RELEASE_VERSION autoconf macro. --- configure.ac | 2 ++ src/mga.h | 3 --- src/mga_dri.c | 6 +++--- src/mga_driver.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 2a77ae5..dd430aa 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,8 @@ AC_INIT([xf86-video-mga], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-mga) +XORG_RELEASE_VERSION + AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) diff --git a/src/mga.h b/src/mga.h index 04624a9..61e8729 100644 --- a/src/mga.h +++ b/src/mga.h @@ -154,9 +154,6 @@ void MGAdbg_outreg32(ScrnInfoPtr, int,int, char*); #define MGA_C_NAME MGA #define MGA_MODULE_DATA mgaModuleData #define MGA_DRIVER_NAME "mga" -#define MGA_MAJOR_VERSION 1 -#define MGA_MINOR_VERSION 4 -#define MGA_PATCHLEVEL 4 typedef struct { unsigned char ExtVga[6]; diff --git a/src/mga_dri.c b/src/mga_dri.c index 103279d..231dda9 100644 --- a/src/mga_dri.c +++ b/src/mga_dri.c @@ -987,9 +987,9 @@ Bool MGADRIScreenInit( ScreenPtr pScreen ) ((pciConfigPtr)pMga->PciInfo->thisCard)->devnum, ((pciConfigPtr)pMga->PciInfo->thisCard)->funcnum ); } - pDRIInfo->ddxDriverMajorVersion = MGA_MAJOR_VERSION; - pDRIInfo->ddxDriverMinorVersion = MGA_MINOR_VERSION; - pDRIInfo->ddxDriverPatchVersion = MGA_PATCHLEVEL; + pDRIInfo->ddxDriverMajorVersion = PACKAGE_VERSION_MAJOR; + pDRIInfo->ddxDriverMinorVersion = PACKAGE_VERSION_MINOR; + pDRIInfo->ddxDriverPatchVersion = PACKAGE_VERSION_PATCHLEVEL; pDRIInfo->frameBufferPhysicalAddress = (void *) pMga->FbAddress; pDRIInfo->frameBufferSize = pMga->FbMapSize; pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8); diff --git a/src/mga_driver.c b/src/mga_driver.c index a95871a..1f41fd5 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -440,7 +440,7 @@ static XF86ModuleVersionInfo mgaVersRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - MGA_MAJOR_VERSION, MGA_MINOR_VERSION, MGA_PATCHLEVEL, + PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, -- cgit v1.2.3