diff options
100 files changed, 3 insertions, 6423 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5404c00a..ed4c7da7c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,17 +59,6 @@ debian-buster: after_script: - ccache --show-stats -autotools: - extends: .common-build-and-test - script: - - mkdir build/ - - cd build/ - - ../autogen.sh --prefix=/usr CFLAGS="-fno-common" - - make -j${FDO_CI_CONCURRENT:-4} distcheck - - PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts make -j${FDO_CI_CONCURRENT:-4} check - - cd .. - - .gitlab-ci/manpages-check - meson: extends: .common-build-and-test script: diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index abbea2856..000000000 --- a/Makefile.am +++ /dev/null @@ -1,210 +0,0 @@ -AUTOMAKE_OPTIONS=nostdinc - -# Required for automake < 1.14 -ACLOCAL_AMFLAGS = -I m4 - -if COMPOSITE -COMPOSITE_DIR=composite -endif - -if GLX -GLX_DIR=glx -endif - -if DBE -DBE_DIR=dbe -endif - -if RECORD -RECORD_DIR=record -endif - -if DRI3 -DRI3_DIR=dri3 -endif - -if PRESENT -PRESENT_DIR=present -endif - -if PSEUDORAMIX -PSEUDORAMIX_DIR=pseudoramiX -endif - -if GLAMOR -GLAMOR_DIR=glamor -endif - -SUBDIRS = \ - doc \ - man \ - include \ - dix \ - fb \ - mi \ - Xext \ - miext \ - os \ - randr \ - render \ - Xi \ - xkb \ - $(PSEUDORAMIX_DIR) \ - $(DBE_DIR) \ - $(RECORD_DIR) \ - xfixes \ - damageext \ - $(COMPOSITE_DIR) \ - $(GLX_DIR) \ - $(PRESENT_DIR) \ - $(DRI3_DIR) \ - exa \ - $(GLAMOR_DIR) \ - config \ - hw \ - test - -if XORG -aclocaldir = $(datadir)/aclocal -aclocal_DATA = xorg-server.m4 - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xorg-server.pc -endif - -EXTRA_DIST = xorg-server.pc.in xorg-server.m4 autogen.sh README.md - -DISTCHECK_CONFIGURE_FLAGS=\ - --with-xkb-path=$(XKB_BASE_DIRECTORY) \ - --with-xkb-bin-directory=$(XKB_BIN_DIRECTORY) \ - --with-xkb-output='$${datadir}/X11/xkb/compiled' - -.PHONY: ChangeLog INSTALL - -INSTALL: - $(INSTALL_CMD) - -ChangeLog: - $(CHANGELOG_CMD) - -dist-hook: ChangeLog INSTALL - -DIST_SUBDIRS = \ - doc \ - man \ - include \ - dix \ - fb \ - mi \ - Xext \ - miext \ - os \ - pseudoramiX \ - randr \ - render \ - Xi \ - xkb \ - dbe \ - record \ - xfixes \ - damageext \ - composite \ - glx \ - exa \ - glamor \ - config \ - dri3 \ - present \ - hw \ - test - -# gross hack -relink: all - $(AM_V_at)$(MAKE) -C hw relink - -install-headers: Makefile - +find . -name Makefile | while read m; do \ - if grep -q install-sdkHEADERS $$m; then \ - (cd `dirname "$$m"` && make install-sdkHEADERS) \ - fi \ - done - -distcheck-hook: - cd $(srcdir) && \ - meson setup _distcheck_build && \ - meson configure _distcheck_build && \ - ninja -C _distcheck_build && \ - rm -rf _distcheck_build && \ - cd - - -EXTRA_DIST += \ - meson_options.txt \ - include/xorg-config.h.meson.in \ - include/xwin-config.h.meson.in \ - hw/xfree86/loader/symbol-test.c \ - composite/meson.build \ - config/meson.build \ - damageext/meson.build \ - dbe/meson.build \ - dix/meson.build \ - dri3/meson.build \ - exa/meson.build \ - fb/meson.build \ - glamor/meson.build \ - glx/meson.build \ - hw/kdrive/ephyr/meson.build \ - hw/kdrive/meson.build \ - hw/kdrive/src/meson.build \ - hw/meson.build \ - hw/vfb/meson.build \ - hw/xfree86/common/meson.build \ - hw/xfree86/ddc/meson.build \ - hw/xfree86/dixmods/meson.build \ - hw/xfree86/dri2/meson.build \ - hw/xfree86/dri/meson.build \ - hw/xfree86/drivers/modesetting/meson.build \ - hw/xfree86/exa/meson.build \ - hw/xfree86/fbdevhw/meson.build \ - hw/xfree86/glamor_egl/meson.build \ - hw/xfree86/i2c/meson.build \ - hw/xfree86/int10/meson.build \ - hw/xfree86/loader/meson.build \ - hw/xfree86/meson.build \ - hw/xfree86/modes/meson.build \ - hw/xfree86/os-support/meson.build \ - hw/xfree86/parser/meson.build \ - hw/xfree86/ramdac/meson.build \ - hw/xfree86/shadowfb/meson.build \ - hw/xfree86/vgahw/meson.build \ - hw/xfree86/x86emu/meson.build \ - hw/xfree86/xkb/meson.build \ - hw/xnest/meson.build \ - hw/xquartz/meson.build \ - hw/xwayland/meson.build \ - hw/xwin/dri/meson.build \ - hw/xwin/glx/meson.build \ - hw/xwin/meson.build \ - hw/xwin/winclipboard/meson.build \ - include/meson.build \ - meson.build \ - miext/damage/meson.build \ - miext/shadow/meson.build \ - miext/sync/meson.build \ - mi/meson.build \ - os/meson.build \ - present/meson.build \ - pseudoramiX/meson.build \ - randr/meson.build \ - record/meson.build \ - render/meson.build \ - test/bigreq/meson.build \ - test/bigreq/request-length.c \ - test/meson.build \ - test/sync/meson.build \ - test/sync/sync.c \ - Xext/meson.build \ - xfixes/meson.build \ - Xi/meson.build \ - xkb/meson.build - -DISTCLEANFILES = buildDateTime.h diff --git a/Xext/Makefile.am b/Xext/Makefile.am deleted file mode 100644 index f15a15a3e..000000000 --- a/Xext/Makefile.am +++ /dev/null @@ -1,120 +0,0 @@ -noinst_LTLIBRARIES = libXext.la libXvidmode.la libhashtable.la - -AM_CFLAGS = $(DIX_CFLAGS) - -if XORG -sdk_HEADERS = xvdix.h xvmcext.h geext.h geint.h shmint.h syncsdk.h -endif - -# Sources always included in libXextbuiltin.la, libXext.la -BUILTIN_SRCS = \ - bigreq.c \ - geext.c \ - shape.c \ - sleepuntil.c \ - sleepuntil.h \ - sync.c \ - syncsdk.h \ - syncsrv.h \ - xcmisc.c \ - xtest.c -BUILTIN_LIBS = - -# Optional sources included if extension enabled by configure.ac rules - -# MIT Shared Memory extension -MITSHM_SRCS = shm.c shmint.h -if MITSHM -BUILTIN_SRCS += $(MITSHM_SRCS) -endif - -# XVideo extension -XV_SRCS = xvmain.c xvdisp.c xvmc.c xvdix.h xvmcext.h xvdisp.h -if XV -BUILTIN_SRCS += $(XV_SRCS) -endif - -# XResource extension: lets clients get data about per-client resource usage -RES_SRCS = xres.c -if RES -BUILTIN_SRCS += $(RES_SRCS) -endif - -# MIT ScreenSaver extension -SCREENSAVER_SRCS = saver.c -if SCREENSAVER -BUILTIN_SRCS += $(SCREENSAVER_SRCS) -endif - -# Xinerama extension: making multiple video devices act as one virtual screen -XINERAMA_SRCS = panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c -if XINERAMA -BUILTIN_SRCS += $(XINERAMA_SRCS) -if XORG -sdk_HEADERS += panoramiXsrv.h panoramiX.h -endif -endif - -# X-ACE extension: provides hooks for building security policy extensions -# like XC-Security, X-SELinux & XTSol -XACE_SRCS = xace.c xace.h xacestr.h -if XACE -BUILTIN_SRCS += $(XACE_SRCS) -if XORG -sdk_HEADERS += xace.h xacestr.h -endif -endif - -# SELinux extension: provides SELinux policy support for X objects -# requires X-ACE extension -XSELINUX_SRCS = xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h xselinuxint.h -if XSELINUX -BUILTIN_SRCS += $(XSELINUX_SRCS) -BUILTIN_LIBS += $(SELINUX_LIBS) -endif - -# Security extension: multi-level security to protect clients from each other -XCSECURITY_SRCS = security.c securitysrv.h -if XCSECURITY -BUILTIN_SRCS += $(XCSECURITY_SRCS) -endif - -# XF86 Big Font extension -BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h -if XF86BIGFONT -BUILTIN_SRCS += $(BIGFONT_SRCS) -endif - -# DPMS extension -DPMS_SRCS = dpms.c dpmsproc.h -if DPMSExtension -BUILTIN_SRCS += $(DPMS_SRCS) -endif - -# Now take all of the above, mix well, bake for 10 minutes and get libXext*.la - -libXext_la_SOURCES = $(BUILTIN_SRCS) -libXext_la_LIBADD = $(BUILTIN_LIBS) -if RES -libXext_la_LIBADD += libhashtable.la -endif - -# XVidMode extension -libXvidmode_la_SOURCES = vidmode.c - -#Hashtable -libhashtable_la_SOURCES = hashtable.c hashtable.h - -EXTRA_DIST = \ - $(MITSHM_SRCS) \ - $(XV_SRCS) \ - $(RES_SRCS) \ - $(SCREENSAVER_SRCS) \ - $(XACE_SRCS) \ - $(XCSECURITY_SRCS) \ - $(XSELINUX_SRCS) \ - $(XINERAMA_SRCS) \ - $(BIGFONT_SRCS) \ - $(DPMS_SRCS) \ - $(GE_SRCS) - diff --git a/Xi/Makefile.am b/Xi/Makefile.am deleted file mode 100644 index 6c456c4ac..000000000 --- a/Xi/Makefile.am +++ /dev/null @@ -1,111 +0,0 @@ -noinst_LTLIBRARIES = libXi.la libXistubs.la - -AM_CFLAGS = $(DIX_CFLAGS) - -libXi_la_SOURCES = \ - allowev.c \ - allowev.h \ - chgdctl.c \ - chgdctl.h \ - chgfctl.c \ - chgfctl.h \ - chgkbd.c \ - chgkbd.h \ - chgkmap.c \ - chgkmap.h \ - chgprop.c \ - chgprop.h \ - chgptr.c \ - chgptr.h \ - closedev.c \ - closedev.h \ - devbell.c \ - devbell.h \ - exevents.c \ - exglobals.h \ - extinit.c \ - getbmap.c \ - getbmap.h \ - getdctl.c \ - getdctl.h \ - getfctl.c \ - getfctl.h \ - getfocus.c \ - getfocus.h \ - getkmap.c \ - getkmap.h \ - getmmap.c \ - getmmap.h \ - getprop.c \ - getprop.h \ - getselev.c \ - getselev.h \ - getvers.c \ - getvers.h \ - grabdev.c \ - grabdev.h \ - grabdevb.c \ - grabdevb.h \ - grabdevk.c \ - grabdevk.h \ - gtmotion.c \ - gtmotion.h \ - listdev.c \ - listdev.h \ - opendev.c \ - opendev.h \ - queryst.c \ - queryst.h \ - selectev.c \ - selectev.h \ - sendexev.c \ - sendexev.h \ - setbmap.c \ - setbmap.h \ - setdval.c \ - setdval.h \ - setfocus.c \ - setfocus.h \ - setmmap.c \ - setmmap.h \ - setmode.c \ - setmode.h \ - ungrdev.c \ - ungrdev.h \ - ungrdevb.c \ - ungrdevb.h \ - ungrdevk.c \ - ungrdevk.h \ - xiallowev.c \ - xiallowev.h \ - xibarriers.c \ - xibarriers.h \ - xichangecursor.c \ - xichangecursor.h \ - xichangehierarchy.c \ - xichangehierarchy.h \ - xigetclientpointer.c \ - xigetclientpointer.h \ - xigrabdev.c \ - xigrabdev.h \ - xipassivegrab.h \ - xipassivegrab.c \ - xiproperty.c \ - xiproperty.h \ - xiquerydevice.c \ - xiquerydevice.h \ - xiquerypointer.c \ - xiquerypointer.h \ - xiqueryversion.c \ - xiqueryversion.h \ - xiselectev.c \ - xiselectev.h \ - xisetclientpointer.c \ - xisetclientpointer.h \ - xisetdevfocus.c \ - xisetdevfocus.h \ - xiwarppointer.c \ - xiwarppointer.h - -libXistubs_la_SOURCES = \ - stubs.c diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 4de97bf8e..000000000 --- a/autogen.sh +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh - -srcdir=`dirname "$0"` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd "$srcdir" - -autoreconf --force -v --install || exit 1 -cd "$ORIGDIR" || exit $? - -git config --local --get format.subjectPrefix || - git config --local format.subjectPrefix "PATCH xserver" - -if test -z "$NOCONFIGURE"; then - exec "$srcdir"/configure "$@" -fi diff --git a/composite/Makefile.am b/composite/Makefile.am deleted file mode 100644 index c2f5123f2..000000000 --- a/composite/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -noinst_LTLIBRARIES = libcomposite.la - -AM_CFLAGS = $(DIX_CFLAGS) - -if XORG -sdk_HEADERS = compositeext.h -endif - -libcomposite_la_SOURCES = \ - compalloc.c \ - compext.c \ - compint.h \ - compinit.c \ - compoverlay.c \ - compwindow.c diff --git a/config/Makefile.am b/config/Makefile.am deleted file mode 100644 index 51aae473e..000000000 --- a/config/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -AM_CFLAGS = $(DIX_CFLAGS) - -noinst_LTLIBRARIES = libconfig.la -libconfig_la_SOURCES = config.c config-backends.h -libconfig_la_LIBADD = - -if NEED_DBUS -AM_CFLAGS += $(DBUS_CFLAGS) -libconfig_la_SOURCES += dbus-core.c -libconfig_la_LIBADD += $(DBUS_LIBS) -endif - -if CONFIG_UDEV - -AM_CFLAGS += $(UDEV_CFLAGS) -libconfig_la_SOURCES += udev.c -libconfig_la_LIBADD += $(UDEV_LIBS) - -if XORG -xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR) -xorgconfd_DATA = 10-quirks.conf -endif - -else - -if CONFIG_HAL -AM_CFLAGS += $(HAL_CFLAGS) -libconfig_la_SOURCES += hal.c -libconfig_la_LIBADD += $(HAL_LIBS) - -else - -if CONFIG_WSCONS -libconfig_la_SOURCES += wscons.c -endif # CONFIG_WSCONS - -endif # !CONFIG_HAL - -endif # !CONFIG_UDEV - -EXTRA_DIST = x11-input.fdi fdi2iclass.py 10-quirks.conf diff --git a/configure.ac b/configure.ac deleted file mode 100644 index f7d661fb2..000000000 --- a/configure.ac +++ /dev/null @@ -1,2461 +0,0 @@ -dnl Copyright © 2003-2007 Keith Packard, Daniel Stone -dnl -dnl Permission is hereby granted, free of charge, to any person obtaining a -dnl copy of this software and associated documentation files (the "Software"), -dnl to deal in the Software without restriction, including without limitation -dnl the rights to use, copy, modify, merge, publish, distribute, sublicense, -dnl and/or sell copies of the Software, and to permit persons to whom the -dnl Software is furnished to do so, subject to the following conditions: -dnl -dnl The above copyright notice and this permission notice (including the next -dnl paragraph) shall be included in all copies or substantial portions of the -dnl Software. -dnl -dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -dnl DEALINGS IN THE SOFTWARE. -dnl -dnl Authors: Keith Packard <keithp@keithp.com> -dnl Daniel Stone <daniel@fooishbar.org> -dnl an unwitting cast of miscellaneous others -dnl -dnl Process this file with autoconf to create configure. - -AC_PREREQ(2.60) -AC_INIT([xorg-server], 21.0.99.1, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) -RELEASE_DATE="2021-07-05" -RELEASE_NAME="Carrot and Ginger Soup" -AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([foreign dist-xz]) -AC_USE_SYSTEM_EXTENSIONS - -# Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.14 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.14) -XORG_DEFAULT_OPTIONS -XORG_WITH_DOXYGEN(1.6.1) -XORG_CHECK_SGML_DOCTOOLS(1.8) -XORG_ENABLE_DOCS -XORG_ENABLE_DEVEL_DOCS -XORG_WITH_XMLTO(0.0.20) -XORG_WITH_FOP -XORG_WITH_XSLTPROC -XORG_ENABLE_UNIT_TESTS -XORG_LD_WRAP([optional]) - -m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install font-util 1.1 or later before running autoconf/autogen])]) -XORG_FONT_MACROS_VERSION(1.1) - -dnl this gets generated by autoheader, and thus contains all the defines. we -dnl don't ever actually use it, internally. -AC_CONFIG_HEADERS(include/do-not-use-config.h) -dnl xorg-server.h is an external header, designed to be included by loadable -dnl drivers. -AC_CONFIG_HEADERS(include/xorg-server.h) -dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just -dnl dix/). -AC_CONFIG_HEADERS(include/dix-config.h) -dnl xorg-config.h covers the Xorg DDX. -AC_CONFIG_HEADERS(include/xorg-config.h) -dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs. -AC_CONFIG_HEADERS(include/xkb-config.h) -dnl xwin-config.h covers the XWin DDX. -AC_CONFIG_HEADERS(include/xwin-config.h) -dnl xwayland-config.h covers Xwayland. -AC_CONFIG_HEADERS(include/xwayland-config.h) -dnl version-config.h covers the version numbers so they can be bumped without -dnl forcing an entire recompile.x -AC_CONFIG_HEADERS(include/version-config.h) - -AM_PROG_AS -AC_PROG_LN_S -LT_PREREQ([2.2]) -LT_INIT([disable-static win32-dll]) -PKG_PROG_PKG_CONFIG -AC_PROG_LEX -AC_PROG_YACC -AC_SYS_LARGEFILE -XORG_PROG_RAWCPP - -# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow -# easier overrides at build time. -XSERVER_CFLAGS='$(CWARNFLAGS)' - -dnl Explicitly add -fno-strict-aliasing since this option should disappear -dnl from util-macros CWARNFLAGS -if test "x$GCC" = xyes ; then - XSERVER_CFLAGS="$XSERVER_CFLAGS -fno-strict-aliasing" -fi - -dnl Check for dtrace program (needed to build Xserver dtrace probes) -dnl Also checks for <sys/sdt.h>, since some Linux distros have an -dnl ISDN trace program named dtrace -AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH], - [Enable dtrace probes (default: enabled if dtrace found)]), - [WDTRACE=$withval], [WDTRACE=auto]) -if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then - AC_PATH_PROG(DTRACE, [dtrace], [not_found], [$PATH:/usr/sbin]) - if test "x$DTRACE" = "xnot_found" ; then - if test "x$WDTRACE" = "xyes" ; then - AC_MSG_FAILURE([dtrace requested but not found]) - fi - WDTRACE="no" - else - AC_CHECK_HEADER(sys/sdt.h, [HAS_SDT_H="yes"], [HAS_SDT_H="no"]) - if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then - WDTRACE="no" - fi - fi -fi -if test "x$WDTRACE" != "xno" ; then - AC_DEFINE(XSERVER_DTRACE, 1, - [Define to 1 if the DTrace Xserver provider probes should be built in.]) - -# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into -# object files, and require linking with those as relocatable objects, not .a -# archives. MacOS X handles all this in the normal compiler toolchain, and on -# some releases (like Tiger), will error out on dtrace -G. For now, other -# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux -# ports appear to, based on my web searches, but have not yet been tested). - case $host_os in - darwin*) SPECIAL_DTRACE_OBJECTS=no ;; - *) SPECIAL_DTRACE_OBJECTS=yes ;; - esac -fi -AM_CONDITIONAL(XSERVER_DTRACE, [test "x$WDTRACE" != "xno"]) -AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"]) - -AC_HEADER_DIRENT -AC_HEADER_STDC -AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h \ - fnmatch.h sys/mkdev.h sys/sysmacros.h sys/utsname.h]) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_TYPEOF -AC_C_BIGENDIAN(AC_DEFINE(X_BYTE_ORDER, X_BIG_ENDIAN, [byte order]), - AC_DEFINE(X_BYTE_ORDER, X_LITTLE_ENDIAN, [byte order])) - -AC_CHECK_SIZEOF([unsigned long]) -if test "$ac_cv_sizeof_unsigned_long" = 8; then - AC_DEFINE(_XSERVER64, 1, [Define to 1 if unsigned long is 64 bits.]) -fi - -AC_TYPE_PID_T - -dnl Check to see if dlopen is in default libraries (like Solaris, which -dnl has it in libc), or if libdl is needed to get it. -AC_CHECK_FUNC([dlopen], [], - AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) -AC_SUBST(DLOPEN_LIBS) - -dnl Checks for library functions. -AC_CHECK_FUNCS([backtrace geteuid getuid issetugid getresuid \ - getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \ - mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \ - walkcontext setitimer poll epoll_create1 mkostemp memfd_create \ - sigprocmask isastream]) -AC_CONFIG_LIBOBJ_DIR([os]) -AC_REPLACE_FUNCS([reallocarray strcasecmp strcasestr strlcat strlcpy strndup\ - timingsafe_memcmp]) -AM_CONDITIONAL(POLL, [test "x$ac_cv_func_poll" = "xyes"]) - -AC_CHECK_LIB([bsd], [arc4random_buf]) -AC_CHECK_FUNCS([arc4random_buf]) - -AC_CHECK_DECLS([program_invocation_short_name], [], [], [[#include <errno.h>]]) - -dnl Check for SO_PEERCRED #define -AC_CACHE_CHECK([for SO_PEERCRED in sys/socket.h], - [xorg_cv_sys_have_so_peercred], - [AC_EGREP_CPP(yes_have_so_peercred,[ -#include <sys/types.h> -#include <sys/socket.h> -#ifdef SO_PEERCRED -yes_have_so_peercred -#endif -], - [xorg_cv_sys_have_so_peercred=yes], - [xorg_cv_sys_have_so_peercred=no])]) - -dnl define NO_LOCAL_CLIENT_CRED if no getpeereid, getpeerucred or SO_PEERCRED -if test "x$ac_cv_func_getpeereid" = xno && test "x$ac_cv_func_getpeerucred" = xno && test "x$xorg_cv_sys_have_so_peercred" = xno ; then - AC_DEFINE([NO_LOCAL_CLIENT_CRED], 1, [Define to 1 if no local socket credentials interface exists]) -fi - -dnl Find the math library, then check for cbrt function in it. -AC_CHECK_LIB(m, sqrt) -AC_CHECK_FUNCS([cbrt]) - -dnl AGPGART headers -AC_ARG_ENABLE(agp, AS_HELP_STRING([--enable-agp], - [Enable AGP support (default: auto)]), - [AGP=$enableval], [AGP=auto]) -if test "x$AGP" = "xauto" ; then - AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes) -fi -AM_CONDITIONAL(AGP, [test "x$AGP" = xyes]) - -dnl fbdev header -AC_CHECK_HEADERS([linux/fb.h], FBDEV=yes) -AM_CONDITIONAL(FBDEVHW, [test "x$FBDEV" = xyes]) - -dnl FreeBSD kldload support (sys/linker.h) -AC_CHECK_HEADERS([sys/linker.h], - [ac_cv_sys_linker_h=yes], - [ac_cv_sys_linker_h=no], - [#include <sys/param.h>]) -AM_CONDITIONAL(FREEBSD_KLDLOAD, [test "x$ac_cv_sys_linker_h" = xyes]) - -AC_CACHE_CHECK([for SYSV IPC], - ac_cv_sysv_ipc, - [AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -#include <sys/types.h> -#include <sys/ipc.h> -#include <sys/shm.h> -#include <sys/stat.h> -]],[[ -{ - int id; - id = shmget(IPC_PRIVATE, 512, S_IRUSR | S_IWUSR); - if (id < 0) return -1; - return shmctl(id, IPC_RMID, 0); -}]])], - [ac_cv_sysv_ipc=yes], - [ac_cv_sysv_ipc=no])]) -if test "x$ac_cv_sysv_ipc" = xyes; then - AC_DEFINE(HAVE_SYSV_IPC, 1, [Define to 1 if SYSV IPC is available]) -fi - -dnl OpenBSD /dev/xf86 aperture driver -if test -c /dev/xf86 ; then - AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver]) -fi - -dnl glibc backtrace support check -AC_CHECK_HEADER([execinfo.h],[ - AC_CHECK_LIB(c, backtrace, [ - AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support]) - AC_DEFINE(HAVE_EXECINFO_H, 1, [Have execinfo.h]) - ])] -) - -dnl --------------------------------------------------------------------------- -dnl Bus options and CPU capabilities. Replaces logic in -dnl hw/xfree86/os-support/bus/Makefile.am, among others. -dnl --------------------------------------------------------------------------- -DEFAULT_INT10="x86emu" - -dnl Override defaults as needed for specific platforms: - -case $host_cpu in - alpha*) - ALPHA_VIDEO=yes - case $host_os in - *freebsd*) SYS_LIBS=-lio ;; - *netbsd*) AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;; - esac - GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee" - ;; - arm*) - ARM_VIDEO=yes - DEFAULT_INT10="stub" - ;; - i*86) - I386_VIDEO=yes - case $host_os in - *freebsd*) AC_DEFINE(USE_DEV_IO) ;; - *dragonfly*) AC_DEFINE(USE_DEV_IO) ;; - *netbsd*) AC_DEFINE(USE_I386_IOPL) - SYS_LIBS=-li386 - ;; - *openbsd*) AC_DEFINE(USE_I386_IOPL) - SYS_LIBS=-li386 - ;; - esac - ;; - powerpc*) - PPC_VIDEO=yes - case $host_os in - *freebsd*) DEFAULT_INT10=stub ;; - esac - ;; - sparc*) - SPARC64_VIDEO=yes - BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c" - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; - x86_64*|amd64*) - I386_VIDEO=yes - case $host_os in - *freebsd*) AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;; - *dragonfly*) AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;; - *netbsd*) AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl]) - SYS_LIBS=-lx86_64 - ;; - *openbsd*) AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl]) - SYS_LIBS=-lamd64 - ;; - esac - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; - ia64*) - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; - s390*) - GLX_ARCH_DEFINES="-D__GLX_ALIGN64" - ;; -esac -AC_SUBST(GLX_ARCH_DEFINES) - -dnl BSD *_video.c selection -AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes]) -AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes]) -AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes]) -AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes]) -AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes]) - -DRI=no -dnl it would be nice to autodetect these *CONS_SUPPORTs -case $host_os in - *freebsd* | *dragonfly*) - case $host_os in - kfreebsd*-gnu) ;; - *) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;; - esac - AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) - AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console]) - AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console]) - DRI=yes - ;; - *netbsd*) - AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) - AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console]) - AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console]) - AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console]) - DRI=yes - ;; - *openbsd*) - AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) - AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console]) - AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console]) - ;; - *linux*) - DRI=yes - ;; - *solaris*) - DRI=yes - ;; - darwin*) - AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) - ;; - cygwin*|mingw*) - CFLAGS="$CFLAGS -DFD_SETSIZE=512" - ;; -esac - -dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the -dnl major number -PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1` - -dnl Convert to the old-style 1.x.y version scheme used up to 1.20.x for -dnl backwards compatibility -VENDOR_RELEASE="((10000000) + (($PVMAJOR) * 100000) + (($PVM) * 1000) + $PVP)" -VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}" - -VENDOR_NAME="The X.Org Foundation" -VENDOR_NAME_SHORT="X.Org" -VENDOR_WEB="http://wiki.x.org" - -dnl Build options. -AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror], - [Obsolete - use --enable-strict-compilation instead]), - AC_MSG_ERROR([--enable-werror has been replaced by --enable-strict-compilation])) - -AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], - [Enable debugging (default: disabled)]), - [DEBUGGING=$enableval], [DEBUGGING=no]) -AC_ARG_WITH(int10, AS_HELP_STRING([--with-int10=BACKEND], [int10 backend: vm86, x86emu or stub]), - [INT10="$withval"], - [INT10="$DEFAULT_INT10"]) -AC_ARG_WITH(vendor-name, AS_HELP_STRING([--with-vendor-name=VENDOR], - [Vendor string reported by the server]), - [ VENDOR_NAME="$withval" ], []) -AC_ARG_WITH(vendor-name-short, AS_HELP_STRING([--with-vendor-name-short=VENDOR], - [Short version of vendor string reported by the server]), - [ VENDOR_NAME_SHORT="$withval" ], []) -AC_ARG_WITH(vendor-web, AS_HELP_STRING([--with-vendor-web=URL], - [Vendor web address reported by the server]), - [ VENDOR_WEB="$withval" ], []) -AC_ARG_WITH(module-dir, AS_HELP_STRING([--with-module-dir=DIR], - [Directory where modules are installed (default: $libdir/xorg/modules)]), - [ moduledir="$withval" ], - [ moduledir="${libdir}/xorg/modules" ]) -AC_ARG_WITH(log-dir, AS_HELP_STRING([--with-log-dir=DIR], - [Directory where log files are kept (default: $localstatedir/log)]), - [ logdir="$withval" ], - [ logdir="$localstatedir/log" ]) -AC_ARG_WITH(builder-addr, AS_HELP_STRING([--with-builder-addr=ADDRESS], - [Builder address (default: xorg@lists.freedesktop.org)]), - [ BUILDERADDR="$withval" ], - [ BUILDERADDR="xorg@lists.freedesktop.org" ]) -AC_ARG_WITH(builderstring, AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]), - [ BUILDERSTRING="$withval" ] - [ ]) -AC_ARG_ENABLE(listen-tcp, AS_HELP_STRING([--enable-listen-tcp], - [Listen on TCP by default (default:disabled)]), - [LISTEN_TCP=$enableval], [LISTEN_TCP=no]) -AC_ARG_ENABLE(listen-unix, AS_HELP_STRING([--disable-listen-unix], - [Listen on Unix by default (default:enabled)]), - [LISTEN_UNIX=$enableval], [LISTEN_UNIX=yes]) - -AC_ARG_ENABLE(listen-local, AS_HELP_STRING([--disable-listen-local], - [Listen on local by default (default:enabled)]), - [LISTEN_LOCAL=$enableval], [LISTEN_LOCAL=yes]) - -case $host_os in - linux*) - FALLBACK_INPUT_DRIVER="libinput" - ;; - *) - FALLBACK_INPUT_DRIVER="" - ;; -esac -AC_ARG_WITH(fallback-input-driver, - AC_HELP_STRING([--with-fallback-input-driver=$FALLBACK_INPUT_DRIVER], - [Input driver fallback if the requested driver for a device is unavailable]), - [ FALLBACK_INPUT_DRIVER=$withval ], []) -if test "x$FALLBACK_INPUT_DRIVER" = "xno"; then - FALLBACK_INPUT_DRIVER="" -fi -AC_MSG_CHECKING([for fallback input driver]) -AC_MSG_RESULT([$FALLBACK_INPUT_DRIVER]) -AC_DEFINE_UNQUOTED(FALLBACK_INPUT_DRIVER, ["$FALLBACK_INPUT_DRIVER"], [ Fallback input driver ]) - -dnl Determine font path -XORG_FONTROOTDIR -XORG_FONTSUBDIR(FONTMISCDIR, fontmiscdir, misc) -XORG_FONTSUBDIR(FONTOTFDIR, fontotfdir, OTF) -XORG_FONTSUBDIR(FONTTTFDIR, fontttfdir, TTF) -XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1) -XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi) -XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi) - -dnl Uses --with-default-font-path if set, otherwise uses standard -dnl subdirectories of FONTROOTDIR. Some distros set the default font path to -dnl "catalogue:/etc/X11/fontpath.d,built-ins" -DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" -case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; -esac - -AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), - [ FONTPATH="$withval" ], - [ FONTPATH="${DEFAULT_FONT_PATH}" ]) - -AC_MSG_CHECKING([for default font path]) -AC_MSG_RESULT([$FONTPATH]) - -AC_ARG_WITH(xkb-path, AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: auto)]), - [ XKBPATH="$withval" ], - [ XKBPATH="auto" ]) -AC_ARG_WITH(xkb-output, AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]), - [ XKBOUTPUT="$withval" ], - [ XKBOUTPUT="compiled" ]) -AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES], - [Keyboard ruleset (default: base/evdev)]), - [ XKB_DFLT_RULES="$withval" ], - [ XKB_DFLT_RULES="" ]) -AC_ARG_WITH(default-xkb-model, AS_HELP_STRING([--with-default-xkb-model=MODEL], - [Keyboard model (default: pc105)]), - [ XKB_DFLT_MODEL="$withval" ], - [ XKB_DFLT_MODEL="pc105" ]) -AC_ARG_WITH(default-xkb-layout, AS_HELP_STRING([--with-default-xkb-layout=LAYOUT], - [Keyboard layout (default: us)]), - [ XKB_DFLT_LAYOUT="$withval" ], - [ XKB_DFLT_LAYOUT="us" ]) -AC_ARG_WITH(default-xkb-variant, AS_HELP_STRING([--with-default-xkb-variant=VARIANT], - [Keyboard variant (default: (none))]), - [ XKB_DFLT_VARIANT="$withval" ], - [ XKB_DFLT_VARIANT="" ]) -AC_ARG_WITH(default-xkb-options, AS_HELP_STRING([--with-default-xkb-options=OPTIONS], - [Keyboard layout options (default: (none))]), - [ XKB_DFLT_OPTIONS="$withval" ], - [ XKB_DFLT_OPTIONS="" ]) -AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], - [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]), - [ SERVERCONFIG="$withval" ], - [ SERVERCONFIG="${libdir}/xorg" ]) -AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: /Applications/Utilities)]), - [ APPLE_APPLICATIONS_DIR="${withval}" ], - [ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ]) -AC_SUBST([APPLE_APPLICATIONS_DIR]) -AC_ARG_WITH(apple-application-name,AS_HELP_STRING([--with-apple-application-name=NAME], [Name for the .app (default: X11)]), - [ APPLE_APPLICATION_NAME="${withval}" ], - [ APPLE_APPLICATION_NAME="X11" ]) -AC_SUBST([APPLE_APPLICATION_NAME]) -AC_ARG_WITH(bundle-id-prefix, AS_HELP_STRING([--with-bundle-id-prefix=RDNS_PREFIX], [Prefix to use for bundle identifiers (default: org.x)]), - [ BUNDLE_ID_PREFIX="${withval}" ]) -AC_SUBST([BUNDLE_ID_PREFIX]) -AC_DEFINE_UNQUOTED(BUNDLE_ID_PREFIX, "$BUNDLE_ID_PREFIX", [Prefix to use for bundle identifiers]) -m4_define(DEFAULT_BUNDLE_VERSION, m4_esyscmd([echo ]AC_PACKAGE_VERSION[ | cut -f1-3 -d. | tr -d '\n'])) -AC_ARG_WITH(bundle-version, AS_HELP_STRING([--with-bundle-version=VERSION], [Version to use for X11.app's CFBundleVersion (default: ]DEFAULT_BUNDLE_VERSION[)]), - [ BUNDLE_VERSION="${withval}" ], - [ BUNDLE_VERSION="DEFAULT_BUNDLE_VERSION" ]) -AC_SUBST([BUNDLE_VERSION]) -AC_ARG_WITH(bundle-version-string, AS_HELP_STRING([--with-bundle-version-string=VERSION], [Version to use for X11.app's CFBundleShortVersionString (default: ]AC_PACKAGE_VERSION[)]), - [ BUNDLE_VERSION_STRING="${withval}" ], - [ BUNDLE_VERSION_STRING="${PACKAGE_VERSION}" ]) -AC_SUBST([BUNDLE_VERSION_STRING]) -AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11.app using the Sparkle Framework (default: disabled)]), - [ XQUARTZ_SPARKLE="${enableval}" ], - [ XQUARTZ_SPARKLE="no" ]) -AC_SUBST([XQUARTZ_SPARKLE]) -AC_ARG_WITH(sparkle-feed-url, AS_HELP_STRING([--with-sparkle-feed-url=URL], [URL for the Sparkle feed (default: https://www.xquartz.org/releases/sparkle/release.xml)]), - [ XQUARTZ_SPARKLE_FEED_URL="${withval}" ], - [ XQUARTZ_SPARKLE_FEED_URL="https://www.xquartz.org/releases/sparkle/release.xml" ]) -AC_SUBST([XQUARTZ_SPARKLE_FEED_URL]) -AC_ARG_ENABLE(visibility, AS_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]), - [SYMBOL_VISIBILITY=$enableval], - [SYMBOL_VISIBILITY=auto]) - -dnl GLX build options -AC_ARG_WITH(khronos-spec-dir, AS_HELP_STRING([--with-khronos-spec-dir=PATH], [Path to Khronos OpenGL registry database files (default: auto)]), - [KHRONOS_SPEC_DIR="${withval}"], - [KHRONOS_SPEC_DIR=auto]) - -dnl Extensions. -AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes]) -AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-mitshm], [Build SHM extension (default: auto)]), [MITSHM=$enableval], [MITSHM=auto]) -AC_ARG_ENABLE(xres, AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes]) -AC_ARG_ENABLE(record, AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes]) -AC_ARG_ENABLE(xv, AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes]) -AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc], [Build XvMC extension (default: enabled)]), [XVMC=$enableval], [XVMC=yes]) -AC_ARG_ENABLE(dga, AS_HELP_STRING([--disable-dga], [Build DGA extension (default: auto)]), [DGA=$enableval], [DGA=auto]) -AC_ARG_ENABLE(screensaver, AS_HELP_STRING([--disable-screensaver], [Build ScreenSaver extension (default: enabled)]), [SCREENSAVER=$enableval], [SCREENSAVER=yes]) -AC_ARG_ENABLE(xdmcp, AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto]) -AC_ARG_ENABLE(xdm-auth-1, AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto]) -AC_ARG_ENABLE(glx, AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes]) -AC_ARG_ENABLE(dri, AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval]) -AC_ARG_ENABLE(dri2, AS_HELP_STRING([--enable-dri2], [Build DRI2 extension (default: auto)]), [DRI2=$enableval], [DRI2=auto]) -AC_ARG_ENABLE(dri3, AS_HELP_STRING([--enable-dri3], [Build DRI3 extension (default: auto)]), [DRI3=$enableval], [DRI3=auto]) -AC_ARG_ENABLE(present, AS_HELP_STRING([--disable-present], [Build Present extension (default: enabled)]), [PRESENT=$enableval], [PRESENT=yes]) -AC_ARG_ENABLE(xinerama, AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes]) -AC_ARG_ENABLE(xf86vidmode, AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto]) -AC_ARG_ENABLE(xace, AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes]) -AC_ARG_ENABLE(xselinux, AS_HELP_STRING([--enable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no]) -AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no]) -AC_ARG_ENABLE(dbe, AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes]) -AC_ARG_ENABLE(xf86bigfont, AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no]) -AC_ARG_ENABLE(dpms, AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes]) -AC_ARG_ENABLE(config-udev, AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto]) -AC_ARG_ENABLE(config-udev-kms, AS_HELP_STRING([--enable-config-udev-kms], [Build udev kms support (default: auto)]), [CONFIG_UDEV_KMS=$enableval], [CONFIG_UDEV_KMS=auto]) -AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto]) -AC_ARG_ENABLE(config-wscons, AS_HELP_STRING([--enable-config-wscons], [Build wscons config support (default: auto)]), [CONFIG_WSCONS=$enableval], [CONFIG_WSCONS=auto]) -AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) -AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes]) -AC_ARG_ENABLE(int10-module, AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes]) -AC_ARG_ENABLE(windowsdri, AS_HELP_STRING([--enable-windowsdri], [Build XWin with WindowsDRI extension (default: auto)]), [WINDOWSDRI=$enableval], [WINDOWSDRI=auto]) -AC_ARG_ENABLE(libdrm, AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes]) -AC_ARG_ENABLE(clientids, AS_HELP_STRING([--disable-clientids], [Build Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval], [CLIENTIDS=yes]) -AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes]) -AC_ARG_ENABLE(linux_acpi, AS_HELP_STRING([--disable-linux-acpi], [Disable building ACPI support on Linux (if available).]), [enable_linux_acpi=$enableval], [enable_linux_acpi=yes]) -AC_ARG_ENABLE(linux_apm, AS_HELP_STRING([--disable-linux-apm], [Disable building APM support on Linux (if available).]), [enable_linux_apm=$enableval], [enable_linux_apm=yes]) -AC_ARG_ENABLE(systemd-logind, AS_HELP_STRING([--enable-systemd-logind], [Build systemd-logind support (default: auto)]), [SYSTEMD_LOGIND=$enableval], [SYSTEMD_LOGIND=auto]) -AC_ARG_ENABLE(suid-wrapper, AS_HELP_STRING([--enable-suid-wrapper], [Build suid-root wrapper for legacy driver support on rootless xserver systems (default: no)]), [SUID_WRAPPER=$enableval], [SUID_WRAPPER=no]) - -dnl DDXes. -AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) -AC_ARG_ENABLE(xvfb, AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes]) -AC_ARG_ENABLE(xnest, AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto]) -AC_ARG_ENABLE(xquartz, AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto]) -AC_ARG_ENABLE(xwayland, AS_HELP_STRING([--enable-xwayland], [Build Xwayland server (default: auto)]), [XWAYLAND=$enableval], [XWAYLAND=auto]) -AC_ARG_ENABLE(xwayland-eglstream, AS_HELP_STRING([--enable-xwayland-eglstream], [Build Xwayland eglstream support (default: no)]), [XWAYLAND_EGLSTREAM=$enableval], [XWAYLAND_EGLSTREAM=no]) -AC_ARG_WITH(xwayland-path, AS_HELP_STRING([--with-xwayland-path=PATH], [Directory containing Xwayland executable (default: ${bindir})]), - [ xwayland_path="$withval" ], [ xwayland_path="$bindir" ]) -AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no]) -AC_ARG_ENABLE(xwin, AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto]) -AC_ARG_ENABLE(glamor, AS_HELP_STRING([--enable-glamor], [Build glamor dix module (default: auto)]), [GLAMOR=$enableval], [GLAMOR=auto]) -AC_ARG_ENABLE(xf86-input-inputtest, AS_HELP_STRING([--enable-xf86-input-inputtest], [Build Xorg test input driver (default: yes)]), [XORG_DRIVER_INPUT_INPUTTEST=$enableval], [XORG_DRIVER_INPUT_INPUTTEST=yes]) -dnl kdrive and its subsystems -AC_ARG_ENABLE(kdrive, AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no]) -AC_ARG_ENABLE(xephyr, AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto]) -dnl kdrive options -AC_ARG_ENABLE(libunwind, AS_HELP_STRING([--enable-libunwind], [Use libunwind for backtracing (default: auto)]), [LIBUNWIND="$enableval"], [LIBUNWIND="auto"]) -AC_ARG_ENABLE(xshmfence, AS_HELP_STRING([--disable-xshmfence], [Disable xshmfence (default: auto)]), [XSHMFENCE="$enableval"], [XSHMFENCE="auto"]) - - -dnl chown/chmod to be setuid root as part of build -dnl Replaces InstallXserverSetUID in imake -AC_ARG_ENABLE(install-setuid, - AS_HELP_STRING([--enable-install-setuid], - [Install Xorg server as owned by root with setuid bit (default: auto)]), - [SETUID=$enableval], [SETUID=auto]) -AC_MSG_CHECKING([to see if we can install the Xorg server as root]) -if test "x$SETUID" = "xauto" ; then - case $host_os in - cygwin*) SETUID="no" ;; - mingw*) SETUID="no" ;; - darwin*) SETUID="no" ;; - *) - case $host_cpu in - sparc) SETUID="no" ;; - *) SETUID="yes" ;; - esac - esac - if test "x$SETUID" = xyes; then - touch testfile - chown root testfile > /dev/null 2>&1 || SETUID="no" - rm -f testfile - fi -fi -AC_MSG_RESULT([$SETUID]) -AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"]) - -dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro -dnl was not expanded, since xorg-server with no transport types is rather useless. -dnl -dnl If you're seeing an error here, be sure you installed the lib/xtrans module -dnl first and if it's not in the default location, that you set the ACLOCAL -dnl environment variable to find it, such as: -dnl ACLOCAL="aclocal -I ${PREFIX}/share/aclocal" -m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$]) - -# Transport selection macro from xtrans.m4 -XTRANS_CONNECTION_FLAGS - -# Secure RPC detection macro from xtrans.m4 -XTRANS_SECURE_RPC_FLAGS -AM_CONDITIONAL(SECURE_RPC, [test "x$SECURE_RPC" = xyes]) - -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 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 - cygwin* | mingw*) - CONFIG_HAL=no - CONFIG_UDEV=no - CONFIG_UDEV_KMS=no - DGA=no - DRM=no - DRI2=no - DRI3=no - INT10MODULE=no - PCI=no - VGAHW=no - XF86UTILS=no - XF86VIDMODE=no - XSELINUX=no - SYMBOL_VISIBILITY=no - ;; - darwin*) - PCI=no - INT10MODULE=no - VGAHW=no - DRM=no - DRI2=no - DRI3=no - - if test x$XQUARTZ = xauto; then - AC_CACHE_CHECK([whether to build Xquartz],xorg_cv_Carbon_framework,[ - save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -framework Carbon" - AC_LINK_IFELSE([AC_LANG_SOURCE([char FSFindFolder(); int main() { FSFindFolder(); return 0;}])], - [xorg_cv_Carbon_framework=yes], - [xorg_cv_Carbon_framework=no]) - LDFLAGS=$save_LDFLAGS]) - - if test "X$xorg_cv_Carbon_framework" = Xyes; then - XQUARTZ=yes - else - XQUARTZ=no - fi - fi - - if test "x$XQUARTZ" = xyes ; then - XQUARTZ=yes - XVFB=no - XNEST=no - XWAYLAND=no - - COMPOSITE=no - DGA=no - DPMSExtension=no - XF86VIDMODE=no - fi - ;; - gnu*) - DRM=no - DRI2=no - DRI3=no - ;; - *) XQUARTZ=no ;; -esac - -dnl --------------------------------------------------------------------------- -dnl Extension section -dnl --------------------------------------------------------------------------- -XEXT_INC='-I$(top_srcdir)/Xext' -XEXT_LIB='$(top_builddir)/Xext/libXext.la' - -dnl Optional modules -VIDEOPROTO="videoproto" -COMPOSITEPROTO="compositeproto >= 0.4" -RECORDPROTO="recordproto >= 1.13.99.1" -SCRNSAVERPROTO="scrnsaverproto >= 1.1" -RESOURCEPROTO="resourceproto >= 1.2.0" -DRIPROTO="xf86driproto >= 2.1.0" -DRI2PROTO="dri2proto >= 2.8" -DRI3PROTO="dri3proto >= 1.2" -XINERAMAPROTO="xineramaproto" -BIGFONTPROTO="xf86bigfontproto >= 1.2.0" -DGAPROTO="xf86dgaproto >= 2.0.99.1" -GLPROTO="glproto >= 1.4.17" -VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1" -APPLEWMPROTO="applewmproto >= 1.4" -LIBXSHMFENCE="xshmfence >= 1.1" - -dnl Required modules -XPROTO="xproto >= 7.0.31" -RANDRPROTO="randrproto >= 1.6.0" -RENDERPROTO="renderproto >= 0.11" -XEXTPROTO="xextproto >= 7.2.99.901" -INPUTPROTO="inputproto >= 2.3.99.1" -KBPROTO="kbproto >= 1.0.3" -FONTSPROTO="fontsproto >= 2.1.3" -FIXESPROTO="fixesproto >= 6.0" -DAMAGEPROTO="damageproto >= 1.1" -XCMISCPROTO="xcmiscproto >= 1.2.0" -BIGREQSPROTO="bigreqsproto >= 1.1.0" -XTRANS="xtrans >= 1.3.5" -PRESENTPROTO="presentproto >= 1.2" - -dnl List of libraries that require a specific version -LIBAPPLEWM="applewm >= 1.4" -LIBDRI="dri >= 7.8.0" -LIBDRM="libdrm >= 2.4.89" -LIBEGL="egl" -LIBGBM="gbm >= 10.2.0" -LIBGL="gl >= 1.2" -LIBXEXT="xext >= 1.0.99.4" -LIBXFONT="xfont2 >= 2.0.0" -LIBXI="xi >= 1.2.99.1" -LIBXTST="xtst >= 1.0.99.2" -LIBPCIACCESS="pciaccess >= 0.12.901" -LIBUDEV="libudev >= 143" -LIBSELINUX="libselinux >= 2.0.86" -LIBDBUS="dbus-1 >= 1.0" -LIBPIXMAN="pixman-1 >= 0.27.2" -LIBXCVT="libxcvt" - -dnl Pixman is always required, but we separate it out so we can link -dnl specific modules against it -PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN) -REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau" - -dnl Core modules for most extensions, et al. -SDK_REQUIRED_MODULES="$XPROTO $RANDRPROTO $RENDERPROTO $XEXTPROTO $INPUTPROTO $KBPROTO $FONTSPROTO $LIBPIXMAN $LIBXCVT" -# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc -AC_SUBST(SDK_REQUIRED_MODULES) - -AC_CHECK_DECL([PTHREAD_MUTEX_RECURSIVE], [HAVE_RECURSIVE_MUTEX=yes], [HAVE_RECURSIVE_MUTEX=no], [[#include <pthread.h>]]) - -THREAD_DEFAULT=no - -if test "x$HAVE_RECURSIVE_MUTEX" = "xyes" ; then - THREAD_DEFAULT=yes -fi - -case $host_os in - mingw*) THREAD_DEFAULT=no ;; - *) -esac - -AC_ARG_ENABLE(input-thread, AS_HELP_STRING([--enable-input-thread], - [Enable input threads]), - [INPUTTHREAD=$enableval], [INPUTTHREAD=$THREAD_DEFAULT]) - -if test "x$INPUTTHREAD" = "xyes" ; then - AX_PTHREAD(,AC_MSG_ERROR([threaded input requested but no pthread support has been found])) - SYS_LIBS="$SYS_LIBS $PTHREAD_LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - AC_DEFINE(INPUTTHREAD, 1, [Use a separate input thread]) - - save_LIBS="$LIBS" - LIBS="$LIBS $SYS_LIBS" - dnl MacOS X 10.6 & higher - AC_MSG_CHECKING(for pthread_setname_np(const char*)) - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], - [pthread_setname_np("example")])], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID,1, - [Have function pthread_setname_np(const char*)])], - [AC_MSG_RESULT(no)]) - dnl GNU libc 2.12 & higher, Solaris 11.3 & higher - AC_MSG_CHECKING(for pthread_setname_np(pthread_t, const char*)) - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], - [pthread_setname_np(pthread_self(), "example")])], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PTHREAD_SETNAME_NP_WITH_TID,1, - [Have function pthread_setname_np(pthread_t, const char*)])], - [AC_MSG_RESULT(no)]) - LIBS="$save_LIBS" -fi - -REQUIRED_MODULES="$FIXESPROTO $DAMAGEPROTO $XCMISCPROTO $XTRANS $BIGREQSPROTO $SDK_REQUIRED_MODULES" - -dnl systemd socket activation -dnl activate the code in libxtrans that grabs systemd's socket fds -dnl libsystemd-daemon was moved into libsystemd in version 209 -LIBSYSTEMD="libsystemd >= 209" -AC_ARG_WITH([systemd-daemon], - AS_HELP_STRING([--with-systemd-daemon], - [support systemd socket activation (default: auto)]), - [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto]) -if test "x$WITH_SYSTEMD_DAEMON" = "xyes" -o "x$WITH_SYSTEMD_DAEMON" = "xauto" ; then - PKG_CHECK_MODULES([SYSTEMD_DAEMON], [$LIBSYSTEMD], - [HAVE_SYSTEMD_DAEMON=yes; - LIBSYSTEMD_DAEMON="$LIBSYSTEMD"], - [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], - [HAVE_SYSTEMD_DAEMON=yes; - LIBSYSTEMD_DAEMON=libsystemd-daemon], - [HAVE_SYSTEMD_DAEMON=no])]) - if test "x$HAVE_SYSTEMD_DAEMON" = xyes; then - AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available]) - REQUIRED_LIBS="$REQUIRED_LIBS $LIBSYSTEMD_DAEMON" - elif test "x$WITH_SYSTEMD_DAEMON" = xyes; then - AC_MSG_ERROR([systemd support requested but no library has been found]) - fi -fi -AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"]) - -if test "x$CONFIG_UDEV" = xyes && test "x$CONFIG_HAL" = xyes; then - AC_MSG_ERROR([Hotplugging through both libudev and hal not allowed]) -fi - -PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no]) -if test "x$CONFIG_UDEV" = xauto; then - CONFIG_UDEV="$HAVE_LIBUDEV" -fi -AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes]) -if test "x$CONFIG_UDEV" = xyes; then - CONFIG_HAL=no - if test "x$CONFIG_UDEV_KMS" = xauto; then - CONFIG_UDEV_KMS="$HAVE_LIBUDEV" - fi - if ! test "x$HAVE_LIBUDEV" = xyes; then - AC_MSG_ERROR([udev configuration API requested, but libudev is not installed]) - fi - AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug]) - if test "x$CONFIG_UDEV_KMS" = xyes; then - AC_DEFINE(CONFIG_UDEV_KMS, 1, [Use libudev for kms enumeration]) - fi - SAVE_LIBS=$LIBS - SAVE_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $UDEV_CFLAGS" - LIBS=$UDEV_LIBS - AC_CHECK_FUNCS([udev_monitor_filter_add_match_tag]) - AC_CHECK_FUNCS([udev_enumerate_add_match_tag]) - LIBS=$SAVE_LIBS - CFLAGS=$SAVE_CFLAGS -fi -AM_CONDITIONAL(CONFIG_UDEV_KMS, [test "x$CONFIG_UDEV_KMS" = xyes]) - -PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no]) -if test "x$HAVE_DBUS" = xyes; then - AC_DEFINE(HAVE_DBUS, 1, [Have D-Bus support]) -fi -AM_CONDITIONAL(HAVE_DBUS, [test "x$HAVE_DBUS" = xyes]) - -PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no]) -if test "x$CONFIG_HAL" = xauto; then - CONFIG_HAL="$HAVE_HAL" -fi -if test "x$CONFIG_HAL" = xyes; then - if ! test "x$HAVE_HAL" = xyes; then - AC_MSG_ERROR([HAL hotplug API requested, but HAL is not installed.]) - fi - - AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API]) - NEED_DBUS="yes" -fi -AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes]) - -if test "x$SYSTEMD_LOGIND" = xauto; then - if test "x$HAVE_DBUS" = xyes -a "x$CONFIG_UDEV" = xyes ; then - SYSTEMD_LOGIND=yes - else - SYSTEMD_LOGIND=no - fi -fi -if test "x$SYSTEMD_LOGIND" = xyes; then - if ! test "x$HAVE_DBUS" = xyes; then - AC_MSG_ERROR([systemd-logind requested, but D-Bus is not installed.]) - fi - if ! test "x$CONFIG_UDEV" = xyes ; then - AC_MSG_ERROR([systemd-logind is only supported in combination with udev configuration.]) - fi - - AC_DEFINE(SYSTEMD_LOGIND, 1, [Enable systemd-logind integration]) - NEED_DBUS="yes" -fi -AM_CONDITIONAL(SYSTEMD_LOGIND, [test "x$SYSTEMD_LOGIND" = xyes]) - -if test "x$SUID_WRAPPER" = xyes; then - dnl This is a define so that if some platforms want to put the wrapper - dnl somewhere else this can be easily changed - AC_DEFINE_DIR(SUID_WRAPPER_DIR, libexecdir, [Where to install the Xorg binary and Xorg.wrap]) - SETUID="no" -fi -AM_CONDITIONAL(SUID_WRAPPER, [test "x$SUID_WRAPPER" = xyes]) - -if test "x$NEED_DBUS" = xyes; then - AC_DEFINE(NEED_DBUS, 1, [Enable D-Bus core]) -fi -AM_CONDITIONAL(NEED_DBUS, [test "x$NEED_DBUS" = xyes]) - -if test "x$CONFIG_WSCONS" = xauto; then - case $host_os in - *openbsd*) - CONFIG_WSCONS=yes; - ;; - *) - CONFIG_WSCONS=no; - ;; - esac -fi -AM_CONDITIONAL(CONFIG_WSCONS, [test "x$CONFIG_WSCONS" = xyes]) -if test "x$CONFIG_WSCONS" = xyes; then - AC_DEFINE(CONFIG_WSCONS, 1, [Use wscons for input auto configuration]) -fi - - -AC_MSG_CHECKING([for glibc...]) -AC_PREPROC_IFELSE([AC_LANG_SOURCE([ -#include <features.h> -#ifndef __GLIBC__ -#error -#endif -])], glibc=yes, glibc=no) -AC_MSG_RESULT([$glibc]) - -AC_CHECK_FUNCS([clock_gettime], [have_clock_gettime=yes], - [AC_CHECK_LIB([rt], [clock_gettime], [have_clock_gettime=-lrt], - [have_clock_gettime=no])]) - -AC_MSG_CHECKING([for a useful monotonic clock ...]) - -if ! test "x$have_clock_gettime" = xno; then - if ! test "x$have_clock_gettime" = xyes; then - CLOCK_LIBS="$have_clock_gettime" - else - CLOCK_LIBS="" - fi - - LIBS_SAVE="$LIBS" - LIBS="$CLOCK_LIBS" - CPPFLAGS_SAVE="$CPPFLAGS" - - if test x"$glibc" = xyes; then - CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" - fi - - AC_RUN_IFELSE([AC_LANG_SOURCE([ -#include <time.h> - -int main(int argc, char *argv[[]]) { - struct timespec tp; - - if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) - return 0; - else - return 1; -} - ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no], - [MONOTONIC_CLOCK="cross compiling"]) - - if test "$MONOTONIC_CLOCK" = "cross compiling"; then - AC_CHECK_DECL([CLOCK_MONOTONIC],[MONOTONIC_CLOCK="guessing yes"],[MONOTONIC_CLOCK=no],[#include <time.h>]) - fi - - LIBS="$LIBS_SAVE" - CPPFLAGS="$CPPFLAGS_SAVE" -else - MONOTONIC_CLOCK=no -fi - -AC_MSG_RESULT([$MONOTONIC_CLOCK]) -if test "$MONOTONIC_CLOCK" = "guessing yes"; then - MONOTONIC_CLOCK=yes -fi - -if test "x$MONOTONIC_CLOCK" = xyes; then - AC_DEFINE(MONOTONIC_CLOCK, 1, [Have monotonic clock from clock_gettime()]) - LIBS="$LIBS $CLOCK_LIBS" -fi - -AM_CONDITIONAL(XV, [test "x$XV" = xyes]) -if test "x$XV" = xyes; then - AC_DEFINE(XV, 1, [Support Xv extension]) - AC_DEFINE(XvExtension, 1, [Build Xv extension]) - REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO" - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $VIDEOPROTO" -else - XVMC=no -fi - -AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes]) -if test "x$XVMC" = xyes; then - AC_DEFINE(XvMCExtension, 1, [Build XvMC extension]) -fi - -AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes]) -if test "x$COMPOSITE" = xyes; then - AC_DEFINE(COMPOSITE, 1, [Support Composite Extension]) - REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO" - COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la' - COMPOSITE_INC='-I$(top_srcdir)/composite' -fi - -if test "x$MITSHM" = xauto; then - MITSHM="$ac_cv_sysv_ipc" -fi -AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes]) -if test "x$MITSHM" = xyes; then - AC_DEFINE(MITSHM, 1, [Support MIT-SHM extension]) - AC_DEFINE(HAS_SHM, 1, [Support SHM]) -fi - -AM_CONDITIONAL(RECORD, [test "x$RECORD" = xyes]) -if test "x$RECORD" = xyes; then - AC_DEFINE(XRECORD, 1, [Support Record extension]) - REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO" - RECORD_LIB='$(top_builddir)/record/librecord.la' -fi - -AM_CONDITIONAL(SCREENSAVER, [test "x$SCREENSAVER" = xyes]) -if test "x$SCREENSAVER" = xyes; then - AC_DEFINE(SCREENSAVER, 1, [Support MIT-SCREEN-SAVER extension]) - REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO" - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $SCRNSAVERPROTO" -fi - -HASHTABLE=no -AM_CONDITIONAL(RES, [test "x$RES" = xyes]) -if test "x$RES" = xyes; then - AC_DEFINE(RES, 1, [Support X resource extension]) - HASHTABLE=yes - REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO" - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $RESOURCEPROTO" -fi - -if test "x$LISTEN_TCP" = xyes; then - AC_DEFINE(LISTEN_TCP, 1, [Listen on TCP socket]) -fi -if test "x$LISTEN_UNIX" = xyes; then - AC_DEFINE(LISTEN_UNIX, 1, [Listen on Unix socket]) -fi -if test "x$LISTEN_LOCAL" = xyes; then - AC_DEFINE(LISTEN_LOCAL, 1, [Listen on local socket]) -fi - -# The XRes extension may support client ID tracking only if it has -# been specifically enabled. Client ID tracking is implicitly not -# supported if XRes extension is disabled. -AC_MSG_CHECKING([whether to track client ids]) -if test "x$RES" = xyes && test "x$CLIENTIDS" = xyes; then - AC_DEFINE(CLIENTIDS, 1, [Support client ID tracking]) -else - CLIENTIDS=no -fi -if test "x$CLIENTIDS" = xyes; then - case $host_os in - openbsd*) - SYS_LIBS="$SYS_LIBS -lkvm" - ;; - esac -fi -AC_MSG_RESULT([$CLIENTIDS]) -AM_CONDITIONAL(CLIENTIDS, [test "x$CLIENTIDS" = xyes]) - -AM_CONDITIONAL(DRI, test "x$DRI" = xyes) -if test "x$DRI" = xyes; then - AC_DEFINE(XF86DRI, 1, [Build DRI extension]) - REQUIRED_MODULES="$REQUIRED_MODULES $DRIPROTO $GLPROTO $LIBDRI" - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRIPROTO $GLPROTO $LIBDRI" -fi - -PKG_CHECK_MODULES([DRI2PROTO], $DRI2PROTO, - [HAVE_DRI2PROTO=yes], [HAVE_DRI2PROTO=no]) -case "$DRI2,$HAVE_DRI2PROTO" in - yes,no) - AC_MSG_ERROR([DRI2 requested, but dri2proto not found.]) - ;; - yes,yes | auto,yes) - AC_DEFINE(DRI2, 1, [Build DRI2 extension]) - DRI2=yes - LIBGL="gl >= 1.2" - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO" - ;; -esac -AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes) - -AC_ARG_ENABLE(xtrans-send-fds, AS_HELP_STRING([--disable-xtrans-send-fds], [Use Xtrans support for fd passing (default: auto)]), [XTRANS_SEND_FDS=$enableval], [XTRANS_SEND_FDS=auto]) - -case "x$XTRANS_SEND_FDS" in -xauto) - case "$host_os" in - linux*|solaris*|freebsd*|dragonfly*|openbsd*) - XTRANS_SEND_FDS=yes - ;; - *) - XTRANS_SEND_FDS=no - ;; - esac -esac - -case "x$XTRANS_SEND_FDS" in -xyes) - AC_DEFINE(XTRANS_SEND_FDS, 1, [Enable xtrans fd passing support]) - ;; -esac - -case "$DRI3,$XTRANS_SEND_FDS" in - yes,yes | auto,yes) - ;; - yes,no) - AC_MSG_ERROR([DRI3 requested, but xtrans fd passing support not found.]) - DRI3=no - ;; - no,*) - ;; - *) - AC_MSG_NOTICE([DRI3 disabled because xtrans fd passing support not found.]) - DRI3=no - ;; -esac - -PKG_CHECK_MODULES([DRI3PROTO], $DRI3PROTO, - [HAVE_DRI3PROTO=yes], [HAVE_DRI3PROTO=no]) - -case "$DRI3,$HAVE_DRI3PROTO" in - yes,yes | auto,yes) - REQUIRED_MODULES="$REQUIRED_MODULES dri3proto" - ;; - yes,no) - AC_MSG_ERROR([DRI3 requested, but dri3proto not found.]) - DRI3=no - ;; - no,*) - ;; - *) - AC_MSG_NOTICE([DRI3 disabled because dri3proto not found.]) - DRI3=no - ;; -esac - -AC_CHECK_FUNCS([sigaction]) - -BUSFAULT=no - -case x"$ac_cv_func_sigaction" in - xyes) - AC_DEFINE(HAVE_SIGACTION, 1, [Have sigaction function]) - BUSFAULT=yes - ;; -esac - -case x"$BUSFAULT" in - xyes) - AC_DEFINE(BUSFAULT, 1, [Include busfault OS API]) - ;; -esac - -AM_CONDITIONAL(BUSFAULT, test x"$BUSFAULT" = xyes) - - -PKG_CHECK_MODULES([XSHMFENCE], $LIBXSHMFENCE, [HAVE_XSHMFENCE=yes], [HAVE_XSHMFENCE=no]) -if test "x$XSHMFENCE" = "xauto"; then - XSHMFENCE="$HAVE_XSHMFENCE" -fi - -if test "x$XSHMFENCE" = "xyes"; then - if test "x$HAVE_XSHMFENCE" != "xyes"; then - AC_MSG_ERROR([xshmfence requested but not installed.]) - fi - AC_DEFINE(HAVE_XSHMFENCE, 1, [Have xshmfence support]) - REQUIRED_LIBS="$REQUIRED_LIBS $LIBXSHMFENCE" -fi - -AM_CONDITIONAL(XSHMFENCE, [test "x$XSHMFENCE" = xyes]) - -case "$DRI3,$XSHMFENCE" in - yes,yes | auto,yes) - ;; - yes,no) - AC_MSG_ERROR([DRI3 requested, but xshmfence not found.]) - DRI3=no - ;; - no,*) - ;; - *) - AC_MSG_NOTICE([DRI3 disabled because xshmfence not found.]) - DRI3=no - ;; -esac - -case x"$DRI3" in - xyes|xauto) - DRI3=yes - AC_DEFINE(DRI3, 1, [Build DRI3 extension]) - DRI3_LIB='$(top_builddir)/dri3/libdri3.la' - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI3PROTO" - AC_MSG_NOTICE([DRI3 enabled]); - ;; -esac - -AM_CONDITIONAL(DRI3, test "x$DRI3" = xyes) - -if test "x$DRI" = xyes || test "x$DRI2" = xyes || test "x$DRI3" = xyes || test "x$CONFIG_UDEV_KMS" = xyes || test "x$XORG" = xyes; then - if test "x$DRM" = xyes; then - AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support]) - PKG_CHECK_MODULES([LIBDRM], $LIBDRM) - fi -fi - -if test "x$GLX" = xyes; then - PKG_CHECK_MODULES([XLIB], [x11]) - PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL) - AC_SUBST(XLIB_CFLAGS) - AC_DEFINE(GLXEXT, 1, [Build GLX extension]) - HASHTABLE=yes - GLX_LIBS='$(top_builddir)/glx/libglx.la $(top_builddir)/glx/libglxvnd.la' - GLX_SYS_LIBS="$GLX_SYS_LIBS $GL_LIBS" -else - GLX=no -fi -AM_CONDITIONAL(GLX, test "x$GLX" = xyes) - -AM_CONDITIONAL(HASHTABLE, test "x$HASHTABLE" = xyes) - -AC_SUBST([GLX_DEFINES]) -AC_SUBST([GLX_SYS_LIBS]) - -AM_CONDITIONAL(PRESENT, [test "x$PRESENT" = xyes]) -if test "x$PRESENT" = xyes; then - AC_DEFINE(PRESENT, 1, [Support Present extension]) - REQUIRED_MODULES="$REQUIRED_MODULES $PRESENTPROTO" - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $PRESENTPROTO" - PRESENT_INC='-I$(top_srcdir)/present' - PRESENT_LIB='$(top_builddir)/present/libpresent.la' -fi - -AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes]) -if test "x$XINERAMA" = xyes; then - AC_DEFINE(XINERAMA, 1, [Support Xinerama extension]) - AC_DEFINE(PANORAMIX, 1, [Internal define for Xinerama]) - REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO" - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO" -fi - -AM_CONDITIONAL(XACE, [test "x$XACE" = xyes]) -if test "x$XACE" = xyes; then - AC_DEFINE(XACE, 1, [Build X-ACE extension]) -fi - -AM_CONDITIONAL(XSELINUX, [test "x$XSELINUX" = xyes]) -if test "x$XSELINUX" = xyes; then - if test "x$XACE" != xyes; then - AC_MSG_ERROR([cannot build SELinux extension without X-ACE]) - fi - AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers])) - AC_CHECK_LIB(audit, audit_open, [], AC_MSG_ERROR([SELinux extension requires audit system library])) - PKG_CHECK_MODULES([SELINUX], $LIBSELINUX) - SELINUX_LIBS="$SELINUX_LIBS -laudit" - AC_DEFINE(XSELINUX, 1, [Build SELinux extension]) -fi - -AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes]) -if test "x$XCSECURITY" = xyes; then - if test "x$XACE" != xyes; then - AC_MSG_ERROR([cannot build Security extension without X-ACE]) - fi - AC_DEFINE(XCSECURITY, 1, [Build Security extension]) -fi - -AM_CONDITIONAL(DBE, [test "x$DBE" = xyes]) -if test "x$DBE" = xyes; then - AC_DEFINE(DBE, 1, [Support DBE extension]) - DBE_LIB='$(top_builddir)/dbe/libdbe.la' - DBE_INC='-I$(top_srcdir)/dbe' -fi - -AM_CONDITIONAL(XF86BIGFONT, [test "x$XF86BIGFONT" = xyes]) -if test "x$XF86BIGFONT" = xyes; then - AC_DEFINE(XF86BIGFONT, 1, [Support XF86 Big font extension]) - REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO" - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $BIGFONTPROTO" -fi - -AM_CONDITIONAL(DPMSExtension, [test "x$DPMSExtension" = xyes]) -if test "x$DPMSExtension" = xyes; then - AC_DEFINE(DPMSExtension, 1, [Support DPMS extension]) -fi - -AC_DEFINE(RENDER, 1, [Support RENDER extension]) -RENDER_LIB='$(top_builddir)/render/librender.la' -RENDER_INC='-I$(top_srcdir)/render' - -AC_DEFINE(RANDR, 1, [Support RANDR extension]) -RANDR_LIB='$(top_builddir)/randr/librandr.la' -RANDR_INC='-I$(top_srcdir)/randr' - -AC_DEFINE(XFIXES,1,[Support XFixes extension]) -FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la' -FIXES_INC='-I$(top_srcdir)/xfixes' - -AC_DEFINE(DAMAGE,1,[Support Damage extension]) -DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la' -DAMAGE_INC='-I$(top_srcdir)/damageext' -MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la' -MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage' - -# XINPUT extension is integral part of the server -AC_DEFINE(XINPUT, 1, [Support X Input extension]) -XI_LIB='$(top_builddir)/Xi/libXi.la' -XI_INC='-I$(top_srcdir)/Xi' - -AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes) -AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes) -AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes) - -AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) - -if test "x$XKBPATH" = "xauto"; then - XKBPATH=$(pkg-config --variable datadir xkbcomp || echo ${datadir})/X11/xkb -fi - -AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data]) -AC_ARG_WITH(xkb-bin-directory, - AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program (default: auto)]), - [XKB_BIN_DIRECTORY="$withval"], - [XKB_BIN_DIRECTORY="auto"]) - -if test "x$XKB_BIN_DIRECTORY" = "xauto"; then - XKB_BIN_DIRECTORY=$(pkg-config --variable bindir xkbcomp) - if test -z $XKB_BIN_DIRECTORY; then - XKB_BIN_DIRECTORY="$bindir" - fi -fi - -AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir]) - -dnl Make sure XKM_OUTPUT_DIR is an absolute path -XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1` -if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then - XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT" -fi - -dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed -dnl XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused - -XKBOUTPUT=`echo $XKBOUTPUT/ | $SED 's|/*$|/|'` -XKB_COMPILED_DIR=`echo $XKBOUTPUT | $SED 's|/*$||'` -AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir]) -AC_SUBST(XKB_COMPILED_DIR) - -if test "x$XKB_DFLT_RULES" = x; then - case $host_os in - linux*) - dnl doesn't take AutoAddDevices into account, but whatever. - XKB_DFLT_RULES="evdev" - ;; - *) - XKB_DFLT_RULES="base" - ;; - esac -fi -AC_DEFINE_UNQUOTED(XKB_DFLT_RULES, ["$XKB_DFLT_RULES"], [Default XKB ruleset]) -AC_DEFINE_UNQUOTED(XKB_DFLT_MODEL, ["$XKB_DFLT_MODEL"], [Default XKB model]) -AC_DEFINE_UNQUOTED(XKB_DFLT_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout]) -AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant]) -AC_DEFINE_UNQUOTED(XKB_DFLT_OPTIONS, ["$XKB_DFLT_OPTIONS"], [Default XKB options]) -AC_SUBST([XKB_DFLT_RULES]) -AC_SUBST([XKB_DFLT_MODEL]) -AC_SUBST([XKB_DFLT_LAYOUT]) -AC_SUBST([XKB_DFLT_VARIANT]) -AC_SUBST([XKB_DFLT_OPTIONS]) - -XKB_LIB='$(top_builddir)/xkb/libxkb.la' -XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' -REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" - -PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"]) -if test "x$XDMCP" = xauto; then - if test "x$have_libxdmcp" = xyes; then - XDMCP=yes - else - XDMCP=no - fi -fi -if test "x$XDMAUTH" = xauto; then - if test "x$have_libxdmcp" = xyes; then - XDMAUTH=yes - else - XDMAUTH=no - fi -fi - -AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes]) -if test "x$XDMCP" = xyes; then - AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol]) - REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" - XDMCP_MODULES="xdmcp" -fi - -AM_CONDITIONAL(XDMAUTH, [test "x$XDMAUTH" = xyes]) -if test "x$XDMAUTH" = xyes; then - AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1]) - if ! test "x$XDMCP" = xyes; then - REQUIRED_LIBS="$REQUIRED_LIBS xdmcp" - XDMCP_MODULES="xdmcp" - fi -fi - -if test "x$XF86VIDMODE" = xauto; then - PKG_CHECK_EXISTS($VIDMODEPROTO, [XF86VIDMODE=yes], [XF86VIDMODE=no]) -fi -if test "x$XF86VIDMODE" = xyes; then - AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension]) -fi -AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes]) - -AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path]) -AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path]) -AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path]) -dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` -AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path]) -AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name]) -AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor name]) -AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version]) -AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address]) - -AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string]) - -AC_SUBST([VENDOR_NAME_SHORT]) -AC_DEFINE_UNQUOTED(VENDOR_NAME, ["$VENDOR_NAME"], [Vendor name]) -AC_DEFINE_UNQUOTED(VENDOR_NAME_SHORT, ["$VENDOR_NAME_SHORT"], [Vendor name]) -AC_DEFINE_UNQUOTED(VENDOR_RELEASE, [$VENDOR_RELEASE], [Vendor release]) -AC_DEFINE_UNQUOTED(VENDOR_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version]) - -if test "x$DEBUGGING" = xyes; then - AC_DEFINE(DEBUG, 1, [Enable debugging code]) -fi -AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes]) - -AC_DEFINE(XTEST, 1, [Support XTest extension]) -AC_DEFINE(XSYNC, 1, [Support XSync extension]) -AC_DEFINE(XCMISC, 1, [Support XCMisc extension]) -AC_DEFINE(BIGREQS, 1, [Support BigRequests extension]) - -if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then - DIX_LIB='$(top_builddir)/dix/dix.O' - OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS) $(LIBUNWIND_LIBS)' -else - DIX_LIB='$(top_builddir)/dix/libdix.la' - OS_LIB='$(top_builddir)/os/libos.la' -fi -AC_SUBST([DIX_LIB]) -AC_SUBST([OS_LIB]) - -MAIN_LIB='$(top_builddir)/dix/libmain.la' -AC_SUBST([MAIN_LIB]) - -MI_LIB='$(top_builddir)/mi/libmi.la' -MI_EXT_LIB='$(top_builddir)/mi/libmiext.la' -MI_INC='-I$(top_srcdir)/mi' -FB_LIB='$(top_builddir)/fb/libfb.la' -FB_INC='-I$(top_srcdir)/fb' -MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow' -MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la' -MIEXT_SYNC_INC='-I$(top_srcdir)/miext/sync' -MIEXT_SYNC_LIB='$(top_builddir)/miext/sync/libsync.la' -CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include' - -# SHA1 hashing -AC_ARG_WITH([sha1], - [AS_HELP_STRING([--with-sha1=libc|libmd|libnettle|libgcrypt|libcrypto|libsha1|CommonCrypto|CryptoAPI], - [choose SHA1 implementation])]) -AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes]) -if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then - with_sha1=libc -fi -if test "x$with_sha1" = xlibc && test "x$HAVE_SHA1_IN_LIBC" != xyes; then - AC_MSG_ERROR([libc requested but not found]) -fi -if test "x$with_sha1" = xlibc; then - AC_DEFINE([HAVE_SHA1_IN_LIBC], [1], - [Use libc SHA1 functions]) - SHA1_LIBS="" -fi -AC_CHECK_FUNC([CC_SHA1_Init], [HAVE_SHA1_IN_COMMONCRYPTO=yes]) -if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_COMMONCRYPTO" = xyes; then - with_sha1=CommonCrypto -fi -if test "x$with_sha1" = xCommonCrypto && test "x$HAVE_SHA1_IN_COMMONCRYPTO" != xyes; then - AC_MSG_ERROR([CommonCrypto requested but not found]) -fi -if test "x$with_sha1" = xCommonCrypto; then - AC_DEFINE([HAVE_SHA1_IN_COMMONCRYPTO], [1], - [Use CommonCrypto SHA1 functions]) - SHA1_LIBS="" -fi -dnl stdcall functions cannot be tested with AC_CHECK_LIB -AC_CHECK_HEADER([wincrypt.h], [HAVE_SHA1_IN_CRYPTOAPI=yes], [], [#include <windows.h>]) -if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_CRYPTOAPI" = xyes; then - with_sha1=CryptoAPI -fi -if test "x$with_sha1" = xCryptoAPI && test "x$HAVE_SHA1_IN_CRYPTOAPI" != xyes; then - AC_MSG_ERROR([CryptoAPI requested but not found]) -fi -if test "x$with_sha1" = xCryptoAPI; then - AC_DEFINE([HAVE_SHA1_IN_CRYPTOAPI], [1], - [Use CryptoAPI SHA1 functions]) - SHA1_LIBS="" -fi -AC_CHECK_LIB([md], [SHA1Init], [HAVE_LIBMD=yes]) -if test "x$with_sha1" = x && test "x$HAVE_LIBMD" = xyes; then - with_sha1=libmd -fi -if test "x$with_sha1" = xlibmd && test "x$HAVE_LIBMD" != xyes; then - AC_MSG_ERROR([libmd requested but not found]) -fi -if test "x$with_sha1" = xlibmd; then - AC_DEFINE([HAVE_SHA1_IN_LIBMD], [1], - [Use libmd SHA1 functions]) - SHA1_LIBS=-lmd -fi -PKG_CHECK_MODULES([LIBSHA1], [libsha1], [HAVE_LIBSHA1=yes], [HAVE_LIBSHA1=no]) -if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then - with_sha1=libsha1 -fi -if test "x$with_sha1" = xlibsha1 && test "x$HAVE_LIBSHA1" != xyes; then - AC_MSG_ERROR([libsha1 requested but not found]) -fi -if test "x$with_sha1" = xlibsha1; then - AC_DEFINE([HAVE_SHA1_IN_LIBSHA1], [1], - [Use libsha1 for SHA1]) - SHA1_LIBS=-lsha1 -fi -AC_CHECK_LIB([nettle], [nettle_sha1_init], [HAVE_LIBNETTLE=yes]) -if test "x$with_sha1" = x && test "x$HAVE_LIBNETTLE" = xyes; then - with_sha1=libnettle -fi -if test "x$with_sha1" = xlibnettle && test "x$HAVE_LIBNETTLE" != xyes; then - AC_MSG_ERROR([libnettle requested but not found]) -fi -if test "x$with_sha1" = xlibnettle; then - AC_DEFINE([HAVE_SHA1_IN_LIBNETTLE], [1], - [Use libnettle SHA1 functions]) - SHA1_LIBS=-lnettle -fi -AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes]) -if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then - with_sha1=libgcrypt -fi -if test "x$with_sha1" = xlibgcrypt && test "x$HAVE_LIBGCRYPT" != xyes; then - AC_MSG_ERROR([libgcrypt requested but not found]) -fi -if test "x$with_sha1" = xlibgcrypt; then - AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1], - [Use libgcrypt SHA1 functions]) - SHA1_LIBS=-lgcrypt -fi -# We don't need all of the OpenSSL libraries, just libcrypto -AC_CHECK_LIB([crypto], [SHA1_Init], [HAVE_LIBCRYPTO=yes]) -PKG_CHECK_MODULES([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes], - [HAVE_OPENSSL_PKC=no]) -if test "x$HAVE_LIBCRYPTO" = xyes || test "x$HAVE_OPENSSL_PKC" = xyes; then - if test "x$with_sha1" = x; then - with_sha1=libcrypto - fi -else - if test "x$with_sha1" = xlibcrypto; then - AC_MSG_ERROR([OpenSSL libcrypto requested but not found]) - fi -fi -if test "x$with_sha1" = xlibcrypto; then - if test "x$HAVE_LIBCRYPTO" = xyes; then - SHA1_LIBS=-lcrypto - else - SHA1_LIBS="$OPENSSL_LIBS" - SHA1_CFLAGS="$OPENSSL_CFLAGS" - fi -fi -AC_MSG_CHECKING([for SHA1 implementation]) -if test "x$with_sha1" = x; then - AC_MSG_ERROR([No suitable SHA1 implementation found]) -fi -AC_MSG_RESULT([$with_sha1]) -AC_SUBST(SHA1_LIBS) -AC_SUBST(SHA1_CFLAGS) - -PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS]) -PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS]) - -PKG_CHECK_MODULES(LIBUNWIND, libunwind, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no]) -if test "x$LIBUNWIND" = "xauto"; then - LIBUNWIND="$HAVE_LIBUNWIND" -fi - -if test "x$LIBUNWIND" = "xyes"; then - if test "x$HAVE_LIBUNWIND" != "xyes"; then - AC_MSG_ERROR([libunwind requested but not installed.]) - fi - AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) -fi - -AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$LIBUNWIND" = xyes]) - -# Autotools has some unfortunate issues with library handling. In order to -# get a server to rebuild when a dependency in the tree is changed, it must -# be listed in SERVERNAME_DEPENDENCIES. However, no system libraries may be -# listed there, or some versions of autotools will break (especially if a -L -# is required to find the library). So, we keep two sets of libraries -# detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which -# will go into the _DEPENDENCIES and _LDADD of the server, and -# NAMESPACE_SYS_LIBS which will go into only the _LDADD. The -# NAMESPACEMODULES_LIBS detected from pkgconfig should always go in -# NAMESPACE_SYS_LIBS. -# -# XSERVER_LIBS is the set of in-tree libraries which all servers require. -# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers -# require. -# -XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}" -XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB" -XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}" -AC_SUBST([XSERVER_LIBS]) -AC_SUBST([XSERVER_SYS_LIBS]) - -UTILS_SYS_LIBS="${SYS_LIBS}" -AC_SUBST([UTILS_SYS_LIBS]) - -# The Xorg binary needs to export symbols so that they can be used from modules -# Some platforms require extra flags to do this. libtool should set the -# necessary flags for each platform when -export-dynamic is passed to it. -LD_EXPORT_SYMBOLS_FLAG="-export-dynamic" -LD_NO_UNDEFINED_FLAG= -XORG_DRIVER_LIBS= -case "$host_os" in - cygwin*) - LD_EXPORT_SYMBOLS_FLAG="-Wl,--export-all,--out-implib,lib\$@.a" - LD_NO_UNDEFINED_FLAG="-no-undefined -Wl,\$(top_builddir)/hw/xfree86/libXorg.exe.a" - XORG_DRIVER_LIBS="-lXorg.exe -L\${moduledir} -lshadow -lfb -no-undefined" - CYGWIN=yes - ;; - solaris*) - # We use AC_LINK_IFELSE to generate a temporary program conftest$EXEEXT - # that we can link against for testing if the system linker is new - # enough to support -z parent=<program> for verifying loadable modules - # are only calling functions defined in either the loading program or - # the libraries they're linked with. - AC_LINK_IFELSE( - [AC_LANG_SOURCE([int main(int argc, char **argv) { return 0; }])], - [mv conftest$EXEEXT conftest.parent - XORG_CHECK_LINKER_FLAGS([-Wl,-z,parent=conftest.parent -G], - [LD_NO_UNDEFINED_FLAG="-Wl,-z,defs -Wl,-z,parent=\$(top_builddir)/hw/xfree86/Xorg" -# Not set yet, since this gets exported in xorg-server.pc to all the drivers, -# and they're not all fixed to build correctly with it yet. -# XORG_DRIVER_LIBS="-Wl,-z,defs -Wl,-z,parent=${bindir}/Xorg" - ],[], - [AC_LANG_SOURCE([extern int main(int argc, char **argv); - int call_main(void) { return main(0, (void *)0); }])]) - rm -f conftest.parent - ]) - ;; -esac -AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) -AC_SUBST([LD_NO_UNDEFINED_FLAG]) -AC_SUBST([XORG_DRIVER_LIBS]) -AM_CONDITIONAL([CYGWIN], [test x"$CYGWIN" = xyes]) -AM_CONDITIONAL([NO_UNDEFINED], [test x"$LD_NO_UNDEFINED_FLAG" != x]) - -dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so -dnl we need to replicate that here until those can all be fixed -AC_MSG_CHECKING([if SVR4 needs to be defined]) -AC_EGREP_CPP([I_AM_SVR4],[ -#if defined(SVR4) || defined(__svr4__) || defined(__SVR4) - I_AM_SVR4 -#endif -],[ -AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4]) -AC_MSG_RESULT([yes])], AC_MSG_RESULT([no])) - -XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC $DBE_INC $PRESENT_INC" - -dnl --------------------------------------------------------------------------- -dnl DDX section. -dnl --------------------------------------------------------------------------- - -dnl Xvfb DDX - -AC_MSG_CHECKING([whether to build Xvfb DDX]) -AC_MSG_RESULT([$XVFB]) -AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes]) - -if test "x$XVFB" = xyes; then - XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB" - XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS" - AC_SUBST([XVFB_LIBS]) - AC_SUBST([XVFB_SYS_LIBS]) -fi - - -dnl Xnest DDX - -PKG_CHECK_MODULES(XNESTMODULES, [$LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no]) -AC_MSG_CHECKING([whether to build Xnest DDX]) -if test "x$XNEST" = xauto; then - XNEST="$have_xnest" -fi -AC_MSG_RESULT([$XNEST]) -AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) - -if test "x$XNEST" = xyes; then - if test "x$have_xnest" = xno; then - AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.]) - fi - XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $RENDER_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB" - XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS" - AC_SUBST([XNEST_LIBS]) - AC_SUBST([XNEST_SYS_LIBS]) -fi - - -dnl Xorg DDX - -AC_MSG_CHECKING([whether to build Xorg DDX]) -if test "x$XORG" = xauto; then - XORG="yes" - case $host_os in - cygwin*) XORG="no" ;; - mingw*) XORG="no" ;; - darwin*) XORG="no" ;; - esac -fi -AC_MSG_RESULT([$XORG]) - -if test "x$XORG" = xyes; then - PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT) - - XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' - XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' - XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" - XORG_CFLAGS="$XORGSERVER_CFLAGS $LIBXCVT_CFLAGS -DHAVE_XORG_CONFIG_H" - XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB" - XORG_SYS_LIBS="$XORG_SYS_LIBS $LIBXCVT_LIBS" - - dnl ================================================================== - dnl symbol visibility - symbol_visibility= - have_visibility=disabled - if test x$SYMBOL_VISIBILITY != xno; then - AC_MSG_CHECKING(for symbol visibility support) - if test x$GCC = xyes; then - VISIBILITY_CFLAGS="-fvisibility=hidden" - else - if test x$SUNCC = xyes; then - VISIBILITY_CFLAGS="-xldscope=hidden" - else - have_visibility=no - fi - fi - if test x$have_visibility != xno; then - save_CFLAGS="$CFLAGS" - proto_inc=`$PKG_CONFIG --cflags xproto` - CFLAGS="$CFLAGS $VISIBILITY_CFLAGS $proto_inc" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ - [#include <X11/Xfuncproto.h> - extern _X_HIDDEN int hidden_int; - extern _X_EXPORT int public_int; - extern _X_HIDDEN int hidden_int_func(void); - extern _X_EXPORT int public_int_func(void);]], - [])], - have_visibility=yes, - have_visibility=no) - CFLAGS=$save_CFLAGS - fi - AC_MSG_RESULT([$have_visibility]) - if test x$have_visibility != xno; then - symbol_visibility=$VISIBILITY_CFLAGS - XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS" - XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS" - fi - fi - dnl added to xorg-server.pc - AC_SUBST([symbol_visibility]) - dnl =================================================================== - - dnl =================================================================== - dnl ================= beginning of PCI configuration ================== - dnl =================================================================== - xorg_bus_bsdpci=no - xorg_bus_sparc=no - - AC_MSG_CHECKING([whether to build Xorg PCI functions]) - if test "x$PCI" = xyes; then - PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS) - SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS" - XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $LIBDRM_LIBS" - XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS $LIBDRM_CFLAGS" - - AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation]) - AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path]) - case $host_os in - gnu* | freebsd* | kfreebsd*-gnu | netbsd* | openbsd* | solaris* | dragonfly*) - xorg_bus_bsdpci="yes" - ;; - esac - case $host_cpu in - sparc*) - xorg_bus_sparc="yes" - ;; - esac - else - if test "x$CONFIG_UDEV_KMS" = xyes; then - AC_MSG_ERROR([Platform device enumeration requires libpciaccess]) - fi - if test "x$INT10MODULE" = xyes && test "x$INT10" != xstub; then - AC_MSG_ERROR([Cannot build int10 without libpciaccess]) - fi - fi - AC_MSG_RESULT([$PCI]) - - if test "x$CONFIG_UDEV_KMS" = xyes; then - AC_DEFINE(XSERVER_PLATFORM_BUS, 1, [X server supports platform device enumeration]) - fi - AC_MSG_RESULT([$XSERVER_PLATFORM_BUS]) - dnl =================================================================== - dnl ==================== end of PCI configuration ===================== - dnl =================================================================== - - case $host_os in - linux*) - XORG_OS_SUBDIR="linux" - linux_acpi="no" - case $host_cpu in - i*86|amd64*|x86_64*|ia64*) - linux_acpi=$enable_linux_acpi - ;; - *) - ;; - esac - dnl APM header - AC_CHECK_HEADERS([linux/apm_bios.h], [linux_apm=$enable_linux_apm]) - ;; - freebsd* | kfreebsd*-gnu | dragonfly*) - XORG_OS_SUBDIR="bsd" - ;; - netbsd*) - XORG_OS_SUBDIR="bsd" - ;; - openbsd*) - XORG_OS_SUBDIR="bsd" - ;; - solaris*) - XORG_OS_SUBDIR="solaris" - AC_CHECK_HEADERS([sys/kd.h]) - AC_CHECK_HEADERS([sys/vt.h], [solaris_vt=yes], [solaris_vt=no]) - # Check for minimum supported release - AC_MSG_CHECKING([Solaris version]) - OS_MINOR=`echo ${host_os}|$SED -e 's/^.*solaris2\.//' -e s'/\..*$//'` - if test "${OS_MINOR}" -ge 7 ; then - AC_MSG_RESULT(Solaris ${OS_MINOR}) - else - AC_MSG_RESULT(Solaris `echo ${host_os}|$SED -e 's/^.*solaris//`) - fi - if test "${OS_MINOR}" -lt 8 ; then - AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.]) - fi - AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"]) - - case $host_cpu in - sparc*) - SOLARIS_INOUT_ARCH="sparcv8plus" - ;; - i*86|x86_64*) - if test x$SOLARIS_64 = xyes ; then - SOLARIS_INOUT_ARCH="amd64" - else - SOLARIS_INOUT_ARCH="ia32" - fi - ;; - *) - AC_MSG_ERROR([Unsupported Solaris platform. Only SPARC & x86 \ - are supported on Solaris in this release. If you are \ - interested in porting Xorg to your platform, please email \ - xorg@lists.freedesktop.org.]) ;; - esac - AC_SUBST([SOLARIS_INOUT_ARCH]) - ;; - gnu*) - XORG_OS_SUBDIR="hurd" - ;; - cygwin*) - XORG_OS_SUBDIR="stub" - ;; - *) - XORG_OS_SUBDIR="stub" - AC_MSG_NOTICE([m4_text_wrap(m4_join([ ], - [Your OS is unknown.], - [If you are interested in porting Xorg to your platform,], - [please email xorg@lists.freedesktop.org.]))]) - ;; - esac - - if test "x$DGA" = xauto; then - PKG_CHECK_MODULES(DGA, $DGAPROTO, [DGA=yes], [DGA=no]) - fi - if test "x$DGA" = xyes; then - XORG_MODULES="$XORG_MODULES $DGAPROTO" - PKG_CHECK_MODULES(DGA, $DGAPROTO) - AC_DEFINE(DGA, 1, [Support DGA extension]) - AC_DEFINE(XFreeXDGA, 1, [Build XDGA support]) - fi - - if test "x$XF86VIDMODE" = xyes; then - XORG_MODULES="$XORG_MODULES $VIDMODEPROTO" - fi - - if test -n "$XORG_MODULES"; then - PKG_CHECK_MODULES(XORG_MODULES, [$XORG_MODULES]) - XORG_CFLAGS="$XORG_CFLAGS $XORG_MODULES_CFLAGS" - XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS" - fi - - if test "x$DRM" = xyes -a "x$DRI2" = xyes; then - XORG_DRIVER_MODESETTING=yes - fi - - AC_SUBST([XORG_LIBS]) - AC_SUBST([XORG_SYS_LIBS]) - AC_SUBST([XORG_INCS]) - AC_SUBST([XORG_OS_SUBDIR]) - AC_SUBST([XORG_CFLAGS]) - - dnl these only go in xorg-config.h - XF86CONFIGFILE="xorg.conf" - XF86CONFIGDIR="xorg.conf.d" - AC_SUBST(XF86CONFIGDIR) - LOGPREFIX="Xorg." - XDG_DATA_HOME=".local/share" - XDG_DATA_HOME_LOGDIR="xorg" - AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) - AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) - AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) - AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) - AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) - AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) - AC_DEFINE_DIR(XCONFIGFILE, XF86CONFIGFILE, [Name of configuration file]) - AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file]) - AC_DEFINE_DIR(XCONFIGDIR, XF86CONFIGDIR, [Name of configuration directory]) - AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path]) - AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path]) - AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location]) - AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default logfile prefix]) - AC_DEFINE_DIR(DEFAULT_XDG_DATA_HOME, XDG_DATA_HOME, [Default XDG_DATA dir under HOME]) - AC_DEFINE_DIR(DEFAULT_XDG_DATA_HOME_LOGDIR, XDG_DATA_HOME_LOGDIR, [Default log dir under XDG_DATA_HOME]) - AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support]) - if test "x$VGAHW" = xyes; then - AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module]) - fi - - driverdir="$moduledir/drivers" - AC_SUBST([moduledir]) - AC_SUBST([driverdir]) - sdkdir="$includedir/xorg" - extdir="$includedir/X11/extensions" - sysconfigdir="$datadir/X11/$XF86CONFIGDIR" - AC_SUBST([sdkdir]) - AC_SUBST([extdir]) - AC_SUBST([sysconfigdir]) - AC_SUBST([logdir]) - - # stuff the ABI versions into the pc file too - extract_abi() { - grep ^.define.*${1}_VERSION ${srcdir}/hw/xfree86/common/xf86Module.h | tr '(),' ' .' | awk '{ print $4$5 }' - } - abi_ansic=`extract_abi ANSIC` - abi_videodrv=`extract_abi VIDEODRV` - abi_xinput=`extract_abi XINPUT` - abi_extension=`extract_abi EXTENSION` - AC_SUBST([abi_ansic]) - AC_SUBST([abi_videodrv]) - AC_SUBST([abi_xinput]) - AC_SUBST([abi_extension]) -fi -AM_CONDITIONAL([XORG], [test "x$XORG" = xyes]) -AM_CONDITIONAL([XORG_BUS_PCI], [test "x$PCI" = xyes]) -AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes]) -AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes]) -AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes]) -AM_CONDITIONAL([LNXAPM], [test "x$linux_apm" = xyes]) -AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes]) -AM_CONDITIONAL([DGA], [test "x$DGA" = xyes]) -AM_CONDITIONAL([XORG_BUS_PLATFORM], [test "x$CONFIG_UDEV_KMS" = xyes]) -AM_CONDITIONAL([XORG_DRIVER_MODESETTING], [test "x$XORG_DRIVER_MODESETTING" = xyes]) -AM_CONDITIONAL([XORG_DRIVER_INPUT_INPUTTEST], [test "x$XORG_DRIVER_INPUT_INPUTTEST" = xyes]) - -dnl glamor -if test "x$GLAMOR" = xauto; then - if echo "$XORG" "$XEPHYR" "$XWAYLAND" | grep -q yes ; then - GLAMOR=yes - fi -fi - -AM_CONDITIONAL([GLAMOR], [test "x$GLAMOR" = xyes]) - -if test "x$GLAMOR" = xyes; then - AC_DEFINE(GLAMOR, 1, [Build glamor]) - PKG_CHECK_MODULES([GLAMOR], [epoxy]) - - PKG_CHECK_EXISTS(epoxy >= 1.4.4, - [AC_DEFINE(GLAMOR_HAS_EGL_QUERY_DMABUF, 1, [Have GLAMOR_HAS_EGL_QUERY_DMABUF])], - []) - - PKG_CHECK_EXISTS(epoxy >= 1.5.4, - [AC_DEFINE(GLAMOR_HAS_EGL_QUERY_DRIVER, 1, [Have GLAMOR_HAS_EGL_QUERY_DRIVER])], - []) - - PKG_CHECK_MODULES(GBM, "$LIBGBM", [GBM=yes], [GBM=no]) - if test "x$GBM" = xyes; then - AC_DEFINE(GLAMOR_HAS_GBM, 1, - [Build glamor with GBM-based EGL support]) - AC_CHECK_DECL(GBM_BO_USE_LINEAR, - [AC_DEFINE(GLAMOR_HAS_GBM_LINEAR, 1, [Have GBM_BO_USE_LINEAR])], [], - [#include <stdlib.h> - #include <gbm.h>]) - dnl 17.1.0 is required for gbm_bo_create_with_modifiers - PKG_CHECK_EXISTS(gbm >= 17.1.0, - [AC_DEFINE(GBM_BO_WITH_MODIFIERS, 1, [Have gbm_bo_create_with_modifiers])], - []) - dnl 21.1.0 is required for gbm_bo_get_fd_for_plane - PKG_CHECK_EXISTS(gbm >= 21.1.0, - [AC_DEFINE(GBM_BO_FD_FOR_PLANE, 1, [Have gbm_bo_get_fd_for_plane])], - []) - else - if test "x$XORG" = xyes; then - AC_MSG_ERROR([Glamor for Xorg requires $LIBGBM]) - fi - fi -fi -AM_CONDITIONAL([GLAMOR_EGL], [test "x$GBM" = xyes]) - -dnl XWin DDX - -AC_MSG_CHECKING([whether to build XWin DDX]) -if test "x$XWIN" = xauto; then - case $host_os in - cygwin*) XWIN="yes" ;; - mingw*) XWIN="yes" ;; - *) XWIN="no" ;; - esac -fi -AC_MSG_RESULT([$XWIN]) - -if test "x$XWIN" = xyes; then - AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location]) - AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) - AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support]) - AC_CHECK_TOOL(WINDRES, windres) - - PKG_CHECK_MODULES([XWINMODULES],[xcb-aux xcb-composite xcb-image xcb-ewmh xcb-icccm xcb-xfixes]) - - if test "x$WINDOWSDRI" = xauto; then - PKG_CHECK_EXISTS([windowsdriproto], [WINDOWSDRI=yes], [WINDOWSDRI=no]) - fi - if test "x$WINDOWSDRI" = xyes ; then - PKG_CHECK_MODULES(WINDOWSDRI, [windowsdriproto]) - fi - - case $host_os in - cygwin*) - XWIN_SERVER_NAME=XWin - AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages]) - ;; - mingw*) - XWIN_SERVER_NAME=Xming - AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location]) - AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets]) - XWIN_SYS_LIBS="-lpthread -lws2_32" - ;; - esac - - XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB" - XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS" - AC_SUBST(XWIN_LIBS) - AC_SUBST(XWIN_SERVER_NAME) - AC_SUBST(XWIN_SYS_LIBS) - - if test "x$DEBUGGING" = xyes; then - AC_DEFINE(CYGDEBUG, 1, [Simple debug messages]) - AC_DEFINE(CYGWINDOWING_DEBUG, 1, [Debug messages for window handling]) - AC_DEFINE(CYGMULTIWINDOW_DEBUG, 1, [Debug window manager]) - fi - - AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF]) - AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ]) - -dnl XWin requires OpenGL spec files in order to generate wrapper code for native GL functions - if [test "x$XWIN" = xyes && test "x$GLX" = xyes] ; then - AC_CHECK_PROG(PYTHON3, python3, python3) - if test -z "$PYTHON3"; then - AC_MSG_ERROR([python3 not found]) - fi - AC_MSG_CHECKING(for python module lxml) - $PYTHON3 -c "import lxml;" - if test $? -ne 0 ; then - AC_MSG_ERROR([not found]) - fi - AC_MSG_RESULT(yes) - if test "x$KHRONOS_SPEC_DIR" = "xauto" ; then - PKG_CHECK_MODULES([KHRONOS_OPENGL_REGISTRY], [khronos-opengl-registry]) - KHRONOS_SPEC_DIR=`pkg-config khronos-opengl-registry --variable=specdir` - fi - AC_SUBST(KHRONOS_SPEC_DIR) - fi - -fi -AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes]) -AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && test "x$GLX" = xyes]) -AM_CONDITIONAL(XWIN_WINDOWS_DRI, [test "x$XWIN" = xyes && test "x$WINDOWSDRI" = xyes]) - -dnl Darwin / OS X DDX -if test "x$XQUARTZ" = xyes; then - AC_DEFINE(XQUARTZ,1,[Have Quartz]) - AC_DEFINE(ROOTLESS,1,[Build Rootless code]) - - XQUARTZ_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB $PRESENT_LIB" - AC_SUBST([XQUARTZ_LIBS]) - - AC_CHECK_LIB([Xplugin],[xp_init],[:]) - - CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA" - - PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11) - - if test "x$XQUARTZ_SPARKLE" = xyes ; then - AC_DEFINE(XQUARTZ_SPARKLE,1,[Support application updating through sparkle.]) - fi - - if test "x$STANDALONE_XPBPROXY" = xyes ; then - AC_DEFINE(STANDALONE_XPBPROXY,1,[Build a standalone xpbproxy]) - fi -fi - -AM_CONDITIONAL(PSEUDORAMIX, [test "x$XQUARTZ" = xyes -o "x$XWIN" = xyes ]) - -# Support for objc in autotools is minimal and not documented. -OBJC='$(CC)' -OBJCLD='$(CCLD)' -OBJCLINK='$(LINK)' -OBJCFLAGS='$(CFLAGS)' -AC_SUBST([OBJC]) -AC_SUBST([OBJCCLD]) -AC_SUBST([OBJCLINK]) -AC_SUBST([OBJCFLAGS]) -# internal, undocumented automake func follows :( -_AM_DEPENDENCIES([OBJC]) -AM_CONDITIONAL(XQUARTZ, [test "x$XQUARTZ" = xyes]) -AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"]) -AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes]) - -dnl kdrive DDX - -XEPHYR_LIBS= -XEPHYR_INCS= - -AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes]) - -if test "$KDRIVE" = yes; then - XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb" - if test "x$XV" = xyes; then - XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv" - fi - if test "x$DRI" = xyes && test "x$GLX" = xyes; then - XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBDRM xcb-glx xcb-xf86dri > 1.6" - fi - - if test "x$XEPHYR" = xauto; then - PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [XEPHYR="yes"], [XEPHYR="no"]) - elif test "x$XEPHYR" = xyes ; then - PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS) - fi - - # Xephyr needs nanosleep() which is in librt on Solaris - AC_CHECK_FUNC([nanosleep], [], - AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt")) - - # damage shadow extension glx (NOTYET) fb mi - KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src' - KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC" - KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux' - KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC" - - KDRIVE_CFLAGS="$XSERVER_CFLAGS" - - KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB" - KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la' - KDRIVE_MAIN_LIB="$MAIN_LIB" - KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB" - KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS" - - AC_SUBST([XEPHYR_LIBS]) - AC_SUBST([XEPHYR_INCS]) -fi -AC_SUBST([KDRIVE_INCS]) -AC_SUBST([KDRIVE_PURE_INCS]) -AC_SUBST([KDRIVE_CFLAGS]) -AC_SUBST([KDRIVE_PURE_LIBS]) -AC_SUBST([KDRIVE_MAIN_LIB]) -AC_SUBST([KDRIVE_LOCAL_LIBS]) -AC_SUBST([KDRIVE_LIBS]) -AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes]) - -dnl Xwayland DDX - -XWAYLANDMODULES="wayland-client >= 1.5.0 wayland-protocols >= 1.18" -if test "x$XF86VIDMODE" = xyes; then - XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO" -fi -if test "x$DRM" = xyes; then - XWAYLANDMODULES="$XWAYLANDMODULES $LIBDRM" -fi -if test "x$GLAMOR" = xyes; then - XWAYLANDMODULES="$XWAYLANDMODULES epoxy" -fi -PKG_CHECK_MODULES(XWAYLANDMODULES, [$XWAYLANDMODULES], [have_xwayland=yes], [have_xwayland=no]) -AC_MSG_CHECKING([whether to build Xwayland DDX]) -if test "x$XWAYLAND" = xauto; then - XWAYLAND="$have_xwayland" -fi -AC_MSG_RESULT([$XWAYLAND]) -AM_CONDITIONAL(XWAYLAND, [test "x$XWAYLAND" = xyes]) - -if test "x$XWAYLAND" = xyes; then - if test "x$have_xwayland" = xno; then - AC_MSG_ERROR([Xwayland build explicitly requested, but required modules not found.]) - fi - - if test "x$GLAMOR" = xyes && test "x$GBM" = xyes; then - AC_DEFINE(XWL_HAS_GLAMOR, 1, - [Build xwayland with glamor support]) - AC_SUBST(have_glamor, "true") - else - AC_SUBST(have_glamor, "false") - fi - - PKG_CHECK_MODULES(WAYLAND_EGLSTREAM, [wayland-eglstream-protocols >= 1.0.2], [have_wl_eglstream=yes], [have_wl_eglstream=no]) - - if test "x$XWAYLAND_EGLSTREAM" = xauto; then - if test "x$have_wl_eglstream" = xyes && test "x$GLAMOR" = xyes; then - XWAYLAND_EGLSTREAM=yes - fi - fi - - if test "x$XWAYLAND_EGLSTREAM" = xyes; then - if test "x$GLAMOR" != xyes; then - AC_MSG_ERROR([Xwayland eglstream support explicitly requested, but required modules not found.]) - fi - - if test "x$have_wl_eglstream" = xno; then - AC_MSG_ERROR([Xwayland eglstream support requires wayland-eglstream-protocols >= 1.0.2]) - fi - - AC_SUBST(WAYLAND_EGLSTREAM_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-eglstream-protocols`) - AC_DEFINE(XWL_HAS_EGLSTREAM, 1, - [Build xwayland with eglstream support]) - AC_SUBST(have_eglstream, "true") - else - AC_SUBST(have_eglstream, "false") - fi - - PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT) - - XWAYLAND_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB" - XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS $LIBXCVT_LIBS" - AC_SUBST([XWAYLAND_LIBS]) - AC_SUBST([XWAYLAND_SYS_LIBS]) - - if test "x$MONOTONIC_CLOCK" != xyes; then - AC_MSG_ERROR([Xwayland requires CLOCK_MONOTONIC support.]) - fi - - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - if test "x$WAYLAND_SCANNER" = x; then - PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) - AC_SUBST(WAYLAND_SCANNER, `$PKG_CONFIG --variable=wayland_scanner wayland-scanner`) - fi - - PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner >= 1.14.91], - AC_SUBST(SCANNER_ARG, 'private-code'), - AC_SUBST(SCANNER_ARG, 'code')) - - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) - - AC_SUBST(xwayland_path) - -fi -AM_CONDITIONAL(XWAYLAND_EGLSTREAM, [test "x$XWAYLAND_EGLSTREAM" = "xyes"]) - - -dnl and the rest of these are generic, so they're in config.h -dnl -dnl though, thanks to the passing of some significant amount of time, the -dnl above is probably a complete fallacy, and you should not rely on it. -dnl but this is still actually better than imake, honest. -daniels - -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include <features.h> -#ifndef __GLIBC__ -#error not glibc -#endif -]], [])], [AC_DEFINE(_GNU_SOURCE, 1, - [ Enable GNU and other extensions to the C environment for glibc])]) - -AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix]) -AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [sysconfdir]) - -AC_SUBST([RELEASE_DATE]) - -DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS" - -AC_SUBST([DIX_CFLAGS]) - -AC_SUBST([libdir]) -AC_SUBST([exec_prefix]) -AC_SUBST([prefix]) - -AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/sdksyms.dep]) - -if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then - AC_MSG_WARN([ - *********************************************** - Neither HAL nor udev backend will be enabled. - Input device hotplugging will not be available! - ***********************************************]) -fi - -AC_CONFIG_FILES([ -Makefile -glx/Makefile -include/Makefile -composite/Makefile -damageext/Makefile -dbe/Makefile -dix/Makefile -doc/Makefile -doc/dtrace/Makefile -man/Makefile -fb/Makefile -glamor/Makefile -record/Makefile -config/Makefile -mi/Makefile -miext/Makefile -miext/sync/Makefile -miext/damage/Makefile -miext/shadow/Makefile -miext/rootless/Makefile -os/Makefile -pseudoramiX/Makefile -randr/Makefile -render/Makefile -xkb/Makefile -Xext/Makefile -Xi/Makefile -xfixes/Makefile -exa/Makefile -dri3/Makefile -present/Makefile -hw/Makefile -hw/xfree86/Makefile -hw/xfree86/Xorg.sh -hw/xfree86/common/Makefile -hw/xfree86/ddc/Makefile -hw/xfree86/dixmods/Makefile -hw/xfree86/doc/Makefile -hw/xfree86/dri/Makefile -hw/xfree86/dri2/Makefile -hw/xfree86/dri2/pci_ids/Makefile -hw/xfree86/drivers/Makefile -hw/xfree86/drivers/inputtest/Makefile -hw/xfree86/drivers/modesetting/Makefile -hw/xfree86/exa/Makefile -hw/xfree86/exa/man/Makefile -hw/xfree86/fbdevhw/Makefile -hw/xfree86/fbdevhw/man/Makefile -hw/xfree86/glamor_egl/Makefile -hw/xfree86/i2c/Makefile -hw/xfree86/int10/Makefile -hw/xfree86/loader/Makefile -hw/xfree86/man/Makefile -hw/xfree86/modes/Makefile -hw/xfree86/os-support/Makefile -hw/xfree86/os-support/bsd/Makefile -hw/xfree86/os-support/bus/Makefile -hw/xfree86/os-support/hurd/Makefile -hw/xfree86/os-support/misc/Makefile -hw/xfree86/os-support/linux/Makefile -hw/xfree86/os-support/solaris/Makefile -hw/xfree86/os-support/stub/Makefile -hw/xfree86/parser/Makefile -hw/xfree86/ramdac/Makefile -hw/xfree86/shadowfb/Makefile -hw/xfree86/vgahw/Makefile -hw/xfree86/x86emu/Makefile -hw/xfree86/xkb/Makefile -hw/xfree86/utils/Makefile -hw/xfree86/utils/man/Makefile -hw/xfree86/utils/gtf/Makefile -hw/vfb/Makefile -hw/vfb/man/Makefile -hw/xnest/Makefile -hw/xnest/man/Makefile -hw/xwin/Makefile -hw/xwin/dri/Makefile -hw/xwin/glx/Makefile -hw/xwin/man/Makefile -hw/xwin/winclipboard/Makefile -hw/xquartz/Makefile -hw/xquartz/GL/Makefile -hw/xquartz/bundle/Makefile -hw/xquartz/man/Makefile -hw/xquartz/mach-startup/Makefile -hw/xquartz/pbproxy/Makefile -hw/xquartz/xpr/Makefile -hw/kdrive/Makefile -hw/kdrive/ephyr/Makefile -hw/kdrive/ephyr/man/Makefile -hw/kdrive/src/Makefile -hw/xwayland/Makefile -hw/xwayland/man/Makefile -hw/xwayland/xwayland.pc -test/Makefile -xserver.ent -xorg-server.pc -]) -AC_OUTPUT diff --git a/damageext/Makefile.am b/damageext/Makefile.am deleted file mode 100644 index 4d4cf4478..000000000 --- a/damageext/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -noinst_LTLIBRARIES = libdamageext.la - -AM_CFLAGS = $(DIX_CFLAGS) - -libdamageext_la_SOURCES = \ - damageext.c \ - damageextint.h diff --git a/dbe/Makefile.am b/dbe/Makefile.am deleted file mode 100644 index 7d034c7f7..000000000 --- a/dbe/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -noinst_LTLIBRARIES = libdbe.la - -AM_CFLAGS = $(DIX_CFLAGS) - -if XORG -sdk_HEADERS = dbestruct.h -endif - -libdbe_la_SOURCES = \ - dbe.c \ - midbe.c \ - midbe.h diff --git a/devbook.am b/devbook.am deleted file mode 100644 index edddc863d..000000000 --- a/devbook.am +++ /dev/null @@ -1,57 +0,0 @@ -# -# Generate output formats for a single DocBook/XML with/without chapters -# -# Variables set by the calling Makefile: -# noinst_DATA: developers docs are not installed -# docbook: the main DocBook/XML file, no chapters, appendix or image files -# chapters: all files pulled in by an XInclude statement and images. -# - -# -# This makefile is intended for Developers Documentation and is not installed. -# Do not use for Users docs or Specs which need to be installed and require olink support -# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 -# for an explanation on documents classification. -# - -# Developers documnetation is not installed -noinst_DATA = - -# DocBook/XML file with chapters, appendix and images it includes -dist_noinst_DATA = $(docbook) $(chapters) - -FILTER_XMLTO=$(SHELL) $(top_srcdir)/doc/filter-xmlto.sh $(XMLTO) - -if HAVE_STYLESHEETS - -XMLTO_HTML_FLAGS = \ - --searchpath "$(XORG_SGML_PATH)/X11" \ - --searchpath "$(abs_top_builddir)" \ - -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl - -noinst_DATA += $(docbook:.xml=.html) -%.html: %.xml $(chapters) - $(AM_V_GEN)$(FILTER_XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< - -if HAVE_XMLTO_TEXT -noinst_DATA += $(docbook:.xml=.txt) -%.txt: %.xml $(chapters) - $(AM_V_GEN)$(FILTER_XMLTO) $(XMLTO_HTML_FLAGS) txt $< -endif HAVE_XMLTO_TEXT - -if HAVE_FOP -XMLTO_FO_FLAGS = \ - --searchpath "$(XORG_SGML_PATH)/X11" \ - --searchpath "$(abs_top_builddir)" \ - --stringparam img.src.path=$(abs_builddir)/ \ - -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl - -noinst_DATA += $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -%.pdf: %.xml $(chapters) - $(AM_V_GEN)$(FILTER_XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< -%.ps: %.xml $(chapters) - $(AM_V_GEN)$(FILTER_XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< -endif HAVE_FOP -endif HAVE_STYLESHEETS - -CLEANFILES = $(noinst_DATA) diff --git a/dix/Makefile.am b/dix/Makefile.am deleted file mode 100644 index e1498cd56..000000000 --- a/dix/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -noinst_LTLIBRARIES = libdix.la libmain.la - -AM_CPPFLAGS = -I$(top_srcdir)/include -AM_CFLAGS = $(DIX_CFLAGS) - -libmain_la_SOURCES = \ - stubmain.c - -libdix_la_SOURCES = \ - atom.c \ - colormap.c \ - cursor.c \ - devices.c \ - dispatch.c \ - dispatch.h \ - dixfonts.c \ - main.c \ - dixutils.c \ - enterleave.c \ - enterleave.h \ - events.c \ - eventconvert.c \ - extension.c \ - gc.c \ - getevents.c \ - gestures.c \ - globals.c \ - glyphcurs.c \ - grabs.c \ - initatoms.c \ - inpututils.c \ - pixmap.c \ - privates.c \ - property.c \ - ptrveloc.c \ - region.c \ - registry.c \ - resource.c \ - selection.c \ - swaprep.c \ - swapreq.c \ - tables.c \ - touch.c \ - window.c - -EXTRA_DIST = buildatoms BuiltInAtoms - -# Install list of protocol names -miscconfigdir = $(SERVER_MISC_CONFIG_PATH) -dist_miscconfig_DATA = protocol.txt - -if SPECIAL_DTRACE_OBJECTS -# Generate dtrace object code for probes in libdix -dtrace-dix.o: $(top_srcdir)/include/Xserver.d libdix.la - $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/include/Xserver.d $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) - -noinst_PROGRAMS = dix.O - -dix_O_SOURCES = -dix.O: dtrace-dix.o libdix.la - $(AM_V_GEN)ld -r -o $@ $(am_libdix_la_OBJECTS:%.lo=.libs/%.o) -endif diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index b305f4db7..000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -SUBDIRS = dtrace - -if ENABLE_DEVEL_DOCS -if HAVE_XMLTO - -# Main DocBook/XML files (DOCTYPE book) -docbook = Xserver-spec.xml Xinput.xml - -# Generate DocBook/XML output formats with or without stylesheets -include $(top_srcdir)/devbook.am - -endif HAVE_XMLTO -endif ENABLE_DEVEL_DOCS - -EXTRA_DIST = smartsched filter-xmlto.sh diff --git a/doc/dtrace/Makefile.am b/doc/dtrace/Makefile.am deleted file mode 100644 index df26d2b9e..000000000 --- a/doc/dtrace/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ - -if ENABLE_DOCS -if XSERVER_DTRACE - -# Main DocBook/XML files (DOCTYPE book) -docbook = Xserver-DTrace.xml - -# The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir) - -# Generate DocBook/XML output formats with or without stylesheets -include $(top_srcdir)/docbook.am - -endif XSERVER_DTRACE -endif ENABLE_DOCS diff --git a/docbook.am b/docbook.am deleted file mode 100644 index bba4d5453..000000000 --- a/docbook.am +++ /dev/null @@ -1,105 +0,0 @@ -# -# Generate output formats for a single DocBook/XML with/without chapters -# -# Variables set by the calling Makefile: -# shelfdir: the location where the docs/specs are installed. Typically $(docdir) -# docbook: the main DocBook/XML file, no chapters, appendix or image files -# chapters: all files pulled in by an XInclude statement and images. -# - -# -# This makefile is intended for Users Documentation and Functional Specifications. -# Do not use for Developer Documentation which is not installed and does not require olink. -# Refer to http://www.x.org/releases/X11R7.6/doc/xorg-docs/ReleaseNotes.html#id2584393 -# for an explanation on documents classification. -# - -# DocBook/XML generated output formats to be installed -shelf_DATA = - -# DocBook/XML file with chapters, appendix and images it includes -dist_shelf_DATA = $(docbook) $(chapters) - -if HAVE_XMLTO -if HAVE_STYLESHEETS - -XMLTO_SEARCHPATH_FLAGS = \ - --searchpath "$(XORG_SGML_PATH)/X11" \ - --searchpath "$(abs_top_builddir)" -XMLTO_HTML_OLINK_FLAGS = \ - --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.html.xml \ - --stringparam current.docid="$(<:.xml=)" -XMLTO_HTML_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl -XMLTO_HTML_FLAGS = \ - $(XMLTO_SEARCHPATH_FLAGS) \ - $(XMLTO_HTML_STYLESHEET_FLAGS) \ - $(XMLTO_HTML_OLINK_FLAGS) - -shelf_DATA += $(docbook:.xml=.html) -%.html: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) xhtml-nochunks $< - -if HAVE_XMLTO_TEXT - -shelf_DATA += $(docbook:.xml=.txt) -%.txt: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_HTML_FLAGS) txt $< -endif HAVE_XMLTO_TEXT - -if HAVE_FOP -XMLTO_FO_IMAGEPATH_FLAGS = --stringparam img.src.path=$(abs_builddir)/ -XMLTO_PDF_OLINK_FLAGS = \ - --stringparam target.database.document=$(XORG_SGML_PATH)/X11/dbs/masterdb.pdf.xml \ - --stringparam current.docid="$(<:.xml=)" -XMLTO_FO_STYLESHEET_FLAGS = -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl - -XMLTO_FO_FLAGS = \ - $(XMLTO_SEARCHPATH_FLAGS) \ - $(XMLTO_FO_STYLESHEET_FLAGS) \ - $(XMLTO_FO_IMAGEPATH_FLAGS) \ - $(XMLTO_PDF_OLINK_FLAGS) - -shelf_DATA += $(docbook:.xml=.pdf) -%.pdf: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop pdf $< - -shelf_DATA += $(docbook:.xml=.ps) -%.ps: %.xml $(chapters) - $(AM_V_GEN)$(XMLTO) $(XMLTO_FO_FLAGS) --with-fop ps $< -endif HAVE_FOP - -# Generate documents cross-reference target databases -if HAVE_XSLTPROC - -XSLT_SEARCHPATH_FLAGS = \ - --path "$(XORG_SGML_PATH)/X11" \ - --path "$(abs_top_builddir)" -XSLT_OLINK_FLAGS = \ - --stringparam targets.filename "$@" \ - --stringparam collect.xref.targets "only" \ - --stringparam olink.base.uri "$(@:.db=)" - -XSLT_HTML_FLAGS = \ - $(XSLT_SEARCHPATH_FLAGS) \ - $(XSLT_OLINK_FLAGS) \ - --nonet --xinclude \ - $(STYLESHEET_SRCDIR)/xorg-xhtml.xsl -XSLT_PDF_FLAGS = \ - $(XSLT_SEARCHPATH_FLAGS) \ - $(XSLT_OLINK_FLAGS) \ - --nonet --xinclude \ - $(STYLESHEET_SRCDIR)/xorg-fo.xsl - -shelf_DATA += $(docbook:.xml=.html.db) -%.html.db: %.xml $(chapters) - $(AM_V_GEN)$(XSLTPROC) $(XSLT_HTML_FLAGS) $< - -shelf_DATA += $(docbook:.xml=.pdf.db) -%.pdf.db: %.xml $(chapters) - $(AM_V_GEN)$(XSLTPROC) $(XSLT_PDF_FLAGS) $< - -endif HAVE_XSLTPROC -endif HAVE_STYLESHEETS -endif HAVE_XMLTO - -CLEANFILES = $(shelf_DATA) diff --git a/dri3/Makefile.am b/dri3/Makefile.am deleted file mode 100644 index 32b694f68..000000000 --- a/dri3/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -noinst_LTLIBRARIES = libdri3.la -AM_CFLAGS = \ - @DIX_CFLAGS@ \ - @LIBDRM_CFLAGS@ - -libdri3_la_SOURCES = \ - dri3.h \ - dri3_priv.h \ - dri3.c \ - dri3_request.c \ - dri3_screen.c - -sdk_HEADERS = dri3.h diff --git a/exa/Makefile.am b/exa/Makefile.am deleted file mode 100644 index 00b28b1e4..000000000 --- a/exa/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -noinst_LTLIBRARIES = libexa.la - -if XORG -sdk_HEADERS = exa.h -endif - -AM_CPPFLAGS = $(XORG_INCS) - -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) - -libexa_la_SOURCES = \ - exa.c \ - exa.h \ - exa_classic.c \ - exa_migration_classic.c \ - exa_driver.c \ - exa_mixed.c \ - exa_migration_mixed.c \ - exa_accel.c \ - exa_glyphs.c \ - exa_offscreen.c \ - exa_render.c \ - exa_priv.h \ - exa_unaccel.c diff --git a/fb/Makefile.am b/fb/Makefile.am deleted file mode 100644 index 333aa06a9..000000000 --- a/fb/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -noinst_LTLIBRARIES = libfb.la libwfb.la - -AM_CFLAGS = $(DIX_CFLAGS) - -if XORG -sdk_HEADERS = fb.h fbrop.h fboverlay.h wfbrename.h fbpict.h -endif - -libfb_la_CFLAGS = $(AM_CFLAGS) -libfb_la_LIBADD = $(PIXMAN_LIBS) - -libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER -libwfb_la_LIBADD = $(PIXMAN_LIBS) - -libfb_la_SOURCES = \ - fb.h \ - fballpriv.c \ - fbarc.c \ - fbbits.c \ - fbbits.h \ - fbblt.c \ - fbbltone.c \ - fbcmap_mi.c \ - fbcopy.c \ - fbfill.c \ - fbfillrect.c \ - fbfillsp.c \ - fbgc.c \ - fbgetsp.c \ - fbglyph.c \ - fbimage.c \ - fbline.c \ - fboverlay.c \ - fboverlay.h \ - fbpict.c \ - fbpict.h \ - fbpixmap.c \ - fbpoint.c \ - fbpush.c \ - fbrop.h \ - fbscreen.c \ - fbseg.c \ - fbsetsp.c \ - fbsolid.c \ - fbtrap.c \ - fbutil.c \ - fbwindow.c - -libwfb_la_SOURCES = $(libfb_la_SOURCES) diff --git a/glamor/Makefile.am b/glamor/Makefile.am deleted file mode 100644 index 7069fbd16..000000000 --- a/glamor/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -noinst_LTLIBRARIES = libglamor.la libglamor_egl_stubs.la - -libglamor_la_LIBADD = $(GLAMOR_LIBS) - -AM_CFLAGS = $(CWARNFLAGS) $(DIX_CFLAGS) $(GLAMOR_CFLAGS) - -libglamor_la_SOURCES = \ - glamor.c \ - glamor_context.h \ - glamor_copy.c \ - glamor_core.c \ - glamor_dash.c \ - glamor_debug.h \ - glamor_font.c \ - glamor_font.h \ - glamor_composite_glyphs.c \ - glamor_image.c \ - glamor_lines.c \ - glamor_segs.c \ - glamor_render.c \ - glamor_gradient.c \ - glamor_prepare.c \ - glamor_prepare.h \ - glamor_program.c \ - glamor_program.h \ - glamor_rects.c \ - glamor_spans.c \ - glamor_text.c \ - glamor_transfer.c \ - glamor_transfer.h \ - glamor_transform.c \ - glamor_transform.h \ - glamor_trapezoid.c \ - glamor_triangles.c\ - glamor_addtraps.c\ - glamor_glyphblt.c\ - glamor_points.c\ - glamor_priv.h\ - glamor_pixmap.c\ - glamor_largepixmap.c\ - glamor_picture.c\ - glamor_vbo.c \ - glamor_window.c\ - glamor_fbo.c\ - glamor_compositerects.c\ - glamor_utils.c\ - glamor_utils.h\ - glamor_sync.c \ - glamor.h - -if XV -libglamor_la_SOURCES += \ - glamor_xv.c -endif - -libglamor_egl_stubs_la_SOURCES = \ - glamor_egl_stubs.c \ - glamor_egl_ext.h \ - glamor_egl.h - -sdk_HEADERS = glamor.h diff --git a/glx/Makefile.am b/glx/Makefile.am deleted file mode 100644 index 8f19e9dc7..000000000 --- a/glx/Makefile.am +++ /dev/null @@ -1,95 +0,0 @@ -if DRI2 -GLXDRI_LIBRARY = libglxdri.la -endif - -noinst_LTLIBRARIES = libglx.la $(GLXDRI_LIBRARY) libglxvnd.la - -AM_CFLAGS = \ - @DIX_CFLAGS@ \ - @GL_CFLAGS@ \ - @XLIB_CFLAGS@ \ - @LIBDRM_CFLAGS@ \ - @GLX_DEFINES@ \ - @GLX_ARCH_DEFINES@ - -sdk_HEADERS = vndserver.h - -AM_CPPFLAGS = \ - -I$(top_srcdir)/hw/xfree86/os-support \ - -I$(top_srcdir)/hw/xfree86/os-support/bus \ - -I$(top_srcdir)/hw/xfree86/common \ - -I$(top_srcdir)/hw/xfree86/dri \ - -I$(top_srcdir)/hw/xfree86/dri2 \ - -I$(top_srcdir)/mi \ - -I$(top_srcdir)/present - -indirect_sources = \ - indirect_dispatch.c \ - indirect_dispatch.h \ - indirect_dispatch_swap.c \ - indirect_reqsize.c \ - indirect_reqsize.h \ - indirect_size.h \ - indirect_size_get.c \ - indirect_size_get.h \ - indirect_table.c - -libglxdri_la_SOURCES = -if DRI2 -libglxdri_la_SOURCES += glxdri2.c -endif - -libglxdri_la_LIBADD = $(DLOPEN_LIBS) - -libglx_la_SOURCES = \ - $(indirect_sources) \ - clientinfo.c \ - createcontext.c \ - extension_string.c \ - extension_string.h \ - indirect_util.c \ - indirect_util.h \ - indirect_program.c \ - indirect_table.h \ - indirect_texture_compression.c \ - glxbyteorder.h \ - glxcmds.c \ - glxcmdsswap.c \ - glxcontext.h \ - glxdrawable.h \ - glxext.c \ - glxext.h \ - glxdriswrast.c \ - glxdricommon.c \ - glxdricommon.h \ - glxscreens.c \ - glxscreens.h \ - glxserver.h \ - glxutil.h \ - render2.c \ - render2swap.c \ - renderpix.c \ - renderpixswap.c \ - rensize.c \ - single2.c \ - single2swap.c \ - singlepix.c \ - singlepixswap.c \ - singlesize.c \ - singlesize.h \ - swap_interval.c \ - unpack.h \ - xfont.c - -libglx_la_LIBADD = $(DLOPEN_LIBS) $(top_builddir)/Xext/libhashtable.la - -libglxvnd_la_SOURCES = \ - vndcmds.c \ - vndext.c \ - vndservermapping.c \ - vndservervendor.h \ - vndservervendor.c - -libglxvnd_la_LIBADD = $(top_builddir)/Xext/libhashtable.la - -EXTRA_DIST = vnd_dispatch_stubs.c diff --git a/hw/Makefile.am b/hw/Makefile.am deleted file mode 100644 index 006898bfb..000000000 --- a/hw/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -if XORG -XORG_SUBDIRS = xfree86 -endif - -if XVFB -XVFB_SUBDIRS = vfb -endif - -if XNEST -XNEST_SUBDIRS = xnest -endif - -if XWIN -XWIN_SUBDIRS = xwin -endif - -if KDRIVE -KDRIVE_SUBDIRS = kdrive -endif - -if XQUARTZ -XQUARTZ_SUBDIRS = xquartz -endif - -if XWAYLAND -XWAYLAND_SUBDIRS = xwayland -endif - -SUBDIRS = \ - $(XORG_SUBDIRS) \ - $(XWIN_SUBDIRS) \ - $(XVFB_SUBDIRS) \ - $(XNEST_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ - $(XQUARTZ_SUBDIRS) \ - $(XWAYLAND_SUBDIRS) - -DIST_SUBDIRS = xfree86 vfb xnest xwin xquartz kdrive xwayland - -relink: - $(AM_V_at)for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am deleted file mode 100644 index dc71dbd81..000000000 --- a/hw/kdrive/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -if XEPHYR -XEPHYR_SUBDIRS = ephyr -endif - -SERVER_SUBDIRS = \ - $(XEPHYR_SUBDIRS) - -SUBDIRS = \ - src \ - $(SERVER_SUBDIRS) - -DIST_SUBDIRS = ephyr src - -relink: - $(AM_V_at)for i in $(SERVER_SUBDIRS) ; do $(MAKE) -C $$i relink || exit 1 ; done diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am deleted file mode 100644 index a3d6b1c02..000000000 --- a/hw/kdrive/ephyr/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright © 2013 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -SUBDIRS = man - -AM_CPPFLAGS = \ - @KDRIVE_INCS@ \ - @KDRIVE_CFLAGS@ \ - @XEPHYR_INCS@ \ - @XEPHYR_CFLAGS@ \ - -DHAVE_DIX_CONFIG_H \ - -I$(top_srcdir) \ - -I$(top_srcdir)/glamor \ - -I$(top_srcdir)/exa - -if XV -XV_SRCS = ephyrvideo.c -endif - -if GLAMOR -if XV -GLAMOR_XV_SRCS = ephyr_glamor_xv.c -endif - -GLAMOR_SRCS = \ - ephyr_glamor.c \ - ephyr_glamor.h \ - $(GLAMOR_XV_SRCS) \ - $() -endif - -bin_PROGRAMS = Xephyr - -Xephyr_SOURCES = \ - ephyr.c \ - ephyr.h \ - ephyrlog.h \ - ephyr_draw.c \ - ephyrinit.c \ - ephyrcursor.c \ - hostx.c \ - hostx.h \ - $(XV_SRCS) \ - $(GLAMOR_SRCS) \ - $() - -if GLAMOR -AM_CPPFLAGS += $(XLIB_CFLAGS) -XEPHYR_GLAMOR_LIB = \ - $(top_builddir)/glamor/libglamor.la \ - $(top_builddir)/glamor/libglamor_egl_stubs.la \ - $() -endif - -Xephyr_LDADD = \ - $(top_builddir)/exa/libexa.la \ - $(XEPHYR_GLAMOR_LIB) \ - @KDRIVE_LIBS@ \ - @XEPHYR_LIBS@ - -Xephyr_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ $(XEPHYR_GLAMOR_LIB) - -Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -relink: - $(AM_V_at)rm -f $(bin_PROGRAMS) && $(MAKE) $(bin_PROGRAMS) diff --git a/hw/kdrive/ephyr/man/Makefile.am b/hw/kdrive/ephyr/man/Makefile.am deleted file mode 100644 index e8a372143..000000000 --- a/hw/kdrive/ephyr/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = Xephyr.man diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am deleted file mode 100644 index b1331dae6..000000000 --- a/hw/kdrive/src/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -AM_CPPFLAGS = \ - @KDRIVE_INCS@ \ - @KDRIVE_CFLAGS@ - -AM_CFLAGS = -DHAVE_DIX_CONFIG_H - -noinst_LTLIBRARIES = libkdrive.la - -if XV -KDRIVE_XV_SOURCES = \ - kxv.c \ - kxv.h -endif - -libkdrive_la_SOURCES = \ - kcmap.c \ - kdrive.c \ - kdrive.h \ - kinfo.c \ - kinput.c \ - kshadow.c \ - $(KDRIVE_XV_SOURCES) \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/mi/miinitext.h - -if CONFIG_UDEV -libkdrive_la_LIBADD = $(top_builddir)/config/libconfig.la -else -if CONFIG_HAL -libkdrive_la_LIBADD = $(top_builddir)/config/libconfig.la -endif -endif diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am deleted file mode 100644 index a4b45264f..000000000 --- a/hw/vfb/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -SUBDIRS = man - -bin_PROGRAMS = Xvfb - -AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ - $(XVFBMODULES_CFLAGS) \ - $(DIX_CFLAGS) - -SRCS = InitInput.c \ - InitOutput.c \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/mi/miinitext.h - -Xvfb_SOURCES = $(SRCS) - -XVFB_LIBS = \ - @XVFB_LIBS@ \ - $(MAIN_LIB) \ - $(XSERVER_LIBS) \ - $(top_builddir)/Xi/libXistubs.la - -Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS) -Xvfb_DEPENDENCIES = $(XVFB_LIBS) -Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -relink: - $(AM_V_at)rm -f Xvfb$(EXEEXT) && $(MAKE) Xvfb$(EXEEXT) diff --git a/hw/vfb/man/Makefile.am b/hw/vfb/man/Makefile.am deleted file mode 100644 index 93941882a..000000000 --- a/hw/vfb/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = Xvfb.man diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am deleted file mode 100644 index baf380d4d..000000000 --- a/hw/xfree86/Makefile.am +++ /dev/null @@ -1,154 +0,0 @@ - -if DRI -DRI_SUBDIR = dri -DRI_LIB = dri/libdri.la -endif - -if DRI2 -DRI2_SUBDIR = dri2 -DRI2_LIB = dri2/libdri2.la -endif - -if DRI3 -DRI3_BUILDDIR = $(top_builddir)/dri3 -DRI3_LIB = $(DRI3_BUILDDIR)/libdri3.la -endif - -if GLX -GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la -endif - -if GLAMOR_EGL -GLAMOR_EGL_SUBDIR = glamor_egl -endif - -if XF86UTILS -XF86UTILS_SUBDIR = utils -endif - -if VGAHW -VGAHW_SUBDIR = vgahw -endif - -if INT10MODULE -INT10_SUBDIR = int10 -endif - -SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ - ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ - $(DRI2_SUBDIR) . i2c dixmods xkb \ - fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \ - $(GLAMOR_EGL_SUBDIR) drivers - -DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ - parser ramdac shadowfb vgahw \ - loader dixmods xkb dri dri2 exa modes \ - utils doc man glamor_egl drivers - -bin_PROGRAMS = Xorg -nodist_Xorg_SOURCES = sdksyms.c - -AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser \ - -I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \ - -I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3 - -LOCAL_LIBS = \ - $(MAIN_LIB) \ - $(XSERVER_LIBS) \ - loader/libloader.la \ - common/libcommon.la \ - os-support/libxorgos.la \ - parser/libxf86config.la \ - dixmods/libdixmods.la \ - modes/libxf86modes.la \ - ramdac/libramdac.la \ - ddc/libddc.la \ - i2c/libi2c.la \ - $(XORG_LIBS) \ - xkb/libxorgxkb.la \ - $(DRI_LIB) \ - $(DRI2_LIB) \ - $(DRI3_LIB) \ - $(GLXVND_LIB) \ - $(top_builddir)/fb/libfb.la \ - $(top_builddir)/miext/sync/libsync.la \ - $(top_builddir)/mi/libmi.la \ - $(top_builddir)/os/libos.la \ - $(top_builddir)/Xext/libXvidmode.la - -Xorg_LDADD = \ - $(LOCAL_LIBS) \ - $(XORG_SYS_LIBS) \ - $(XSERVER_SYS_LIBS) -Xorg_DEPENDENCIES = $(LOCAL_LIBS) - -Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -if SUID_WRAPPER -wrapexecdir = $(SUID_WRAPPER_DIR) -wrapexec_PROGRAMS = Xorg.wrap -Xorg_wrap_SOURCES = xorg-wrapper.c -endif - -BUILT_SOURCES = xorg.conf.example -DISTCLEANFILES = xorg.conf.example -EXTRA_DIST = xorgconf.cpp - -# Without logdir, X will post an error on the terminal and will not start -install-data-local: - $(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir) -if CYGWIN - $(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a -endif - -install-exec-hook: - (cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) Xorg$(EXEEXT) X) -if INSTALL_SETUID - chown 0 $(DESTDIR)$(bindir)/Xorg - chmod u+s $(DESTDIR)$(bindir)/Xorg -endif -if SUID_WRAPPER - $(MKDIR_P) $(DESTDIR)$(SUID_WRAPPER_DIR) - mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg - ${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/Xorg - -chown 0 $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap -endif - -uninstall-local: -if CYGWIN - $(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXorg.exe.a -endif - -uninstall-hook: - $(AM_V_at)rm -f $(DESTDIR)$(bindir)/X - -# Use variables from XORG_MANPAGE_SECTIONS and X Server configuration -# Do not include manpages.am as values are not appropriate for rc files -CONF_SUBSTS = -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \ - -e 's|MODULEPATH|$(DEFAULT_MODULE_PATH)|g' \ - -e 's|DEFAULTFONTPATH|$(COMPILEDDEFAULTFONTPATH)|g' - -xorg.conf.example: xorgconf.cpp - $(AM_V_GEN)$(SED) $(CONF_SUBSTS) < $(srcdir)/xorgconf.cpp > $@ - -relink: - $(AM_V_at)rm -f Xorg$(EXEEXT) && $(MAKE) Xorg$(EXEEXT) - -CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh -EXTRA_DIST += sdksyms.sh - -sdksyms.dep sdksyms.c: sdksyms.sh - $(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS) - -SDKSYMS_DEP = sdksyms.dep --include $(SDKSYMS_DEP) - -i2c/libi2c.la: - $(AM_V_at)cd i2c && $(MAKE) libi2c.la - -dixmods/libdixmods.la: - $(AM_V_at)cd dixmods && $(MAKE) libdixmods.la - -xkb/libxorgxkb.la: - $(AM_V_at)cd xkb && $(MAKE) libxorgxkb.la diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am deleted file mode 100644 index 39c1e90f0..000000000 --- a/hw/xfree86/common/Makefile.am +++ /dev/null @@ -1,104 +0,0 @@ -noinst_LTLIBRARIES = libcommon.la - -if XORG_BUS_PCI -PCI_SOURCES = xf86pciBus.c xf86VGAarbiter.c xf86VGAarbiter.h \ - xf86VGAarbiterPriv.h -endif - -if XORG_BUS_SPARC -SBUS_SOURCES = xf86sbusBus.c -endif - -if XV -XVSOURCES = xf86xv.c xf86xvmc.c -XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h -endif - -if DGA -DGASOURCES = xf86DGA.c -DGA_SDK = dgaproc.h -endif - -if XORG_BUS_PLATFORM -PLATSOURCES = xf86platformBus.c -endif - -RANDRSOURCES = xf86RandR.c - -BUSSOURCES = xf86fbBus.c xf86noBus.c $(PCI_SOURCES) $(SBUS_SOURCES) $(PLATSOURCES) - -MODEDEFSOURCES = $(srcdir)/vesamodes $(srcdir)/extramodes - -xf86DefModeSet.c: $(srcdir)/modeline2c.awk $(MODEDEFSOURCES) - $(AM_V_GEN)cat $(MODEDEFSOURCES) | LC_ALL=C $(AWK) -f $(srcdir)/modeline2c.awk > $@ - $(AM_V_GEN)echo >> $@ - -BUILT_SOURCES = xf86DefModeSet.c - -AM_LDFLAGS = -r -libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \ - xf86Cursor.c $(DGASOURCES) xf86DPMS.c \ - xf86Events.c xf86Globals.c xf86AutoConfig.c \ - xf86Option.c xf86Init.c \ - xf86VidMode.c xf86fbman.c xf86cmap.c \ - xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \ - xf86Mode.c xorgHelper.c xf86Extensions.h \ - xf86Extensions.c $(XF86VMODESOURCES) \ - $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES) -nodist_libcommon_la_SOURCES = xf86DefModeSet.c -libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ - -I$(srcdir)/../loader -I$(srcdir)/../parser \ - -I$(srcdir)/../vbe -I$(srcdir)/../int10 \ - -I$(srcdir)/../vgahw -I$(srcdir)/../dixmods/extmod \ - -I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2 \ - -I$(top_builddir) - -sdk_HEADERS = compiler.h xf86.h xf86Module.h xf86Opt.h \ - xf86PciInfo.h xf86Priv.h xf86Privstr.h \ - xf86cmap.h xf86fbman.h xf86str.h xf86Xinput.h xisb.h \ - $(XVSDKINCS) $(XF86VMODE_SDK) $(DGA_SDK) xorgVersion.h \ - xf86sbusBus.h xf86VGAarbiter.h xf86Optionstr.h \ - xf86platformBus.h xf86MatchDrivers.h \ - xaarop.h - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = \ - compiler.h \ - xf86.h \ - xf86Bus.h \ - xf86Config.h \ - xf86InPriv.h \ - xf86Module.h \ - xf86Opt.h \ - xf86PciInfo.h \ - xf86Priv.h \ - xf86Privstr.h \ - xf86Xinput.h \ - xf86cmap.h \ - xf86fbman.h \ - xf86pciBus.h \ - xf86str.h \ - xf86xv.h \ - xf86xvmc.h \ - xf86xvpriv.h \ - xisb.h \ - xorgVersion.h \ - $(MODEDEFSOURCES) \ - modeline2c.awk \ - xf86VGAarbiter.h \ - xf86VGAarbiterPriv.h \ - $(DISTKBDSOURCES) \ - xaarop.h - -if LNXACPI -XORG_CFLAGS += -DHAVE_ACPI -endif - -if NEED_DBUS -XORG_CFLAGS += $(DBUS_CFLAGS) -endif - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am deleted file mode 100644 index a7b84adcd..000000000 --- a/hw/xfree86/ddc/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -sdk_HEADERS = edid.h xf86DDC.h - -noinst_LTLIBRARIES = libddc.la - -libddc_la_SOURCES = ddc.c interpret_edid.c print_edid.c ddcProperty.c - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../i2c - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -EXTRA_DIST = DDC.HOWTO diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am deleted file mode 100644 index 3d5811066..000000000 --- a/hw/xfree86/dixmods/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -noinst_LTLIBRARIES = libdixmods.la - -if GLX -GLXMODS = libglx.la -endif - -module_LTLIBRARIES = libwfb.la \ - libshadow.la - -extsmoduledir = $(moduledir)/extensions -extsmodule_LTLIBRARIES = $(GLXMODS) - -AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ -AM_CPPFLAGS = @XORG_INCS@ \ - -I$(top_srcdir)/hw/xfree86/loader \ - -I$(top_srcdir)/miext/shadow \ - -I$(top_srcdir)/glx - -libwfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la -libwfb_la_SOURCES = fbmodule.c -libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER - -libglx_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libglx_la_LIBADD = $(top_builddir)/glx/libglx.la $(GLX_SYS_LIBS) -if DRI2 -libglx_la_LIBADD += $(top_builddir)/glx/libglxdri.la -if NO_UNDEFINED -libglx_la_LIBADD += $(LIBDRM_LIBS) $(PIXMAN_LIBS) -endif -endif -libglx_la_SOURCES = glxmodule.c - -libshadow_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libshadow_la_LIBADD = $(top_builddir)/miext/shadow/libshadow.la -libshadow_la_SOURCES = shmodule.c - -libdixmods_la_SOURCES = \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/mi/miinitext.h -libdixmods_la_CFLAGS = $(AM_CFLAGS) diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am deleted file mode 100644 index 392bdfa03..000000000 --- a/hw/xfree86/doc/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ - -if ENABLE_DEVEL_DOCS -if HAVE_XMLTO - -# Main DocBook/XML files (DOCTYPE book) -docbook = ddxDesign.xml - -# Generate DocBook/XML output formats with or without stylesheets -include $(top_srcdir)/devbook.am - -endif HAVE_XMLTO -endif ENABLE_DEVEL_DOCS - -EXTRA_DIST = \ - Registry \ - exa-driver.txt \ - README.modes diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am deleted file mode 100644 index ced04ff38..000000000 --- a/hw/xfree86/dri/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -noinst_LTLIBRARIES = libdri.la -AM_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ - -I$(top_srcdir)/hw/xfree86/os-support \ - -I$(top_srcdir)/hw/xfree86/modes \ - -I$(top_srcdir)/hw/xfree86/ddc \ - -I$(top_srcdir)/hw/xfree86/i2c \ - -I$(top_srcdir)/hw/xfree86/parser \ - -I$(top_srcdir)/hw/xfree86/ramdac \ - -I$(top_srcdir)/hw/xfree86/os-support/bus \ - -I$(top_srcdir)/glx \ - -DHAVE_XORG_CONFIG_H \ - @DIX_CFLAGS@ @XORG_CFLAGS@ -libdri_la_SOURCES = \ - dri.c \ - dri.h \ - dristruct.h \ - sarea.h \ - xf86dri.c - -sdk_HEADERS = dri.h sarea.h dristruct.h diff --git a/hw/xfree86/dri2/Makefile.am b/hw/xfree86/dri2/Makefile.am deleted file mode 100644 index 78e507bd3..000000000 --- a/hw/xfree86/dri2/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -SUBDIRS=pci_ids - -noinst_LTLIBRARIES = libdri2.la -AM_CFLAGS = \ - -DHAVE_XORG_CONFIG_H \ - @DIX_CFLAGS@ @XORG_CFLAGS@ \ - -I$(top_srcdir)/hw/xfree86/common \ - -I$(top_srcdir)/hw/xfree86/os-support/bus - -libdri2_la_SOURCES = \ - dri2.c \ - dri2.h \ - dri2ext.c \ - dri2int.h - -sdk_HEADERS = dri2.h diff --git a/hw/xfree86/dri2/pci_ids/Makefile.am b/hw/xfree86/dri2/pci_ids/Makefile.am deleted file mode 100644 index 69fe8c40d..000000000 --- a/hw/xfree86/dri2/pci_ids/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -EXTRA_DIST = \ - pci_id_driver_map.h \ - i810_pci_ids.h \ - i915_pci_ids.h \ - i965_pci_ids.h \ - r200_pci_ids.h \ - r300_pci_ids.h \ - r600_pci_ids.h \ - radeon_pci_ids.h \ - radeonsi_pci_ids.h \ - virtio_gpu_pci_ids.h \ - vmwgfx_pci_ids.h diff --git a/hw/xfree86/drivers/Makefile.am b/hw/xfree86/drivers/Makefile.am deleted file mode 100644 index 954c9f1d4..000000000 --- a/hw/xfree86/drivers/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -SUBDIRS = - -if XORG_DRIVER_MODESETTING -SUBDIRS += modesetting -endif -if XORG_DRIVER_INPUT_INPUTTEST -SUBDIRS += inputtest -endif diff --git a/hw/xfree86/drivers/inputtest/Makefile.am b/hw/xfree86/drivers/inputtest/Makefile.am deleted file mode 100644 index f6210aa8d..000000000 --- a/hw/xfree86/drivers/inputtest/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2005 Adam Jackson. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# this is obnoxious: -# -module lets us name the module exactly how we want -# -avoid-version prevents gratuitous .0.0.0 version numbers on the end -# _ladir passes a dummy rpath to libtool so the thing will actually link -# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. - -include $(top_srcdir)/manpages.am - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(CWARNFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) - -inputtest_drv_la_LTLIBRARIES = inputtest_drv.la -inputtest_drv_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -inputtest_drv_ladir = @moduledir@/input - -inputtest_drv_la_SOURCES = xf86-input-inputtest.c xf86-input-inputtest-protocol.h - -sdk_HEADERS = xf86-input-inputtest-protocol.h - -drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = inputtestdrv.man -driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) - -EXTRA_DIST = inputtestdrv.man - -CLEANFILES = $(driverman_DATA) - diff --git a/hw/xfree86/drivers/modesetting/Makefile.am b/hw/xfree86/drivers/modesetting/Makefile.am deleted file mode 100644 index 961c57408..000000000 --- a/hw/xfree86/drivers/modesetting/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2005 Adam Jackson. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# this is obnoxious: -# -module lets us name the module exactly how we want -# -avoid-version prevents gratuitous .0.0.0 version numbers on the end -# _ladir passes a dummy rpath to libtool so the thing will actually link -# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. - -include $(top_srcdir)/manpages.am - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(LIBDRM_CFLAGS) $(UDEV_CFLAGS) $(CWARNFLAGS) - -AM_CPPFLAGS = \ - $(XORG_INCS) \ - -I$(top_srcdir)/glamor \ - -I$(srcdir)/../../ddc \ - -I$(srcdir)/../../dri2 \ - -I$(srcdir)/../../i2c \ - -I$(srcdir)/../../modes \ - -I$(srcdir)/../../parser \ - -I$(srcdir)/../../ramdac \ - $(NULL) - -modesetting_drv_la_LTLIBRARIES = modesetting_drv.la -modesetting_drv_la_LDFLAGS = -module -avoid-version -modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) -modesetting_drv_ladir = @moduledir@/drivers - -modesetting_drv_la_SOURCES = \ - dri2.c \ - driver.c \ - driver.h \ - drmmode_display.c \ - drmmode_display.h \ - dumb_bo.c \ - dumb_bo.h \ - present.c \ - vblank.c \ - pageflip.c \ - $(NULL) - -drivermandir = $(DRIVER_MAN_DIR) -driverman_PRE = modesetting.man -driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) - -EXTRA_DIST = modesetting.man - -CLEANFILES = $(driverman_DATA) diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am deleted file mode 100644 index ccbb305d3..000000000 --- a/hw/xfree86/exa/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -SUBDIRS = man - -module_LTLIBRARIES = libexa.la - -libexa_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) - -AM_CPPFLAGS = \ - $(XORG_INCS) \ - -I$(srcdir)/../../../exa - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -libexa_la_SOURCES = \ - examodule.c - -libexa_la_LIBADD = \ - ../../../exa/libexa.la $(PIXMAN_LIBS) diff --git a/hw/xfree86/exa/man/Makefile.am b/hw/xfree86/exa/man/Makefile.am deleted file mode 100644 index 51da4fd50..000000000 --- a/hw/xfree86/exa/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -driverman_PRE = exa.man diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am deleted file mode 100644 index 37cd88c0e..000000000 --- a/hw/xfree86/fbdevhw/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -SUBDIRS = man - -module_LTLIBRARIES = libfbdevhw.la - -libfbdevhw_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) - -if FBDEVHW -libfbdevhw_la_SOURCES = fbdevhw.c -else -libfbdevhw_la_SOURCES = fbdevhwstub.c -endif - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../i2c -I$(srcdir)/../modes -I$(srcdir)/../ddc -I$(srcdir)/../parser - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -sdk_HEADERS = fbdevhw.h - -EXTRA_DIST = fbpriv.h README diff --git a/hw/xfree86/fbdevhw/man/Makefile.am b/hw/xfree86/fbdevhw/man/Makefile.am deleted file mode 100644 index 7f22a12b9..000000000 --- a/hw/xfree86/fbdevhw/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -driverman_PRE = fbdevhw.man diff --git a/hw/xfree86/glamor_egl/Makefile.am b/hw/xfree86/glamor_egl/Makefile.am deleted file mode 100644 index e697c8296..000000000 --- a/hw/xfree86/glamor_egl/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright © 2013 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. - -module_LTLIBRARIES = libglamoregl.la - -libglamoregl_la_SOURCES = \ - $(top_srcdir)/glamor/glamor_egl.c \ - $(top_srcdir)/glamor/glamor_eglmodule.c \ - glamor_xf86_xv.c \ - $() - -libglamoregl_la_LDFLAGS = \ - -avoid-version \ - $(GBM_LIBS) \ - $() - -libglamoregl_la_LIBADD = \ - $(top_builddir)/glamor/libglamor.la \ - $() - -AM_CPPFLAGS = $(XORG_INCS) \ - -I$(top_srcdir)/dri3 \ - -I$(top_srcdir)/glamor \ - $() - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(GLAMOR_CFLAGS) $(GBM_CFLAGS) diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am deleted file mode 100644 index 8bf795ded..000000000 --- a/hw/xfree86/i2c/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -noinst_LTLIBRARIES = libi2c.la - -libi2c_la_SOURCES = xf86i2c.c - -AM_CPPFLAGS = $(XORG_INCS) - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -sdk_HEADERS = xf86i2c.h i2c_def.h diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am deleted file mode 100644 index 0248dc781..000000000 --- a/hw/xfree86/int10/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -module_LTLIBRARIES = libint10.la - -sdk_HEADERS = xf86int10.h vbe.h vbeModes.h - -EXTRA_CFLAGS = - -libint10_la_LDFLAGS = -avoid-version -libint10_la_LIBADD = $(PCIACCESS_LIBS) - -COMMON_SOURCES = \ - vbe.c \ - vbeModes.c \ - helper_exec.c \ - helper_mem.c \ - xf86int10.c \ - xf86int10module.c - -if I386_VIDEO -I386_VIDEO_CFLAGS = -D_PC -endif - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../modes -I$(srcdir)/../i2c \ - -I$(srcdir)/../parser - -if INT10_VM86 -AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS) -libint10_la_SOURCES = \ - $(COMMON_SOURCES) \ - $(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \ - $(srcdir)/../os-support/linux/int10/linux.c -endif - -if INT10_X86EMU -AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \ - $(XORG_CFLAGS) $(EXTRA_CFLAGS) $(DIX_CFLAGS) -AM_CPPFLAGS += -I$(srcdir)/../x86emu -libint10_la_SOURCES = \ - $(COMMON_SOURCES) \ - xf86x86emu.c \ - generic.c \ - x86emu.c -endif - -if INT10_STUB -AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS) -libint10_la_SOURCES = stub.c xf86int10module.c -endif - -EXTRA_DIST = xf86x86emu.h INT10.HOWTO diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am deleted file mode 100644 index 3529a7acd..000000000 --- a/hw/xfree86/loader/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -noinst_LTLIBRARIES = libloader.la - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../parser \ - -I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../modes \ - -I$(srcdir)/../ramdac -I$(srcdir)/../dri -I$(srcdir)/../dri2 - -#AM_LDFLAGS = -r -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -EXTRA_DIST = \ - loader.h \ - loaderProcs.h - -libloader_la_SOURCES = \ - loader.c \ - loaderProcs.h \ - loadmod.c - -libloader_la_LIBADD = $(DLOPEN_LIBS) diff --git a/hw/xfree86/man/Makefile.am b/hw/xfree86/man/Makefile.am deleted file mode 100644 index 5da404cbb..000000000 --- a/hw/xfree86/man/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = Xorg.man -fileman_PRE = xorg.conf.man xorg.conf.d.man - -if SUID_WRAPPER -appman_PRE += Xorg.wrap.man -fileman_PRE += Xwrapper.config.man -else -EXTRA_DIST += Xorg.wrap.man Xwrapper.config.man -endif diff --git a/hw/xfree86/modes/Makefile.am b/hw/xfree86/modes/Makefile.am deleted file mode 100644 index 35a174b5b..000000000 --- a/hw/xfree86/modes/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -noinst_LTLIBRARIES = libxf86modes.la - -if DGA -DGA_SRCS = xf86DiDGA.c -endif - -libxf86modes_la_SOURCES = \ - xf86Crtc.c \ - xf86Crtc.h \ - xf86Cursors.c \ - xf86gtf.c \ - xf86EdidModes.c \ - xf86Modes.c \ - xf86Modes.h \ - xf86RandR12.c \ - xf86RandR12.h \ - xf86Rotate.c \ - $(DGA_SRCS) - -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ - -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \ - -I$(srcdir)/../vbe -I$(srcdir)/../int10 \ - -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac \ - -I$(srcdir)/../dixmods/extmod - -sdk_HEADERS = \ - xf86Crtc.h \ - xf86Modes.h \ - xf86RandR12.h - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am deleted file mode 100644 index a0140a16d..000000000 --- a/hw/xfree86/os-support/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS) -DIST_SUBDIRS = bsd bus misc linux solaris stub hurd - -sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h - -EXTRA_DIST = int10Defines.h xf86OSpriv.h - -# to get the grouping semantics right, you have to glom these three together -# as one library, otherwise libtool will actively defeat your attempts to -# list them multiple times on the link line. -noinst_LTLIBRARIES = libxorgos.la -libxorgos_la_SOURCES = -libxorgos_la_LIBADD = @XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.la \ - bus/libbus.la \ - misc/libmisc.la - -AM_CFLAGS = $(DIX_CFLAGS) - diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am deleted file mode 100644 index 2311dc242..000000000 --- a/hw/xfree86/os-support/bsd/Makefile.am +++ /dev/null @@ -1,65 +0,0 @@ -noinst_LTLIBRARIES = libbsd.la - -# No APM support. -APM_SOURCES = $(srcdir)/../shared/pm_noop.c - -if FREEBSD_KLDLOAD -KMOD_SOURCES = bsd_kmod.c -else -KMOD_SOURCES = $(srcdir)/../shared/kmod_noop.c -endif - -if AGP -AGP_SOURCES = $(srcdir)/../linux/lnx_agp.c -else -AGP_SOURCES = $(srcdir)/../shared/agp_noop.c -endif - -if ALPHA_VIDEO -# Cheat here and piggyback other alpha bits on ALPHA_VIDEO. -ARCH_SOURCES = \ - alpha_video.c -endif - -if ARM_VIDEO -ARCH_SOURCES = arm_video.c -endif - -if I386_VIDEO -ARCH_SOURCES = i386_video.c -endif - -if PPC_VIDEO -ARCH_SOURCES = ppc_video.c -endif - -if SPARC64_VIDEO -# Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO. -ARCH_SOURCES = \ - sparc64_video.c \ - $(srcdir)/../shared/ioperm_noop.c -endif - -# FIXME: NetBSD Aperture defines (configure.ac) -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) - -libbsd_la_SOURCES = \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/sigio.c \ - $(srcdir)/../shared/vidmem.c \ - bsd_VTsw.c \ - bsd_init.c \ - bsd_bell.c \ - $(ARCH_SOURCES) \ - $(AGP_SOURCES) \ - $(APM_SOURCES) \ - $(AXP_SOURCES) \ - $(DRI_SOURCES) \ - $(KMOD_SOURCES) \ - $(RES_SOURCES) - -# FIXME: Add these files to the build as needed -EXTRA_DIST = \ - memrange.h diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am deleted file mode 100644 index eebb3aed6..000000000 --- a/hw/xfree86/os-support/bus/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -noinst_LTLIBRARIES = libbus.la -sdk_HEADERS = xf86Pci.h - -PCI_SOURCES = -if XORG_BUS_PCI -PCI_SOURCES += Pci.c Pci.h -endif - -if XORG_BUS_BSDPCI -PCI_SOURCES += bsd_pci.c -endif - -if XORG_BUS_SPARC -PLATFORM_SOURCES = Sbus.c -sdk_HEADERS += xf86Sbus.h -endif - -libbus_la_SOURCES = $(PCI_SOURCES) $(PLATFORM_SOURCES) nobus.c - -AM_CPPFLAGS = $(XORG_INCS) - -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) - -EXTRA_DIST = $(sdk_HEADERS) diff --git a/hw/xfree86/os-support/hurd/Makefile.am b/hw/xfree86/os-support/hurd/Makefile.am deleted file mode 100644 index 33857f459..000000000 --- a/hw/xfree86/os-support/hurd/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -noinst_LTLIBRARIES = libhurd.la - -libhurd_la_SOURCES = hurd_bell.c hurd_init.c \ - hurd_video.c \ - $(srcdir)/../shared/VTsw_noop.c \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/vidmem.c \ - $(srcdir)/../shared/sigiostubs.c \ - $(srcdir)/../shared/pm_noop.c \ - $(srcdir)/../shared/kmod_noop.c \ - $(srcdir)/../shared/agp_noop.c - -AM_CFLAGS = -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am deleted file mode 100644 index 4392fe8d4..000000000 --- a/hw/xfree86/os-support/linux/Makefile.am +++ /dev/null @@ -1,44 +0,0 @@ -noinst_LTLIBRARIES = liblinux.la - -if LNXACPI -ACPI_SRCS = lnx_acpi.c -if !LNXAPM -ACPI_SRCS += lnx_apm.c -endif -XORG_CFLAGS += -DHAVE_ACPI -endif - -if LNXAPM -APM_SRCS = lnx_apm.c -XORG_CFLAGS += -DHAVE_APM -endif - -if !LNXAPM -if !LNXACPI -ACPI_SRCS = $(srcdir)/../shared/pm_noop.c -endif -endif - -if SYSTEMD_LOGIND -LOGIND_SRCS = systemd-logind.c -XORG_CFLAGS += $(DBUS_CFLAGS) -endif - -if AGP -AGP_SRCS = lnx_agp.c -endif - -liblinux_la_SOURCES = linux.h lnx_init.c lnx_video.c \ - lnx_kmod.c lnx_bell.c lnx_platform.c \ - $(srcdir)/../shared/VTsw_usl.c \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/vidmem.c \ - $(srcdir)/../shared/sigio.c \ - $(ACPI_SRCS) \ - $(APM_SRCS) \ - $(LOGIND_SRCS) \ - $(AGP_SRCS) - -AM_CFLAGS = -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) - -AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am deleted file mode 100644 index 0265aecd4..000000000 --- a/hw/xfree86/os-support/misc/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -noinst_LTLIBRARIES = libmisc.la - -libmisc_la_SOURCES = SlowBcopy.c - -#AM_LDFLAGS = -r - -AM_CPPFLAGS = $(XORG_INCS) - -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) - -EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am deleted file mode 100644 index ae109ff09..000000000 --- a/hw/xfree86/os-support/solaris/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -if SOLARIS_VT -VTSW_SRC = sun_VTsw.c -else -VTSW_SRC = $(srcdir)/../shared/VTsw_noop.c -endif - -if AGP -AGP_SRC = sun_agp.c -else -AGP_SRC = $(srcdir)/../shared/agp_noop.c -endif - -SOLARIS_INOUT_SRC = solaris-@SOLARIS_INOUT_ARCH@.S -DISTCLEANFILES = solaris-@SOLARIS_INOUT_ARCH@.il - -solaris-@SOLARIS_INOUT_ARCH@.il: solaris-@SOLARIS_INOUT_ARCH@.S - $(CPP) -P -DINLINE_ASM $(srcdir)/solaris-@SOLARIS_INOUT_ARCH@.S > $@ - -noinst_LTLIBRARIES = libsolaris.la -libsolaris_la_SOURCES = sun_init.c \ - sun_vid.c sun_bell.c $(AGP_SRC) sun_apm.c \ - $(srcdir)/../shared/kmod_noop.c \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/sigio.c \ - $(srcdir)/../shared/vidmem.c \ - $(VTSW_SRC) -nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) - -sdk_HEADERS = -nodist_sdk_HEADERS = solaris-@SOLARIS_INOUT_ARCH@.il - -AM_CFLAGS = -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) - -EXTRA_DIST = solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S sun_inout.s diff --git a/hw/xfree86/os-support/stub/Makefile.am b/hw/xfree86/os-support/stub/Makefile.am deleted file mode 100644 index 19468c6de..000000000 --- a/hw/xfree86/os-support/stub/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -noinst_LTLIBRARIES = libstub.la - -AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) - -AM_CPPFLAGS = $(XORG_INCS) - -libstub_la_SOURCES = \ - $(srcdir)/../shared/VTsw_noop.c \ - $(srcdir)/../shared/agp_noop.c \ - $(srcdir)/../shared/ioperm_noop.c \ - $(srcdir)/../shared/kmod_noop.c \ - $(srcdir)/../shared/pm_noop.c \ - $(srcdir)/../shared/vidmem.c \ - $(srcdir)/../shared/posix_tty.c \ - $(srcdir)/../shared/sigio.c \ - stub_bell.c \ - stub_init.c \ - stub_video.c diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am deleted file mode 100644 index 2e4c6afdb..000000000 --- a/hw/xfree86/parser/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -noinst_LTLIBRARIES = libxf86config.la - -INTERNAL_SOURCES= \ - Device.c \ - Files.c \ - Flags.c \ - Input.c \ - InputClass.c \ - OutputClass.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 - -libxf86config_la_SOURCES = \ - $(INTERNAL_SOURCES) - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ - -DDATADIR=\"$(datadir)\" - -EXTRA_DIST = \ - Configint.h \ - configProcs.h \ - xf86Optrec.h \ - xf86Parser.h \ - xf86tokens.h - -sdk_HEADERS = \ - xf86Parser.h \ - xf86Optrec.h - -AM_CPPFLAGS = -I$(srcdir)/../common diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am deleted file mode 100644 index ffae2c31f..000000000 --- a/hw/xfree86/ramdac/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -noinst_LTLIBRARIES = libramdac.la - -libramdac_la_SOURCES = xf86CursorRD.c xf86HWCurs.c - -sdk_HEADERS = xf86Cursor.h - -EXTRA_DIST = xf86CursorPriv.h CURSOR.NOTES - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -AM_CPPFLAGS = $(XORG_INCS) diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am deleted file mode 100644 index 67fb2e4cb..000000000 --- a/hw/xfree86/shadowfb/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -module_LTLIBRARIES = libshadowfb.la -libshadowfb_la_LDFLAGS = -module -avoid-version $(LD_NO_UNDEFINED_FLAG) -libshadowfb_la_SOURCES = sfbmodule.c shadowfb.c -libshadowfb_la_LIBADD = $(PIXMAN_LIBS) - -sdk_HEADERS = shadowfb.h - -AM_CPPFLAGS = $(XORG_INCS) - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/hw/xfree86/utils/Makefile.am b/hw/xfree86/utils/Makefile.am deleted file mode 100644 index ce83bc3b1..000000000 --- a/hw/xfree86/utils/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = \ - gtf \ - man diff --git a/hw/xfree86/utils/gtf/Makefile.am b/hw/xfree86/utils/gtf/Makefile.am deleted file mode 100644 index f77bf608e..000000000 --- a/hw/xfree86/utils/gtf/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -# DEALINGS IN THE SOFTWARE. -# - -bin_PROGRAMS = gtf - -gtf_SOURCES = gtf.c -gtf_CFLAGS = $(XORG_CFLAGS) -gtf_LDADD = -lm diff --git a/hw/xfree86/utils/man/Makefile.am b/hw/xfree86/utils/man/Makefile.am deleted file mode 100644 index 25b3b6a4f..000000000 --- a/hw/xfree86/utils/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = gtf.man diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am deleted file mode 100644 index b8196a695..000000000 --- a/hw/xfree86/vgahw/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -module_LTLIBRARIES = libvgahw.la -libvgahw_la_LDFLAGS = -avoid-version -libvgahw_la_LIBADD = $(PCIACCESS_LIBS) -libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c -AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -sdk_HEADERS = vgaHW.h diff --git a/hw/xfree86/x86emu/Makefile.am b/hw/xfree86/x86emu/Makefile.am deleted file mode 100644 index 2a55d6353..000000000 --- a/hw/xfree86/x86emu/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -if INT10_X86EMU -noinst_LTLIBRARIES = libx86emu.la -endif - -libx86emu_la_SOURCES = debug.c \ - decode.c \ - fpu.c \ - ops2.c \ - ops.c \ - prim_ops.c \ - sys.c \ - x86emu.h - -AM_CPPFLAGS = - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -EXTRA_DIST = validate.c \ - x86emu/debug.h \ - x86emu/decode.h \ - x86emu/fpu.h \ - x86emu/fpu_regs.h \ - x86emu/ops.h \ - x86emu/prim_asm.h \ - x86emu/prim_ops.h \ - x86emu/prim_x86_gcc.h \ - x86emu/regs.h \ - x86emu/types.h \ - x86emu/x86emui.h diff --git a/hw/xfree86/xkb/Makefile.am b/hw/xfree86/xkb/Makefile.am deleted file mode 100644 index 252cf3b5d..000000000 --- a/hw/xfree86/xkb/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -noinst_LTLIBRARIES = libxorgxkb.la - -AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ -AM_CPPFLAGS = @XORG_INCS@ - -libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am deleted file mode 100644 index 3342f9e13..000000000 --- a/hw/xnest/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -SUBDIRS = man - -bin_PROGRAMS = Xnest - -AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \ - $(DIX_CFLAGS) \ - $(XNESTMODULES_CFLAGS) - -SRCS = Args.c \ - Args.h \ - Color.c \ - Color.h \ - Cursor.c \ - Display.c \ - Display.h \ - Drawable.h \ - Events.c \ - Events.h \ - Font.c \ - GC.c \ - GCOps.c \ - GCOps.h \ - Handlers.c \ - Handlers.h \ - Init.c \ - Init.h \ - Keyboard.c \ - Keyboard.h \ - Pixmap.c \ - Pointer.c \ - Pointer.h \ - Screen.c \ - Screen.h \ - Visual.c \ - Visual.h \ - Window.c \ - XNCursor.h \ - Xnest.h \ - XNFont.h \ - XNGC.h \ - XNPixmap.h \ - XNWindow.h \ - xnest-config.h \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/mi/miinitext.h - -XNEST_LIBS = \ - @XNEST_LIBS@ \ - $(top_builddir)/Xi/libXistubs.la - -Xnest_SOURCES = $(SRCS) - -Xnest_DEPENDENCIES = $(XNEST_LIBS) -Xnest_LDADD = $(XNEST_LIBS) $(XNEST_SYS_LIBS) $(XSERVER_SYS_LIBS) -Xnest_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -EXTRA_DIST = icon \ - screensaver - -relink: - $(AM_V_at)rm -f Xnest$(EXEEXT) && $(MAKE) Xnest$(EXEEXT) diff --git a/hw/xnest/man/Makefile.am b/hw/xnest/man/Makefile.am deleted file mode 100644 index 30b6370bc..000000000 --- a/hw/xnest/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = Xnest.man diff --git a/hw/xquartz/GL/Makefile.am b/hw/xquartz/GL/Makefile.am deleted file mode 100644 index 736c94b4a..000000000 --- a/hw/xquartz/GL/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -noinst_LTLIBRARIES = libCGLCore.la -AM_CFLAGS = $(DIX_CFLAGS) $(GL_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/glx \ - -I$(top_srcdir)/hw/xquartz \ - -I$(top_srcdir)/hw/xquartz/xpr \ - -I$(top_srcdir)/miext/damage - -libCGLCore_la_SOURCES = \ - indirect.c \ - capabilities.c \ - visualConfigs.c - -EXTRA_DIST = \ - capabilities.h \ - visualConfigs.h diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am deleted file mode 100644 index bcc6dabfe..000000000 --- a/hw/xquartz/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -noinst_LTLIBRARIES = libXquartz.la -AM_CFLAGS = $(DIX_CFLAGS) -AM_OBJCFLAGS = $(DIX_CFLAGS) -AM_CPPFLAGS = \ - -DXSERVER_VERSION=\"$(VERSION)\" \ - -DUSE_NEW_CLUT \ - -DXFree86Server \ - -I$(top_srcdir)/miext/rootless \ - -I$(top_builddir)/pseudoramiX \ - -I$(top_builddir) \ - -DX11LIBDIR=\"$(libdir)\" - -if GLX -GL_DIR = GL -endif - -SUBDIRS = bundle . $(GL_DIR) xpr pbproxy mach-startup man - -DIST_SUBDIRS = bundle . GL xpr pbproxy mach-startup man - -libXquartz_la_SOURCES = \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/mi/miinitext.h \ - X11Application.m \ - X11Controller.m \ - applewm.c \ - darwin.c \ - darwinEvents.c \ - darwinXinput.c \ - keysym2ucs.c \ - quartz.c \ - quartzKeyboard.c \ - quartzStartup.c \ - quartzRandR.c - -libXquartz_la_LIBADD = $(top_builddir)/pseudoramiX/libPseudoramiX.la - -EXTRA_DIST = \ - X11Application.h \ - X11Controller.h \ - applewmExt.h \ - darwin.h \ - darwinfb.h \ - darwinEvents.h \ - keysym2ucs.h \ - quartz.h \ - quartzKeyboard.h \ - quartzRandR.h \ - sanitizedCarbon.h \ - sanitizedCocoa.h diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am deleted file mode 100644 index d97de1e71..000000000 --- a/hw/xquartz/bundle/Makefile.am +++ /dev/null @@ -1,185 +0,0 @@ -include cpprules.in - -CPP_FILES_FLAGS = \ - -DAPPLE_APPLICATION_NAME="$(APPLE_APPLICATION_NAME)" \ - -DBUNDLE_ID_PREFIX="$(BUNDLE_ID_PREFIX)" \ - -DBUNDLE_VERSION="$(BUNDLE_VERSION)" \ - -DBUNDLE_VERSION_STRING="$(BUNDLE_VERSION_STRING)" - -if XQUARTZ_SPARKLE -CPP_FILES_FLAGS += -DXQUARTZ_SPARKLE -DXQUARTZ_SPARKLE_FEED_URL="$(XQUARTZ_SPARKLE_FEED_URL)" -endif - -install-data-hook: - $(srcdir)/mk_bundke.sh $(srcdir) $(builddir) $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app install - -uninstall-hook: - $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Resources - $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/Info.plist - $(RM) -rf $(DESTDIR)$(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/PkgInfo - -noinst_PRE = Info.plist.cpp -noinst_DATA = $(noinst_PRE:plist.cpp=plist) - -CLEANFILES = $(noinst_DATA) - -resourcedir=$(libdir)/X11/xserver -resource_DATA = Xquartz.plist - -EXTRA_DIST = \ - mk_bundke.sh \ - X11.sh \ - Info.plist.cpp \ - PkgInfo \ - $(resource_DATA) \ - Resources/ar.lproj/Localizable.strings \ - Resources/ar.lproj/locversion.plist \ - Resources/ar.lproj/main.nib/designable.nib \ - Resources/ar.lproj/main.nib/keyedobjects.nib \ - Resources/ar.lproj/main.nib/keyedobjects-110000.nib \ - Resources/ca.lproj/Localizable.strings \ - Resources/ca.lproj/locversion.plist \ - Resources/ca.lproj/main.nib/designable.nib \ - Resources/ca.lproj/main.nib/keyedobjects.nib \ - Resources/ca.lproj/main.nib/keyedobjects-110000.nib \ - Resources/cs.lproj/Localizable.strings \ - Resources/cs.lproj/locversion.plist \ - Resources/cs.lproj/main.nib/designable.nib \ - Resources/cs.lproj/main.nib/keyedobjects.nib \ - Resources/cs.lproj/main.nib/keyedobjects-110000.nib \ - Resources/da.lproj/Localizable.strings \ - Resources/da.lproj/locversion.plist \ - Resources/da.lproj/main.nib/designable.nib \ - Resources/da.lproj/main.nib/keyedobjects.nib \ - Resources/da.lproj/main.nib/keyedobjects-110000.nib \ - Resources/Dutch.lproj/Localizable.strings \ - Resources/Dutch.lproj/locversion.plist \ - Resources/Dutch.lproj/main.nib/designable.nib \ - Resources/Dutch.lproj/main.nib/keyedobjects.nib \ - Resources/Dutch.lproj/main.nib/keyedobjects-110000.nib \ - Resources/el.lproj/Localizable.strings \ - Resources/el.lproj/locversion.plist \ - Resources/el.lproj/main.nib/designable.nib \ - Resources/el.lproj/main.nib/keyedobjects.nib \ - Resources/el.lproj/main.nib/keyedobjects-110000.nib \ - Resources/English.lproj/Localizable.strings \ - Resources/English.lproj/locversion.plist \ - Resources/English.lproj/main.nib/designable.nib \ - Resources/English.lproj/main.nib/keyedobjects.nib \ - Resources/English.lproj/main.nib/keyedobjects-110000.nib \ - Resources/fi.lproj/Localizable.strings \ - Resources/fi.lproj/locversion.plist \ - Resources/fi.lproj/main.nib/designable.nib \ - Resources/fi.lproj/main.nib/keyedobjects.nib \ - Resources/fi.lproj/main.nib/keyedobjects-110000.nib \ - Resources/French.lproj/Localizable.strings \ - Resources/French.lproj/locversion.plist \ - Resources/French.lproj/main.nib/designable.nib \ - Resources/French.lproj/main.nib/keyedobjects.nib \ - Resources/French.lproj/main.nib/keyedobjects-110000.nib \ - Resources/German.lproj/Localizable.strings \ - Resources/German.lproj/locversion.plist \ - Resources/German.lproj/main.nib/designable.nib \ - Resources/German.lproj/main.nib/keyedobjects.nib \ - Resources/German.lproj/main.nib/keyedobjects-110000.nib \ - Resources/he.lproj/Localizable.strings \ - Resources/he.lproj/locversion.plist \ - Resources/he.lproj/main.nib/designable.nib \ - Resources/he.lproj/main.nib/keyedobjects.nib \ - Resources/he.lproj/main.nib/keyedobjects-110000.nib \ - Resources/hr.lproj/Localizable.strings \ - Resources/hr.lproj/locversion.plist \ - Resources/hr.lproj/main.nib/designable.nib \ - Resources/hr.lproj/main.nib/keyedobjects.nib \ - Resources/hr.lproj/main.nib/keyedobjects-110000.nib \ - Resources/hu.lproj/Localizable.strings \ - Resources/hu.lproj/locversion.plist \ - Resources/hu.lproj/main.nib/designable.nib \ - Resources/hu.lproj/main.nib/keyedobjects.nib \ - Resources/hu.lproj/main.nib/keyedobjects-110000.nib \ - Resources/Italian.lproj/Localizable.strings \ - Resources/Italian.lproj/locversion.plist \ - Resources/Italian.lproj/main.nib/designable.nib \ - Resources/Italian.lproj/main.nib/keyedobjects.nib \ - Resources/Italian.lproj/main.nib/keyedobjects-110000.nib \ - Resources/Japanese.lproj/Localizable.strings \ - Resources/Japanese.lproj/locversion.plist \ - Resources/Japanese.lproj/main.nib/designable.nib \ - Resources/Japanese.lproj/main.nib/keyedobjects.nib \ - Resources/Japanese.lproj/main.nib/keyedobjects-110000.nib \ - Resources/ko.lproj/Localizable.strings \ - Resources/ko.lproj/locversion.plist \ - Resources/ko.lproj/main.nib/designable.nib \ - Resources/ko.lproj/main.nib/keyedobjects.nib \ - Resources/ko.lproj/main.nib/keyedobjects-110000.nib \ - Resources/no.lproj/Localizable.strings \ - Resources/no.lproj/locversion.plist \ - Resources/no.lproj/main.nib/designable.nib \ - Resources/no.lproj/main.nib/keyedobjects.nib \ - Resources/no.lproj/main.nib/keyedobjects-110000.nib \ - Resources/pl.lproj/Localizable.strings \ - Resources/pl.lproj/locversion.plist \ - Resources/pl.lproj/main.nib/designable.nib \ - Resources/pl.lproj/main.nib/keyedobjects.nib \ - Resources/pl.lproj/main.nib/keyedobjects-110000.nib \ - Resources/pt.lproj/Localizable.strings \ - Resources/pt.lproj/locversion.plist \ - Resources/pt.lproj/main.nib/designable.nib \ - Resources/pt.lproj/main.nib/keyedobjects.nib \ - Resources/pt.lproj/main.nib/keyedobjects-110000.nib \ - Resources/pt_PT.lproj/Localizable.strings \ - Resources/pt_PT.lproj/locversion.plist \ - Resources/pt_PT.lproj/main.nib/designable.nib \ - Resources/pt_PT.lproj/main.nib/keyedobjects.nib \ - Resources/pt_PT.lproj/main.nib/keyedobjects-110000.nib \ - Resources/ro.lproj/Localizable.strings \ - Resources/ro.lproj/locversion.plist \ - Resources/ro.lproj/main.nib/designable.nib \ - Resources/ro.lproj/main.nib/keyedobjects.nib \ - Resources/ro.lproj/main.nib/keyedobjects-110000.nib \ - Resources/ru.lproj/Localizable.strings \ - Resources/ru.lproj/locversion.plist \ - Resources/ru.lproj/main.nib/designable.nib \ - Resources/ru.lproj/main.nib/keyedobjects.nib \ - Resources/ru.lproj/main.nib/keyedobjects-110000.nib \ - Resources/sk.lproj/Localizable.strings \ - Resources/sk.lproj/locversion.plist \ - Resources/sk.lproj/main.nib/designable.nib \ - Resources/sk.lproj/main.nib/keyedobjects.nib \ - Resources/sk.lproj/main.nib/keyedobjects-110000.nib \ - Resources/Spanish.lproj/Localizable.strings \ - Resources/Spanish.lproj/locversion.plist \ - Resources/Spanish.lproj/main.nib/designable.nib \ - Resources/Spanish.lproj/main.nib/keyedobjects.nib \ - Resources/Spanish.lproj/main.nib/keyedobjects-110000.nib \ - Resources/sv.lproj/Localizable.strings \ - Resources/sv.lproj/locversion.plist \ - Resources/sv.lproj/main.nib/designable.nib \ - Resources/sv.lproj/main.nib/keyedobjects.nib \ - Resources/sv.lproj/main.nib/keyedobjects-110000.nib \ - Resources/th.lproj/Localizable.strings \ - Resources/th.lproj/locversion.plist \ - Resources/th.lproj/main.nib/designable.nib \ - Resources/th.lproj/main.nib/keyedobjects.nib \ - Resources/th.lproj/main.nib/keyedobjects-110000.nib \ - Resources/tr.lproj/Localizable.strings \ - Resources/tr.lproj/locversion.plist \ - Resources/tr.lproj/main.nib/designable.nib \ - Resources/tr.lproj/main.nib/keyedobjects.nib \ - Resources/tr.lproj/main.nib/keyedobjects-110000.nib \ - Resources/uk.lproj/Localizable.strings \ - Resources/uk.lproj/locversion.plist \ - Resources/uk.lproj/main.nib/designable.nib \ - Resources/uk.lproj/main.nib/keyedobjects.nib \ - Resources/uk.lproj/main.nib/keyedobjects-110000.nib \ - Resources/X11.icns \ - Resources/zh_CN.lproj/Localizable.strings \ - Resources/zh_CN.lproj/locversion.plist \ - Resources/zh_CN.lproj/main.nib/designable.nib \ - Resources/zh_CN.lproj/main.nib/keyedobjects.nib \ - Resources/zh_CN.lproj/main.nib/keyedobjects-110000.nib \ - Resources/zh_TW.lproj/Localizable.strings \ - Resources/zh_TW.lproj/locversion.plist \ - Resources/zh_TW.lproj/main.nib/designable.nib \ - Resources/zh_TW.lproj/main.nib/keyedobjects.nib - Resources/zh_TW.lproj/main.nib/keyedobjects-110000.nib diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am deleted file mode 100644 index e250b2869..000000000 --- a/hw/xquartz/mach-startup/Makefile.am +++ /dev/null @@ -1,94 +0,0 @@ -AM_CPPFLAGS = \ - -I$(srcdir)/.. \ - -I$(top_builddir) \ - -DXSERVER_VERSION=\"$(VERSION)\" \ - -DX11BINDIR=\"$(bindir)\" - -AM_CFLAGS = $(DIX_CFLAGS) - -x11appdir = $(APPLE_APPLICATIONS_DIR)/$(APPLE_APPLICATION_NAME).app/Contents/MacOS -x11app_PROGRAMS = X11.bin X11 - -dist_X11_bin_SOURCES = \ - bundle-main.c - -dist_X11_SOURCES = \ - bundle_trampoline.c - -nodist_X11_bin_SOURCES = \ - mach_startupServer.c \ - mach_startupUser.c - -X11_bin_DEPENDENCIES = \ - $(top_builddir)/hw/xquartz/libXquartz.la \ - $(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \ - $(top_builddir)/dix/dixfonts.lo \ - $(top_builddir)/miext/rootless/librootless.la \ - $(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \ - $(XQUARTZ_LIBS) $(XSERVER_LIBS) - -# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering -# to work around build issues on Tiger. -X11_bin_LDADD = $(X11_bin_DEPENDENCIES) $(XSERVER_SYS_LIBS) - -X11_bin_LDFLAGS = \ - -lXplugin \ - -XCClinker -Objc \ - -Wl,-u,_miDCInitialize \ - -Wl,-framework,Carbon \ - -Wl,-framework,Cocoa \ - -Wl,-framework,CoreAudio \ - -Wl,-framework,IOKit - -if GLX -X11_bin_DEPENDENCIES += \ - $(top_builddir)/hw/xquartz/GL/libCGLCore.la \ - $(top_builddir)/glx/libglxvnd.la \ - $(top_builddir)/glx/libglx.la - -X11_bin_LDFLAGS += \ - -Wl,-framework,OpenGL -endif - -if XQUARTZ_SPARKLE -X11_bin_LDFLAGS += \ - -Wl,-framework,Sparkle -endif - -if RECORD -X11_bin_DEPENDENCIES += \ - $(top_builddir)/record/librecord.la -endif - -bin_PROGRAMS = Xquartz - -dist_Xquartz_SOURCES = \ - stub.c \ - launchd_fd.c - -nodist_Xquartz_SOURCES = \ - mach_startupUser.c - -Xquartz_LDFLAGS = \ - -Wl,-framework,CoreServices - -if XQUARTZ - -BUILT_SOURCES = \ - mach_startupServer.c \ - mach_startupUser.c \ - mach_startupServer.h \ - mach_startup.h - -CLEANFILES = \ - $(BUILT_SOURCES) - -$(BUILT_SOURCES): $(srcdir)/mach_startup.defs - mig -sheader mach_startupServer.h $(srcdir)/mach_startup.defs - -endif - -EXTRA_DIST = \ - launchd_fd.h \ - mach_startup.defs \ - mach_startup_types.h diff --git a/hw/xquartz/man/Makefile.am b/hw/xquartz/man/Makefile.am deleted file mode 100644 index 5a0cde7cc..000000000 --- a/hw/xquartz/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = Xquartz.man diff --git a/hw/xquartz/pbproxy/Makefile.am b/hw/xquartz/pbproxy/Makefile.am deleted file mode 100644 index 9429ea25d..000000000 --- a/hw/xquartz/pbproxy/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -AM_CPPFLAGS=-DBUNDLE_ID_PREFIX=\"$(BUNDLE_ID_PREFIX)\" - -AM_CFLAGS=$(XPBPROXY_CFLAGS) -AM_OBJCFLAGS=$(XPBPROXY_CFLAGS) - -noinst_LTLIBRARIES = libxpbproxy.la -libxpbproxy_la_SOURCES = \ - trick_autotools.c \ - main.m \ - x-input.m \ - x-selection.m - -libxpbproxy_la_LDFLAGS=$(XPBPROXY_LIBS) - -if STANDALONE_XPBPROXY - -bin_PROGRAMS = xpbproxy -xpbproxy_SOURCES = app-main.m -xpbproxy_LDADD = libxpbproxy.la -xpbproxy_LDFLAGS = -Wl,-framework,Cocoa - -AM_CPPFLAGS += -DSTANDALONE_XPBPROXY - -endif - -EXTRA_DIST = \ - pbproxy.h \ - x-selection.h diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am deleted file mode 100644 index c654ee595..000000000 --- a/hw/xquartz/xpr/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -noinst_LTLIBRARIES = libXquartzXpr.la - -AM_CFLAGS = $(DIX_CFLAGS) -AM_CPPFLAGS = \ - -I$(srcdir) -I$(srcdir)/.. \ - -I$(top_builddir)/pseudoramiX \ - -I$(top_srcdir)/miext \ - -I$(top_srcdir)/miext/rootless - -libXquartzXpr_la_SOURCES = \ - appledri.c \ - dri.c \ - driWrap.c \ - xprAppleWM.c \ - xprCursor.c \ - xprEvent.c \ - xprFrame.c \ - xprScreen.c \ - x-hash.c \ - x-hook.c \ - x-list.c - -EXTRA_DIST = \ - dri.h \ - driWrap.h \ - dristruct.h \ - appledri.h \ - appledristr.h \ - x-hash.h \ - x-hook.h \ - x-list.h \ - xpr.h \ - xprEvent.h diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am deleted file mode 100644 index 0060df70a..000000000 --- a/hw/xwayland/Makefile.am +++ /dev/null @@ -1,189 +0,0 @@ -SUBDIRS = man - -DIST_SUBDIRS = man - -bindir = @xwayland_path@ -bin_PROGRAMS = Xwayland - -Xwayland_CFLAGS = \ - -I$(top_srcdir)/glamor \ - -I$(top_srcdir)/dri3 \ - -DHAVE_DIX_CONFIG_H \ - $(XWAYLANDMODULES_CFLAGS) \ - $(DIX_CFLAGS) \ - $(GLAMOR_CFLAGS) \ - $(GBM_CFLAGS) \ - $(LIBXCVT_CFLAGS) - -Xwayland_SOURCES = \ - xwayland.c \ - xwayland-input.c \ - xwayland-input.h \ - xwayland-cursor.c \ - xwayland-cursor.h \ - xwayland-glamor.h \ - xwayland-glx.h \ - xwayland-pixmap.c \ - xwayland-pixmap.h \ - xwayland-present.h \ - xwayland-screen.c \ - xwayland-screen.h \ - xwayland-shm.c \ - xwayland-shm.h \ - xwayland-types.h \ - xwayland-output.c \ - xwayland-output.h \ - xwayland-cvt.c \ - xwayland-cvt.h \ - xwayland-vidmode.c \ - xwayland-vidmode.h \ - xwayland-window.c \ - xwayland-window.h \ - xwayland-window-buffers.c \ - xwayland-window-buffers.h \ - $(top_srcdir)/Xi/stubs.c \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/mi/miinitext.h - -if GLAMOR -if GLX -Xwayland_SOURCES += \ - xwayland-glx.c -Xwayland_CFLAGS += \ - -I$(top_srcdir)/glx -GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la -endif #GLX -endif # GLAMOR - -Xwayland_LDADD = \ - $(glamor_lib) \ - $(XWAYLAND_LIBS) \ - $(GLXVND_LIB) \ - $(XWAYLAND_SYS_LIBS) \ - $(top_builddir)/Xext/libXvidmode.la \ - $(XSERVER_SYS_LIBS) \ - $(LIBXCVT_LIBS) -Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) - -Xwayland_built_sources = - -if GLAMOR_EGL -Xwayland_SOURCES += \ - xwayland-glamor.c \ - xwayland-glamor-gbm.c \ - xwayland-present.c -if XV -Xwayland_SOURCES += \ - xwayland-glamor-xv.c -endif - -if XWAYLAND_EGLSTREAM -Xwayland_SOURCES += \ - xwayland-glamor-eglstream.c -endif - -glamor_built_sources = \ - drm-client-protocol.h \ - drm-protocol.c - -Xwayland_built_sources += $(glamor_built_sources) - -glamor_lib = $(top_builddir)/glamor/libglamor.la - -Xwayland_LDADD += $(GLAMOR_LIBS) $(GBM_LIBS) -lEGL -lGL -Xwayland_DEPENDENCIES = $(glamor_lib) $(XWAYLAND_LIBS) -endif - -Xwayland_built_sources += \ - relative-pointer-unstable-v1-client-protocol.h \ - relative-pointer-unstable-v1-protocol.c \ - pointer-constraints-unstable-v1-client-protocol.h \ - pointer-constraints-unstable-v1-protocol.c \ - tablet-unstable-v2-client-protocol.h \ - tablet-unstable-v2-protocol.c \ - xwayland-keyboard-grab-unstable-v1-protocol.c \ - xwayland-keyboard-grab-unstable-v1-client-protocol.h \ - xdg-output-unstable-v1-protocol.c \ - xdg-output-unstable-v1-client-protocol.h \ - linux-dmabuf-unstable-v1-client-protocol.h \ - linux-dmabuf-unstable-v1-protocol.c \ - viewporter-client-protocol.h \ - viewporter-protocol.c\ - xdg-shell-client-protocol.h\ - xdg-shell-protocol.c - -if XWAYLAND_EGLSTREAM -Xwayland_built_sources += \ - wayland-eglstream-client-protocol.h \ - wayland-eglstream-protocol.c \ - wayland-eglstream-controller-client-protocol.h \ - wayland-eglstream-controller-protocol.c -endif - -nodist_Xwayland_SOURCES = $(Xwayland_built_sources) -CLEANFILES = $(Xwayland_built_sources) - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xwayland.pc - -EXTRA_DIST = xwayland.pc.in drm.xml - -$(Xwayland_SOURCES): $(Xwayland_built_sources) - -relink: - $(AM_V_at)rm -f Xwayland$(EXEEXT) && $(MAKE) Xwayland$(EXEEXT) - -relative-pointer-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/relative-pointer/relative-pointer-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) @SCANNER_ARG@ < $< > $@ -relative-pointer-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/relative-pointer/relative-pointer-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -pointer-constraints-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) @SCANNER_ARG@ < $< > $@ -pointer-constraints-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/pointer-constraints/pointer-constraints-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -tablet-unstable-v2-protocol.c: $(WAYLAND_PROTOCOLS_DATADIR)/unstable/tablet/tablet-unstable-v2.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) @SCANNER_ARG@ < $< > $@ -tablet-unstable-v2-client-protocol.h: $(WAYLAND_PROTOCOLS_DATADIR)/unstable/tablet/tablet-unstable-v2.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -xwayland-keyboard-grab-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) @SCANNER_ARG@ < $< > $@ -xwayland-keyboard-grab-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/xwayland-keyboard-grab/xwayland-keyboard-grab-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ -xdg-output-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/xdg-output/xdg-output-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) @SCANNER_ARG@ < $< > $@ -xdg-output-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/xdg-output/xdg-output-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -linux-dmabuf-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) @SCANNER_ARG@ < $< > $@ -linux-dmabuf-unstable-v1-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -viewporter-protocol.c: $(WAYLAND_PROTOCOLS_DATADIR)/stable/viewporter/viewporter.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) @SCANNER_ARG@ < $< > $@ -viewporter-client-protocol.h: $(WAYLAND_PROTOCOLS_DATADIR)/stable/viewporter/viewporter.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -xdg-shell-protocol.c: $(WAYLAND_PROTOCOLS_DATADIR)/stable/xdg-shell/xdg-shell.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) @SCANNER_ARG@ < $< > $@ -xdg-shell-client-protocol.h: $(WAYLAND_PROTOCOLS_DATADIR)/stable/xdg-shell/xdg-shell.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -wayland-eglstream-client-protocol.h : $(WAYLAND_EGLSTREAM_DATADIR)/wayland-eglstream.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ -wayland-eglstream-controller-client-protocol.h : $(WAYLAND_EGLSTREAM_DATADIR)/wayland-eglstream-controller.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -wayland-eglstream-protocol.c : $(WAYLAND_EGLSTREAM_DATADIR)/wayland-eglstream.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ -wayland-eglstream-controller-protocol.c : $(WAYLAND_EGLSTREAM_DATADIR)/wayland-eglstream-controller.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ - -%-protocol.c : %.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) @SCANNER_ARG@ < $< > $@ - -%-client-protocol.h : %.xml - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ diff --git a/hw/xwayland/man/Makefile.am b/hw/xwayland/man/Makefile.am deleted file mode 100644 index 6e4b59e17..000000000 --- a/hw/xwayland/man/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = Xwayland.man diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am deleted file mode 100644 index 75c2b2058..000000000 --- a/hw/xwin/Makefile.am +++ /dev/null @@ -1,162 +0,0 @@ -bin_PROGRAMS = XWin - -SRCS_CLIPBOARD = \ - winclipboardinit.c \ - winclipboardwrappers.c -CLIPBOARD_LIBS = $(top_builddir)/hw/xwin/winclipboard/libXWinclipboard.la - -if XWIN_GLX_WINDOWS -GLX_DIR = -DEFS_GLX_WINDOWS = -XWIN_GLX_LIBS = -if XWIN_WINDOWS_DRI -GLX_DIR += dri -DEFS_GLX_WINDOWS += -DXWIN_WINDOWS_DRI -XWIN_GLX_LIBS += $(top_builddir)/hw/xwin/dri/libWindowsDRI.la -endif -GLX_DIR += glx -DEFS_GLX_WINDOWS += -DXWIN_GLX_WINDOWS -XWIN_GLX_LIBS += $(top_builddir)/hw/xwin/glx/libXwinGLX.la -XWIN_GLX_SYS_LIBS = -lopengl32 -endif - -SRCS_MULTIWINDOW = \ - winmultiwindowshape.c \ - winmultiwindowwindow.c \ - winmultiwindowwm.c \ - winmultiwindowwndproc.c \ - propertystore.h \ - winSetAppUserModelID.c -MULTIWINDOW_SYS_LIBS = -lshlwapi -lole32 -ldwmapi - -SRCS_RANDR = \ - winrandr.c - -SRCS = InitInput.c \ - InitOutput.c \ - winallpriv.c \ - winauth.c \ - winblock.c \ - wincmap.c \ - winconfig.c \ - wincreatewnd.c \ - wincursor.c \ - windialogs.c \ - winengine.c \ - winerror.c \ - winglobals.c \ - winkeybd.c \ - winkeyhook.c \ - winmisc.c \ - winmonitors.c \ - winmouse.c \ - winmsg.c \ - winmsgwindow.c \ - winmultiwindowclass.c \ - winmultiwindowicons.c \ - winos.c \ - winprefs.c \ - winprefsyacc.y \ - winprefslex.l \ - winprocarg.c \ - winscrinit.c \ - winshadddnl.c \ - winshadgdi.c \ - wintaskbar.c \ - wintrayicon.c \ - winvalargs.c \ - winwakeup.c \ - winwindow.c \ - winwndproc.c \ - ddraw.h \ - winconfig.h \ - win.h \ - winglobals.h \ - winkeybd.h \ - winkeynames.h \ - winlayouts.h \ - winmessages.h \ - winmonitors.h \ - winmsg.h \ - winms.h \ - winmultiwindowclass.h \ - winmultiwindowicons.h \ - winprefs.h \ - winresource.h \ - winwindow.h \ - windisplay.c \ - windisplay.h \ - XWin.rc \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/mi/miinitext.h \ - $(SRCS_CLIPBOARD) \ - $(SRCS_MULTIWINDOW) \ - $(SRCS_RANDR) - -DEFS = \ - $(DEFS_GLX_WINDOWS) \ - $(DEFS_MULTIWINDOWEXTWM) - -XWin_SOURCES = $(SRCS) - -XWIN_SYS_LIBS += -ldxguid - -XWIN_LIBS += \ - $(top_builddir)/pseudoramiX/libPseudoramiX.la \ - $(top_builddir)/Xi/libXistubs.la - -XWin_DEPENDENCIES = \ - $(XWIN_GLX_LIBS) \ - $(XWIN_LIBS) \ - $(CLIPBOARD_LIBS) \ - $(XSERVER_LIBS) - - -XWin_LDADD = \ - $(XWIN_GLX_LIBS) \ - $(XWIN_LIBS) \ - $(CLIPBOARD_LIBS) \ - $(XSERVER_LIBS) \ - $(XWIN_GLX_SYS_LIBS) \ - $(XSERVER_SYS_LIBS) \ - $(XWIN_SYS_LIBS) \ - $(MULTIWINDOW_SYS_LIBS) - -XWin_LDFLAGS = -mwindows -Wl,--disable-stdcall-fixup $(LD_EXPORT_SYMBOLS_FLAG) - - -.rc.o: - $(AM_V_GEN)$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include - -XWin.o: XWin.rc XWin.exe.manifest X.ico - -winprefsyacc.h: winprefsyacc.c -winprefslex.c: winprefslex.l winprefsyacc.c winprefsyacc.h - -BUILT_SOURCES = winprefsyacc.h winprefsyacc.c winprefslex.c -CLEANFILES = $(BUILT_SOURCES) - -AM_YFLAGS = -d -AM_LFLAGS = -i -AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \ - $(XWINMODULES_CFLAGS) \ - -I$(top_srcdir) \ - -Wno-bad-function-cast - -xwinconfigdir = $(sysconfdir)/X11 -xwinconfig_DATA = system.XWinrc - -install-exec-hook: - (cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) XWin$(EXEEXT) X) - -EXTRA_DIST = \ - $(xwinconfig_DATA) \ - X.ico \ - XWin.rc \ - XWin.exe.manifest - -relink: - $(AM_V_at)rm -f XWin$(EXEEXT) && $(MAKE) XWin$(EXEEXT) - -SUBDIRS = man $(GLX_DIR) winclipboard . -DIST_SUBDIRS = man dri glx winclipboard . diff --git a/hw/xwin/dri/Makefile.am b/hw/xwin/dri/Makefile.am deleted file mode 100644 index 948c2b5c6..000000000 --- a/hw/xwin/dri/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -noinst_LTLIBRARIES = libWindowsDRI.la - -libWindowsDRI_la_SOURCES = \ - windowsdri.c \ - windowsdri.h - -AM_CFLAGS = $(DIX_CFLAGS) \ - @WINDOWSDRI_CFLAGS@ \ - -I$(top_srcdir)/hw/xwin/ diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am deleted file mode 100644 index ae9debe5c..000000000 --- a/hw/xwin/glx/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -noinst_LTLIBRARIES = libXwinGLX.la -lib_LTLIBRARIES = libnativeGLthunk.la - -libXwinGLX_la_SOURCES = \ - winpriv.c \ - winpriv.h \ - glwindows.h \ - glshim.c \ - indirect.c \ - indirect.h \ - wgl_ext_api.c \ - wgl_ext_api.h - -if XWIN_WINDOWS_DRI -libXwinGLX_la_SOURCES += \ - dri_helpers.c \ - dri_helpers.h -endif - -libnativeGLthunk_la_SOURCES = \ - glthunk.c - -if XWIN_GLX_WINDOWS -DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS -endif - -DEFS = \ - $(DEFS_GLX_WINDOWS) - -AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \ - $(XWINMODULES_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/hw/xwin/ - -libnativeGLthunk_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-function -Wno-missing-prototypes -Wno-missing-declarations -libnativeGLthunk_la_LDFLAGS = -shared -no-undefined -avoid-version -lopengl32 -export-symbols generated_gl_thunks.def -EXTRA_libnativeGLthunk_la_DEPENDENCIES = generated_gl_thunks.def - -if XWIN_GLX_WINDOWS - -if DEBUG -GENGLWRAPPERSOPTS="" -else -GENGLWRAPPERSOPTS="-nodebug" -endif - -generated_wgl_wrappers.ic: $(srcdir)/gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/wgl.xml $(KHRONOS_SPEC_DIR)/reg.py - $(AM_V_GEN)PYTHONPATH=$(KHRONOS_SPEC_DIR) $(PYTHON3) $(srcdir)/gen_gl_wrappers.py -registry $(KHRONOS_SPEC_DIR)/wgl.xml -prefix wgl -wrapper -preresolve $(GENGLWRAPPERSOPTS) -outfile $@ - -generated_gl_shim.ic: $(srcdir)/gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.xml $(KHRONOS_SPEC_DIR)/reg.py - $(AM_V_GEN)PYTHONPATH=$(KHRONOS_SPEC_DIR) $(PYTHON3) $(srcdir)/gen_gl_wrappers.py -registry $(KHRONOS_SPEC_DIR)/gl.xml -shim $(GENGLWRAPPERSOPTS) -outfile $@ - -generated_gl_thunks.ic: $(srcdir)/gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.xml $(KHRONOS_SPEC_DIR)/reg.py - $(AM_V_GEN)PYTHONPATH=$(KHRONOS_SPEC_DIR) $(PYTHON3) $(srcdir)/gen_gl_wrappers.py -registry $(KHRONOS_SPEC_DIR)/gl.xml -thunk $(GENGLWRAPPERSOPTS) -outfile $@ - -generated_gl_thunks.def: $(srcdir)/gen_gl_wrappers.py $(KHRONOS_SPEC_DIR)/gl.xml $(KHRONOS_SPEC_DIR)/reg.py - $(AM_V_GEN)PYTHONPATH=$(KHRONOS_SPEC_DIR) $(PYTHON3) $(srcdir)/gen_gl_wrappers.py -registry $(KHRONOS_SPEC_DIR)/gl.xml -thunkdefs $(GENGLWRAPPERSOPTS) -outfile $@ - -BUILT_SOURCES = generated_gl_shim.ic generated_gl_thunks.ic generated_gl_thunks.def generated_wgl_wrappers.ic -CLEANFILES = $(BUILT_SOURCES) - -endif - -EXTRA_DIST = gen_gl_wrappers.py diff --git a/hw/xwin/man/Makefile.am b/hw/xwin/man/Makefile.am deleted file mode 100644 index d19c2729f..000000000 --- a/hw/xwin/man/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -include $(top_srcdir)/manpages.am -appman_PRE = XWin.man -fileman_PRE = XWinrc.man diff --git a/hw/xwin/winclipboard/Makefile.am b/hw/xwin/winclipboard/Makefile.am deleted file mode 100644 index bfd302413..000000000 --- a/hw/xwin/winclipboard/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -noinst_LTLIBRARIES = libXWinclipboard.la - -libXWinclipboard_la_SOURCES = \ - internal.h \ - winclipboard.h \ - textconv.c \ - thread.c \ - wndproc.c \ - xevents.c - -libXWinclipboard_la_CFLAGS = -DHAVE_XWIN_CONFIG_H \ - $(DIX_CFLAGS) \ - $(XWINMODULES_CFLAGS) - -libXWinclipboard_la_LDFLAGS = -static -no-undefined - -bin_PROGRAMS = xwinclip - -xwinclip_SOURCES = xwinclip.c debug.c - -xwinclip_CFLAGS = $(XWINMODULES_CFLAGS) - -xwinclip_LDADD = libXWinclipboard.la $(XWINMODULES_LIBS) -lgdi32 -lpthread - -include $(top_srcdir)/manpages.am -appman_PRE = xwinclip.man diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index a1f241263..000000000 --- a/include/Makefile.am +++ /dev/null @@ -1,96 +0,0 @@ -if XORG -sdk_HEADERS = \ - XIstubs.h \ - Xprintf.h \ - callback.h \ - client.h \ - closestr.h \ - closure.h \ - colormap.h \ - colormapst.h \ - hotplug.h \ - cursor.h \ - cursorstr.h \ - dix.h \ - dixaccess.h \ - dixevents.h \ - dixfont.h \ - dixfontstr.h \ - dixgrabs.h \ - dixstruct.h \ - events.h \ - exevents.h \ - extension.h \ - extinit.h \ - extnsionst.h \ - fourcc.h \ - gc.h \ - gcstruct.h \ - globals.h \ - glx_extinit.h \ - glxvndabi.h \ - input.h \ - inputstr.h \ - list.h \ - misc.h \ - miscstruct.h \ - opaque.h \ - nonsdk_extinit.h \ - optionstr.h \ - os.h \ - pixmap.h \ - pixmapstr.h \ - privates.h \ - property.h \ - propertyst.h \ - ptrveloc.h \ - region.h \ - regionstr.h \ - registry.h \ - resource.h \ - rgb.h \ - screenint.h \ - scrnintstr.h \ - selection.h \ - servermd.h \ - validate.h \ - displaymode.h \ - window.h \ - windowstr.h \ - xkbfile.h \ - xkbsrv.h \ - xkbstr.h \ - xkbrules.h \ - xserver_poll.h \ - xserver-properties.h - -nodist_sdk_HEADERS = xorg-server.h -endif - -AM_CFLAGS = $(DIX_CFLAGS) - -EXTRA_DIST = \ - busfault.h dbus-core.h \ - dix-config-apple-verbatim.h \ - eventconvert.h eventstr.h inpututils.h \ - probes.h \ - protocol-versions.h \ - swaprep.h \ - swapreq.h \ - systemd-logind.h \ - vidmodestr.h \ - xorg-config.h.meson.in \ - xorg-server.h.meson.in \ - xwayland-config.h.meson.in \ - xwin-config.h.meson.in \ - xsha1.h - -if XSERVER_DTRACE -# Generate dtrace header file for C sources to include -BUILT_SOURCES = Xserver-dtrace.h - -Xserver-dtrace.h: $(srcdir)/Xserver.d - $(AM_V_GEN)$(DTRACE) -C -h -o $@ -s $(srcdir)/Xserver.d -endif - -CLEANFILES = Xserver-dtrace.h diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 71d704917..000000000 --- a/man/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -# Xserver.man covers options generic to all X servers built in this tree -# (i.e. those handled in the os/utils.c options processing instead of in -# the DDX-level options processing) - -include $(top_srcdir)/manpages.am -appman_PRE = Xserver.man diff --git a/manpages.am b/manpages.am deleted file mode 100644 index 15056905c..000000000 --- a/manpages.am +++ /dev/null @@ -1,59 +0,0 @@ -appmandir = $(APP_MAN_DIR) -#appman_PRE = list of application man page files set by calling Makefile.am -appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) - -drivermandir = $(DRIVER_MAN_DIR) -#driverman_PRE = list of driver man page files set by calling Makefile.am -driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX)) - -filemandir = $(FILE_MAN_DIR) -#fileman_PRE = list of file man page files set by calling Makefile.am -fileman_DATA = $(fileman_PRE:man=$(FILE_MAN_SUFFIX)) - -# The calling Makefile should only contain man page targets -# Otherwise the following three global variables may conflict -EXTRA_DIST = $(appman_PRE) $(driverman_PRE) $(fileman_PRE) -CLEANFILES = $(appman_DATA) $(driverman_DATA) $(fileman_DATA) -SUFFIXES = .$(APP_MAN_SUFFIX) .$(DRIVER_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man - -# xorg-macros.m4 has these bracketed by double underscores, but meson -# wants ats. - -MAN_SUBSTS += -e 's|@vendorversion@|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' \ - -e 's|@xorgversion@|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' \ - -e 's|@xservername@|Xorg|g' \ - -e 's|@xconfigfile@|xorg.conf|g' \ - -e 's|@projectroot@|$(prefix)|g' \ - -e 's|@apploaddir@|$(appdefaultdir)|g' \ - -e 's|@appmansuffix@|$(APP_MAN_SUFFIX)|g' \ - -e 's|@drivermansuffix@|$(DRIVER_MAN_SUFFIX)|g' \ - -e 's|@adminmansuffix@|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|@libmansuffix@|$(LIB_MAN_SUFFIX)|g' \ - -e 's|@miscmansuffix@|$(MISC_MAN_SUFFIX)|g' \ - -e 's|@filemansuffix@|$(FILE_MAN_SUFFIX)|g' - -# Add server specific man pages string substitution from XORG_MANPAGE_SECTIONS -# 's|/,|/, |g' will add a space to help font path formatting -MAN_SUBSTS += -e 's|[@]logdir[@]|$(logdir)|g' \ - -e 's|[@]datadir[@]|$(datadir)|g' \ - -e 's|[@]mandir[@]|$(mandir)|g' \ - -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|[@]xconfigdir[@]|$(XCONFIGDIR)|g' \ - -e 's|[@]xkbdir[@]|$(XKB_BASE_DIRECTORY)|g' \ - -e 's|[@]XKB_DFLT_RULES[@]|$(XKB_DFLT_RULES)|g' \ - -e 's|[@]XKB_DFLT_MODEL[@]|$(XKB_DFLT_MODEL)|g' \ - -e 's|[@]XKB_DFLT_LAYOUT[@]|$(XKB_DFLT_LAYOUT)|g' \ - -e 's|[@]XKB_DFLT_VARIANT[@]|$(XKB_DFLT_VARIANT)|g' \ - -e 's|[@]XKB_DFLT_OPTIONS[@]|$(XKB_DFLT_OPTIONS)|g' \ - -e 's|[@]bundle_id_prefix[@]|$(BUNDLE_ID_PREFIX)|g' \ - -e 's|[@]modulepath[@]|$(DEFAULT_MODULE_PATH)|g' \ - -e 's|[@]suid_wrapper_dir[@]|$(SUID_WRAPPER_DIR)|g' \ - -e 's|[@]default_font_path[@]|$(COMPILEDDEFAULTFONTPATH)|g' \ - -e '\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g' - -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -.man.$(DRIVER_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -.man.$(FILE_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/mi/Makefile.am b/mi/Makefile.am deleted file mode 100644 index 110c3f5dd..000000000 --- a/mi/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -noinst_LTLIBRARIES = libmi.la - -if XORG -sdk_HEADERS = micmap.h miline.h mipointer.h mi.h \ - migc.h mipointrst.h mizerarc.h micoord.h \ - mistruct.h mioverlay.h -endif - -AM_CFLAGS = $(DIX_CFLAGS) - -libmi_la_SOURCES = \ - mi.h \ - miarc.c \ - mibitblt.c \ - micmap.c \ - micmap.h \ - micoord.h \ - micopy.c \ - midash.c \ - midispcur.c \ - mieq.c \ - miexpose.c \ - mifillarc.c \ - mifillarc.h \ - mifillrct.c \ - mifpoly.h \ - migc.c \ - migc.h \ - miglblt.c \ - miline.h \ - mioverlay.c \ - mioverlay.h \ - mipointer.c \ - mipointer.h \ - mipointrst.h \ - mipoly.c \ - mipoly.h \ - mipolypnt.c \ - mipolyrect.c \ - mipolyseg.c \ - mipolytext.c \ - mipushpxl.c \ - miscanfill.h \ - miscrinit.c \ - misprite.c \ - misprite.h \ - mistruct.h \ - mivaltree.c \ - mivalidate.h \ - miwideline.c \ - miwideline.h \ - miwindow.c \ - mizerarc.c \ - mizerarc.h \ - mizerclip.c \ - mizerline.c diff --git a/miext/Makefile.am b/miext/Makefile.am deleted file mode 100644 index add4d18b0..000000000 --- a/miext/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = sync damage shadow rootless diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am deleted file mode 100644 index a7f432a61..000000000 --- a/miext/damage/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -noinst_LTLIBRARIES = libdamage.la - -AM_CFLAGS = $(DIX_CFLAGS) - -AM_CPPFLAGS = -I$(srcdir)/../cw - -if XORG -sdk_HEADERS = damage.h damagestr.h -endif - -libdamage_la_SOURCES = \ - damage.c \ - damage.h \ - damagestr.h diff --git a/miext/rootless/Makefile.am b/miext/rootless/Makefile.am deleted file mode 100644 index c97bebebe..000000000 --- a/miext/rootless/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AM_CFLAGS = $(DIX_CFLAGS) $(XSERVER_CFLAGS) - -noinst_LTLIBRARIES = librootless.la -librootless_la_SOURCES = \ - rootlessCommon.c \ - rootlessGC.c \ - rootlessScreen.c \ - rootlessValTree.c \ - rootlessWindow.c - -EXTRA_DIST = \ - README.txt \ - rootless.h \ - rootlessCommon.h \ - rootlessConfig.h \ - rootlessWindow.h diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am deleted file mode 100644 index dabbf038c..000000000 --- a/miext/shadow/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -noinst_LTLIBRARIES = libshadow.la - -AM_CFLAGS = $(DIX_CFLAGS) - -if XORG -sdk_HEADERS = shadow.h -endif - -libshadow_la_SOURCES = \ - c2p_core.h \ - shadow.c \ - shadow.h \ - sh3224.c \ - shafb4.c \ - shafb8.c \ - shiplan2p4.c \ - shiplan2p8.c \ - shpacked.c \ - shplanar8.c \ - shplanar.c \ - shrot16pack_180.c \ - shrot16pack_270.c \ - shrot16pack_270YX.c \ - shrot16pack_90.c \ - shrot16pack_90YX.c \ - shrot16pack.c \ - shrot32pack_180.c \ - shrot32pack_270.c \ - shrot32pack_90.c \ - shrot32pack.c \ - shrot8pack_180.c \ - shrot8pack_270.c \ - shrot8pack_90.c \ - shrot8pack.c \ - shrotate.c \ - shrotpack.h \ - shrotpackYX.h diff --git a/miext/sync/Makefile.am b/miext/sync/Makefile.am deleted file mode 100644 index 34961d5ff..000000000 --- a/miext/sync/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -noinst_LTLIBRARIES = libsync.la - -AM_CFLAGS = $(DIX_CFLAGS) - -AM_CPPFLAGS = - -if XORG -sdk_HEADERS = misync.h misyncstr.h misyncshm.h misyncfd.h -endif - -XSHMFENCE_SRCS = misyncshm.c - -libsync_la_SOURCES = \ - misync.c \ - misync.h \ - misyncfd.c \ - misyncstr.h - -if XSHMFENCE -libsync_la_SOURCES += $(XSHMFENCE_SRCS) -endif diff --git a/os/Makefile.am b/os/Makefile.am deleted file mode 100644 index 30f516cfa..000000000 --- a/os/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -noinst_LTLIBRARIES = libos.la - -AM_CFLAGS = $(DIX_CFLAGS) $(SHA1_CFLAGS) - -SECURERPC_SRCS = rpcauth.c -XDMCP_SRCS = xdmcp.c -XORG_SRCS = log.c -BUSFAULT_SRCS = busfault.c - -XSERVER_POLL_SRCS=xserver_poll.c - -libos_la_SOURCES = \ - WaitFor.c \ - access.c \ - auth.c \ - backtrace.c \ - client.c \ - connection.c \ - inputthread.c \ - io.c \ - mitauth.c \ - oscolor.c \ - osdep.h \ - osinit.c \ - ospoll.c \ - ospoll.h \ - utils.c \ - xdmauth.c \ - xsha1.c \ - xstrans.c \ - xprintf.c \ - $(XORG_SRCS) -libos_la_LIBADD = @SHA1_LIBS@ $(DLOPEN_LIBS) $(LTLIBOBJS) - -if SECURE_RPC -libos_la_SOURCES += $(SECURERPC_SRCS) -endif - -if POLL -else -libos_la_SOURCES += $(XSERVER_POLL_SRCS) -endif - -if XDMCP -libos_la_SOURCES += $(XDMCP_SRCS) -endif - -if HAVE_LIBUNWIND -AM_CFLAGS += $(LIBUNWIND_CFLAGS) -libos_la_LIBADD += $(LIBUNWIND_LIBS) -endif - -if BUSFAULT -libos_la_SOURCES += $(BUSFAULT_SRCS) -endif - -EXTRA_DIST = $(SECURERPC_SRCS) $(XDMCP_SRCS) - -if SPECIAL_DTRACE_OBJECTS -# Generate dtrace object code for probes in libos & libdix -dtrace.o: $(top_srcdir)/include/Xserver.d libos.la - $(AM_V_GEN)$(DTRACE) -G -C -o $@ -s $(top_srcdir)/include/Xserver.d .libs/*.o ../dix/.libs/*.o - -noinst_PROGRAMS = os.O - -os_O_SOURCES = -os.O: dtrace.o libos.la - $(AM_V_GEN)ld -r -o $@ dtrace.o .libs/*.o -endif diff --git a/present/Makefile.am b/present/Makefile.am deleted file mode 100644 index a2d58212c..000000000 --- a/present/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -noinst_LTLIBRARIES = libpresent.la -AM_CFLAGS = \ - @DIX_CFLAGS@ - -libpresent_la_SOURCES = \ - present.h \ - present.c \ - present_event.c \ - present_execute.c \ - present_fake.c \ - present_fence.c \ - present_notify.c \ - present_priv.h \ - present_request.c \ - present_scmd.c \ - present_screen.c \ - present_vblank.c - -sdk_HEADERS = present.h presentext.h diff --git a/pseudoramiX/Makefile.am b/pseudoramiX/Makefile.am deleted file mode 100644 index 17b664b9e..000000000 --- a/pseudoramiX/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -# Fake Xinerama extension - -AM_CFLAGS = $(DIX_CFLAGS) - -noinst_LTLIBRARIES = libPseudoramiX.la - -libPseudoramiX_la_SOURCES = pseudoramiX.c pseudoramiX.h diff --git a/randr/Makefile.am b/randr/Makefile.am deleted file mode 100644 index f9cefd18a..000000000 --- a/randr/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -noinst_LTLIBRARIES = librandr.la - -AM_CFLAGS = $(DIX_CFLAGS) - -XINERAMA_SRCS = rrxinerama.c - -if XORG -sdk_HEADERS = randrstr.h rrtransform.h -endif - -librandr_la_SOURCES = \ - randr.c \ - randrstr.h \ - rrcrtc.c \ - rrdispatch.c \ - rrinfo.c \ - rrlease.c \ - rrmode.c \ - rrmonitor.c \ - rroutput.c \ - rrpointer.c \ - rrproperty.c \ - rrprovider.c \ - rrproviderproperty.c \ - rrscreen.c \ - rrsdispatch.c \ - rrtransform.h \ - rrtransform.c - -if XINERAMA -librandr_la_SOURCES += ${XINERAMA_SRCS} -endif - diff --git a/record/Makefile.am b/record/Makefile.am deleted file mode 100644 index 2a64f3189..000000000 --- a/record/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -noinst_LTLIBRARIES = librecord.la - -AM_CFLAGS = $(DIX_CFLAGS) - -librecord_la_SOURCES = record.c set.c - -EXTRA_DIST = set.h diff --git a/render/Makefile.am b/render/Makefile.am deleted file mode 100644 index d02028b3b..000000000 --- a/render/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -noinst_LTLIBRARIES = librender.la - -AM_CFLAGS = $(DIX_CFLAGS) - -librender_la_SOURCES = \ - animcur.c \ - filter.c \ - glyph.c \ - matrix.c \ - miindex.c \ - mipict.c \ - mirect.c \ - mitrap.c \ - mitri.c \ - picture.c \ - render.c - -if XORG -sdk_HEADERS = picture.h mipict.h glyphstr.h picturestr.h -endif diff --git a/test/Makefile.am b/test/Makefile.am deleted file mode 100644 index 1f797530c..000000000 --- a/test/Makefile.am +++ /dev/null @@ -1,199 +0,0 @@ -if ENABLE_UNIT_TESTS -SUBDIRS= . -AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ -AM_CPPFLAGS = $(XORG_INCS) - -tests_CPPFLAGS= -CLEANFILES= - -tests_SOURCES = \ - tests-common.c \ - tests-common.h \ - list.c \ - string.c \ - tests.c \ - tests.h - -noinst_PROGRAMS = simple-xinit tests - -if XVFB -XVFB_TESTS = scripts/xvfb-piglit.sh -if XEPHYR -if GLAMOR -XEPHYR_GLAMOR_TESTS = scripts/xephyr-glamor-piglit.sh -endif -endif -endif - -if XWAYLAND -XWAYLAND_TESTS = scripts/xwayland-piglit.sh -endif - -SCRIPT_TESTS = \ - $(XVFB_TESTS) \ - $(XEPHYR_GLAMOR_TESTS) \ - $(XWAYLAND_TESTS) \ - $(NULL) - -TESTS = tests \ - $(SCRIPT_TESTS) \ - $(NULL) - -TESTS_ENVIRONMENT = \ - XSERVER_DIR=$(abs_top_srcdir) \ - XSERVER_BUILDDIR=$(abs_top_builddir) \ - $(XORG_MALLOC_DEBUG_ENV) \ - $(NULL) - -tests_LDADD = - -if XORG - -# Tests that require at least some DDX functions in order to fully link -# For now, requires xf86 ddx, could be adjusted to use another - -AM_CPPFLAGS += \ - -I$(srcdir)/xi1 \ - -I$(srcdir)/xi2 \ - -I$(top_srcdir)/hw/xfree86/common \ - -I$(top_srcdir)/hw/xfree86/parser \ - -I$(top_srcdir)/hw/xfree86/ddc \ - -I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \ - -I$(top_srcdir)/hw/xfree86/ramdac -I$(top_srcdir)/hw/xfree86/dri \ - -I$(top_srcdir)/hw/xfree86/dri2 -I$(top_srcdir)/dri3 -tests_CPPFLAGS += $(AM_CPPFLAGS) - -tests_SOURCES += \ - fixes.c \ - input.c \ - misc.c \ - signal-logging.c \ - touch.c \ - xfree86.c \ - test_xkb.c \ - xtest.c -tests_CPPFLAGS += -DXORG_TESTS - -if RES -tests_SOURCES += hashtabletest.c -tests_CPPFLAGS += -DRES_TESTS -endif - -endif XORG - -if HAVE_LD_WRAP - -tests_CPPFLAGS += -DLDWRAP_TESTS - -if XORG -tests_SOURCES += \ - xi1/protocol-xchangedevicecontrol.c \ - xi2/protocol-common.c \ - xi2/protocol-xiqueryversion.c \ - xi2/protocol-xiquerydevice.c \ - xi2/protocol-xiselectevents.c \ - xi2/protocol-xigetselectedevents.c \ - xi2/protocol-xisetclientpointer.c \ - xi2/protocol-xigetclientpointer.c \ - xi2/protocol-xiquerypointer.c \ - xi2/protocol-xipassivegrabdevice.c \ - xi2/protocol-xiwarppointer.c \ - xi2/protocol-eventconvert.c \ - xi2/xi2.c \ - xi2/protocol-common.h - -tests_LDFLAGS = \ - -Wl,-wrap,dixLookupWindow \ - -Wl,-wrap,dixLookupClient \ - -Wl,-wrap,WriteToClient \ - -Wl,-wrap,dixLookupWindow \ - -Wl,-wrap,XISetEventMask \ - -Wl,-wrap,AddResource \ - -Wl,-wrap,GrabButton \ - $() -endif XORG - -else !HAVE_LD_WRAP - -# Print that xi1-tests were skipped (exit code 77 for automake test harness) -TESTS += xi1-tests -CLEANFILES += xi1-tests - -xi1-tests: - @echo 'echo "ld -wrap support required for xi1 unit tests, skipping"' > $@ - @echo 'exit 77' >> $@ - $(AM_V_GEN)chmod +x $@ - -# Print that xi2-tests were skipped (exit code 77 for automake test harness) -TESTS += xi2-tests -CLEANFILES += xi2-tests - -xi2-tests: - @echo 'echo "ld -wrap support required for xi2 unit tests, skipping"' > $@ - @echo 'exit 77' >> $@ - $(AM_V_GEN)chmod +x $@ - -endif !HAVE_LD_WRAP - -if XORG - -nodist_tests_SOURCES = sdksyms.c - -tests_LDADD += \ - $(top_builddir)/hw/xfree86/loader/libloader.la \ - $(top_builddir)/hw/xfree86/common/libcommon.la \ - $(top_builddir)/hw/xfree86/os-support/libxorgos.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 \ - $(top_builddir)/hw/xfree86/ddc/libddc.la \ - $(top_builddir)/hw/xfree86/i2c/libi2c.la \ - $(top_builddir)/hw/xfree86/xkb/libxorgxkb.la \ - $(top_builddir)/Xext/libXvidmode.la \ - $(top_builddir)/fb/libfb.la \ - $(XSERVER_LIBS) \ - $(XORG_LIBS) - -if !SPECIAL_DTRACE_OBJECTS -tests_LDADD += $(top_builddir)/os/libos.la -endif - -if GLX -tests_LDADD += $(top_builddir)/glx/libglxvnd.la -endif - -BUILT_SOURCES = sdksyms.c -CLEANFILES += sdksyms.c - -sdksyms.c: $(top_builddir)/hw/xfree86/sdksyms.c - $(AM_V_GEN)$(LN_S) $(top_builddir)/hw/xfree86/sdksyms.c - -if DRI -tests_LDADD += $(top_builddir)/hw/xfree86/dri/libdri.la -endif - -if DRI2 -tests_LDADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la -endif - -if DRI3 -tests_LDADD += $(top_builddir)/dri3/libdri3.la -endif - -endif XORG - -# GNU LD scans only in one direction, add the following dependencies at the end -# so as they get picked up by the previously-linked libraries -tests_LDADD += $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS) - -endif ENABLE_UNIT_TESTS - -EXTRA_DIST = \ - scripts/xvfb-piglit.sh \ - scripts/xephyr-glamor-piglit.sh \ - scripts/xinit-piglit-session.sh \ - scripts/xwayland-piglit.sh \ - scripts/run-piglit.sh \ - $(NULL) - diff --git a/test/scripts/build-travis-osx.sh b/test/scripts/build-travis-osx.sh index e77049e9c..d9632490d 100755 --- a/test/scripts/build-travis-osx.sh +++ b/test/scripts/build-travis-osx.sh @@ -45,14 +45,6 @@ fi popd # build -if [[ "$1" == "autotools" ]]; then - autoreconf -fvi - ./configure --prefix=/opt/X11 --disable-dependency-tracking --with-apple-application-name=XQuartz --with-bundle-id-prefix=org.macosforge.xquartz - make - make check - make install DESTDIR=$(pwd)/staging -elif [[ "$1" == "meson" ]]; then - meson _build/ -Dprefix=/opt/X11 -Dsecure-rpc=false - DESTDIR=$(pwd)/staging ninja -C _build/ install - ninja -C _build/ test -fi +meson _build/ -Dprefix=/opt/X11 -Dsecure-rpc=false +DESTDIR=$(pwd)/staging ninja -C _build/ install +ninja -C _build/ test diff --git a/xfixes/Makefile.am b/xfixes/Makefile.am deleted file mode 100644 index 52a7e6c6a..000000000 --- a/xfixes/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -noinst_LTLIBRARIES = libxfixes.la - -AM_CFLAGS = $(DIX_CFLAGS) - -libxfixes_la_SOURCES = \ - cursor.c \ - disconnect.c \ - region.c \ - saveset.c \ - select.c \ - xfixes.c \ - xfixes.h \ - xfixesint.h diff --git a/xkb/Makefile.am b/xkb/Makefile.am deleted file mode 100644 index e386ce5a2..000000000 --- a/xkb/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -noinst_LTLIBRARIES = libxkb.la libxkbstubs.la - -AM_CFLAGS = $(DIX_CFLAGS) - -DDX_SRCS = \ - ddxBeep.c \ - ddxCtrls.c \ - ddxLEDs.c \ - ddxLoad.c - -DIX_SRCS = \ - xkb.c \ - xkbUtils.c \ - xkbEvents.c \ - xkbAccessX.c \ - xkbSwap.c \ - xkbLEDs.c \ - xkbInit.c \ - xkbActions.c \ - xkbPrKeyEv.c - -# this should be replaced by a common library or something, ideally -d -XKBFILE_SRCS = \ - maprules.c \ - xkmread.c \ - xkbtext.c \ - xkbfmisc.c \ - xkbout.c - -X11_SRCS = \ - XKBMisc.c \ - XKBAlloc.c \ - XKBGAlloc.c \ - XKBMAlloc.c - -libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XKBFILE_SRCS) $(X11_SRCS) -libxkbstubs_la_SOURCES = ddxVT.c ddxPrivate.c ddxKillSrv.c - -EXTRA_DIST = xkbDflts.h xkbgeom.h xkb.h - -xkbcompileddir = $(XKB_COMPILED_DIR) -dist_xkbcompiled_DATA = README.compiled |