xserver: Branch 'master'

[Adam Jackson]

 configure.ac      |   11 +++++++++++
 xorg-server.pc.in |    6 ++++++
 2 files changed, 17 insertions(+)

New commits:
commit 58332894c061ae96d6a457f65266660f5f65e88b
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Nov 5 17:17:25 2007 -0500

    Export the server ABI versions from xorg-server.pc

diff --git a/configure.ac b/configure.ac
index 10f580f..a09a5c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1536,6 +1536,17 @@ dnl has it in libc), or if libdl is needed to get it.
 	AC_SUBST([sdkdir])
 	AC_SUBST([extdir])
 	AC_SUBST([logdir])
+
+	# stuff the ABI versions into the pc file too
+	extract_abi() {
+	    grep ^.define.*${1}_VERSION ${srcdir}/hw/xfree86/common/xf86Module.h | tr '(),' '  .' | awk '{ print $4$5 }'
+	}
+	abi_ansic=`extract_abi ANSIC`
+	abi_videodrv=`extract_abi VIDEODRV`
+	abi_xinput=`extract_abi XINPUT`
+	abi_extension=`extract_abi EXTENSION`
+	abi_font=`extract_abi FONT`
+	AC_SUBST([abi_ansic abi_videodrv abi_xinput abi_extension abi_font])
 fi
 AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
 AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])
diff --git a/xorg-server.pc.in b/xorg-server.pc.in
index c1cdb7d..53b4ed2 100644
--- a/xorg-server.pc.in
+++ b/xorg-server.pc.in
@@ -5,6 +5,12 @@ includedir=@includedir@
 moduledir=@moduledir@
 sdkdir=@sdkdir@
 
+abi_ansic=@abi_ansic@
+abi_videodrv=@abi_videodrv@
+abi_xinput=@abi_xinput@
+abi_extension=@abi_extension@
+abi_font=@abi_font@
+
 Name: xorg-server
 Description: Modular X.Org X Server
 Version: @PACKAGE_VERSION@