xserver: Branch 'master'

[Adam Jackson]

 configure.ac      |    2 --
 xorg-server.pc.in |    1 -
 2 files changed, 3 deletions(-)

New commits:
commit 3c53f3241319d96affad2f4539f7661e02e80521
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Jul 9 17:21:07 2009 -0400

    Since font modules are dead, don't mention them in xorg-server.pc

diff --git a/configure.ac b/configure.ac
index e47b60e..65a17de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1583,12 +1583,10 @@ if test "x$XORG" = xyes; then
 	abi_videodrv=`extract_abi VIDEODRV`
 	abi_xinput=`extract_abi XINPUT`
 	abi_extension=`extract_abi EXTENSION`
-	abi_font=`extract_abi FONT`
 	AC_SUBST([abi_ansic])
 	AC_SUBST([abi_videodrv])
 	AC_SUBST([abi_xinput])
 	AC_SUBST([abi_extension])
-	AC_SUBST([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 7547aa3..3d58dab 100644
--- a/xorg-server.pc.in
+++ b/xorg-server.pc.in
@@ -9,7 +9,6 @@ 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