From dabf7c3590b427c185089128ecfd967f188f2658 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 7 Feb 2014 16:21:47 +0100 Subject: [PATCH] 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 Reviewed-by: Keith Packard --- configure.ac | 8 -------- hw/xfree86/parser/Makefile.am | 14 -------------- hw/xfree86/parser/configProcs.h | 3 +-- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/configure.ac b/configure.ac index f38345a33..e434720bb 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 4d0bb4fd8..8e496bfb0 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 e6c231e2d..171f8e85f 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);