summaryrefslogtreecommitdiff
path: root/configure.ac
AgeCommit message (Collapse)AuthorFilesLines
2010-04-02xserver 1.8.0xorg-server-1.8.0Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-02configure: enable udev backend as "auto"Peter Hutterer1-1/+1
Due to the checks in configure, this means it gets priority over HAL if libudev is found. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-04-01Install 10-evdev.conf in $(prefix)/etc/X11/xorg.conf.d under udevKeith Packard1-0/+1
udev needs some xorg.conf file to tell it to load a suitable input driver, 10-evdev.conf is as simple as they come, mapping all evdev devices to the evdev driver. Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-29Merge remote branch 'whot/for-keith'Keith Packard1-0/+1
2010-03-25os: Prevent backtrace from being stopped in noreturn functions.Rami Ylimaki1-0/+13
There are two noreturn functions in the X server: FatalError and AbortServer. Having any of those two functions in the middle of a call stack will prevent unwinding the program properly and stops the backtrace at those functions in gdb. The file containing FatalError and AbortServer, os/log.c, has to be compiled with the -mapcs-frame option on ARM to get proper backtraces. Automake imposes its own restrictions on compiling individual source files with different options. The recommended way to do this is to put os/log.c into a convenience library and add this library inside os/libos.la. See the documentation of GNU Automake manual, version 1.11.1, section 27.8 Per-Object Flags Emulation, for details. Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-24configure: Always define XINPUT.Peter Hutterer1-0/+1
This define was removed in e251c9e75afdc "Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac". Drivers that support multiple server versions and still check for ifdef XINPUT now always build without XINPUT support if they're calling XORG_DRIVER_CHECK_EXT(XINPUT, inputproto). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-22Use libtool -export-dynamic flag for portabilityYaakov Selkowitz1-11/+3
The linker flag required for exporting symbols in executables varies by platform. libtool handles this with a single -export-dynamic flag (not to be confused with the similarly-named ELF linker flag) which tells it to use the correct platform-specific flag at link time. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-03-21Bump to 1.7.99.902 -- 1.8 RC2xorg-server-1.7.99.902Keith Packard1-2/+2
2010-03-16Cygwin/X: Allow the default log location to be configurableYaakov Selkowitz1-0/+1
Allow the default log location to be configurable (e.g. /var/log), and use separate logs for each display instance (e.g. XWin.0.log). Make the type of g_pszLogFile const char*, per os/log.c:LogInit(). Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-03-12Xext: Link to external libraries when necessary.Eamon Walsh1-1/+1
Although the DDX should be linked to the necessary libraries, we may also need to pull them in directly to the module to ensure the symbols are resolved at runtime. Should fix this bug with XSELINUX: /usr/bin/X: symbol lookup error: /usr/lib64/xorg/modules/extensions/libextmod.so: undefined symbol: is_selinux_enabled -v2: use _LIBADD instead of _LIBS; remove SELINUX_LIBS from XSERVER_SYS_LIBS as it should only be needed in extmod. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-03-03configure: move SELINUX_LIBS to XSERVER_SYS_LIBSPeter Hutterer1-2/+2
All ddxs require linking against selinux if enabled. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-03configure: move libselinux requirement up to the common section.Peter Hutterer1-1/+2
Let's have all version-specific requirements in one block. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-02-22libselinux now has a pkgconfig file. Use it.Eamon Walsh1-8/+3
Also remove HAVE_NETLINK_AVC_ACQUIRE_FD tests, because we now require a version of libselinux that has it. Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov> Reviewed-by: Keith Packard <keithp@keithp.com>
2010-02-12Bump to 1.7.99.901 -- 1.8 RC1xorg-server-1.7.99.901Keith Packard1-2/+2
2010-02-12Merge remote branch 'jturney/master'Keith Packard1-2/+5
2010-02-05Define FD_SETSIZE on Cygwin regardless of XWin DDXYaakov Selkowitz1-2/+3
All DDXs segfault on Cygwin unless -DFD_SETSIZE=256 is set, so make sure we do so whether or not we are building XWin. FD_SETSIZE must be at least XFD_SETSIZE for uses of select() to be correct. The Cygwin default is only 64, so it must be increased to 256 Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-02-05Cygwin/X: Look for system.Xwinrc in SYSCONFDIR/X11Yaakov Selkowitz1-0/+1
Look for system.Xwinrc in SYSCONFDIR/X11 (usually /etc/X11) Rename sample system.Xwinrc file not to have a X11R6 path in it's name Add makefile install rule for system.XWinrc Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-02-05Cygwin/X: Update resources file and About dialogYaakov Selkowitz1-0/+1
Use the configured vendor web address in the About dialog Update resources file: rework About dialog, use 'MS Shell Dlg 2' logical font for all dialogs, add ellipsis to exit option in tray menu as it (may) trigger another dialog. Get short vendor name from xwin-config.h, like other configuration data presented in the About dialog box, rather than creating the PROJECT_NAME define Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2010-02-05Don't use AC_CHECK_FILE for fontpath checks when cross compilingDan Nicholson1-9/+13
AC_CHECK_FILE chokes when cross compiling, so instead we set the default to the standard FONTROOTDIR directories in that case. Signed-off-by: Dan Nicholson<dbn.lists@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-01-27dix/configure: remove null root cursor optionTiago Vignatti1-7/+0
The default behavior of the server is to start with an invisible root cursor. Be such cursor invisible or inexistent (null), in the end it doesn't matter - for the user. The content on screen will be the same. Besides, there's no difference, in terms of performance, whether such cursor is invisible or simply null. The paths that both take inside the server are roughly the same. Therefore create a null root cursor becomes irrelevant. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-01-27xserver: require libdri 7.8.0 to buildJesse Barnes1-1/+1
We depend on new DRI interfaces now, so require them in configure.ac. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-01-27Merge remote branch 'alanc/master'Keith Packard1-6/+26
2010-01-25Only enable kdrive input drivers on Linux by defaultAlan Coopersmith1-6/+26
Fixes build on non-Linux platforms by restoring the defaults to where they were before commit 6c2b3a4247d10a50699ffa6abb643c5e959eefa8, to only enable the Linux kbd, mouse & evdev drivers when building on Linux platforms. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-01-24config: replace custom code with reusable macro XORG_WITH_DOXYGENGaetan Nadon1-10/+3
XORG_WITH_DOXYGEN provides additional functions like a configure option which allow platform builders to control the usage of the doxygen program. This is a requirement from platforms that do not have such doc tool. A platform with a back level doxygen may use --without-doxygen to get the rest of the documentation built. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-01-13Merge remote branch 'jbarnes/master'Keith Packard1-2/+2
2010-01-11GLX/DRI2: add INTEL_swap_event supportJesse Barnes1-1/+1
This allows clients to easily check for swap completion status in their main loop. Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Adam Jackson <ajax@nwnk.net> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-01-11DRI2: add support for new DRI2 protocol requestsJesse Barnes1-1/+1
Support the new DRI2 2.2 protocol requests: DRI2SwapBuffers, DRI2GetMSC, DRI2WaitMSC, DRI2WaitSBC and DRI2SwapInterval. These requests allow the server to support the SGI_video_sync, SGI_swap_interval, and OML_sync_control GLX extensions if DDX support is present. The new DDX APIs are documented in dri2.h. Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> Reviewed-by: Adam Jackson <ajax@nwnk.net> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-01-08configure: use backticks rather than $() for commandsGaetan Nadon1-2/+2
This patch to xserver configure.ac is to increase code portability to non POSIX system by using backticks rather than $() for command substitution for BUILD_DATE and BUILD_TIME. Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2010-01-06kdrive: Add option to compile out input driversMikhail Gusarov1-0/+18
Add --without-kdrive-{kbd,mouse,evdev} configure options disabling Linux keyboard driver, Linux mouse drivers (ps2, bus,ms), and Linux evdev driver. Build all drivers by default as before. Acked-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
2009-12-30config: add libudev input-hotplug backendJulien Cristau1-2/+21
Add a backend using libudev for input hotplug, and disable the hal and dbus backends if this one is enabled. XKB configuration happens using xkb{rules,model,layout,variant,options} properties (case-insensitive) on the device. We fill in InputAttributes to allow configuration through InputClass in Xorg. Requires udev 148 for the input_id helper and ID_INPUT* properties. Signed-off-by: Julien Cristau <jcristau@debian.org> Acked-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-12-30Merge remote branch 'dbn/inputclass'Keith Packard1-1/+1
2009-12-23xfree86: Introduce InputClass configurationDan Nicholson1-1/+1
Currently Xorg uses hal's fdi files to decide what configuration options are applied to automatically added input devices. This is sub-optimal since it requires users to use a new and different configuration store than xorg.conf. The InputClass section attempts to provide a system similar to hal where configuration can be applied to all devices with certain attributes. For now, devices can be matched to: * A substring of the product name via a MatchProduct entry * A substring of the vendir name via a MatchVendor entry * A pathname pattern of the device file via a MatchDevicePath entry * A device type via boolean entries for MatchIsKeyboard, MatchIsPointer, MatchIsJoystick, MatchIsTablet, MatchIsTouchpad and MatchIsTouchscreen See the INPUTCLASS section in xorg.conf(5) for more details. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-12-22xfree86: Use xorg.conf.d directory for multiple config filesDan Nicholson1-0/+2
Currently there is a single file, xorg.conf, for configuring the server. This works fine most of the time, but it becomes a problem when packages or system services need to adjust the configuration. Instead, allow multiple configuration files to live in a directory. Typically this will be /etc/X11/xorg.conf.d. Files with a suffix of .conf will be read and added to the server configuration after xorg.conf. The server won't fall back to using the auto configuration unless there is no config file and there are no files in the config directory. Right now this uses a simpler search template than the config file search path by not using the command line or environment variable parameters. The matching code was refactored a bit to make this more coherent. Any DDX wanting to read the config files will need to call xf86initConfigFiles before opening/reading them. This is to allow xf86openConfigFile without xf86openConfigDirFiles and vice-versa. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
2009-12-19Bump to 1.7.99.3 (unreleased)Keith Packard1-2/+2
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-18Set release date for 1.7.99.2xorg-server-1.7.99.2Keith Packard1-1/+1
Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-18Change default xkb model from pc104 to pc105Alan Coopersmith1-2/+2
PC105 is a more useful default for non-American keyboard users, not harmful for American PC101/PC104 keyboard users. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-18Change sysconfdir brackets to avoid some shells trying to run it as a commandAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-18Convert checks for PC98 support from platform #ifdefs to configure flagAlan Coopersmith1-0/+17
Default remains the same - on for most OS'es on i386 (except Solaris), off for everyone else. Can be manually toggled via --enable-pc98 or --disable-pc98. Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-12-15Fix dtrace object builds of libos to link with SHA1_LIBSAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Acked-by: Adam Jackson <ajax@redhat.com>
2009-12-03configure.ac: error while checking for XDMXCONFIG_DEPGaetan Nadon1-5/+9
Introduced in commit 9998105a387e0294054502331a56e1e020cd93e4 The replacement third parameters to PKG_CHECK_MODULES([DMXMODULES] was not quoted. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-11-25Move xdmxconfig modules into DMX conditionals (#25102)Peter Hutterer1-3/+3
xdmxconfig requires additional modules not checked for if Xdmx build is set to auto (the default). This may lead to build errors if the Xdmx modules are installed, but not the extra ones required for xdmxconfig. X.Org Bug 25102 <http://bugs.freedesktop.org/show_bug.cgi?id=25102> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Remi Cardona <remi@gentoo.org> Acked-by: Julien Cristau <jcristau@debian.org>
2009-11-25Revert "Move xdmxconfig modules into DMX conditionals (#25102)"Peter Hutterer1-3/+3
New package dependency unnecessarily links in a few libraries that Xdmx doesn't need. This can be fixed more elegantly. This reverts commit 0ef15ca9d2d9c78c79a2771c550563bc6931b365. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-11-23configure: remove unused kdrive Xvesa config variableTiago Vignatti1-11/+0
Xvesa was gone in commit 6d21fbf0 and this should be there as well. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-16Move xdmxconfig modules into DMX conditionals (#25102)Peter Hutterer1-3/+3
xdmxconfig requires additional modules not checked for if Xdmx build is set to auto (the default). This may lead to build errors if the Xdmx modules are installed, but not the extra ones required for xdmxconfig. X.Org Bug 25102 <http://bugs.freedesktop.org/show_bug.cgi?id=25102> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Tested-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-13configure: change 'sigio-default' to 'use-sigio-by-default'Paulo Ricardo Zanoni1-1/+1
This was discussed in this thread: http://lists.x.org/archives/xorg-devel/2009-September/002025.html The patch sent fixed the help string but not the configure option. Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-11INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206Gaetan Nadon1-1/+1
Add missing INSTALL file. Use standard GNU file on building tarball README may have been updated Remove AUTHORS file as it is empty and no content available yet. Remove NEWS file as it is empty and no content available yet. Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-11Deploy the new XORG_DEFAULT_OPTIONS #24242Gaetan Nadon1-3/+4
This macro aggregate a number of existing macros that sets commmon X.Org components configuration options. It shields the configuration file from future changes. Reviewed-By: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2009-11-09Cygwin/X: Allow composite to be enabled for XwinYaakov Selkowitz1-4/+0
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
2009-11-09Set default font path with fontutil 1.1 and fontpath.dYaakov Selkowitz1-8/+24
Look for $sysconfdir/X11/fontpath.d and, if it exists, set it to the default font path as a catalogue: entry. Based on app/xfs commit c66a46e35ae40a23ad9acee838ab42300eddbd67. Otherwise, use the font-util 1.1 macros to determine the system fontrootdir and standard subdirectories, or let the user configure it and the subdirectories themselves. This adds a build-time (or at least an autoconf/autogen time) dependency on font-util, and changes the --with-fontdir argument to --with-fontrootdir. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Alan Coopersmith <alan.coopersmith-xsfywfwIY+M@public.gmane.org> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2009-11-05configure.ac: Notify user about which SHA1 implementation is being usedJeremy Huddleston1-0/+2
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>