projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
progs/demos: update arbocclude.c to do multiple queries at once
[mesa.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index b6f71f904302ebd650f25ed18ce1d2fae914f2b5..485836a428215d0be0dff22a3c145519cb18f1e0 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-20,7
+20,7
@@
AC_CANONICAL_HOST
dnl Versions for external dependencies
LIBDRM_REQUIRED=2.4.15
LIBDRM_RADEON_REQUIRED=2.4.17
dnl Versions for external dependencies
LIBDRM_REQUIRED=2.4.15
LIBDRM_RADEON_REQUIRED=2.4.17
-DRI2PROTO_REQUIRED=2.
2
+DRI2PROTO_REQUIRED=2.
1
GLPROTO_REQUIRED=1.4.11
dnl Check for progs
GLPROTO_REQUIRED=1.4.11
dnl Check for progs
@@
-92,6
+92,9
@@
linux*|*-gnu*|gnu*)
solaris*)
DEFINES="$DEFINES -DPTHREADS -DSVR4"
;;
solaris*)
DEFINES="$DEFINES -DPTHREADS -DSVR4"
;;
+cygwin*)
+ DEFINES="$DEFINES -DPTHREADS"
+ ;;
esac
dnl Add flags for gcc and g++
esac
dnl Add flags for gcc and g++
@@
-445,7
+448,7
@@
xlib)
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
;;
dri)
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
;;
dri)
- SRC_DIRS="$SRC_DIRS glx
/x11
"
+ SRC_DIRS="$SRC_DIRS glx"
DRIVER_DIRS="dri"
WINDOW_SYSTEM="dri"
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm"
DRIVER_DIRS="dri"
WINDOW_SYSTEM="dri"
GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm"
@@
-918,12
+921,16
@@
if test "x$enable_egl" = xyes; then
fi
# build egl_dri2 when xcb-dri2 is available
fi
# build egl_dri2 when xcb-dri2 is available
- PKG_CHECK_
EXISTS([x11-xcb xcb-dri2 xcb-xfixes
],
- [have_xcb_dri2=yes],[have_xcb_dri2=no])
+ PKG_CHECK_
MODULES([EGL_DRI2], [x11-xcb xcb-dri2 xcb-xfixes libdrm
],
+
[have_xcb_dri2=yes],[have_xcb_dri2=no])
if test "$have_xcb_dri2" = yes; then
EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2"
fi
fi
if test "$have_xcb_dri2" = yes; then
EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2"
fi
fi
+
+ if test "$with_demos" = yes; then
+ PROGRAM_DIRS="$PROGRAM_DIRS egl"
+ fi
fi
AC_SUBST([EGL_LIB_DEPS])
AC_SUBST([EGL_DRIVERS_DIRS])
fi
AC_SUBST([EGL_LIB_DEPS])
AC_SUBST([EGL_DRIVERS_DIRS])
@@
-1324,7
+1331,7
@@
AC_ARG_ENABLE([gallium-nouveau],
[enable_gallium_nouveau=no])
if test "x$enable_gallium_nouveau" = xyes; then
GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS nouveau"
[enable_gallium_nouveau=no])
if test "x$enable_gallium_nouveau" = xyes; then
GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS nouveau"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv
04 nv10 nv20 nv
30 nv40 nv50"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv30 nv40 nv50"
fi
dnl
fi
dnl