summaryrefslogtreecommitdiff
path: root/configure.ac
AgeCommit message (Collapse)AuthorFilesLines
2011-11-23Add fallback implementation of strndup()Alan Coopersmith1-0/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Linux test code fixed by: Keith Packard <keithp@keithp.com>
2011-11-23Don't require ld -wrap for tests that don't need itAlan Coopersmith1-1/+1
If configure is generated with xorg-macros 1.16 or later, this allows builders to --enable-unit-test and run the tests other than the xi2 tests which require ld -wrap (and are still wrapped in if HAVE_LD_WRAP in tests/xi2/Makefile). If an older xorg-macros is used, the existing behaviour is preserved of requiring ld -wrap for all unit tests, but no side effects occur, so the minimum xorg-macros version is not raised. If unit testing is enabled without ld -wrap, then we create a bogus "xi2-tests" script just to report that we're skipping them. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-20Bump version to 1.11.99.1 (1.12 development release 1)xorg-server-1.11.99.1Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-10-21configure.ac: Add -fno-strict-aliasing to CFLAGSJeremy Huddleston1-0/+6
This should force the server to have -fno-strict-aliasing even once it is removed from the warning flags. See: https://bugs.freedesktop.org/show_bug.cgi?id=31238 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-10-15xorg-server.pc.in: Remove libpciaccess and pixman-1 from RequiresJeremy Huddleston1-5/+6
Every module building against xorg-server does not *Require* pixman nor libpciaccess. If such modules need pixman or pciaccess, they should be depending on them directly rather than inheriting a dependency from xorg-server. To do this, they should use PKG_CHECK_MODULES in configure.ac to check for pixman-1 or pciaccess and include the apporpriate _LIBS variable to the appropriate _LDFLAGS variable in Makefile.am This also moves pixman-1 to Requires.private, so CPPFLAGS is set right to to satisfy include dependencies but avoid linking needlessly. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-10-15darwin: configure: Force some irrelevant options to off on darwinJeremy Huddleston1-0/+5
This removes the need to pass the following to configure on darwin: --disable-pciaccess -disable-int10-module --disable-vbe --disable-vgahw --disable-libdrm Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-10-15configure: wrap PCI code with macro and set it at build timeTiago Vignatti1-0/+8
--disable-pciaccess, used together with --disable-module-int10, can be used to disable all pci code inside the server. Note that XSERVER_LIBPCIACCESS was previously used only in the driver side and now it defines also whether the library is used inside the server. Also, XORG_BUS_PCI automake variable is introduced to track PCI code needs. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-15configure: make PCI configuration more saneTiago Vignatti1-17/+22
No semantical changes. Just moved code around, grouping PCI related stuff in a single chunk. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-10-15configure: change PCI function checking by a meaningful version of the libraryTiago Vignatti1-10/+0
People that don't want VGA arbiter active can go to the library and enable the stubs there. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-10-15xfree86: Add stubs for os-support to help adding new architecture supportJeremy Huddleston1-2/+3
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-10-15pci: Remove xf86MapDomainMemoryAdam Jackson1-4/+1
This is slightly draconian, but that API is just awful. In all but one case in the callers it's used to get a map of some legacy VGA memory, and it would be cleaner for the caller to just call pci_device_map_legacy. The sole exception is in the vesa driver, which uses it to avoid having to look up which device the BAR belongs to. That's similarly trivial to fix. Having done that, Linux's PCI layer is now very small indeed. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
2011-10-15linux: Remove ia64 domain I/O support codeAdam Jackson1-6/+1
pciaccess handles this now. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Tested-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Jamey Sharp <jamey@minilop.net>
2011-10-03Merge remote-tracking branch 'herrb/master'Keith Packard1-0/+16
2011-10-03udev: make use of udev_enumerate_add_match_tag() only when it is availableLennart Poettering1-0/+9
udev_enumerate_add_match_tag() and udev_monitor_filter_add_match_tag() are mostly optimizations, hence simply skip these calls if they are not available in the installed version of libudev. This should fix the build on older versions of udev. [airlied: fixes tinderbox failures on RHEL6] Signed-off-by: Lennart Poettering <lennart@poettering.net> Reviewed-by: Dave Airlie <airlied@redhat.com> Tested-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-10-03Merge remote-tracking branch 'whot/next'Keith Packard1-1/+1
2011-10-03Add AC_LANG_SOURCE wrappers around configure.ac code fragmentsKeith Packard1-5/+5
Current autoconf versions are very unhappy when code fragments are not wrapped in AC_LANG_SOURCE macros, generating errors like: configure.ac:723: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2662: _AC_LINK_IFELSE is expanded from... ../../lib/autoconf/general.m4:2679: AC_LINK_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2032: AC_CACHE_VAL is expanded from... ../../lib/autoconf/general.m4:2053: AC_CACHE_CHECK is expanded from... configure.ac:723: the top level Signed-off-by: Keith Packard <keithp@keithp.com>
2011-09-30Add a 'wscons' autoconf mechanism to configure input devices on BSD.Matthieu Herrb1-0/+16
This does not really handle hotplug (it's handled inside the kernel, by the 'mux' devices), but uses the wscons console driver configuration to figure out the keyboard layout and the list of pointing devices found by the kernel. Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-09-29Merge branch 'raw-events' into nextPeter Hutterer1-1/+1
Conflicts: configure.ac dix/events.c
2011-09-29Support (and require) XI 2.1Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-09-21Merge remote-tracking branch 'jamey/reviewed'Keith Packard1-30/+0
2011-09-16configure.ac: Remove unreachable check for VM86 headers.Jamey Sharp1-4/+0
"configure --with-int10" is not a valid configuration, and the check for sys/vm86.h and sys/io.h is not used. Delete it. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-15Remove PC98 support.Jamey Sharp1-15/+0
Gaetan Nadon wrote: Alan Coopersmith wrote: "I think we recently dropped PC98 support from the X server, so I'd be okay with dropping the documentation now". Let's make them be right, shall we? Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Acked-by: Gaetan Nadon <memsize@videotron.ca> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-09-15configure.ac: XORG_OS is not used, so delete it.Jamey Sharp1-8/+0
Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-15configure.ac: Remove unused XORG_OS_PCI variable.Jamey Sharp1-3/+0
This is the last mention after ccfaf82367c9d057fd8314ce36b47f0a8eb696b6 quit using the variable. Signed-off-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Tiago Vignatti posted an identical patch in June 2010, which I only noticed after getting the above reviews. His patch was: Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2011-08-31configure.ac: Fix help string for mitshm.Cyril Brulebois1-1/+1
Pasting from ./configure --help's output, one would get: | configure: WARNING: unrecognized options: --disable-shm Fix the help string to include the previously missing “mit” bits. Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-08-26Version bumped to 1.11xorg-server-1.11.0Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-08-03Version bumped to 1.10.99.902 (1.11 RC2)xorg-server-1.10.99.902Keith Packard1-2/+2
At the close of the 1.11 non-critical fixes window. Signed-off-by: Keith Packard <keithp@keithp.com>
2011-07-27configure: set default xkb rules to evdev on LinuxJulien Cristau1-5/+1
If config/udev was enabled, this would default to base, which means that after regen the devices would get the wrong rules, and hilarity would ensue. It's probably safe to default to evdev unconditionally on Linux by now. Reported-by: Bastian Blank <waldi@debian.org> Signed-off-by: Julien Cristau <jcristau@debian.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-29Merge remote-tracking branch 'jbarnes/master'Keith Packard1-2/+2
2011-06-29Remove unused check for PERL programGaetan Nadon1-8/+0
Unable to find any use of the PERL Automake variable. It was used in hw/xfree86/scanpci around 2005. Should it ever be needed, use XORG_WITH_PERL macro. Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-06-29Merge remote-tracking branch 'kibi/master'Keith Packard1-1/+1
2011-06-29DRI2/GLX: use new swap event typesJesse Barnes1-2/+2
Use the new event types so we can pass a valid SBC value to clients. Fix up the completion calls to use CARD32 instead of CARD64 to match the new field size. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2011-06-28XQuartz: Fix Makefile dependenciesJeremy Huddleston1-2/+2
automake generates _DEPENDENCIES from _LIBADD, but it strips out variables. This resulted in not relinking if some components were rebuilt (like libdix, libos, etc). Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-28Create sdksyms.dep in the right place at configure timeKeith Packard1-1/+1
sdksyms moved from hw/xfree86/loader to hw/xfree86, so the configure-time create of sdksyms.dep needs to reflect that change. Otherwise, make might be confused by a missing file and (more importantly to me) hw/xfree86/loader/sdksyms.dep will be left around after 'make clean' causing 'make distcheck' to fail.
2011-06-21Xdmx.man: Show actual configured XKB defaults instead of old hardcoded valuesAlan Coopersmith1-0/+5
Passed through from configure.ac via manpages.am Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-06-20Install target dbs alongside generated documentsGaetan Nadon1-1/+1
This matches a change in xorg-sgml-docs whereby the masterdb will look for the target dbs into the same location as the generated documents. The target dbs are now installed alongside the generated documents. Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which has the potential of installing outside the package prefix and cause distcheck to fail when user does not have write permission in this package. Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-16configure: Bump dependency on xproto.Cyril Brulebois1-1/+1
Bumping this dependency means some additional macros can be used, like _X_UNUSED. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Cyril Brulebois <kibi@debian.org>
2011-06-01Version bumped to 1.10.99.901 (1.11 RC1)xorg-server-1.10.99.901Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2011-05-31Merge remote-tracking branch 'ajax/xserver-next'Keith Packard1-1/+1
2011-05-31fixes: Add support for pointer barriersAdam Jackson1-1/+1
Implements pointer barriers as specified by version 5 of the XFIXES protocol. Barriers are axis-aligned, zero-width lines that block pointer movement for relative input devices. Barriers may block motion in either the positive or negative direction, or both. v3: - Fix off-by-one in version_requests array - Port to non-glib test harness - Fix review notes from Søren Sandmann Pedersen, add tests to match Co-authored-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-05-27Use XORG_COMPILER_BRAND from util-macros 1.14 to check for SUNCCAlan Coopersmith1-5/+3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-14doc: use devbook.am for developers documentationGaetan Nadon1-1/+0
Relocate the docs under the doc subdir. Remove redundant xml subdir. The xmlrules set of makefiles are no longer used. Reviewed-by Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-05-14doc: relocate xserver.ent in the package root directoryGaetan Nadon1-1/+1
This is the appropriate location for reusable configuration and/or makefile artifacts as opposed to picking one of the subdirs where it is used. It shields them from future doc reorg as every subdir will refer to the root package which never changes location. Reviewed-by Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-05-14doc: add external doc references support to Xserver-DTraceGaetan Nadon1-2/+3
This makefile is used to build the 60+ docbooks in xorg. Dtrace is a user document and should be located under doc subdir. This user document can now refer to external user/specs docs or can be referred to by such documnets. Reviewed-by Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-05-13man: relocate manual pages in the man subdir outside docGaetan Nadon1-1/+1
The convention is to have the manual pages in a man subdir which is not under a doc dir. The doc dir contains users docs. This will move man pages out of the way for upcoming DocBook patches. Reviewed-by Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-05-13dmx: split DocBook/XML and Doxygen makefile targetsGaetan Nadon1-1/+2
Maintaining either requires full knowledge of both. It's not obvious one has to check the usage of global variables in devbook.am when maintaining doxygen target. Or vice-versa. Being in their respective directory, one less thing to worry about. Reviewed-by Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-05-13doc: use common makefile for developers documentationGaetan Nadon1-2/+0
The user/specs docs now have external references support. Developers doc are not installed so they do not participate. However, using a similar makefile shared amongst developers document reduces maintenance and is forward looking. Man pages being out of here, reorg developers docs under the same roof. Drop the obsolete sgml subdir. Reviewed-by Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-05-11configure.ac: XQuartz: Fix support for the deprecated --with-launchd-id-prefixJeremy Huddleston1-2/+1
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-04-29Merge remote-tracking branch 'jturney/remove-opengl-spec-download'Keith Packard1-5/+20
2011-04-28configure: Look for Khronos OpenGL spec files using pkg-configJon TURNEY1-0/+13
Look for Khronos OpenGL spec files using pkg-config, rather than downloading them Also add a --with-khronos-spec-dir=PATH configure option so XWin can be directed where to find these files without using the khronos-spec-files package XWin with AIGLX requires OpenGL spec files in order to generate wrapper code which: (1) thunks from the glapi dispatch table which uses the default cdecl calling convention to native GL functions using the stdcall calling convention. (2) performs function address lookup for OpenGL 1.2+ functions, which are treated as extensions and so not directly linkable. v2: KHRONOS_SPEC_DIR is only valid when XWIN_GLX_WINDOWS is defined. Avoid 'make dist' seeing invalid dependencies by only including rules using KHRONOS_SPEC_DIR if XWIN_GLX_WINDOWS is defined Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>