Add configure option to install libxf86config.a (disabled by default).
This commit is contained in:
parent
594ca0966e
commit
381931b15b
|
@ -1,3 +1,12 @@
|
|||
2005-11-23 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
|
||||
* configure.ac:
|
||||
* hw/xfree86/Makefile.am:
|
||||
* hw/xfree86/parser/Makefile.am:
|
||||
* hw/xfree86/utils/xorgcfg/Makefile.am:
|
||||
Add configure option to install libxf86config.a (disabled by
|
||||
default).
|
||||
|
||||
2005-11-21 Eric Anholt <anholt@FreeBSD.org>
|
||||
|
||||
* hw/xfree86/utils/ioport/Makefile.am:
|
||||
|
|
|
@ -360,6 +360,11 @@ AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RG
|
|||
AC_ARG_ENABLE(builddocs, AS_HELP_STRING([--enable-builddocs], [Build docs (default: disabled)]),
|
||||
[BUILDDOCS=$enableval],
|
||||
[BUILDDOCS=no])
|
||||
AC_ARG_ENABLE(install-libxf86config,
|
||||
AS_HELP_STRING([--enable-install-libxf86config],
|
||||
[Install libxf86config (default: disabled)]),
|
||||
[INSTALL_LIBXF86CONFIG=$enableval],
|
||||
[INSTALL_LIBXF86CONFIG=no])
|
||||
|
||||
dnl Extensions.
|
||||
AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])
|
||||
|
@ -451,6 +456,9 @@ if test "x$BUILDDOCS" = xyes; then
|
|||
fi
|
||||
AM_CONDITIONAL(BUILDSGMLDOCS, test "x$LINUXDOC" != x)
|
||||
|
||||
dnl Handle installing libxf86config
|
||||
AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
|
||||
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl Extension section
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
|
|
@ -34,7 +34,7 @@ XORG_LIBS = \
|
|||
common/libinit.a \
|
||||
loader/libloader.a \
|
||||
common/libcommon.a \
|
||||
parser/libparser.a \
|
||||
parser/libxf86config.a \
|
||||
$(OS_LIBS) \
|
||||
dummylib/libdummy.a \
|
||||
dixmods/libdixmods.la \
|
||||
|
|
|
@ -1,7 +1,27 @@
|
|||
noinst_LIBRARIES = libparser.a
|
||||
libparser_a_SOURCES = Device.c Files.c Flags.c Input.c Keyboard.c Layout.c \
|
||||
Module.c Video.c Monitor.c Pointer.c Screen.c \
|
||||
Vendor.c read.c scan.c write.c DRI.c Extensions.c
|
||||
if INSTALL_LIBXF86CONFIG
|
||||
lib_LIBRARIES = libxf86config.a
|
||||
else
|
||||
noinst_LIBRARIES = libxf86config.a
|
||||
endif
|
||||
|
||||
libxf86config_a_SOURCES = \
|
||||
Device.c \
|
||||
Files.c \
|
||||
Flags.c \
|
||||
Input.c \
|
||||
Keyboard.c \
|
||||
Layout.c \
|
||||
Module.c \
|
||||
Video.c \
|
||||
Monitor.c \
|
||||
Pointer.c \
|
||||
Screen.c \
|
||||
Vendor.c \
|
||||
read.c \
|
||||
scan.c \
|
||||
write.c \
|
||||
DRI.c \
|
||||
Extensions.c
|
||||
|
||||
AM_CFLAGS = $(XORG_CFLAGS)
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@ bin_PROGRAMS = xorgcfg
|
|||
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser
|
||||
|
||||
xorgcfg_CFLAGS = $(XORG_CFLAGS) $(CURSESDEFINES) $(XORGCFG_DEP_CFLAGS)
|
||||
xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libparser.a $(LOADERLIB) \
|
||||
xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \
|
||||
../../os-support/libxorgos.la ../../dummylib/libdummy-nonserver.a
|
||||
|
||||
#if DoLoadableServer
|
||||
|
|
Loading…
Reference in New Issue
Block a user