diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-29 11:28:12 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-29 11:28:12 +0100 |
| commit | 52cd3051ba15ddda117f8d8cae1979cd3c86f5b6 (patch) | |
| tree | fbfed14bbfb67daadbff4b0a77b2f6587ffc71d5 /xorg-server | |
| parent | 7a80ea1b5dd2eb54717fdcc427912a9764e7719f (diff) | |
| parent | c043f97a8572e1f509251288d8bcd70d0fb96770 (diff) | |
| download | vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.gz vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.bz2 vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 29 Nov 2013
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/configure.ac | 42 | ||||
| -rw-r--r-- | xorg-server/hw/dmx/dmxinit.c | 4 |
2 files changed, 27 insertions, 19 deletions
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index 6c4a609d7..6197e9bed 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -1809,24 +1809,30 @@ if test "x$XORG" = xyes; then 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 $GLX_SYS_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 + PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS) + SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $LIBPCIACCESS" + XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_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$INT10" != xstub; then + AC_MSG_ERROR([Cannot build int10 without libpciaccess]) + fi fi AC_MSG_RESULT([$PCI]) diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c index c1e97e0cf..3fd439300 100644 --- a/xorg-server/hw/dmx/dmxinit.c +++ b/xorg-server/hw/dmx/dmxinit.c @@ -612,6 +612,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[]) #ifdef GLXEXT static Bool glxSupported = TRUE; +#else + const Bool glxSupported = FALSE; #endif if (dmxGeneration != serverGeneration) { @@ -740,10 +742,10 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[]) /* Check if GLX extension exists on all back-end servers */ for (i = 0; i < dmxNumScreens; i++) glxSupported &= (dmxScreens[i].glxMajorOpcode > 0); +#endif if (serverGeneration == 1) dmxAddExtensions(glxSupported); -#endif /* Tell dix layer about the backend displays */ for (i = 0; i < dmxNumScreens; i++) { |