aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-29 11:25:56 +0100
committermarha <marha@users.sourceforge.net>2013-11-29 11:25:56 +0100
commitc043f97a8572e1f509251288d8bcd70d0fb96770 (patch)
tree8ebbc0f82f5c5b1d6453420963ca7d71b6161e0c /xorg-server/configure.ac
parent4042ec939a2cdc8473479c900871c4c8c0b4e818 (diff)
downloadvcxsrv-c043f97a8572e1f509251288d8bcd70d0fb96770.tar.gz
vcxsrv-c043f97a8572e1f509251288d8bcd70d0fb96770.tar.bz2
vcxsrv-c043f97a8572e1f509251288d8bcd70d0fb96770.zip
fontconfig mesa xserver git update 29 Nov 2013
xserver commit d695cb7fb6bb8fd159a332d902673edbbd2237d7 fontconfig commit a5fd7912ff8c7bc72d2cdbd0038c7ff0c968831f mesa commit fb5f5b81883f360dcbbf407a0f6f5606bc0c0495
Diffstat (limited to 'xorg-server/configure.ac')
-rw-r--r--xorg-server/configure.ac42
1 files changed, 24 insertions, 18 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])