xserver: Branch 'master'

[Adam Jackson]

 config/Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 27845fe197b74bf453d99f352e83513e201fdaae (from 276f8e2ca42eec982d16b86d67217d68ff98f81d)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Thu Jul 26 09:32:16 2007 -0400

    libconfig shouldn't be an installed library.

diff --git a/config/Makefile.am b/config/Makefile.am
index 1cc9109..43c9aa3 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,7 +3,7 @@ AM_CFLAGS = @DIX_CFLAGS@
 dbusconfigdir = $(sysconfdir)/dbus-1/system.d
 dbusconfig_DATA = xorg-server.conf
 
-lib_LIBRARIES = libconfig.a
+noinst_LIBRARIES = libconfig.a
 
 libconfig_a_SOURCES = config.c