aboutsummaryrefslogtreecommitdiff
path: root/mesalib/configure
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-11-29 22:05:53 +0000
committermarha <marha@users.sourceforge.net>2010-11-29 22:05:53 +0000
commitfed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (patch)
treefa1ba494685a71e28a096990a8707680c7cb378b /mesalib/configure
parentae340911c1ba1f98b418bd8f1a487fa4d79491b0 (diff)
parent6fda93be42ace9eeab0e82ceebb6798961c9105c (diff)
downloadvcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.gz
vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.bz2
vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.zip
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/configure')
-rw-r--r--mesalib/configure1225
1 files changed, 956 insertions, 269 deletions
diff --git a/mesalib/configure b/mesalib/configure
index 25b438d15..4e4431d00 100644
--- a/mesalib/configure
+++ b/mesalib/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for Mesa 7.8.2.
+# Generated by GNU Autoconf 2.65 for Mesa 7.9.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa>.
#
@@ -553,8 +553,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Mesa'
PACKAGE_TARNAME='mesa'
-PACKAGE_VERSION='7.8.2'
-PACKAGE_STRING='Mesa 7.8.2'
+PACKAGE_VERSION='7.9.0'
+PACKAGE_STRING='Mesa 7.9.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa'
PACKAGE_URL=''
@@ -598,15 +598,22 @@ ac_subst_vars='LTLIBOBJS
LIBOBJS
XORG_DRIVER_INSTALL_DIR
EGL_DRIVER_INSTALL_DIR
-EGL_DISPLAYS
+EGL_PLATFORMS
XEXT_LIBS
XEXT_CFLAGS
+EGL_CLIENT_APIS
+VG_LIB_DEPS
LIBKMS_XORG_LIBS
LIBKMS_XORG_CFLAGS
LIBDRM_XORG_LIBS
LIBDRM_XORG_CFLAGS
XORG_LIBS
XORG_CFLAGS
+LLVM_VERSION
+LLVM_LDFLAGS
+LLVM_LIBS
+LLVM_CFLAGS
+LLVM_CONFIG
PROGRAM_DIRS
APP_LIB_DEPS
GLUT_PC_CFLAGS
@@ -634,8 +641,10 @@ GLU_MESA_DEPS
GLU_LIB_DEPS
EGL_DRIVERS_DIRS
EGL_LIB_DEPS
-EGL_DRI2_LIBS
-EGL_DRI2_CFLAGS
+LIBUDEV_LIBS
+LIBUDEV_CFLAGS
+XCB_DRI2_LIBS
+XCB_DRI2_CFLAGS
OSMESA_PC_LIB_PRIV
OSMESA_PC_REQ
OSMESA_MESA_DEPS
@@ -643,15 +652,22 @@ OSMESA_LIB_DEPS
OSMESA_LIB
RADEON_LDFLAGS
RADEON_CFLAGS
-LIBDRM_RADEON_LIBS
-LIBDRM_RADEON_CFLAGS
INTEL_LIBS
INTEL_CFLAGS
DRI_LIB_DEPS
EXPAT_INCLUDES
DRI_DIRS
+GLES_OVERLAY
+API_DEFINES
DRI_DRIVER_SEARCH_DIR
DRI_DRIVER_INSTALL_DIR
+LIBDRM_RADEON_LIBS
+LIBDRM_RADEON_CFLAGS
+HAVE_XF86VIDMODE
+GLESv2_PC_LIB_PRIV
+GLESv2_LIB_DEPS
+GLESv1_CM_PC_LIB_PRIV
+GLESv1_CM_LIB_DEPS
DRI_PC_REQ_PRIV
GL_PC_CFLAGS
GL_PC_LIB_PRIV
@@ -661,6 +677,8 @@ XCB_LIBS
XCB_CFLAGS
DRIGL_LIBS
DRIGL_CFLAGS
+XF86VIDMODE_LIBS
+XF86VIDMODE_CFLAGS
GLPROTO_LIBS
GLPROTO_CFLAGS
DRI2PROTO_LIBS
@@ -676,27 +694,36 @@ X_CFLAGS
XMKMF
X11_LIBS
X11_CFLAGS
+MESA_LLVM
GALLIUM_STATE_TRACKERS_DIRS
GALLIUM_DRIVERS_DIRS
-GALLIUM_WINSYS_DRM_DIRS
GALLIUM_WINSYS_DIRS
+GALLIUM_TARGET_DIRS
GALLIUM_DIRS
-WINDOW_SYSTEM
DRIVER_DIRS
GLU_DIRS
SRC_DIRS
+TALLOC_LIBS
+TALLOC_CFLAGS
EGREP
GREP
+DLOPEN_LIBS
PIC_FLAGS
GLAPI_ASM_SOURCES
MESA_ASM_SOURCES
ASM_FLAGS
+VG_LIB_GLOB
+GLESv2_LIB_GLOB
+GLESv1_CM_LIB_GLOB
EGL_LIB_GLOB
OSMESA_LIB_GLOB
GLW_LIB_GLOB
GLUT_LIB_GLOB
GLU_LIB_GLOB
GL_LIB_GLOB
+VG_LIB_NAME
+GLESv2_LIB_NAME
+GLESv1_CM_LIB_NAME
EGL_LIB_NAME
OSMESA_LIB_NAME
GLW_LIB_NAME
@@ -788,7 +815,6 @@ enable_asm
enable_pic
enable_selinux
with_driver
-with_demos
with_x
enable_xcb
enable_glx_tls
@@ -796,6 +822,10 @@ with_dri_driverdir
with_dri_searchpath
enable_driglx_direct
with_dri_drivers
+enable_opengl
+enable_gles1
+enable_gles2
+enable_gles_overlay
with_expat
enable_gl_osmesa
with_osmesa_bits
@@ -806,14 +836,18 @@ enable_motif
enable_glut
enable_gallium
with_state_trackers
+with_egl_platforms
with_egl_displays
with_egl_driver_dir
with_xorg_driver_dir
with_max_width
with_max_height
+enable_gallium_llvm
enable_gallium_svga
-enable_gallium_intel
+enable_gallium_i915
+enable_gallium_i965
enable_gallium_radeon
+enable_gallium_r600
enable_gallium_nouveau
enable_gallium_swrast
'
@@ -836,6 +870,8 @@ OPT_FLAGS
ARCH_FLAGS
MKLIB_OPTIONS
PIC_FLAGS
+TALLOC_CFLAGS
+TALLOC_LIBS
X11_CFLAGS
X11_LIBS
XMKMF
@@ -847,16 +883,20 @@ DRI2PROTO_CFLAGS
DRI2PROTO_LIBS
GLPROTO_CFLAGS
GLPROTO_LIBS
+XF86VIDMODE_CFLAGS
+XF86VIDMODE_LIBS
DRIGL_CFLAGS
DRIGL_LIBS
XCB_CFLAGS
XCB_LIBS
-INTEL_CFLAGS
-INTEL_LIBS
LIBDRM_RADEON_CFLAGS
LIBDRM_RADEON_LIBS
-EGL_DRI2_CFLAGS
-EGL_DRI2_LIBS
+INTEL_CFLAGS
+INTEL_LIBS
+XCB_DRI2_CFLAGS
+XCB_DRI2_LIBS
+LIBUDEV_CFLAGS
+LIBUDEV_LIBS
GLW_CFLAGS
GLW_LIBS
GLUT_CFLAGS
@@ -1410,7 +1450,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Mesa 7.8.2 to adapt to many kinds of systems.
+\`configure' configures Mesa 7.9.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1481,7 +1521,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Mesa 7.8.2:";;
+ short | recursive ) echo "Configuration of Mesa 7.9.0:";;
esac
cat <<\_ACEOF
@@ -1502,8 +1542,12 @@ Optional Features:
--enable-selinux Build SELinux-aware Mesa [default=disabled]
--enable-xcb use XCB for GLX [default=disabled]
--enable-glx-tls enable TLS support in GLX [default=disabled]
- --disable-driglx-direct enable direct rendering in GLX for DRI
+ --disable-driglx-direct enable direct rendering in GLX and EGL for DRI
[default=enabled]
+ --disable-opengl disable support for standard OpenGL API [default=no]
+ --enable-gles1 enable support for OpenGL ES 1.x API [default=no]
+ --enable-gles2 enable support for OpenGL ES 2.x API [default=no]
+ --enable-gles-overlay build separate OpenGL ES only libraries [default=no]
--enable-gl-osmesa enable OSMesa with libGL [default=enabled for xlib
driver]
--disable-egl disable EGL library [default=enabled]
@@ -1513,20 +1557,21 @@ Optional Features:
--disable-glut enable GLUT library [default=enabled if source
available]
--disable-gallium build gallium [default=enabled]
+ --enable-gallium-llvm build gallium LLVM support [default=disabled]
--enable-gallium-svga build gallium SVGA [default=disabled]
- --enable-gallium-intel build gallium intel [default=disabled]
+ --enable-gallium-i915 build gallium i915 [default=disabled]
+ --enable-gallium-i965 build gallium i965 [default=disabled]
--enable-gallium-radeon build gallium radeon [default=disabled]
+ --enable-gallium-r600 build gallium radeon [default=disabled]
--enable-gallium-nouveau
build gallium nouveau [default=disabled]
- --enable-gallium-swrast build gallium swrast [default=disabled]
+ --enable-gallium-swrast build gallium swrast [default=auto]
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-driver=DRIVER driver for Mesa: xlib,dri,osmesa [default=dri when
available, or xlib]
- --with-demos[=DIRS...] optional comma delimited demo directories to build
- [default=auto if source available]
--with-x use the X Window System
--with-dri-driverdir=DIR
directory for the DRI drivers [${libdir}/dri]
@@ -1542,9 +1587,11 @@ Optional Packages:
--with-state-trackers[=DIRS...]
comma delimited state_trackers list, e.g. "egl,glx"
[default=auto]
+ --with-egl-platforms[=DIRS...]
+ comma delimited native platforms libEGL supports,
+ e.g. "x11,drm" [default=auto]
--with-egl-displays[=DIRS...]
- comma delimited native displays libEGL supports,
- e.g. "x11,kms" [default=auto]
+ DEPRECATED. Use --with-egl-platforms instead
--with-egl-driver-dir=DIR
directory for EGL drivers [[default=${libdir}/egl]]
--with-xorg-driver-dir=DIR
@@ -1576,6 +1623,9 @@ Some influential environment variables:
MKLIB_OPTIONS
Options for the Mesa library script, mklib
PIC_FLAGS compiler flags for PIC code
+ TALLOC_CFLAGS
+ C compiler flags for TALLOC, overriding pkg-config
+ TALLOC_LIBS linker flags for TALLOC, overriding pkg-config
X11_CFLAGS C compiler flags for X11, overriding pkg-config
X11_LIBS linker flags for X11, overriding pkg-config
XMKMF Path to xmkmf, Makefile generator for X Window System
@@ -1593,22 +1643,30 @@ Some influential environment variables:
C compiler flags for GLPROTO, overriding pkg-config
GLPROTO_LIBS
linker flags for GLPROTO, overriding pkg-config
+ XF86VIDMODE_CFLAGS
+ C compiler flags for XF86VIDMODE, overriding pkg-config
+ XF86VIDMODE_LIBS
+ linker flags for XF86VIDMODE, overriding pkg-config
DRIGL_CFLAGS
C compiler flags for DRIGL, overriding pkg-config
DRIGL_LIBS linker flags for DRIGL, overriding pkg-config
XCB_CFLAGS C compiler flags for XCB, overriding pkg-config
XCB_LIBS linker flags for XCB, overriding pkg-config
- INTEL_CFLAGS
- C compiler flags for INTEL, overriding pkg-config
- INTEL_LIBS linker flags for INTEL, overriding pkg-config
LIBDRM_RADEON_CFLAGS
C compiler flags for LIBDRM_RADEON, overriding pkg-config
LIBDRM_RADEON_LIBS
linker flags for LIBDRM_RADEON, overriding pkg-config
- EGL_DRI2_CFLAGS
- C compiler flags for EGL_DRI2, overriding pkg-config
- EGL_DRI2_LIBS
- linker flags for EGL_DRI2, overriding pkg-config
+ INTEL_CFLAGS
+ C compiler flags for INTEL, overriding pkg-config
+ INTEL_LIBS linker flags for INTEL, overriding pkg-config
+ XCB_DRI2_CFLAGS
+ C compiler flags for XCB_DRI2, overriding pkg-config
+ XCB_DRI2_LIBS
+ linker flags for XCB_DRI2, overriding pkg-config
+ LIBUDEV_CFLAGS
+ C compiler flags for LIBUDEV, overriding pkg-config
+ LIBUDEV_LIBS
+ linker flags for LIBUDEV, overriding pkg-config
GLW_CFLAGS C compiler flags for GLW, overriding pkg-config
GLW_LIBS linker flags for GLW, overriding pkg-config
GLUT_CFLAGS C compiler flags for GLUT, overriding pkg-config
@@ -1694,7 +1752,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Mesa configure 7.8.2
+Mesa configure 7.9.0
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2103,7 +2161,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Mesa $as_me 7.8.2, which was
+It was created by Mesa $as_me 7.9.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -4547,7 +4605,36 @@ done
;;
esac
-if test "x$GCC" = xyes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiling with clang" >&5
+$as_echo_n "checking if compiling with clang... " >&6; }
+
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+#ifndef __clang__
+ not clang
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ CLANG=yes
+else
+ CLANG=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG" >&5
+$as_echo "$CLANG" >&6; }
+
+if test "x$GCC" = xyes -a "x$CLANG" = xno; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc version is sufficient" >&5
$as_echo_n "checking whether gcc version is sufficient... " >&6; }
major=0
@@ -4727,15 +4814,17 @@ cygwin*)
esac
if test "x$GCC" = xyes; then
- CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99 -ffast-math"
+ CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -std=c99"
+ if test "x$CLANG" = "xno"; then
+ CFLAGS="$CFLAGS -ffast-math"
+ fi
# Enable -fvisibility=hidden if using a gcc that supports it
save_CFLAGS="$CFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5
$as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; }
CFLAGS="$CFLAGS -fvisibility=hidden"
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
@@ -4762,6 +4851,32 @@ fi
if test "x$GXX" = xyes; then
CXXFLAGS="$CXXFLAGS -Wall"
+ # Enable -fvisibility=hidden if using a gcc that supports it
+ save_CXXFLAGS="$CXXFLAGS"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -fvisibility=hidden" >&5
+$as_echo_n "checking whether $CXX supports -fvisibility=hidden... " >&6; }
+ CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ CXXFLAGS="$save_CXXFLAGS" ; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext;
+
# Work around aliasing bugs - developers should comment this out
CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
fi
@@ -4873,6 +4988,8 @@ if test "x$enable_debug" = xyes; then
fi
fi
+LIB_PREFIX_GLOB='lib'
+LIB_VERSION_SEPARATOR='.'
if test "$enable_static" = yes; then
LIB_EXTENSION='a'
else
@@ -4880,6 +4997,8 @@ else
darwin* )
LIB_EXTENSION='dylib' ;;
cygwin* )
+ LIB_PREFIX_GLOB='???'
+ LIB_VERSION_SEPARATOR='-'
LIB_EXTENSION='dll' ;;
aix* )
LIB_EXTENSION='a' ;;
@@ -4894,13 +5013,26 @@ GLUT_LIB_NAME='lib$(GLUT_LIB).'${LIB_EXTENSION}
GLW_LIB_NAME='lib$(GLW_LIB).'${LIB_EXTENSION}
OSMESA_LIB_NAME='lib$(OSMESA_LIB).'${LIB_EXTENSION}
EGL_LIB_NAME='lib$(EGL_LIB).'${LIB_EXTENSION}
+GLESv1_CM_LIB_NAME='lib$(GLESv1_CM_LIB).'${LIB_EXTENSION}
+GLESv2_LIB_NAME='lib$(GLESv2_LIB).'${LIB_EXTENSION}
+VG_LIB_NAME='lib$(VG_LIB).'${LIB_EXTENSION}
+
+GL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLU_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLU_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLUT_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLUT_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLW_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLW_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+OSMESA_LIB_GLOB=${LIB_PREFIX_GLOB}'$(OSMESA_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv1_CM_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv1_CM_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+GLESv2_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLESv2_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+VG_LIB_GLOB=${LIB_PREFIX_GLOB}'$(VG_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+
+
+
+
+
-GL_LIB_GLOB='lib$(GL_LIB).*'${LIB_EXTENSION}'*'
-GLU_LIB_GLOB='lib$(GLU_LIB).*'${LIB_EXTENSION}'*'
-GLUT_LIB_GLOB='lib$(GLUT_LIB).*'${LIB_EXTENSION}'*'
-GLW_LIB_GLOB='lib$(GLW_LIB).*'${LIB_EXTENSION}'*'
-OSMESA_LIB_GLOB='lib$(OSMESA_LIB).*'${LIB_EXTENSION}'*'
-EGL_LIB_GLOB='lib$(EGL_LIB).*'${LIB_EXTENSION}'*'
@@ -5167,6 +5299,7 @@ fi
fi
+
ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign"
if test "x$ac_cv_func_posix_memalign" = x""yes; then :
DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"
@@ -5533,27 +5666,119 @@ xxlib|xdri|xosmesa)
esac
-CORE_DIRS="glsl mesa"
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TALLOC" >&5
+$as_echo_n "checking for TALLOC... " >&6; }
-SRC_DIRS="glew"
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TALLOC_CFLAGS"; then
+ pkg_cv_TALLOC_CFLAGS="$TALLOC_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "talloc") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_TALLOC_CFLAGS=`$PKG_CONFIG --cflags "talloc" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TALLOC_LIBS"; then
+ pkg_cv_TALLOC_LIBS="$TALLOC_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"talloc\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "talloc") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_TALLOC_LIBS=`$PKG_CONFIG --libs "talloc" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "talloc"`
+ else
+ TALLOC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "talloc"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$TALLOC_PKG_ERRORS" >&5
+
+ as_fn_error "Package requirements (talloc) were not met:
+
+$TALLOC_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables TALLOC_CFLAGS
+and TALLOC_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables TALLOC_CFLAGS
+and TALLOC_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+ TALLOC_CFLAGS=$pkg_cv_TALLOC_CFLAGS
+ TALLOC_LIBS=$pkg_cv_TALLOC_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
+fi
+
+
+
+
+CORE_DIRS="mapi/glapi glsl mesa"
+
+SRC_DIRS=""
GLU_DIRS="sgi"
-WINDOW_SYSTEM=""
GALLIUM_DIRS="auxiliary drivers state_trackers"
-GALLIUM_WINSYS_DIRS=""
-GALLIUM_WINSYS_DRM_DIRS=""
-GALLIUM_DRIVERS_DIRS="softpipe failover trace identity"
+GALLIUM_TARGET_DIRS=""
+GALLIUM_WINSYS_DIRS="sw"
+GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug identity"
GALLIUM_STATE_TRACKERS_DIRS=""
case "$mesa_driver" in
xlib)
DRIVER_DIRS="x11"
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS xlib"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib"
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS libgl-xlib"
;;
dri)
SRC_DIRS="$SRC_DIRS glx"
DRIVER_DIRS="dri"
- WINDOW_SYSTEM="dri"
- GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS drm"
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"
;;
osmesa)
DRIVER_DIRS="osmesa"
@@ -5569,43 +5794,6 @@ esac
-if test -d "$srcdir/progs/demos"; then
- default_demos=yes
-else
- default_demos=no
-fi
-
-# Check whether --with-demos was given.
-if test "${with_demos+set}" = set; then :
- withval=$with_demos; with_demos="$withval"
-else
- with_demos="$default_demos"
-fi
-
-if test "x$with_demos" = x; then
- with_demos=no
-fi
-
-PROGRAM_DIRS=""
-case "$with_demos" in
-no) ;;
-yes)
- # If the driver isn't osmesa, we have libGL and can build xdemos
- if test "$mesa_driver" != osmesa; then
- PROGRAM_DIRS="xdemos"
- fi
- ;;
-*)
- # verify the requested demos directories exist
- demos=`IFS=,; echo $with_demos`
- for demo in $demos; do
- test -d "$srcdir/progs/$demo" || \
- as_fn_error "Program directory '$demo' doesn't exist" "$LINENO" 5
- done
- PROGRAM_DIRS="$demos"
- ;;
-esac
-
if test -n "$PKG_CONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config files for X11 are available" >&5
$as_echo_n "checking pkg-config files for X11 are available... " >&6; }
@@ -6536,8 +6724,8 @@ fi
GL_PC_LIB_PRIV="$GL_LIB_DEPS"
GL_PC_CFLAGS="$X11_INCLUDES"
fi
- GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread"
- GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread"
+ GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS"
+ GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS"
# if static, move the external libraries to the programs
# and empty the libraries for libGL
@@ -6828,8 +7016,85 @@ fi
# find the DRI deps for libGL
if test "$x11_pkgconfig" = yes; then
+ dri_modules="x11 xext xdamage xfixes"
+
+ # add xf86vidmode if available
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VIDMODE" >&5
+$as_echo_n "checking for XF86VIDMODE... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XF86VIDMODE_CFLAGS"; then
+ pkg_cv_XF86VIDMODE_CFLAGS="$XF86VIDMODE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xxf86vm\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xxf86vm") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_XF86VIDMODE_CFLAGS=`$PKG_CONFIG --cflags "xxf86vm" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XF86VIDMODE_LIBS"; then
+ pkg_cv_XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xxf86vm\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xxf86vm") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_XF86VIDMODE_LIBS=`$PKG_CONFIG --libs "xxf86vm" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xxf86vm"`
+ else
+ XF86VIDMODE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xxf86vm"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XF86VIDMODE_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_XF86VIDMODE=no
+elif test $pkg_failed = untried; then
+ HAVE_XF86VIDMODE=no
+else
+ XF86VIDMODE_CFLAGS=$pkg_cv_XF86VIDMODE_CFLAGS
+ XF86VIDMODE_LIBS=$pkg_cv_XF86VIDMODE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_XF86VIDMODE=yes
+fi
+ if test "$HAVE_XF86VIDMODE" = yes ; then
+ dri_modules="$dri_modules xxf86vm"
+ fi
+
# add xcb modules if necessary
- dri_modules="x11 xext xxf86vm xdamage xfixes"
if test "$enable_xcb" = yes; then
dri_modules="$dri_modules x11-xcb xcb-glx"
fi
@@ -7035,6 +7300,10 @@ fi
# need DRM libs, -lpthread, etc.
GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
GL_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+ GLESv1_CM_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+ GLESv1_CM_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+ GLESv2_LIB_DEPS="$LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS"
+ GLESv2_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
;;
osmesa)
# No libGL for osmesa
@@ -7047,6 +7316,85 @@ esac
+
+
+
+
+
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM_RADEON" >&5
+$as_echo_n "checking for LIBDRM_RADEON... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBDRM_RADEON_CFLAGS"; then
+ pkg_cv_LIBDRM_RADEON_CFLAGS="$LIBDRM_RADEON_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_radeon libdrm >= \$LIBDRM_RADEON_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBDRM_RADEON_CFLAGS=`$PKG_CONFIG --cflags "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBDRM_RADEON_LIBS"; then
+ pkg_cv_LIBDRM_RADEON_LIBS="$LIBDRM_RADEON_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_radeon libdrm >= \$LIBDRM_RADEON_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBDRM_RADEON_LIBS=`$PKG_CONFIG --libs "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBDRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED"`
+ else
+ LIBDRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBDRM_RADEON_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_LIBDRM_RADEON=no
+elif test $pkg_failed = untried; then
+ HAVE_LIBDRM_RADEON=no
+else
+ LIBDRM_RADEON_CFLAGS=$pkg_cv_LIBDRM_RADEON_CFLAGS
+ LIBDRM_RADEON_LIBS=$pkg_cv_LIBDRM_RADEON_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_LIBDRM_RADEON=yes
+fi
+
if test "$mesa_driver" = xlib; then
DEFINES="$DEFINES -DUSE_XSHM"
fi
@@ -7095,6 +7443,58 @@ if test "x$with_dri_drivers" = x; then
with_dri_drivers=no
fi
+# Check whether --enable-opengl was given.
+if test "${enable_opengl+set}" = set; then :
+ enableval=$enable_opengl; enable_opengl="$enableval"
+else
+ enable_opengl=yes
+fi
+
+# Check whether --enable-gles1 was given.
+if test "${enable_gles1+set}" = set; then :
+ enableval=$enable_gles1; enable_gles1="$enableval"
+else
+ enable_gles1=no
+fi
+
+# Check whether --enable-gles2 was given.
+if test "${enable_gles2+set}" = set; then :
+ enableval=$enable_gles2; enable_gles2="$enableval"
+else
+ enable_gles2=no
+fi
+
+# Check whether --enable-gles-overlay was given.
+if test "${enable_gles_overlay+set}" = set; then :
+ enableval=$enable_gles_overlay; enable_gles_overlay="$enableval"
+else
+ enable_gles_overlay=no
+fi
+
+
+API_DEFINES=""
+GLES_OVERLAY=0
+if test "x$enable_opengl" = xno; then
+ API_DEFINES="$API_DEFINES -DFEATURE_GL=0"
+else
+ API_DEFINES="$API_DEFINES -DFEATURE_GL=1"
+fi
+if test "x$enable_gles1" = xyes; then
+ API_DEFINES="$API_DEFINES -DFEATURE_ES1=1"
+fi
+if test "x$enable_gles2" = xyes; then
+ API_DEFINES="$API_DEFINES -DFEATURE_ES2=1"
+fi
+if test "x$enable_gles_overlay" = xyes -o \
+ "x$enable_gles1" = xyes -o "x$enable_gles2" = xyes; then
+ CORE_DIRS="mapi/es1api mapi/es2api $CORE_DIRS"
+ if test "x$enable_gles_overlay" = xyes; then
+ GLES_OVERLAY=1
+ fi
+fi
+
+
+
DRI_DIRS=""
case "$with_dri_drivers" in
no) ;;
@@ -7260,7 +7660,7 @@ fi
# put all the necessary libs together
- DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
+ DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS $TALLOC_LIBS"
fi
@@ -7278,12 +7678,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_INTEL_CFLAGS="$INTEL_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_intel >= 2.4.19\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm_intel >= 2.4.19") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_intel >= 2.4.21\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm_intel >= 2.4.21") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_INTEL_CFLAGS=`$PKG_CONFIG --cflags "libdrm_intel >= 2.4.19" 2>/dev/null`
+ pkg_cv_INTEL_CFLAGS=`$PKG_CONFIG --cflags "libdrm_intel >= 2.4.21" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7296,12 +7696,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_INTEL_LIBS="$INTEL_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_intel >= 2.4.19\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm_intel >= 2.4.19") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_intel >= 2.4.21\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm_intel >= 2.4.21") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_INTEL_LIBS=`$PKG_CONFIG --libs "libdrm_intel >= 2.4.19" 2>/dev/null`
+ pkg_cv_INTEL_LIBS=`$PKG_CONFIG --libs "libdrm_intel >= 2.4.21" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7320,14 +7720,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- INTEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm_intel >= 2.4.19"`
+ INTEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm_intel >= 2.4.21"`
else
- INTEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm_intel >= 2.4.19"`
+ INTEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm_intel >= 2.4.21"`
fi
# Put the nasty error message in config.log where it belongs
echo "$INTEL_PKG_ERRORS" >&5
- as_fn_error "Package requirements (libdrm_intel >= 2.4.19) were not met:
+ as_fn_error "Package requirements (libdrm_intel >= 2.4.21) were not met:
$INTEL_PKG_ERRORS
@@ -7363,79 +7763,7 @@ esac
case $DRI_DIRS in
*radeon*|*r200*|*r300*|*r600*)
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM_RADEON" >&5
-$as_echo_n "checking for LIBDRM_RADEON... " >&6; }
-
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBDRM_RADEON_CFLAGS"; then
- pkg_cv_LIBDRM_RADEON_CFLAGS="$LIBDRM_RADEON_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_radeon libdrm >= \$LIBDRM_RADEON_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBDRM_RADEON_CFLAGS=`$PKG_CONFIG --cflags "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBDRM_RADEON_LIBS"; then
- pkg_cv_LIBDRM_RADEON_LIBS="$LIBDRM_RADEON_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm_radeon libdrm >= \$LIBDRM_RADEON_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_LIBDRM_RADEON_LIBS=`$PKG_CONFIG --libs "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- LIBDRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED"`
- else
- LIBDRM_RADEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdrm_radeon libdrm >= $LIBDRM_RADEON_REQUIRED"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LIBDRM_RADEON_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- HAVE_LIBDRM_RADEON=no
-elif test $pkg_failed = untried; then
- HAVE_LIBDRM_RADEON=no
-else
- LIBDRM_RADEON_CFLAGS=$pkg_cv_LIBDRM_RADEON_CFLAGS
- LIBDRM_RADEON_LIBS=$pkg_cv_LIBDRM_RADEON_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- HAVE_LIBDRM_RADEON=yes
-fi
-
- if test "$HAVE_LIBDRM_RADEON" = yes; then
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
fi
@@ -7496,12 +7824,12 @@ case "$DRIVER_DIRS" in
*osmesa*)
# only link libraries with osmesa if shared
if test "$enable_static" = no; then
- OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+ OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS"
else
OSMESA_LIB_DEPS=""
fi
OSMESA_MESA_DEPS=""
- OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+ OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS"
;;
esac
@@ -7526,23 +7854,24 @@ if test "x$enable_egl" = xyes; then
EGL_DRIVERS_DIRS="glx"
fi
- # build egl_dri2 when xcb-dri2 is available
+ if test "$mesa_driver" = dri; then
+ # build egl_dri2 when xcb-dri2 is available
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGL_DRI2" >&5
-$as_echo_n "checking for EGL_DRI2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_DRI2" >&5
+$as_echo_n "checking for XCB_DRI2... " >&6; }
if test -n "$PKG_CONFIG"; then
- if test -n "$EGL_DRI2_CFLAGS"; then
- pkg_cv_EGL_DRI2_CFLAGS="$EGL_DRI2_CFLAGS"
+ if test -n "$XCB_DRI2_CFLAGS"; then
+ pkg_cv_XCB_DRI2_CFLAGS="$XCB_DRI2_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-xfixes libdrm\""; } >&5
- ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-xfixes libdrm") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-xfixes\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-xfixes") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_EGL_DRI2_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb xcb-dri2 xcb-xfixes libdrm" 2>/dev/null`
+ pkg_cv_XCB_DRI2_CFLAGS=`$PKG_CONFIG --cflags "x11-xcb xcb-dri2 xcb-xfixes" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7551,16 +7880,16 @@ else
pkg_failed=untried
fi
if test -n "$PKG_CONFIG"; then
- if test -n "$EGL_DRI2_LIBS"; then
- pkg_cv_EGL_DRI2_LIBS="$EGL_DRI2_LIBS"
+ if test -n "$XCB_DRI2_LIBS"; then
+ pkg_cv_XCB_DRI2_LIBS="$XCB_DRI2_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-xfixes libdrm\""; } >&5
- ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-xfixes libdrm") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11-xcb xcb-dri2 xcb-xfixes\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "x11-xcb xcb-dri2 xcb-xfixes") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_EGL_DRI2_LIBS=`$PKG_CONFIG --libs "x11-xcb xcb-dri2 xcb-xfixes libdrm" 2>/dev/null`
+ pkg_cv_XCB_DRI2_LIBS=`$PKG_CONFIG --libs "x11-xcb xcb-dri2 xcb-xfixes" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -7579,12 +7908,12 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- EGL_DRI2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb-dri2 xcb-xfixes libdrm"`
+ XCB_DRI2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11-xcb xcb-dri2 xcb-xfixes"`
else
- EGL_DRI2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb-dri2 xcb-xfixes libdrm"`
+ XCB_DRI2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11-xcb xcb-dri2 xcb-xfixes"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$EGL_DRI2_PKG_ERRORS" >&5
+ echo "$XCB_DRI2_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -7592,19 +7921,94 @@ $as_echo "no" >&6; }
elif test $pkg_failed = untried; then
have_xcb_dri2=no
else
- EGL_DRI2_CFLAGS=$pkg_cv_EGL_DRI2_CFLAGS
- EGL_DRI2_LIBS=$pkg_cv_EGL_DRI2_LIBS
+ XCB_DRI2_CFLAGS=$pkg_cv_XCB_DRI2_CFLAGS
+ XCB_DRI2_LIBS=$pkg_cv_XCB_DRI2_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
have_xcb_dri2=yes
fi
- if test "$have_xcb_dri2" = yes; then
- EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS dri2"
- fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBUDEV" >&5
+$as_echo_n "checking for LIBUDEV... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBUDEV_CFLAGS"; then
+ pkg_cv_LIBUDEV_CFLAGS="$LIBUDEV_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev > 150\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libudev > 150") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBUDEV_CFLAGS=`$PKG_CONFIG --cflags "libudev > 150" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBUDEV_LIBS"; then
+ pkg_cv_LIBUDEV_LIBS="$LIBUDEV_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libudev > 150\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libudev > 150") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_LIBUDEV_LIBS=`$PKG_CONFIG --libs "libudev > 150" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libudev > 150"`
+ else
+ LIBUDEV_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libudev > 150"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBUDEV_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_libudev=no
+elif test $pkg_failed = untried; then
+ have_libudev=no
+else
+ LIBUDEV_CFLAGS=$pkg_cv_LIBUDEV_CFLAGS
+ LIBUDEV_LIBS=$pkg_cv_LIBUDEV_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_libudev=yes
+fi
+
+ if test "$have_xcb_dri2" = yes; then
+ EGL_DRIVER_DRI2=dri2
+ DEFINES="$DEFINES -DHAVE_XCB_DRI2"
+ if test "$have_libudev" = yes; then
+ DEFINES="$DEFINES -DHAVE_LIBUDEV"
+ fi
+ fi
+ fi
- if test "$with_demos" = yes; then
- PROGRAM_DIRS="$PROGRAM_DIRS egl"
+ EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"
fi
fi
@@ -7622,12 +8026,6 @@ if test "x$enable_glu" = xyes; then
case "$mesa_driver" in
osmesa)
- # If GLU is available and we have libOSMesa (not 16 or 32),
- # we can build the osdemos
- if test "$with_demos" = yes && test "$osmesa_bits" = 8; then
- PROGRAM_DIRS="$PROGRAM_DIRS osdemos"
- fi
-
# Link libGLU to libOSMesa instead of libGL
GLU_LIB_DEPS=""
GLU_PC_REQ="osmesa"
@@ -7936,10 +8334,6 @@ fi
if test "x$enable_glut" = xyes; then
SRC_DIRS="$SRC_DIRS glut/glx"
- GLUT_CFLAGS=""
- if test "x$GCC" = xyes; then
- GLUT_CFLAGS="-fexceptions"
- fi
if test "$x11_pkgconfig" = yes; then
pkg_failed=no
@@ -8039,14 +8433,12 @@ fi
GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS"
GLUT_PC_CFLAGS="$X11_INCLUDES"
fi
+ if test "x$GCC" = xyes; then
+ GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions"
+ fi
GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm"
GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm"
- # If glut is available, we can build most programs
- if test "$with_demos" = yes; then
- PROGRAM_DIRS="$PROGRAM_DIRS demos redbook samples glsl"
- fi
-
# If static, empty GLUT_LIB_DEPS and add libs for programs to link
if test "$enable_static" = no; then
GLUT_MESA_DEPS='-l$(GLU_LIB) -l$(GL_LIB)'
@@ -8087,7 +8479,67 @@ else
fi
if test "x$enable_gallium" = xyes; then
- SRC_DIRS="$SRC_DIRS gallium gallium/winsys"
+ SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
+ ac_fn_c_check_header_mongrel "$LINENO" "udis86.h" "ac_cv_header_udis86_h" "$ac_includes_default"
+if test "x$ac_cv_header_udis86_h" = x""yes; then :
+ HAS_UDIS86="yes"
+else
+ HAS_UDIS86="no"
+fi
+
+
+ # Extract the first word of "llvm-config", so it can be a program name with args.
+set dummy llvm-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LLVM_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $LLVM_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_LLVM_CONFIG="$LLVM_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_LLVM_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_LLVM_CONFIG" && ac_cv_path_LLVM_CONFIG="no"
+ ;;
+esac
+fi
+LLVM_CONFIG=$ac_cv_path_LLVM_CONFIG
+if test -n "$LLVM_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LLVM_CONFIG" >&5
+$as_echo "$LLVM_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+
+
+
+
+
+
+VG_LIB_DEPS=""
+EGL_CLIENT_APIS='$(GL_LIB)'
+if test "x$enable_gles_overlay" = xyes; then
+ EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GLESv1_CM_LIB) $(GLESv2_LIB)'
fi
@@ -8111,8 +8563,10 @@ yes)
;;
dri)
GALLIUM_STATE_TRACKERS_DIRS="dri"
+ HAVE_ST_DRI="yes"
if test "x$enable_egl" = xyes; then
GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
+ HAVE_ST_EGL="yes"
fi
# Have only tested st/xorg on 1.6.0 servers
@@ -8176,35 +8630,130 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_XORG="no"
+ HAVE_ST_XORG="no"
elif test $pkg_failed = untried; then
- HAVE_XORG="no"
+ HAVE_ST_XORG="no"
else
XORG_CFLAGS=$pkg_cv_XORG_CFLAGS
XORG_LIBS=$pkg_cv_XORG_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg"
+ HAVE_ST_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg"
fi
;;
esac
;;
*)
# verify the requested state tracker exist
- state_trackers=`IFS=', '; echo $with_state_trackers`
- for tracker in $state_trackers; do
- test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
- as_fn_error "state tracker '$tracker' doesn't exist" "$LINENO" 5
-
+ state_trackers=""
+ _state_trackers=`IFS=', '; echo $with_state_trackers`
+ for tracker in $_state_trackers; do
case "$tracker" in
+ dri)
+ if test "x$mesa_driver" != xdri; then
+ as_fn_error "cannot build dri state tracker without mesa driver set to dri" "$LINENO" 5
+ fi
+ HAVE_ST_DRI="yes"
+ ;;
egl)
if test "x$enable_egl" != xyes; then
as_fn_error "cannot build egl state tracker without EGL library" "$LINENO" 5
fi
+ HAVE_ST_EGL="yes"
;;
xorg)
pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XORG" >&5
+$as_echo_n "checking for XORG... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XORG_CFLAGS"; then
+ pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.6.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_XORG_CFLAGS=`$PKG_CONFIG --cflags "xorg-server >= 1.6.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$XORG_LIBS"; then
+ pkg_cv_XORG_LIBS="$XORG_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.6.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_XORG_LIBS=`$PKG_CONFIG --libs "xorg-server >= 1.6.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server >= 1.6.0"`
+ else
+ XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server >= 1.6.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$XORG_PKG_ERRORS" >&5
+
+ as_fn_error "Package requirements (xorg-server >= 1.6.0) were not met:
+
+$XORG_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." "$LINENO" 5; }
+else
+ XORG_CFLAGS=$pkg_cv_XORG_CFLAGS
+ XORG_LIBS=$pkg_cv_XORG_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ :
+fi
+
+pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDRM_XORG" >&5
$as_echo_n "checking for LIBDRM_XORG... " >&6; }
@@ -8383,19 +8932,54 @@ else
$as_echo "yes" >&6; }
:
fi
- HAVE_XORG="yes"
+ HAVE_ST_XORG="yes"
;;
es)
- # mesa/es is required to build es state tracker
- CORE_DIRS="$CORE_DIRS mesa/es"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: state tracker 'es' has been replaced by --enable-gles-overlay" >&5
+$as_echo "$as_me: WARNING: state tracker 'es' has been replaced by --enable-gles-overlay" >&2;}
+
+ if test "x$enable_gles_overlay" != xyes; then
+ if test "x$enable_gles1" != xyes -a "x$enable_gles2" != xyes; then
+ CORE_DIRS="mapi/es1api mapi/es2api $CORE_DIRS"
+ fi
+ GLES_OVERLAY=1
+ EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GLESv1_CM_LIB) $(GLESv2_LIB)'
+ fi
+ tracker=""
+ ;;
+ vega)
+ CORE_DIRS="$CORE_DIRS mapi/vgapi"
+ VG_LIB_DEPS="$VG_LIB_DEPS -lpthread"
+ EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'
;;
esac
+
+ if test -n "$tracker"; then
+ test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
+ as_fn_error "state tracker '$tracker' doesn't exist" "$LINENO" 5
+ if test -n "$state_trackers"; then
+ state_trackers="$state_trackers $tracker"
+ else
+ state_trackers="$tracker"
+ fi
+ fi
done
GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"
;;
esac
-if test "x$HAVE_XORG" = xyes; then
+
+
+
+if test "x$HAVE_ST_EGL" = xyes; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"
+ # define GLX_DIRECT_RENDERING even when the driver is not dri
+ if test "x$mesa_driver" != xdri -a "x$driglx_direct" = xyes; then
+ DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+ fi
+fi
+
+if test "x$HAVE_ST_XORG" = xyes; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XEXT" >&5
@@ -8470,19 +9054,28 @@ fi
fi
+# Check whether --with-egl-platforms was given.
+if test "${with_egl_platforms+set}" = set; then :
+ withval=$with_egl_platforms; with_egl_platforms="$withval"
+else
+ with_egl_platforms=yes
+fi
+
+
# Check whether --with-egl-displays was given.
if test "${with_egl_displays+set}" = set; then :
- withval=$with_egl_displays; with_egl_displays="$withval"
-else
- with_egl_displays=yes
+ withval=$with_egl_displays; with_egl_platforms="$withval"
fi
-EGL_DISPLAYS=""
-case "$with_egl_displays" in
+EGL_PLATFORMS=""
+case "$with_egl_platforms" in
yes)
if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then
- EGL_DISPLAYS="x11"
+ EGL_PLATFORMS="x11"
+ if test "$mesa_driver" = dri; then
+ EGL_PLATFORMS="$EGL_PLATFORMS drm"
+ fi
fi
;;
*)
@@ -8490,12 +9083,15 @@ yes)
as_fn_error "cannot build egl state tracker without EGL library" "$LINENO" 5
fi
# verify the requested driver directories exist
- egl_displays=`IFS=', '; echo $with_egl_displays`
- for dpy in $egl_displays; do
- test -d "$srcdir/src/gallium/state_trackers/egl/$dpy" || \
- as_fn_error "EGL display '$dpy' does't exist" "$LINENO" 5
+ egl_platforms=`IFS=', '; echo $with_egl_platforms`
+ for plat in $egl_platforms; do
+ test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \
+ as_fn_error "EGL platform '$plat' does't exist" "$LINENO" 5
+ if test "$plat" = "fbdev"; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"
+ fi
done
- EGL_DISPLAYS="$egl_displays"
+ EGL_PLATFORMS="$egl_platforms"
;;
esac
@@ -8543,6 +9139,47 @@ fi
fi
+# Check whether --enable-gallium-llvm was given.
+if test "${enable_gallium_llvm+set}" = set; then :
+ enableval=$enable_gallium_llvm; enable_gallium_llvm="$enableval"
+else
+ enable_gallium_llvm=auto
+fi
+
+if test "x$enable_gallium_llvm" = xyes; then
+ if test "x$LLVM_CONFIG" != xno; then
+ LLVM_VERSION=`$LLVM_CONFIG --version`
+ LLVM_CFLAGS=`$LLVM_CONFIG --cflags`
+ LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++"
+
+ if test "x$HAS_UDIS86" != xno; then
+ LLVM_LIBS="$LLVM_LIBS -ludis86"
+ DEFINES="$DEFINES -DHAVE_UDIS86"
+ fi
+ LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+ DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
+ MESA_LLVM=1
+ else
+ MESA_LLVM=0
+ fi
+else
+ MESA_LLVM=0
+fi
+
+gallium_check_st() {
+ if test "x$HAVE_ST_DRI" = xyes || test "x$HAVE_ST_XORG" = xyes; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS $1"
+ fi
+ if test "x$HAVE_ST_DRI" = xyes && test "x$2" != x; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $2"
+ fi
+ if test "x$HAVE_ST_XORG" = xyes && test "x$3" != x; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS $3"
+ fi
+}
+
+
# Check whether --enable-gallium-svga was given.
if test "${enable_gallium_svga+set}" = set; then :
enableval=$enable_gallium_svga; enable_gallium_svga="$enableval"
@@ -8551,24 +9188,40 @@ else
fi
if test "x$enable_gallium_svga" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS vmware"
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
+ gallium_check_st "svga/drm" "dri-vmwgfx" "xorg-vmwgfx"
elif test "x$enable_gallium_svga" = xauto; then
GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS svga"
fi
-# Check whether --enable-gallium-intel was given.
-if test "${enable_gallium_intel+set}" = set; then :
- enableval=$enable_gallium_intel; enable_gallium_intel="$enableval"
+# Check whether --enable-gallium-i915 was given.
+if test "${enable_gallium_i915+set}" = set; then :
+ enableval=$enable_gallium_i915; enable_gallium_i915="$enableval"
+else
+ enable_gallium_i915=auto
+fi
+
+if test "x$enable_gallium_i915" = xyes; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+ gallium_check_st "i915/drm" "dri-i915" "xorg-i915"
+elif test "x$enable_gallium_i915" = xauto; then
+ GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS i915/sw"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915"
+fi
+
+# Check whether --enable-gallium-i965 was given.
+if test "${enable_gallium_i965+set}" = set; then :
+ enableval=$enable_gallium_i965; enable_gallium_i965="$enableval"
else
- enable_gallium_intel=auto
+ enable_gallium_i965=auto
fi
-if test "x$enable_gallium_intel" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS intel i965"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
-elif test "x$enable_gallium_intel" = xauto; then
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i915 i965"
+if test "x$enable_gallium_i965" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
+ gallium_check_st "i965/drm" "dri-i965" "xorg-i965"
+elif test "x$enable_gallium_i965" = xauto; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS i965"
fi
# Check whether --enable-gallium-radeon was given.
@@ -8578,11 +9231,38 @@ else
enable_gallium_radeon=auto
fi
+if test "x$enable_gallium_radeon" = xauto; then
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ gallium_check_st "radeon/drm" "dri-r300"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdrm_radeon is missing, not building gallium-radeon (r300)" >&5
+$as_echo "$as_me: WARNING: libdrm_radeon is missing, not building gallium-radeon (r300)" >&2;}
+ fi
+fi
if test "x$enable_gallium_radeon" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS radeon"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
-elif test "x$enable_gallium_radeon" = xauto; then
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+ gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
+ else
+ as_fn_error "libdrm_radeon is missing, cannot build gallium-radeon (r300)" "$LINENO" 5
+ fi
+fi
+
+# Check whether --enable-gallium-r600 was given.
+if test "${enable_gallium_r600+set}" = set; then :
+ enableval=$enable_gallium_r600; enable_gallium_r600="$enableval"
+else
+ enable_gallium_r600=auto
+fi
+
+if test "x$enable_gallium_r600" = xyes; then
+ if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
+ gallium_check_st "r600/drm" "dri-r600"
+ else
+ as_fn_error "libdrm_radeon is missing, cannot build gallium-r600" "$LINENO" 5
+ fi
fi
# Check whether --enable-gallium-nouveau was given.
@@ -8593,8 +9273,8 @@ else
fi
if test "x$enable_gallium_nouveau" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS nouveau"
- GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv30 nv40 nv50"
+ GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50"
+ gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"
fi
# Check whether --enable-gallium-swrast was given.
@@ -8604,8 +9284,10 @@ else
enable_gallium_swrast=auto
fi
-if test "x$enable_gallium_swrast" = xyes; then
- GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS swrast"
+if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xauto; then
+ if test "x$HAVE_ST_DRI" = xyes; then
+ GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-swrast"
+ fi
fi
SRC_DIRS="$CORE_DIRS $SRC_DIRS"
@@ -9160,7 +9842,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Mesa $as_me 7.8.2, which was
+This file was extended by Mesa $as_me 7.9.0, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9217,7 +9899,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Mesa config.status 7.8.2
+Mesa config.status 7.9.0
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
@@ -9807,13 +10489,25 @@ fi
echo " Use XCB: $enable_xcb"
echo ""
+if test "x$MESA_LLVM" = x1; then
+ echo " llvm: yes"
+ echo " llvm-config: $LLVM_CONFIG"
+ echo " llvm-version: $LLVM_VERSION"
+else
+ echo " llvm: no"
+fi
+
+echo ""
if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then
echo " Gallium: yes"
echo " Gallium dirs: $GALLIUM_DIRS"
+ echo " Target dirs: $GALLIUM_TARGET_DIRS"
echo " Winsys dirs: $GALLIUM_WINSYS_DIRS"
- echo " Winsys drm dirs:$GALLIUM_WINSYS_DRM_DIRS"
echo " Driver dirs: $GALLIUM_DRIVERS_DIRS"
echo " Trackers dirs: $GALLIUM_STATE_TRACKERS_DIRS"
+ if test "x$HAVE_ST_EGL" = xyes; then
+ echo " EGL client APIs: $EGL_CLIENT_APIS"
+ fi
else
echo " Gallium: no"
fi
@@ -9823,6 +10517,7 @@ echo " Shared libs: $enable_shared"
echo " Static libs: $enable_static"
if test "$enable_egl" = yes; then
echo " EGL: $EGL_DRIVERS_DIRS"
+ echo " EGL platforms: $EGL_PLATFORMS"
else
echo " EGL: no"
fi
@@ -9830,14 +10525,6 @@ echo " GLU: $enable_glu"
echo " GLw: $enable_glw (Motif: $enable_motif)"
echo " glut: $enable_glut"
-# cleanup the programs var for display
-program_dirs=`echo $PROGRAM_DIRS | $SED 's/^ *//;s/ */ /;s/ *$//'`
-if test "x$program_dirs" = x; then
- echo " Demos: no"
-else
- echo " Demos: $program_dirs"
-fi
-
# cleanup the CFLAGS/CXXFLAGS/DEFINES vars
cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
$SED 's/^ *//;s/ */ /;s/ *$//'`