summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilman Sauerbeck <tilman@code-monkey.de>2006-12-01 19:10:55 +0100
committerTilman Sauerbeck <tilman@code-monkey.de>2006-12-01 19:10:55 +0100
commit10b2202c254b71b8d0da987a225d5e78a030bca4 (patch)
tree8e3fec3b4942bfdd785197e315ae34259fd01e24
parent00efdc4959a0b240eb2dc7a3188c0ef64b2ad74a (diff)
Use the XORG_RELEASE_VERSION autoconf macro.
-rw-r--r--configure.ac2
-rw-r--r--src/mga.h3
-rw-r--r--src/mga_dri.c6
-rw-r--r--src/mga_driver.c2
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,