xserver: Branch 'master' - 2 commits

[Adam Jackson]

 configure.ac                    |    8 --------
 hw/xfree86/Makefile.am          |    2 +-
 hw/xfree86/parser/Makefile.am   |   16 +---------------
 hw/xfree86/parser/configProcs.h |    3 +--
 test/Makefile.am                |    2 +-
 5 files changed, 4 insertions(+), 27 deletions(-)

New commits:
commit fca98ce5e7d6424265c35a1219c2240d3342f627
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri Feb 7 16:21:48 2014 +0100

    libxf86config: libxf86config_internal -> libxf86config
    
    Now since the installable libxf86config is gone, rename
    libxf86config_internal to libxf86config.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 27f2cc6..c45d8c9 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -59,7 +59,7 @@ LOCAL_LIBS = \
             loader/libloader.la \
             common/libcommon.la \
             os-support/libxorgos.la \
-            parser/libxf86config_internal.la \
+            parser/libxf86config.la \
             dixmods/libdixmods.la \
             modes/libxf86modes.la \
             ramdac/libramdac.la \
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 8e496bf..9aa8cfe 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libxf86config_internal.la
+noinst_LTLIBRARIES = libxf86config.la
 
 INTERNAL_SOURCES= \
 	Device.c \
@@ -20,7 +20,7 @@ INTERNAL_SOURCES= \
 	DRI.c \
 	Extensions.c
 
-libxf86config_internal_la_SOURCES = \
+libxf86config_la_SOURCES = \
 	$(INTERNAL_SOURCES)
 
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
diff --git a/test/Makefile.am b/test/Makefile.am
index 82578d9..4d935a2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -49,7 +49,7 @@ libxservertest_la_LIBADD += \
             $(top_builddir)/hw/xfree86/loader/libloader.la \
             $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
             $(top_builddir)/hw/xfree86/common/libcommon.la \
-            $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
+            $(top_builddir)/hw/xfree86/parser/libxf86config.la \
             $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
             $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
             $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
commit dabf7c3590b427c185089128ecfd967f188f2658
Author: Egbert Eich <eich at freedesktop.org>
Date:   Fri Feb 7 16:21:47 2014 +0100

    libxf86config: Remove
    
    The library used by the Xserver to read and parse the configuration file
    could be built so that it culd be installed as a separate lib and used
    by external programs.
    
    Apparently there has not been any interest in this for quite a while as
    this library has been broken for a long time now in the sense that it
    was calling functions provided by the Xserver which were not implemented
    for the external library.
    
    Since this library is useless as it is anyway when built let's drop
    support for it.
    
    Signed-off-by: Egbert Eich <eich at freedesktop.org>
    Reviewed-by: Keith Packard <keithp at keithp.com>

diff --git a/configure.ac b/configure.ac
index f38345a..e434720 100644
--- a/configure.ac
+++ b/configure.ac
@@ -565,11 +565,6 @@ AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11
 				[ XQUARTZ_SPARKLE="${enableval}" ],
 				[ XQUARTZ_SPARKLE="no" ])
 AC_SUBST([XQUARTZ_SPARKLE])
-AC_ARG_ENABLE(install-libxf86config,
-				AS_HELP_STRING([--enable-install-libxf86config],
-				[Install libxf86config (default: disabled)]),
-				[INSTALL_LIBXF86CONFIG=$enableval],
-				[INSTALL_LIBXF86CONFIG=no])
 AC_ARG_ENABLE(visibility,     AS_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),
 				[SYMBOL_VISIBILITY=$enableval],
 				[SYMBOL_VISIBILITY=auto])
@@ -695,9 +690,6 @@ AM_CONDITIONAL(INT10_VM86, [test "x$INT10" = xvm86])
 AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu])
 AM_CONDITIONAL(INT10_STUB, [test "x$INT10" = xstub])
 
-dnl Handle installing libxf86config
-AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
-
 dnl DDX Detection... Yes, it's ugly to have it here... but we need to
 dnl handle this early on so that we don't require unsupported extensions
 case $host_os in
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 4d0bb4f..8e496bf 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -1,12 +1,4 @@
-if INSTALL_LIBXF86CONFIG
 noinst_LTLIBRARIES = libxf86config_internal.la
-lib_LTLIBRARIES = libxf86config.la
-LIBHEADERS = \
-	xf86Optrec.h \
-	xf86Parser.h
-else
-noinst_LTLIBRARIES = libxf86config_internal.la
-endif
 
 INTERNAL_SOURCES= \
 	Device.c \
@@ -31,12 +23,6 @@ INTERNAL_SOURCES= \
 libxf86config_internal_la_SOURCES = \
 	$(INTERNAL_SOURCES)
 
-libxf86config_la_SOURCES = \
-	$(top_srcdir)/os/xprintf.c \
-	$(INTERNAL_SOURCES)
-libxf86config_la_CFLAGS = $(AM_CFLAGS)
-libxf86config_la_LDFLAGS = -static
-
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DDATADIR=\"$(datadir)\"
diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
index e6c231e..171f8e8 100644
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@@ -27,8 +27,7 @@
 
 /* Private procs.  Public procs are in xf86Parser.h and xf86Optrec.h */
 
-/* exported functions are/were used by the X Server, and need to be
- * made public when installing libxf86config */
+/* exported functions are/were used by the X Server */
 
 /* Device.c */
 XF86ConfDevicePtr xf86parseDeviceSection(void);