summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Byer <bbyer@bbyer.local>2007-09-05 20:34:00 -0700
committerBen Byer <bbyer@bbyer.local>2007-09-05 20:34:25 -0700
commitf3f614cd01ae56d84d61b4f5c907c6edd7c8c6d3 (patch)
tree9958353370e3457a0a90ca372d048339c03eb06f
parentbf1641b94cffa54b786e18eaeff3839d8790b9f2 (diff)
Revert "configure.ac: exclude pci-access dependency from XDarwin"
-rw-r--r--configure.ac8
1 files changed, 2 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 0d35d81f4..74a0aea0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1304,6 +1304,8 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
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.
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $DLOPEN_LIBS $GLX_SYS_LIBS"
XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
case $host_os in
@@ -1501,12 +1503,6 @@ return 0;}
;;
esac
- if ! test "$XORG_OS" = "Darwin" ; then
- PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
- XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS"
- XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
- fi
-
if test "x$XORG_OS_PCI" = x ; then
XORG_OS_PCI=$XORG_OS
fi