xserver xkeyboard-config mesa git update 21 Feb 2011

4 files changed, 1968 insertions, 1979 deletions

diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index d2df4255b..e1702ba20 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -1,1912 +1,1912 @@
-dnl Process this file with autoconf to create configure.

-

-AC_PREREQ([2.59])

-

-dnl Versioning - scrape the version from configs/default

-m4_define([mesa_version],

-    [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])

-m4_ifval(mesa_version,,

-    [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])

-

-dnl Tell the user about autoconf.html in the --help output

-m4_divert_once([HELP_END], [

-See docs/autoconf.html for more details on the options for Mesa.])

-

-AC_INIT([Mesa],[mesa_version],

-    [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])

-AC_CONFIG_AUX_DIR([bin])

-AC_CANONICAL_HOST

-

-dnl Versions for external dependencies

-LIBDRM_REQUIRED=2.4.23

-LIBDRM_RADEON_REQUIRED=2.4.23

-LIBDRM_INTEL_REQUIRED=2.4.23

-DRI2PROTO_REQUIRED=2.1

-GLPROTO_REQUIRED=1.4.11

-LIBDRM_XORG_REQUIRED=2.4.23

-LIBKMS_XORG_REQUIRED=1.0.0

-

-dnl Check for progs

-AC_PROG_CPP

-AC_PROG_CC

-AC_PROG_CXX

-AC_CHECK_PROGS([MAKE], [gmake make])

-AC_CHECK_PROGS([PYTHON2], [python2 python])

-AC_PATH_PROG([MKDEP], [makedepend])

-AC_PATH_PROG([SED], [sed])

-

-if test "x$MKDEP" = "x"; then

-    AC_MSG_ERROR([makedepend is required to build Mesa])

-fi

-

-dnl Our fallback install-sh is a symlink to minstall. Use the existing

-dnl configuration in that case.

-AC_PROG_INSTALL

-test "x$INSTALL" = "x$ac_install_sh" && INSTALL='$(MINSTALL)'

-

-dnl We need a POSIX shell for parts of the build. Assume we have one

-dnl in most cases.

-case "$host_os" in

-solaris*)

-    # Solaris /bin/sh is too old/non-POSIX compliant

-    AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh])

-    SHELL="$POSIX_SHELL"

-    ;;

-esac

-

-dnl clang is mostly GCC-compatible, but its version is much lower,

-dnl so we have to check for it.

-AC_MSG_CHECKING([if compiling with clang])

-

-AC_COMPILE_IFELSE(

-[AC_LANG_PROGRAM([], [[

-#ifndef __clang__

-       not clang

-#endif

-]])],

-[CLANG=yes], [CLANG=no])

-

-AC_MSG_RESULT([$CLANG])

-

-dnl If we're using GCC, make sure that it is at least version 3.3.0.  Older

-dnl versions are explictly not supported.

-if test "x$GCC" = xyes -a "x$CLANG" = xno; then

-    AC_MSG_CHECKING([whether gcc version is sufficient])

-    major=0

-    minor=0

-

-    GCC_VERSION=`$CC -dumpversion`

-    if test $? -eq 0; then

-        major=`echo $GCC_VERSION | cut -d. -f1`

-        minor=`echo $GCC_VERSION | cut -d. -f1`

-    fi

-

-    if test $major -lt 3 -o $major -eq 3 -a $minor -lt 3 ; then

-        AC_MSG_RESULT([no])

-        AC_MSG_ERROR([If using GCC, version 3.3.0 or later is required.])

-    else

-        AC_MSG_RESULT([yes])

-    fi

-fi

-

-

-MKDEP_OPTIONS=-fdepend

-dnl Ask gcc where it's keeping its secret headers

-if test "x$GCC" = xyes; then

-    for dir in include include-fixed; do

-        GCC_INCLUDES=`$CC -print-file-name=$dir`

-        if test "x$GCC_INCLUDES" != x && \

-           test "$GCC_INCLUDES" != "$dir" && \

-           test -d "$GCC_INCLUDES"; then

-            MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"

-        fi

-    done

-fi

-AC_SUBST([MKDEP_OPTIONS])

-

-dnl Make sure the pkg-config macros are defined

-m4_ifndef([PKG_PROG_PKG_CONFIG],

-    [m4_fatal([Could not locate the pkg-config autoconf macros.

-  These are usually located in /usr/share/aclocal/pkg.m4. If your macros

-  are in a different location, try setting the environment variable

-  ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])

-PKG_PROG_PKG_CONFIG()

-

-dnl LIB_DIR - library basename

-LIB_DIR=`echo $libdir | $SED 's%.*/%%'`

-AC_SUBST([LIB_DIR])

-

-dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later

-_SAVE_LDFLAGS="$LDFLAGS"

-AC_ARG_VAR([EXTRA_LIB_PATH],[Extra -L paths for the linker])

-AC_SUBST([EXTRA_LIB_PATH])

-

-dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later

-_SAVE_CPPFLAGS="$CPPFLAGS"

-AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers])

-AC_SUBST([X11_INCLUDES])

-

-dnl Compiler macros

-DEFINES=""

-AC_SUBST([DEFINES])

-case "$host_os" in

-linux*|*-gnu*|gnu*)

-    DEFINES="$DEFINES -D_GNU_SOURCE -DPTHREADS"

-    ;;

-solaris*)

-    DEFINES="$DEFINES -DPTHREADS -DSVR4"

-    ;;

-cygwin*)

-    DEFINES="$DEFINES -DPTHREADS"

-    ;;

-esac

-

-dnl Add flags for gcc and g++

-if test "x$GCC" = xyes; then

-    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"

-    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])

-    VISIBILITY_CFLAGS="-fvisibility=hidden"

-    CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"

-    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),

-		   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);

-

-    # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.

-    CFLAGS=$save_CFLAGS

-

-    # Work around aliasing bugs - developers should comment this out

-    CFLAGS="$CFLAGS -fno-strict-aliasing"

-fi

-if test "x$GXX" = xyes; then

-    CXXFLAGS="$CXXFLAGS -Wall"

-

-    # Enable -fvisibility=hidden if using a gcc that supports it

-    save_CXXFLAGS="$CXXFLAGS"

-    AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])

-    VISIBILITY_CXXFLAGS="-fvisibility=hidden"

-    CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"

-    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),

-		   [VISIBILITY_CXXFLAGS="" ; AC_MSG_RESULT([no])]);

-

-    # Restore CXXFLAGS; VISIBILITY_CXXFLAGS are added to it where needed.

-    CXXFLAGS=$save_CXXFLAGS

-

-    # Work around aliasing bugs - developers should comment this out

-    CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"

-fi

-

-AC_SUBST([VISIBILITY_CFLAGS])

-AC_SUBST([VISIBILITY_CXXFLAGS])

-

-dnl These should be unnecessary, but let the user set them if they want

-AC_ARG_VAR([OPT_FLAGS], [Additional optimization flags for the compiler.

-    Default is to use CFLAGS.])

-AC_ARG_VAR([ARCH_FLAGS], [Additional architecture specific flags for the

-    compiler. Default is to use CFLAGS.])

-AC_SUBST([OPT_FLAGS])

-AC_SUBST([ARCH_FLAGS])

-

-dnl

-dnl Hacks to enable 32 or 64 bit build

-dnl

-AC_ARG_ENABLE([32-bit],

-    [AS_HELP_STRING([--enable-32-bit],

-        [build 32-bit libraries @<:@default=auto@:>@])],

-    [enable_32bit="$enableval"],

-    [enable_32bit=auto]

-)

-if test "x$enable_32bit" = xyes; then

-    if test "x$GCC" = xyes; then

-        CFLAGS="$CFLAGS -m32"

-        ARCH_FLAGS="$ARCH_FLAGS -m32"

-    fi

-    if test "x$GXX" = xyes; then

-        CXXFLAGS="$CXXFLAGS -m32"

-    fi

-fi

-AC_ARG_ENABLE([64-bit],

-    [AS_HELP_STRING([--enable-64-bit],

-        [build 64-bit libraries @<:@default=auto@:>@])],

-    [enable_64bit="$enableval"],

-    [enable_64bit=auto]

-)

-if test "x$enable_64bit" = xyes; then

-    if test "x$GCC" = xyes; then

-        CFLAGS="$CFLAGS -m64"

-    fi

-    if test "x$GXX" = xyes; then

-        CXXFLAGS="$CXXFLAGS -m64"

-    fi

-fi

-

-dnl

-dnl shared/static libraries, mimic libtool options

-dnl

-AC_ARG_ENABLE([static],

-    [AS_HELP_STRING([--enable-static],

-        [build static libraries @<:@default=disabled@:>@])],

-    [enable_static="$enableval"],

-    [enable_static=no]

-)

-case "x$enable_static" in

-xyes|xno ) ;;

-x ) enable_static=no ;;

-* )

-    AC_MSG_ERROR([Static library option '$enable_static' is not a valid])

-    ;;

-esac

-AC_ARG_ENABLE([shared],

-    [AS_HELP_STRING([--disable-shared],

-        [build shared libraries @<:@default=enabled@:>@])],

-    [enable_shared="$enableval"],

-    [enable_shared=yes]

-)

-case "x$enable_shared" in

-xyes|xno ) ;;

-x ) enable_shared=yes ;;

-* )

-    AC_MSG_ERROR([Shared library option '$enable_shared' is not a valid])

-    ;;

-esac

-

-dnl Can't have static and shared libraries, default to static if user

-dnl explicitly requested. If both disabled, set to static since shared

-dnl was explicitly requirested.

-case "x$enable_static$enable_shared" in

-xyesyes )

-    AC_MSG_WARN([Can't build static and shared libraries, disabling shared])

-    enable_shared=no

-    ;;

-xnono )

-    AC_MSG_WARN([Can't disable both static and shared libraries, enabling static])

-    enable_static=yes

-    ;;

-esac

-

-dnl

-dnl mklib options

-dnl

-AC_ARG_VAR([MKLIB_OPTIONS],[Options for the Mesa library script, mklib])

-if test "$enable_static" = yes; then

-    MKLIB_OPTIONS="$MKLIB_OPTIONS -static"

-fi

-AC_SUBST([MKLIB_OPTIONS])

-

-dnl

-dnl other compiler options

-dnl

-AC_ARG_ENABLE([debug],

-    [AS_HELP_STRING([--enable-debug],

-        [use debug compiler flags and macros @<:@default=disabled@:>@])],

-    [enable_debug="$enableval"],

-    [enable_debug=no]

-)

-if test "x$enable_debug" = xyes; then

-    DEFINES="$DEFINES -DDEBUG"

-    if test "x$GCC" = xyes; then

-        CFLAGS="$CFLAGS -g"

-    fi

-    if test "x$GXX" = xyes; then

-        CXXFLAGS="$CXXFLAGS -g"

-    fi

-fi

-

-dnl

-dnl library names

-dnl

-LIB_PREFIX_GLOB='lib'

-LIB_VERSION_SEPARATOR='.'

-if test "$enable_static" = yes; then

-    LIB_EXTENSION='a'

-else

-    case "$host_os" in

-    darwin* )

-        LIB_EXTENSION='dylib' ;;

-    cygwin* )

-        dnl prefix can be 'cyg' or 'lib'

-        LIB_PREFIX_GLOB='???'

-        LIB_VERSION_SEPARATOR='-'

-        LIB_EXTENSION='dll' ;;

-    aix* )

-        LIB_EXTENSION='a' ;;

-    * )

-        LIB_EXTENSION='so' ;;

-    esac

-fi

-

-GL_LIB_NAME='lib$(GL_LIB).'${LIB_EXTENSION}

-GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION}

-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}

-GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION}

-WAYLAND_EGL_LIB_NAME='lib$(WAYLAND_EGL_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}'*'

-GLAPI_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLAPI_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-WAYLAND_EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(WAYLAND_EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'

-

-AC_SUBST([GL_LIB_NAME])

-AC_SUBST([GLU_LIB_NAME])

-AC_SUBST([GLUT_LIB_NAME])

-AC_SUBST([GLW_LIB_NAME])

-AC_SUBST([OSMESA_LIB_NAME])

-AC_SUBST([EGL_LIB_NAME])

-AC_SUBST([GLESv1_CM_LIB_NAME])

-AC_SUBST([GLESv2_LIB_NAME])

-AC_SUBST([VG_LIB_NAME])

-AC_SUBST([GLAPI_LIB_NAME])

-AC_SUBST([WAYLAND_EGL_LIB_NAME])

-

-AC_SUBST([GL_LIB_GLOB])

-AC_SUBST([GLU_LIB_GLOB])

-AC_SUBST([GLUT_LIB_GLOB])

-AC_SUBST([GLW_LIB_GLOB])

-AC_SUBST([OSMESA_LIB_GLOB])

-AC_SUBST([EGL_LIB_GLOB])

-AC_SUBST([GLESv1_CM_LIB_GLOB])

-AC_SUBST([GLESv2_LIB_GLOB])

-AC_SUBST([VG_LIB_GLOB])

-AC_SUBST([GLAPI_LIB_GLOB])

-AC_SUBST([WAYLAND_EGL_LIB_GLOB])

-

-dnl

-dnl Arch/platform-specific settings

-dnl

-AC_ARG_ENABLE([asm],

-    [AS_HELP_STRING([--disable-asm],

-        [disable assembly usage @<:@default=enabled on supported plaforms@:>@])],

-    [enable_asm="$enableval"],

-    [enable_asm=yes]

-)

-asm_arch=""

-ASM_FLAGS=""

-MESA_ASM_SOURCES=""

-GLAPI_ASM_SOURCES=""

-AC_MSG_CHECKING([whether to enable assembly])

-test "x$enable_asm" = xno && AC_MSG_RESULT([no])

-# disable if cross compiling on x86/x86_64 since we must run gen_matypes

-if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then

-    case "$host_cpu" in

-    i?86 | x86_64)

-        enable_asm=no

-        AC_MSG_RESULT([no, cross compiling])

-        ;;

-    esac

-fi

-# check for supported arches

-if test "x$enable_asm" = xyes; then

-    case "$host_cpu" in

-    i?86)

-        case "$host_os" in

-        linux* | *freebsd* | dragonfly* | *netbsd*)

-            test "x$enable_64bit" = xyes && asm_arch=x86_64 || asm_arch=x86

-            ;;

-        esac

-        ;;

-    x86_64)

-        case "$host_os" in

-        linux* | *freebsd* | dragonfly* | *netbsd*)

-            test "x$enable_32bit" = xyes && asm_arch=x86 || asm_arch=x86_64

-            ;;

-        esac

-        ;;

-    powerpc)

-        case "$host_os" in

-        linux*)

-            asm_arch=ppc

-            ;;

-        esac

-        ;;

-    sparc*)

-        case "$host_os" in

-        linux*)

-            asm_arch=sparc

-            ;;

-        esac

-        ;;

-    esac

-

-    case "$asm_arch" in

-    x86)

-        ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"

-        MESA_ASM_SOURCES='$(X86_SOURCES)'

-        GLAPI_ASM_SOURCES='$(X86_API)'

-        AC_MSG_RESULT([yes, x86])

-        ;;

-    x86_64)

-        ASM_FLAGS="-DUSE_X86_64_ASM"

-        MESA_ASM_SOURCES='$(X86-64_SOURCES)'

-        GLAPI_ASM_SOURCES='$(X86-64_API)'

-        AC_MSG_RESULT([yes, x86_64])

-        ;;

-    ppc)

-        ASM_FLAGS="-DUSE_PPC_ASM -DUSE_VMX_ASM"

-        MESA_ASM_SOURCES='$(PPC_SOURCES)'

-        AC_MSG_RESULT([yes, ppc])

-        ;;

-    sparc)

-        ASM_FLAGS="-DUSE_SPARC_ASM"

-        MESA_ASM_SOURCES='$(SPARC_SOURCES)'

-        GLAPI_ASM_SOURCES='$(SPARC_API)'

-        AC_MSG_RESULT([yes, sparc])

-        ;;

-    *)

-        AC_MSG_RESULT([no, platform not supported])

-        ;;

-    esac

-fi

-AC_SUBST([ASM_FLAGS])

-AC_SUBST([MESA_ASM_SOURCES])

-AC_SUBST([GLAPI_ASM_SOURCES])

-

-dnl PIC code macro

-MESA_PIC_FLAGS

-

-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.

-AC_CHECK_FUNC([dlopen], [],

-    [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])

-AC_SUBST([DLOPEN_LIBS])

-

-dnl See if posix_memalign is available

-AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])

-

-dnl SELinux awareness.

-AC_ARG_ENABLE([selinux],

-    [AS_HELP_STRING([--enable-selinux],

-        [Build SELinux-aware Mesa @<:@default=disabled@:>@])],

-    [MESA_SELINUX="$enableval"],

-    [MESA_SELINUX=no])

-if test "x$enable_selinux" = "xyes"; then

-    AC_CHECK_HEADER([selinux/selinux.h],[],

-                    [AC_MSG_ERROR([SELinux headers not found])])

-    AC_CHECK_LIB([selinux],[is_selinux_enabled],[],

-                 [AC_MSG_ERROR([SELinux library not found])])

-    SELINUX_LIBS="-lselinux"

-    DEFINES="$DEFINES -DMESA_SELINUX"

-fi

-

-dnl Determine which APIs to support

-AC_ARG_ENABLE([opengl],

-    [AS_HELP_STRING([--disable-opengl],

-        [disable support for standard OpenGL API @<:@default=no@:>@])],

-    [enable_opengl="$enableval"],

-    [enable_opengl=yes])

-AC_ARG_ENABLE([gles1],

-    [AS_HELP_STRING([--enable-gles1],

-        [enable support for OpenGL ES 1.x API @<:@default=no@:>@])],

-    [enable_gles1="$enableval"],

-    [enable_gles1=no])

-AC_ARG_ENABLE([gles2],

-    [AS_HELP_STRING([--enable-gles2],

-        [enable support for OpenGL ES 2.x API @<:@default=no@:>@])],

-    [enable_gles2="$enableval"],

-    [enable_gles2=no])

-AC_ARG_ENABLE([gles-overlay],

-    [AS_HELP_STRING([--enable-gles-overlay],

-        [DEPRECATED.  Same as --enable-gles1 and --enable-gles2])],

-    [enable_gles1="$enableval"; enable_gles2="$enableval"],

-    [])

-

-AC_ARG_ENABLE([openvg],

-    [AS_HELP_STRING([--enable-openvg],

-        [enable support for OpenVG API @<:@default=no@:>@])],

-    [enable_openvg="$enableval"],

-    [enable_openvg=no])

-

-dnl smooth the transition; should be removed eventually

-if test "x$enable_openvg" = xno; then

-    case "x$with_state_trackers" in

-    x*vega*)

-        AC_MSG_WARN([vega state tracker is enabled without --enable-openvg])

-        enable_openvg=yes

-        ;;

-    esac

-fi

-

-if test "x$enable_opengl" = xno -a \

-        "x$enable_gles1" = xno -a \

-        "x$enable_gles2" = xno -a \

-        "x$enable_openvg" = xno; then

-    AC_MSG_ERROR([at least one API should be enabled])

-fi

-

-API_DEFINES=""

-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

-AC_SUBST([API_DEFINES])

-

-AC_ARG_ENABLE([shared-glapi],

-    [AS_HELP_STRING([--enable-shared-glapi],

-        [EXPERIMENTAL.  Enable shared glapi for OpenGL @<:@default=no@:>@])],

-    [enable_shared_glapi="$enableval"],

-    [enable_shared_glapi=no])

-

-SHARED_GLAPI="0"

-if test "x$enable_shared_glapi" = xyes; then

-    SHARED_GLAPI="1"

-fi

-AC_SUBST([SHARED_GLAPI])

-

-dnl

-dnl Driver configuration. Options are xlib, dri and osmesa right now.

-dnl More later: fbdev, ...

-dnl

-default_driver="xlib"

-

-case "$host_os" in

-linux*)

-    case "$host_cpu" in

-    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;

-    esac

-    ;;

-*freebsd* | dragonfly* | *netbsd*)

-    case "$host_cpu" in

-    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;

-    esac

-    ;;

-esac

-

-if test "x$enable_opengl" = xno; then

-    default_driver="no"

-fi

-

-AC_ARG_WITH([driver],

-    [AS_HELP_STRING([--with-driver=DRIVER],

-        [driver for Mesa: xlib,dri,osmesa @<:@default=dri when available, or xlib@:>@])],

-    [mesa_driver="$withval"],

-    [mesa_driver="$default_driver"])

-dnl Check for valid option

-case "x$mesa_driver" in

-xxlib|xdri|xosmesa)

-    if test "x$enable_opengl" = xno; then

-        AC_MSG_ERROR([Driver '$mesa_driver' requires OpenGL enabled])

-    fi

-    ;;

-xno)

-    ;;

-*)

-    AC_MSG_ERROR([Driver '$mesa_driver' is not a valid option])

-    ;;

-esac

-

-dnl

-dnl Driver specific build directories

-dnl

-

-dnl this variable will be prepended to SRC_DIRS and is not exported

-CORE_DIRS=""

-

-SRC_DIRS=""

-GLU_DIRS="sgi"

-GALLIUM_DIRS="auxiliary drivers state_trackers"

-GALLIUM_TARGET_DIRS=""

-GALLIUM_WINSYS_DIRS="sw"

-GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug noop identity"

-GALLIUM_STATE_TRACKERS_DIRS=""

-

-# build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled

-case "x$enabled_shared_glapi$enable_gles1$enable_gles2" in

-x*yes*)

-    CORE_DIRS="$CORE_DIRS mapi/shared-glapi"

-    ;;

-esac

-

-# build glapi if OpenGL is enabled

-if test "x$enable_opengl" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/glapi"

-fi

-

-# build es1api if OpenGL ES 1.x is enabled

-if test "x$enable_gles1" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/es1api"

-fi

-

-# build es2api if OpenGL ES 2.x is enabled

-if test "x$enable_gles2" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/es2api"

-fi

-

-# build vgapi if OpenVG is enabled

-if test "x$enable_openvg" = xyes; then

-    CORE_DIRS="$CORE_DIRS mapi/vgapi"

-fi

-

-# build glsl and mesa if OpenGL or OpenGL ES is enabled

-case "x$enable_opengl$enable_gles1$enable_gles2" in

-x*yes*)

-    CORE_DIRS="$CORE_DIRS glsl mesa"

-    ;;

-esac

-

-case "$mesa_driver" in

-xlib)

-    DRIVER_DIRS="x11"

-    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"

-    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"

-    ;;

-osmesa)

-    DRIVER_DIRS="osmesa"

-    ;;

-no)

-    DRIVER_DRIS=""

-    ;;

-esac

-AC_SUBST([SRC_DIRS])

-AC_SUBST([GLU_DIRS])

-AC_SUBST([DRIVER_DIRS])

-AC_SUBST([GALLIUM_DIRS])

-AC_SUBST([GALLIUM_TARGET_DIRS])

-AC_SUBST([GALLIUM_WINSYS_DIRS])

-AC_SUBST([GALLIUM_DRIVERS_DIRS])

-AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])

-AC_SUBST([MESA_LLVM])

-

-dnl

-dnl Find out if X is available. The variable have_x is set if libX11 is

-dnl found to mimic AC_PATH_XTRA.

-dnl

-if test -n "$PKG_CONFIG"; then

-    AC_MSG_CHECKING([pkg-config files for X11 are available])

-    PKG_CHECK_EXISTS([x11],[

-        x11_pkgconfig=yes

-        have_x=yes

-        ],[

-        x11_pkgconfig=no

-    ])

-    AC_MSG_RESULT([$x11_pkgconfig])

-else

-    x11_pkgconfig=no

-fi

-dnl Use the autoconf macro if no pkg-config files

-if test "$x11_pkgconfig" = yes; then

-    PKG_CHECK_MODULES([X11], [x11])

-else

-    AC_PATH_XTRA

-    test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS"

-    test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11"

-    AC_SUBST([X11_CFLAGS])

-    AC_SUBST([X11_LIBS])

-fi

-

-dnl Try to tell the user that the --x-* options are only used when

-dnl pkg-config is not available. This must be right after AC_PATH_XTRA.

-m4_divert_once([HELP_BEGIN],

-[These options are only used when the X libraries cannot be found by the

-pkg-config utility.])

-

-dnl We need X for xlib and dri, so bomb now if it's not found

-case "$mesa_driver" in

-xlib|dri)

-    if test "$no_x" = yes; then

-        AC_MSG_ERROR([X11 development libraries needed for $mesa_driver driver])

-    fi

-    ;;

-esac

-

-dnl XCB - this is only used for GLX right now

-AC_ARG_ENABLE([xcb],

-    [AS_HELP_STRING([--enable-xcb],

-        [use XCB for GLX @<:@default=disabled@:>@])],

-    [enable_xcb="$enableval"],

-    [enable_xcb=no])

-if test "x$enable_xcb" = xyes; then

-    DEFINES="$DEFINES -DUSE_XCB"

-else

-    enable_xcb=no

-fi

-

-dnl

-dnl libGL configuration per driver

-dnl

-case "$mesa_driver" in

-xlib)

-    if test "$x11_pkgconfig" = yes; then

-        PKG_CHECK_MODULES([XLIBGL], [x11 xext])

-        GL_PC_REQ_PRIV="x11 xext"

-        X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS"

-        GL_LIB_DEPS="$XLIBGL_LIBS"

-    else

-        # should check these...

-        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"

-        GL_LIB_DEPS="$X_LIBS -lX11 -lXext"

-        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"

-

-    # if static, move the external libraries to the programs

-    # and empty the libraries for libGL

-    if test "$enable_static" = yes; then

-        APP_LIB_DEPS="$APP_LIB_DEPS $GL_LIB_DEPS"

-        GL_LIB_DEPS=""

-    fi

-    ;;

-dri|no) # these checks are still desired when there is no mesa_driver

-    # DRI must be shared, I think

-    if test "$enable_static" = yes; then

-        AC_MSG_ERROR([Can't use static libraries for DRI drivers])

-    fi

-

-    # Check for libdrm

-    PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])

-    PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])

-    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])

-    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"

-    DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"

-

-    # find the DRI deps for libGL

-    if test "$x11_pkgconfig" = yes; then

-        dri_modules="x11 xext xdamage xfixes"

-

-        # add xf86vidmode if available

-        PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)

-        if test "$HAVE_XF86VIDMODE" = yes ; then

-            dri_modules="$dri_modules xxf86vm"

-        fi

-

-        # add xcb modules if necessary

-        if test "$enable_xcb" = yes; then

-            dri_modules="$dri_modules x11-xcb xcb-glx"

-        fi

-

-        PKG_CHECK_MODULES([DRIGL], [$dri_modules])

-        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"

-        X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"

-        GL_LIB_DEPS="$DRIGL_LIBS"

-    else

-        # should check these...

-        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"

-        GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes"

-        GL_PC_LIB_PRIV="$GL_LIB_DEPS"

-        GL_PC_CFLAGS="$X11_INCLUDES"

-

-        # XCB can only be used from pkg-config

-        if test "$enable_xcb" = yes; then

-            PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx])

-            GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx"

-            X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS"

-            GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS"

-        fi

-    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

-    GL_LIB_DEPS=""

-    ;;

-esac

-AC_SUBST([GL_LIB_DEPS])

-AC_SUBST([GL_PC_REQ_PRIV])

-AC_SUBST([GL_PC_LIB_PRIV])

-AC_SUBST([GL_PC_CFLAGS])

-AC_SUBST([DRI_PC_REQ_PRIV])

-AC_SUBST([GLESv1_CM_LIB_DEPS])

-AC_SUBST([GLESv1_CM_PC_LIB_PRIV])

-AC_SUBST([GLESv2_LIB_DEPS])

-AC_SUBST([GLESv2_PC_LIB_PRIV])

-

-GLAPI_LIB_DEPS="-lpthread"

-AC_SUBST([GLAPI_LIB_DEPS])

-

-

-dnl Setup default DRI CFLAGS

-DRI_CFLAGS='$(CFLAGS)'

-DRI_CXXFLAGS='$(CXXFLAGS)'

-DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'

-MESA_MODULES='$(TOP)/src/mesa/libmesa.a'

-

-AC_ARG_ENABLE([shared-dricore],

-    [AS_HELP_STRING([--enable-shared-dricore],

-        [link DRI modules with shared core DRI routines @<:@default=disabled@:>@])],

-    [enable_dricore="$enableval"],

-    [enable_dricore=no])

-if test "$mesa_driver" = dri ; then

-   if test "$enable_dricore" = yes ; then

-      if test "$GCC$GXX" != yesyes ; then

-      	 AC_MSG_WARN([Shared dricore requires GCC-compatible rpath handling.  Disabling shared dricore])

-	 enable_dricore=no

-      else

-	 DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'

-	 DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'

-	 DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'

-      	 DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'

-      	 DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'

-      	 DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'

-      	 MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'

-      fi

-   fi

-fi

-AC_SUBST([DRICORE_LIBS])

-AC_SUBST([DRICORE_GLSL_LIBS])

-AC_SUBST([DRICORE_LIB_DEPS])

-AC_SUBST([DRI_CXXFLAGS])

-AC_SUBST([DRI_CFLAGS])

-AC_SUBST([MESA_MODULES])

-

-AC_SUBST([HAVE_XF86VIDMODE])

-

-PKG_CHECK_MODULES([LIBDRM_RADEON],

-		  [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],

-		  HAVE_LIBDRM_RADEON=yes,

-		  HAVE_LIBDRM_RADEON=no)

-

-dnl

-dnl More X11 setup

-dnl

-if test "$mesa_driver" = xlib; then

-    DEFINES="$DEFINES -DUSE_XSHM"

-fi

-

-dnl

-dnl TLS detection

-dnl

-

-AC_ARG_ENABLE([glx-tls],

-    [AS_HELP_STRING([--enable-glx-tls],

-        [enable TLS support in GLX @<:@default=disabled@:>@])],

-    [GLX_USE_TLS="$enableval"],

-    [GLX_USE_TLS=no])

-AC_SUBST(GLX_TLS, ${GLX_USE_TLS})

-

-dnl

-dnl More DRI setup

-dnl

-dnl Directory for DRI drivers

-AC_ARG_WITH([dri-driverdir],

-    [AS_HELP_STRING([--with-dri-driverdir=DIR],

-        [directory for the DRI drivers @<:@${libdir}/dri@:>@])],

-    [DRI_DRIVER_INSTALL_DIR="$withval"],

-    [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])

-AC_SUBST([DRI_DRIVER_INSTALL_DIR])

-dnl Extra search path for DRI drivers

-AC_ARG_WITH([dri-searchpath],

-    [AS_HELP_STRING([--with-dri-searchpath=DIRS...],

-        [semicolon delimited DRI driver search directories @<:@${libdir}/dri@:>@])],

-    [DRI_DRIVER_SEARCH_DIR="$withval"],

-    [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])

-AC_SUBST([DRI_DRIVER_SEARCH_DIR])

-dnl Direct rendering or just indirect rendering

-AC_ARG_ENABLE([driglx-direct],

-    [AS_HELP_STRING([--disable-driglx-direct],

-        [enable direct rendering in GLX and EGL for DRI @<:@default=enabled@:>@])],

-    [driglx_direct="$enableval"],

-    [driglx_direct="yes"])

-dnl Which drivers to build - default is chosen by platform

-AC_ARG_WITH([dri-drivers],

-    [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],

-        [comma delimited DRI drivers list, e.g.

-        "swrast,i965,radeon" @<:@default=auto@:>@])],

-    [with_dri_drivers="$withval"],

-    [with_dri_drivers=yes])

-if test "x$with_dri_drivers" = x; then

-    with_dri_drivers=no

-fi

-

-dnl If $with_dri_drivers is yes, directories will be added through

-dnl platform checks

-DRI_DIRS=""

-case "$with_dri_drivers" in

-no) ;;

-yes)

-    DRI_DIRS="yes"

-    ;;

-*)

-    # verify the requested driver directories exist

-    dri_drivers=`IFS=', '; echo $with_dri_drivers`

-    for driver in $dri_drivers; do

-        test -d "$srcdir/src/mesa/drivers/dri/$driver" || \

-            AC_MSG_ERROR([DRI driver directory '$driver' doesn't exist])

-    done

-    DRI_DIRS="$dri_drivers"

-    ;;

-esac

-

-dnl Set DRI_DIRS, DEFINES and LIB_DEPS

-if test "$mesa_driver" = dri -o "$mesa_driver" = no; then

-    # Use TLS in GLX?

-    if test "x$GLX_USE_TLS" = xyes; then

-        DEFINES="$DEFINES -DGLX_USE_TLS -DPTHREADS"

-    fi

-

-    # Platform specific settings and drivers to build

-    case "$host_os" in

-    linux*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"

-

-        case "$host_cpu" in

-        x86_64)

-            # sis is missing because they have not be converted to use

-            # the new interface.  i810 are missing because there is no

-            # x86-64 system where they could *ever* be used.

-            if test "x$DRI_DIRS" = "xyes"; then

-                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \

-                    savage tdfx unichrome swrast"

-            fi

-            ;;

-        powerpc*)

-            # Build only the drivers for cards that exist on PowerPC.

-            # At some point MGA will be added, but not yet.

-            if test "x$DRI_DIRS" = "xyes"; then

-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"

-            fi

-            ;;

-        sparc*)

-            # Build only the drivers for cards that exist on sparc`

-            if test "x$DRI_DIRS" = "xyes"; then

-                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"

-            fi

-            ;;

-        esac

-        ;;

-    freebsd* | dragonfly* | *netbsd*)

-        DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"

-        DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-

-        if test "x$DRI_DIRS" = "xyes"; then

-            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \

-                unichrome savage sis swrast"

-        fi

-        ;;

-    gnu*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"

-	;;

-    solaris*)

-        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"

-        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"

-        if test "x$driglx_direct" = xyes; then

-            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"

-        fi

-        ;;

-    esac

-

-    # default drivers

-    if test "x$DRI_DIRS" = "xyes"; then

-        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \

-            savage sis tdfx unichrome swrast"

-    fi

-

-    DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`

-

-    # Check for expat

-    if test "$mesa_driver" = dri; then

-        EXPAT_INCLUDES=""

-        EXPAT_LIB=-lexpat

-        AC_ARG_WITH([expat],

-            [AS_HELP_STRING([--with-expat=DIR],

-                [expat install directory])],[

-            EXPAT_INCLUDES="-I$withval/include"

-            CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"

-            LDFLAGS="$LDFLAGS -L$withval/$LIB_DIR"

-            EXPAT_LIB="-L$withval/$LIB_DIR -lexpat"

-            ])

-        AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])

-        AC_CHECK_LIB([expat],[XML_ParserCreate],[],

-            [AC_MSG_ERROR([Expat required for DRI.])])

-    fi

-

-    # put all the necessary libs together, including possibly libdricore

-    DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"

-fi

-AC_SUBST([DRI_DIRS])

-AC_SUBST([EXPAT_INCLUDES])

-AC_SUBST([DRI_LIB_DEPS])

-

-case $DRI_DIRS in

-*i915*|*i965*)

-    PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])

-    ;;

-esac

-

-case $DRI_DIRS in

-*radeon*|*r200*|*r300*|*r600*)

-    if test "x$HAVE_LIBDRM_RADEON" = xyes; then

-	RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"

-	RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS

-    fi

-    ;;

-esac

-AC_SUBST([RADEON_CFLAGS])

-AC_SUBST([RADEON_LDFLAGS])

-

-

-dnl

-dnl OSMesa configuration

-dnl

-if test "$mesa_driver" = xlib; then

-    default_gl_osmesa=yes

-else

-    default_gl_osmesa=no

-fi

-AC_ARG_ENABLE([gl-osmesa],

-    [AS_HELP_STRING([--enable-gl-osmesa],

-        [enable OSMesa with libGL @<:@default=enabled for xlib driver@:>@])],

-    [gl_osmesa="$enableval"],

-    [gl_osmesa="$default_gl_osmesa"])

-if test "x$gl_osmesa" = xyes; then

-    if test "x$enable_opengl" = xno; then

-        AC_MSG_ERROR([OpenGL is not available for OSMesa driver])

-    fi

-    if test "$mesa_driver" = osmesa; then

-        AC_MSG_ERROR([libGL is not available for OSMesa driver])

-    else

-        DRIVER_DIRS="$DRIVER_DIRS osmesa"

-    fi

-fi

-

-dnl Configure the channel bits for OSMesa (libOSMesa, libOSMesa16, ...)

-AC_ARG_WITH([osmesa-bits],

-    [AS_HELP_STRING([--with-osmesa-bits=BITS],

-        [OSMesa channel bits and library name: 8, 16, 32 @<:@default=8@:>@])],

-    [osmesa_bits="$withval"],

-    [osmesa_bits=8])

-if test "$mesa_driver" != osmesa && test "x$osmesa_bits" != x8; then

-    AC_MSG_WARN([Ignoring OSMesa channel bits for non-OSMesa driver])

-    osmesa_bits=8

-fi

-case "x$osmesa_bits" in

-x8)

-    OSMESA_LIB=OSMesa

-    ;;

-x16|x32)

-    OSMESA_LIB="OSMesa$osmesa_bits"

-    DEFINES="$DEFINES -DCHAN_BITS=$osmesa_bits -DDEFAULT_SOFTWARE_DEPTH_BITS=31"

-    ;;

-*)

-    AC_MSG_ERROR([OSMesa bits '$osmesa_bits' is not a valid option])

-    ;;

-esac

-AC_SUBST([OSMESA_LIB])

-

-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"

-    else

-        OSMESA_LIB_DEPS=""

-    fi

-    OSMESA_MESA_DEPS=""

-    OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"

-    ;;

-esac

-AC_SUBST([OSMESA_LIB_DEPS])

-AC_SUBST([OSMESA_MESA_DEPS])

-AC_SUBST([OSMESA_PC_REQ])

-AC_SUBST([OSMESA_PC_LIB_PRIV])

-

-dnl

-dnl EGL configuration

-dnl

-AC_ARG_ENABLE([egl],

-    [AS_HELP_STRING([--disable-egl],

-        [disable EGL library @<:@default=enabled@:>@])],

-    [enable_egl="$enableval"],

-    [enable_egl=yes])

-if test "x$enable_egl" = xno; then

-    if test "x$mesa_driver" = xno; then

-        AC_MSG_ERROR([cannot disable EGL when there is no mesa driver])

-    fi

-    if test "x$enable_openvg" = xyes; then

-        AC_MSG_ERROR([cannot enable OpenVG without EGL])

-    fi

-fi

-if test "x$enable_egl" = xyes; then

-    SRC_DIRS="$SRC_DIRS egl"

-    EGL_LIB_DEPS="$DLOPEN_LIBS -lpthread"

-    EGL_DRIVERS_DIRS=""

-    if test "$enable_static" != yes; then

-        # build egl_glx when libGL is built

-        if test "$mesa_driver" = xlib -o "$mesa_driver" = dri; then

-            EGL_DRIVERS_DIRS="glx"

-        fi

-

-        if test "$mesa_driver" = dri; then

-            # build egl_dri2 when xcb-dri2 is available

-            PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],

-            		  [have_xcb_dri2=yes],[have_xcb_dri2=no])

-            PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],

-            		  [have_libudev=yes],[have_libudev=no])

-            

-            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

-

-        EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"

-    fi

-fi

-AC_SUBST([EGL_LIB_DEPS])

-AC_SUBST([EGL_DRIVERS_DIRS])

-

-dnl

-dnl GLU configuration

-dnl

-AC_ARG_ENABLE([glu],

-    [AS_HELP_STRING([--disable-glu],

-        [enable OpenGL Utility library @<:@default=enabled@:>@])],

-    [enable_glu="$enableval"],

-    [enable_glu=yes])

-

-if test "x$enable_glu" = xyes -a "x$mesa_driver" = xno; then

-    AC_MSG_NOTICE([Disabling GLU since there is no OpenGL driver])

-    enable_glu=no

-fi

-

-if test "x$enable_glu" = xyes; then

-    SRC_DIRS="$SRC_DIRS glu"

-

-    case "$mesa_driver" in

-    osmesa)

-        # Link libGLU to libOSMesa instead of libGL

-        GLU_LIB_DEPS=""

-        GLU_PC_REQ="osmesa"

-        if test "$enable_static" = no; then

-            GLU_MESA_DEPS='-l$(OSMESA_LIB)'

-        else

-            GLU_MESA_DEPS=""

-        fi

-        ;;

-    *)

-        # If static, empty GLU_LIB_DEPS and add libs for programs to link

-        GLU_PC_REQ="gl"

-        GLU_PC_LIB_PRIV="-lm"

-        if test "$enable_static" = no; then

-            GLU_LIB_DEPS="-lm"

-            GLU_MESA_DEPS='-l$(GL_LIB)'

-        else

-            GLU_LIB_DEPS=""

-            GLU_MESA_DEPS=""

-            APP_LIB_DEPS="$APP_LIB_DEPS -lstdc++"

-        fi

-        ;;

-    esac

-fi

-if test "$enable_static" = no; then

-    GLU_LIB_DEPS="$GLU_LIB_DEPS $OS_CPLUSPLUS_LIBS"

-fi

-GLU_PC_LIB_PRIV="$GLU_PC_LIB_PRIV $OS_CPLUSPLUS_LIBS"

-AC_SUBST([GLU_LIB_DEPS])

-AC_SUBST([GLU_MESA_DEPS])

-AC_SUBST([GLU_PC_REQ])

-AC_SUBST([GLU_PC_REQ_PRIV])

-AC_SUBST([GLU_PC_LIB_PRIV])

-AC_SUBST([GLU_PC_CFLAGS])

-

-dnl

-dnl GLw configuration

-dnl

-AC_ARG_ENABLE([glw],

-    [AS_HELP_STRING([--disable-glw],

-        [enable Xt/Motif widget library @<:@default=enabled@:>@])],

-    [enable_glw="$enableval"],

-    [enable_glw=yes])

-dnl Don't build GLw on osmesa

-if test "x$enable_glw" = xyes; then

-    case "$mesa_driver" in

-    osmesa|no)

-        AC_MSG_NOTICE([Disabling GLw since there is no OpenGL driver])

-        enable_glw=no

-        ;;

-    esac

-fi

-AC_ARG_ENABLE([motif],

-    [AS_HELP_STRING([--enable-motif],

-        [use Motif widgets in GLw @<:@default=disabled@:>@])],

-    [enable_motif="$enableval"],

-    [enable_motif=no])

-

-if test "x$enable_glw" = xyes; then

-    SRC_DIRS="$SRC_DIRS glw"

-    if test "$x11_pkgconfig" = yes; then

-        PKG_CHECK_MODULES([GLW],[x11 xt])

-        GLW_PC_REQ_PRIV="x11 xt"

-        GLW_LIB_DEPS="$GLW_LIBS"

-    else

-        # should check these...

-        GLW_LIB_DEPS="$X_LIBS -lXt -lX11"

-        GLW_PC_LIB_PRIV="$GLW_LIB_DEPS"

-        GLW_PC_CFLAGS="$X11_INCLUDES"

-    fi

-

-    GLW_SOURCES="GLwDrawA.c"

-    MOTIF_CFLAGS=

-    if test "x$enable_motif" = xyes; then

-        GLW_SOURCES="$GLW_SOURCES GLwMDrawA.c"

-        AC_PATH_PROG([MOTIF_CONFIG], [motif-config], [no])

-        if test "x$MOTIF_CONFIG" != xno; then

-            MOTIF_CFLAGS=`$MOTIF_CONFIG --cflags`

-            MOTIF_LIBS=`$MOTIF_CONFIG --libs`

-        else

-            AC_CHECK_HEADER([Xm/PrimitiveP.h], [],

-                [AC_MSG_ERROR([Can't locate Motif headers])])

-            AC_CHECK_LIB([Xm], [XmGetPixmap], [MOTIF_LIBS="-lXm"],

-                [AC_MSG_ERROR([Can't locate Motif Xm library])])

-        fi

-        # MOTIF_LIBS is prepended to GLW_LIB_DEPS since Xm needs Xt/X11

-        GLW_LIB_DEPS="$MOTIF_LIBS $GLW_LIB_DEPS"

-        GLW_PC_LIB_PRIV="$MOTIF_LIBS $GLW_PC_LIB_PRIV"

-        GLW_PC_CFLAGS="$MOTIF_CFLAGS $GLW_PC_CFLAGS"

-    fi

-

-    # If static, empty GLW_LIB_DEPS and add libs for programs to link

-    GLW_PC_LIB_PRIV="$GLW_PC_LIB_PRIV"

-    if test "$enable_static" = no; then

-        GLW_MESA_DEPS='-l$(GL_LIB)'

-        GLW_LIB_DEPS="$GLW_LIB_DEPS"

-    else

-        APP_LIB_DEPS="$APP_LIB_DEPS $GLW_LIB_DEPS"

-        GLW_LIB_DEPS=""

-        GLW_MESA_DEPS=""

-    fi

-fi

-AC_SUBST([GLW_LIB_DEPS])

-AC_SUBST([GLW_MESA_DEPS])

-AC_SUBST([GLW_SOURCES])

-AC_SUBST([MOTIF_CFLAGS])

-AC_SUBST([GLW_PC_REQ_PRIV])

-AC_SUBST([GLW_PC_LIB_PRIV])

-AC_SUBST([GLW_PC_CFLAGS])

-

-dnl

-dnl GLUT configuration

-dnl

-if test -f "$srcdir/include/GL/glut.h"; then

-    default_glut=yes

-else

-    default_glut=no

-fi

-AC_ARG_ENABLE([glut],

-    [AS_HELP_STRING([--disable-glut],

-        [enable GLUT library @<:@default=enabled if source available@:>@])],

-    [enable_glut="$enableval"],

-    [enable_glut="$default_glut"])

-

-dnl Don't build glut on osmesa

-if test "x$enable_glut" = xyes; then

-    case "$mesa_driver" in

-    osmesa|no)

-        AC_MSG_NOTICE([Disabling glut since there is no OpenGL driver])

-        enable_glut=no

-        ;;

-    esac

-fi

-dnl Can't build glut if GLU not available

-if test "x$enable_glu$enable_glut" = xnoyes; then

-    AC_MSG_WARN([Disabling glut since GLU is disabled])

-    enable_glut=no

-fi

-

-if test "x$enable_glut" = xyes; then

-    SRC_DIRS="$SRC_DIRS glut/glx"

-    if test "$x11_pkgconfig" = yes; then

-        PKG_CHECK_MODULES([GLUT],[x11 xmu xi])

-        GLUT_PC_REQ_PRIV="x11 xmu xi"

-        GLUT_LIB_DEPS="$GLUT_LIBS"

-    else

-        # should check these...

-        GLUT_LIB_DEPS="$X_LIBS -lX11 -lXmu -lXi"

-        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 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)'

-    else

-        APP_LIB_DEPS="$APP_LIB_DEPS $GLUT_LIB_DEPS"

-        GLUT_LIB_DEPS=""

-        GLUT_MESA_DEPS=""

-    fi

-fi

-AC_SUBST([GLUT_LIB_DEPS])

-AC_SUBST([GLUT_MESA_DEPS])

-AC_SUBST([GLUT_CFLAGS])

-AC_SUBST([GLUT_PC_REQ_PRIV])

-AC_SUBST([GLUT_PC_LIB_PRIV])

-AC_SUBST([GLUT_PC_CFLAGS])

-

-dnl

-dnl Program library dependencies

-dnl    Only libm is added here if necessary as the libraries should

-dnl    be pulled in by the linker

-dnl

-if test "x$APP_LIB_DEPS" = x; then

-    case "$host_os" in

-    solaris*)

-        APP_LIB_DEPS="-lX11 -lsocket -lnsl -lm"

-        ;;

-    cygwin*)

-        APP_LIB_DEPS="-lX11"

-        ;;

-    *)

-        APP_LIB_DEPS="-lm"

-        ;;

-    esac

-fi

-AC_SUBST([APP_LIB_DEPS])

-AC_SUBST([PROGRAM_DIRS])

-

-dnl

-dnl Gallium configuration

-dnl

-AC_ARG_ENABLE([gallium],

-    [AS_HELP_STRING([--disable-gallium],

-        [build gallium @<:@default=enabled@:>@])],

-    [enable_gallium="$enableval"],

-    [enable_gallium=yes])

-if test "x$enable_gallium" = xno -a "x$enable_openvg" = xyes; then

-    AC_MSG_ERROR([cannot enable OpenVG without Gallium])

-fi

-if test "x$enable_gallium" = xyes; then

-    SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"

-    AC_CHECK_HEADER([udis86.h], [HAS_UDIS86="yes"],

-                [HAS_UDIS86="no"])

-    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])

-fi

-

-AC_SUBST([LLVM_CFLAGS])

-AC_SUBST([LLVM_LIBS])

-AC_SUBST([LLVM_LDFLAGS])

-AC_SUBST([LLVM_VERSION])

-

-dnl

-dnl Gallium state trackers configuration

-dnl

-

-AC_ARG_ENABLE([gallium-egl],

-    [AS_HELP_STRING([--enable-gallium-egl],

-        [enable gallium EGL state tracker @<:@default=auto@:>@])],

-    [enable_gallium_egl="$enableval"],

-    [enable_gallium_egl=auto])

-if test "x$enable_gallium_egl" = xauto; then

-    case "$mesa_driver" in

-    dri|no)

-        enable_gallium_egl=$enable_egl

-        ;;

-    *)

-        enable_gallium_egl=$enable_openvg

-        ;;

-    esac

-fi

-case "x$enable_egl$enable_gallium_egl" in

-xnoyes)

-    AC_MSG_ERROR([cannot build Gallium EGL state tracker without EGL])

-esac

-

-AC_ARG_WITH([state-trackers],

-    [AS_HELP_STRING([--with-state-trackers@<:@=DIRS...@:>@],

-        [comma delimited state_trackers list, e.g.

-        "egl,glx" @<:@default=auto@:>@])],

-    [with_state_trackers="$withval"],

-    [with_state_trackers=yes])

-

-case "$with_state_trackers" in

-no)

-    GALLIUM_STATE_TRACKERS_DIRS=""

-    ;;

-yes)

-    # look at what else is built

-    case "$mesa_driver" in

-    xlib)

-        GALLIUM_STATE_TRACKERS_DIRS=glx

-        ;;

-    dri)

-        GALLIUM_STATE_TRACKERS_DIRS="dri"

-        HAVE_ST_DRI="yes"

-        # Have only tested st/xorg on 1.6.0 servers

-        PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0 libdrm >= $LIBDRM_XORG_REQUIRED libkms >= $LIBKMS_XORG_REQUIRED],

-            HAVE_ST_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",

-            HAVE_ST_XORG="no")

-        ;;

-    esac

-

-    if test "x$enable_egl" = xyes; then

-        if test "$enable_openvg" = yes; then

-            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vega"

-            st_egl="yes"

-        fi

-

-        if test "$enable_gallium_egl" = yes; then

-            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"

-            HAVE_ST_EGL="yes"

-        fi

-    fi

-    ;;

-*)

-    # verify the requested state tracker exist

-    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

-                AC_MSG_ERROR([cannot build dri state tracker without mesa driver set to dri])

-            fi

-            HAVE_ST_DRI="yes"

-            ;;

-        egl)

-            if test "x$enable_egl" != xyes; then

-                AC_MSG_ERROR([cannot build egl state tracker without EGL library])

-            fi

-            HAVE_ST_EGL="yes"

-            ;;

-        xorg)

-            PKG_CHECK_MODULES([XORG], [xorg-server >= 1.6.0])

-            PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])

-            PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])

-            HAVE_ST_XORG="yes"

-            ;;

-        vega)

-            if test "x$enable_openvg" != xyes; then

-                AC_MSG_ERROR([cannot build vega state tracker without --enable-openvg])

-            fi

-            have_st_vega="yes"

-            ;;

-        esac

-

-	if test -n "$tracker"; then

-            test -d "$srcdir/src/gallium/state_trackers/$tracker" || \

-                AC_MSG_ERROR([state tracker '$tracker' doesn't exist])

-            if test -n "$state_trackers"; then

-                state_trackers="$state_trackers $tracker"

-            else

-                state_trackers="$tracker"

-            fi

-        fi

-    done

-    GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"

-

-    # append --enable-openvg/--enable-gallium-egl to --with-state-trackers

-    if test "x$have_st_vega" != xyes -a "x$enable_openvg" = xyes; then

-        AC_MSG_ERROR([--with-state-trackers specified but vega is missing])

-    fi

-    if test "x$HAVE_ST_EGL" != xyes -a "x$enable_gallium_egl" = xyes; then

-        AC_MSG_ERROR([--with-state-trackers specified but egl is missing])

-    fi

-    ;;

-esac

-

-

-EGL_CLIENT_APIS=""

-VG_LIB_DEPS=""

-

-case "x$enable_opengl$enable_gles1$enable_gles2" in

-x*yes*)

-    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GL_LIB)'

-    ;;

-esac

-if test "x$enable_openvg" = xyes; then

-    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'

-    VG_LIB_DEPS="$VG_LIB_DEPS -lpthread"

-fi

-

-AC_SUBST([VG_LIB_DEPS])

-AC_SUBST([EGL_CLIENT_APIS])

-

-if test "x$HAVE_ST_EGL" = xyes; then

-	GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"

-fi

-

-if test "x$HAVE_ST_XORG" = xyes; then

-    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],

-        HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",

-        HAVE_XEXTPROTO_71="no")

-fi

-

-AC_ARG_WITH([egl-platforms],

-    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],

-        [comma delimited native platforms libEGL supports, e.g.

-        "x11,drm" @<:@default=auto@:>@])],

-    [with_egl_platforms="$withval"],

-    [with_egl_platforms=yes])

-AC_ARG_WITH([egl-displays],

-    [AS_HELP_STRING([--with-egl-displays@<:@=DIRS...@:>@],

-        [DEPRECATED.  Use --with-egl-platforms instead])],

-    [with_egl_platforms="$withval"])

-

-EGL_PLATFORMS=""

-WAYLAND_EGL_LIB_DEPS=""

-

-case "$with_egl_platforms" in

-yes)

-    if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then

-        EGL_PLATFORMS="x11"

-        if test "$mesa_driver" = dri; then

-            EGL_PLATFORMS="$EGL_PLATFORMS drm"

-        fi

-    fi

-    ;;

-*)

-    if test "x$enable_egl" != xyes; then

-        AC_MSG_ERROR([cannot build egl state tracker without EGL library])

-    fi

-    # verify the requested driver directories exist

-    egl_platforms=`IFS=', '; echo $with_egl_platforms`

-    for plat in $egl_platforms; do

-        test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \

-            AC_MSG_ERROR([EGL platform '$plat' doesn't exist])

-        if test "$plat" = "fbdev"; then

-                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"

-        fi

-	if test "$plat" = "wayland"; then

-		PKG_CHECK_MODULES([WAYLAND], [wayland-client],, \

-				  [AC_MSG_ERROR([cannot find libwayland-client])])

-		WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS"

-	fi

-    done

-    EGL_PLATFORMS="$egl_platforms"

-    ;;

-esac

-AC_SUBST([EGL_PLATFORMS])

-

-AC_SUBST([WAYLAND_EGL_LIB_DEPS])

-WAYLAND_EGL_PC_REQ_PRIV="wayland-client libdrm"

-WAYLAND_EGL_PC_LIB_PRIV=

-WAYLAND_EGL_PC_CFLAGS=

-

-AC_SUBST([WAYLAND_EGL_PC_REQ_PRIV])

-AC_SUBST([WAYLAND_EGL_PC_LIB_PRIV])

-AC_SUBST([WAYLAND_EGL_PC_CFLAGS])

-

-

-AC_ARG_WITH([egl-driver-dir],

-    [AS_HELP_STRING([--with-egl-driver-dir=DIR],

-                    [directory for EGL drivers [[default=${libdir}/egl]]])],

-    [EGL_DRIVER_INSTALL_DIR="$withval"],

-    [EGL_DRIVER_INSTALL_DIR='${libdir}/egl'])

-AC_SUBST([EGL_DRIVER_INSTALL_DIR])

-

-AC_ARG_WITH([xorg-driver-dir],

-    [AS_HELP_STRING([--with-xorg-driver-dir=DIR],

-                    [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])],

-    [XORG_DRIVER_INSTALL_DIR="$withval"],

-    [XORG_DRIVER_INSTALL_DIR="${libdir}/xorg/modules/drivers"])

-AC_SUBST([XORG_DRIVER_INSTALL_DIR])

-

-AC_ARG_WITH([max-width],

-    [AS_HELP_STRING([--with-max-width=N],

-                    [Maximum framebuffer width (4096)])],

-    [DEFINES="${DEFINES} -DMAX_WIDTH=${withval}";

-     AS_IF([test "${withval}" -gt "4096"],

-           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]

-)

-AC_ARG_WITH([max-height],

-    [AS_HELP_STRING([--with-max-height=N],

-                    [Maximum framebuffer height (4096)])],

-    [DEFINES="${DEFINES} -DMAX_HEIGHT=${withval}";

-     AS_IF([test "${withval}" -gt "4096"],

-           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]

-)

-

-dnl

-dnl Gallium LLVM

-dnl

-AC_ARG_ENABLE([gallium-llvm],

-    [AS_HELP_STRING([--enable-gallium-llvm],

-        [build gallium LLVM support @<:@default=disabled@:>@])],

-    [enable_gallium_llvm="$enableval"],

-    [enable_gallium_llvm=auto])

-if test "x$enable_gallium_llvm" = xyes; then

-    if test "x$LLVM_CONFIG" != xno; then

-	LLVM_VERSION=`$LLVM_CONFIG --version`

-	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`

-	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

-

-dnl

-dnl Gallium helper functions

-dnl

-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

-}

-

-

-dnl

-dnl Gallium SVGA configuration

-dnl

-AC_ARG_ENABLE([gallium-svga],

-    [AS_HELP_STRING([--enable-gallium-svga],

-        [build gallium SVGA @<:@default=disabled@:>@])],

-    [enable_gallium_svga="$enableval"],

-    [enable_gallium_svga=auto])

-if test "x$enable_gallium_svga" = xyes; then

-    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

-

-dnl

-dnl Gallium i915 configuration

-dnl

-AC_ARG_ENABLE([gallium-i915],

-    [AS_HELP_STRING([--enable-gallium-i915],

-        [build gallium i915 @<:@default=disabled@:>@])],

-    [enable_gallium_i915="$enableval"],

-    [enable_gallium_i915=auto])

-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

-

-dnl

-dnl Gallium i965 configuration

-dnl

-AC_ARG_ENABLE([gallium-i965],

-    [AS_HELP_STRING([--enable-gallium-i965],

-        [build gallium i965 @<:@default=disabled@:>@])],

-    [enable_gallium_i965="$enableval"],

-    [enable_gallium_i965=auto])

-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

-

-dnl

-dnl Gallium Radeon r300g configuration

-dnl

-AC_ARG_ENABLE([gallium-radeon],

-    [AS_HELP_STRING([--enable-gallium-radeon],

-        [build gallium radeon @<:@default=disabled@:>@])],

-    [enable_gallium_radeon="$enableval"],

-    [enable_gallium_radeon=auto])

-if test "x$enable_gallium_radeon" = xauto; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"

-    gallium_check_st "radeon/drm" "dri-r300"

-fi

-if test "x$enable_gallium_radeon" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"

-    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"

-fi

-

-dnl

-dnl Gallium Radeon r600g configuration

-dnl

-AC_ARG_ENABLE([gallium-r600],

-    [AS_HELP_STRING([--enable-gallium-r600],

-        [build gallium radeon @<:@default=disabled@:>@])],

-    [enable_gallium_r600="$enableval"],

-    [enable_gallium_r600=auto])

-if test "x$enable_gallium_r600" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"

-    gallium_check_st "r600/drm" "dri-r600"

-fi

-

-dnl

-dnl Gallium Nouveau configuration

-dnl

-AC_ARG_ENABLE([gallium-nouveau],

-    [AS_HELP_STRING([--enable-gallium-nouveau],

-        [build gallium nouveau @<:@default=disabled@:>@])],

-    [enable_gallium_nouveau="$enableval"],

-    [enable_gallium_nouveau=no])

-if test "x$enable_gallium_nouveau" = xyes; then

-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0"

-    gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"

-fi

-

-dnl

-dnl Gallium swrast configuration

-dnl

-AC_ARG_ENABLE([gallium-swrast],

-    [AS_HELP_STRING([--enable-gallium-swrast],

-        [build gallium swrast @<:@default=auto@:>@])],

-    [enable_gallium_swrast="$enableval"],

-    [enable_gallium_swrast=auto])

-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

-

-dnl prepend CORE_DIRS to SRC_DIRS

-SRC_DIRS="$CORE_DIRS $SRC_DIRS"

-

-dnl Restore LDFLAGS and CPPFLAGS

-LDFLAGS="$_SAVE_LDFLAGS"

-CPPFLAGS="$_SAVE_CPPFLAGS"

-

-dnl Substitute the config

-AC_CONFIG_FILES([configs/autoconf])

-

-dnl Replace the configs/current symlink

-AC_CONFIG_COMMANDS([configs],[

-if test -f configs/current || test -L configs/current; then

-    rm -f configs/current

-fi

-ln -s autoconf configs/current

-])

-

-AC_OUTPUT

-

-dnl

-dnl Output some configuration info for the user

-dnl

-echo ""

-echo "        prefix:          $prefix"

-echo "        exec_prefix:     $exec_prefix"

-echo "        libdir:          $libdir"

-echo "        includedir:      $includedir"

-

-dnl API info

-echo ""

-echo "        OpenGL:          $enable_opengl (ES1: $enable_gles1 ES2: $enable_gles2)"

-echo "        OpenVG:          $enable_openvg"

-

-dnl Driver info

-echo ""

-echo "        Driver:          $mesa_driver"

-if test "$mesa_driver" != no; then

-    if echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1; then

-        echo "        OSMesa:          lib$OSMESA_LIB"

-    else

-        echo "        OSMesa:          no"

-    fi

-    if test "$mesa_driver" = dri; then

-        # cleanup the drivers var

-        dri_dirs=`echo $DRI_DIRS | $SED 's/^ *//;s/  */ /;s/ *$//'`

-        if test "x$DRI_DIRS" = x; then

-            echo "        DRI drivers:     no"

-        else

-            echo "        DRI drivers:     $dri_dirs"

-        fi

-        echo "        DRI driver dir:  $DRI_DRIVER_INSTALL_DIR"

-        echo "        Use XCB:         $enable_xcb"

-        echo "        Shared dricore:  $enable_dricore"

-    fi

-fi

-echo ""

-echo "        GLU:             $enable_glu"

-echo "        GLw:             $enable_glw (Motif: $enable_motif)"

-echo "        glut:            $enable_glut"

-

-dnl EGL

-echo ""

-echo "        EGL:             $enable_egl"

-if test "$enable_egl" = yes; then

-    echo "        EGL platforms:   $EGL_PLATFORMS"

-

-    egl_drivers=""

-    for d in $EGL_DRIVERS_DIRS; do

-        egl_drivers="$egl_drivers builtin:egl_$d"

-    done

-

-    if test "$enable_gallium" = yes -a "$HAVE_ST_EGL" = yes; then

-        echo "        EGL drivers:    ${egl_drivers} egl_gallium"

-        echo "        EGL Gallium STs:$EGL_CLIENT_APIS"

-    else

-        echo "        EGL drivers:    $egl_drivers"

-    fi

-fi

-

-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 "        Driver dirs:     $GALLIUM_DRIVERS_DIRS"

-    echo "        Trackers dirs:   $GALLIUM_STATE_TRACKERS_DIRS"

-else

-    echo "        Gallium:         no"

-fi

-

-dnl Libraries

-echo ""

-echo "        Shared libs:     $enable_shared"

-echo "        Static libs:     $enable_static"

-

-dnl Compiler options

-# cleanup the CFLAGS/CXXFLAGS/DEFINES vars

-cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \

-    $SED 's/^ *//;s/  */ /;s/ *$//'`

-cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \

-    $SED 's/^ *//;s/  */ /;s/ *$//'`

-defines=`echo $DEFINES $ASM_FLAGS | $SED 's/^ *//;s/  */ /;s/ *$//'`

-echo ""

-echo "        CFLAGS:          $cflags"

-echo "        CXXFLAGS:        $cxxflags"

-echo "        Macros:          $defines"

-echo ""

-echo "        PYTHON2:         $PYTHON2"

-

-echo ""

-echo "        Run '${MAKE-make}' to build Mesa"

-echo ""

+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.59])
+
+dnl Versioning - scrape the version from configs/default
+m4_define([mesa_version],
+    [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])
+m4_ifval(mesa_version,,
+    [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])
+
+dnl Tell the user about autoconf.html in the --help output
+m4_divert_once([HELP_END], [
+See docs/autoconf.html for more details on the options for Mesa.])
+
+AC_INIT([Mesa],[mesa_version],
+    [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
+AC_CONFIG_AUX_DIR([bin])
+AC_CANONICAL_HOST
+
+dnl Versions for external dependencies
+LIBDRM_REQUIRED=2.4.23
+LIBDRM_RADEON_REQUIRED=2.4.23
+LIBDRM_INTEL_REQUIRED=2.4.23
+DRI2PROTO_REQUIRED=2.1
+GLPROTO_REQUIRED=1.4.11
+LIBDRM_XORG_REQUIRED=2.4.23
+LIBKMS_XORG_REQUIRED=1.0.0
+
+dnl Check for progs
+AC_PROG_CPP
+AC_PROG_CC
+AC_PROG_CXX
+AC_CHECK_PROGS([MAKE], [gmake make])
+AC_CHECK_PROGS([PYTHON2], [python2 python])
+AC_PATH_PROG([MKDEP], [makedepend])
+AC_PATH_PROG([SED], [sed])
+
+if test "x$MKDEP" = "x"; then
+    AC_MSG_ERROR([makedepend is required to build Mesa])
+fi
+
+dnl Our fallback install-sh is a symlink to minstall. Use the existing
+dnl configuration in that case.
+AC_PROG_INSTALL
+test "x$INSTALL" = "x$ac_install_sh" && INSTALL='$(MINSTALL)'
+
+dnl We need a POSIX shell for parts of the build. Assume we have one
+dnl in most cases.
+case "$host_os" in
+solaris*)
+    # Solaris /bin/sh is too old/non-POSIX compliant
+    AC_PATH_PROGS(POSIX_SHELL, [ksh93 ksh sh])
+    SHELL="$POSIX_SHELL"
+    ;;
+esac
+
+dnl clang is mostly GCC-compatible, but its version is much lower,
+dnl so we have to check for it.
+AC_MSG_CHECKING([if compiling with clang])
+
+AC_COMPILE_IFELSE(
+[AC_LANG_PROGRAM([], [[
+#ifndef __clang__
+       not clang
+#endif
+]])],
+[CLANG=yes], [CLANG=no])
+
+AC_MSG_RESULT([$CLANG])
+
+dnl If we're using GCC, make sure that it is at least version 3.3.0.  Older
+dnl versions are explictly not supported.
+if test "x$GCC" = xyes -a "x$CLANG" = xno; then
+    AC_MSG_CHECKING([whether gcc version is sufficient])
+    major=0
+    minor=0
+
+    GCC_VERSION=`$CC -dumpversion`
+    if test $? -eq 0; then
+        major=`echo $GCC_VERSION | cut -d. -f1`
+        minor=`echo $GCC_VERSION | cut -d. -f1`
+    fi
+
+    if test $major -lt 3 -o $major -eq 3 -a $minor -lt 3 ; then
+        AC_MSG_RESULT([no])
+        AC_MSG_ERROR([If using GCC, version 3.3.0 or later is required.])
+    else
+        AC_MSG_RESULT([yes])
+    fi
+fi
+
+
+MKDEP_OPTIONS=-fdepend
+dnl Ask gcc where it's keeping its secret headers
+if test "x$GCC" = xyes; then
+    for dir in include include-fixed; do
+        GCC_INCLUDES=`$CC -print-file-name=$dir`
+        if test "x$GCC_INCLUDES" != x && \
+           test "$GCC_INCLUDES" != "$dir" && \
+           test -d "$GCC_INCLUDES"; then
+            MKDEP_OPTIONS="$MKDEP_OPTIONS -I$GCC_INCLUDES"
+        fi
+    done
+fi
+AC_SUBST([MKDEP_OPTIONS])
+
+dnl Make sure the pkg-config macros are defined
+m4_ifndef([PKG_PROG_PKG_CONFIG],
+    [m4_fatal([Could not locate the pkg-config autoconf macros.
+  These are usually located in /usr/share/aclocal/pkg.m4. If your macros
+  are in a different location, try setting the environment variable
+  ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])])
+PKG_PROG_PKG_CONFIG()
+
+dnl LIB_DIR - library basename
+LIB_DIR=`echo $libdir | $SED 's%.*/%%'`
+AC_SUBST([LIB_DIR])
+
+dnl Cache LDFLAGS so we can add EXTRA_LIB_PATH and restore it later
+_SAVE_LDFLAGS="$LDFLAGS"
+AC_ARG_VAR([EXTRA_LIB_PATH],[Extra -L paths for the linker])
+AC_SUBST([EXTRA_LIB_PATH])
+
+dnl Cache CPPFLAGS so we can add *_INCLUDES and restore it later
+_SAVE_CPPFLAGS="$CPPFLAGS"
+AC_ARG_VAR([X11_INCLUDES],[Extra -I paths for X11 headers])
+AC_SUBST([X11_INCLUDES])
+
+dnl Compiler macros
+DEFINES=""
+AC_SUBST([DEFINES])
+case "$host_os" in
+linux*|*-gnu*|gnu*)
+    DEFINES="$DEFINES -D_GNU_SOURCE -DPTHREADS"
+    ;;
+solaris*)
+    DEFINES="$DEFINES -DPTHREADS -DSVR4"
+    ;;
+cygwin*)
+    DEFINES="$DEFINES -DPTHREADS"
+    ;;
+esac
+
+dnl Add flags for gcc and g++
+if test "x$GCC" = xyes; then
+    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"
+    AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
+    VISIBILITY_CFLAGS="-fvisibility=hidden"
+    CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+		   [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);
+
+    # Restore CFLAGS; VISIBILITY_CFLAGS are added to it where needed.
+    CFLAGS=$save_CFLAGS
+
+    # Work around aliasing bugs - developers should comment this out
+    CFLAGS="$CFLAGS -fno-strict-aliasing"
+fi
+if test "x$GXX" = xyes; then
+    CXXFLAGS="$CXXFLAGS -Wall"
+
+    # Enable -fvisibility=hidden if using a gcc that supports it
+    save_CXXFLAGS="$CXXFLAGS"
+    AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
+    VISIBILITY_CXXFLAGS="-fvisibility=hidden"
+    CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
+		   [VISIBILITY_CXXFLAGS="" ; AC_MSG_RESULT([no])]);
+
+    # Restore CXXFLAGS; VISIBILITY_CXXFLAGS are added to it where needed.
+    CXXFLAGS=$save_CXXFLAGS
+
+    # Work around aliasing bugs - developers should comment this out
+    CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
+fi
+
+AC_SUBST([VISIBILITY_CFLAGS])
+AC_SUBST([VISIBILITY_CXXFLAGS])
+
+dnl These should be unnecessary, but let the user set them if they want
+AC_ARG_VAR([OPT_FLAGS], [Additional optimization flags for the compiler.
+    Default is to use CFLAGS.])
+AC_ARG_VAR([ARCH_FLAGS], [Additional architecture specific flags for the
+    compiler. Default is to use CFLAGS.])
+AC_SUBST([OPT_FLAGS])
+AC_SUBST([ARCH_FLAGS])
+
+dnl
+dnl Hacks to enable 32 or 64 bit build
+dnl
+AC_ARG_ENABLE([32-bit],
+    [AS_HELP_STRING([--enable-32-bit],
+        [build 32-bit libraries @<:@default=auto@:>@])],
+    [enable_32bit="$enableval"],
+    [enable_32bit=auto]
+)
+if test "x$enable_32bit" = xyes; then
+    if test "x$GCC" = xyes; then
+        CFLAGS="$CFLAGS -m32"
+        ARCH_FLAGS="$ARCH_FLAGS -m32"
+    fi
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="$CXXFLAGS -m32"
+    fi
+fi
+AC_ARG_ENABLE([64-bit],
+    [AS_HELP_STRING([--enable-64-bit],
+        [build 64-bit libraries @<:@default=auto@:>@])],
+    [enable_64bit="$enableval"],
+    [enable_64bit=auto]
+)
+if test "x$enable_64bit" = xyes; then
+    if test "x$GCC" = xyes; then
+        CFLAGS="$CFLAGS -m64"
+    fi
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="$CXXFLAGS -m64"
+    fi
+fi
+
+dnl
+dnl shared/static libraries, mimic libtool options
+dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static],
+        [build static libraries @<:@default=disabled@:>@])],
+    [enable_static="$enableval"],
+    [enable_static=no]
+)
+case "x$enable_static" in
+xyes|xno ) ;;
+x ) enable_static=no ;;
+* )
+    AC_MSG_ERROR([Static library option '$enable_static' is not a valid])
+    ;;
+esac
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--disable-shared],
+        [build shared libraries @<:@default=enabled@:>@])],
+    [enable_shared="$enableval"],
+    [enable_shared=yes]
+)
+case "x$enable_shared" in
+xyes|xno ) ;;
+x ) enable_shared=yes ;;
+* )
+    AC_MSG_ERROR([Shared library option '$enable_shared' is not a valid])
+    ;;
+esac
+
+dnl Can't have static and shared libraries, default to static if user
+dnl explicitly requested. If both disabled, set to static since shared
+dnl was explicitly requirested.
+case "x$enable_static$enable_shared" in
+xyesyes )
+    AC_MSG_WARN([Can't build static and shared libraries, disabling shared])
+    enable_shared=no
+    ;;
+xnono )
+    AC_MSG_WARN([Can't disable both static and shared libraries, enabling static])
+    enable_static=yes
+    ;;
+esac
+
+dnl
+dnl mklib options
+dnl
+AC_ARG_VAR([MKLIB_OPTIONS],[Options for the Mesa library script, mklib])
+if test "$enable_static" = yes; then
+    MKLIB_OPTIONS="$MKLIB_OPTIONS -static"
+fi
+AC_SUBST([MKLIB_OPTIONS])
+
+dnl
+dnl other compiler options
+dnl
+AC_ARG_ENABLE([debug],
+    [AS_HELP_STRING([--enable-debug],
+        [use debug compiler flags and macros @<:@default=disabled@:>@])],
+    [enable_debug="$enableval"],
+    [enable_debug=no]
+)
+if test "x$enable_debug" = xyes; then
+    DEFINES="$DEFINES -DDEBUG"
+    if test "x$GCC" = xyes; then
+        CFLAGS="$CFLAGS -g"
+    fi
+    if test "x$GXX" = xyes; then
+        CXXFLAGS="$CXXFLAGS -g"
+    fi
+fi
+
+dnl
+dnl library names
+dnl
+LIB_PREFIX_GLOB='lib'
+LIB_VERSION_SEPARATOR='.'
+if test "$enable_static" = yes; then
+    LIB_EXTENSION='a'
+else
+    case "$host_os" in
+    darwin* )
+        LIB_EXTENSION='dylib' ;;
+    cygwin* )
+        dnl prefix can be 'cyg' or 'lib'
+        LIB_PREFIX_GLOB='???'
+        LIB_VERSION_SEPARATOR='-'
+        LIB_EXTENSION='dll' ;;
+    aix* )
+        LIB_EXTENSION='a' ;;
+    * )
+        LIB_EXTENSION='so' ;;
+    esac
+fi
+
+GL_LIB_NAME='lib$(GL_LIB).'${LIB_EXTENSION}
+GLU_LIB_NAME='lib$(GLU_LIB).'${LIB_EXTENSION}
+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}
+GLAPI_LIB_NAME='lib$(GLAPI_LIB).'${LIB_EXTENSION}
+WAYLAND_EGL_LIB_NAME='lib$(WAYLAND_EGL_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}'*'
+GLAPI_LIB_GLOB=${LIB_PREFIX_GLOB}'$(GLAPI_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+WAYLAND_EGL_LIB_GLOB=${LIB_PREFIX_GLOB}'$(WAYLAND_EGL_LIB)'${LIB_VERSION_SEPARATOR}'*'${LIB_EXTENSION}'*'
+
+AC_SUBST([GL_LIB_NAME])
+AC_SUBST([GLU_LIB_NAME])
+AC_SUBST([GLUT_LIB_NAME])
+AC_SUBST([GLW_LIB_NAME])
+AC_SUBST([OSMESA_LIB_NAME])
+AC_SUBST([EGL_LIB_NAME])
+AC_SUBST([GLESv1_CM_LIB_NAME])
+AC_SUBST([GLESv2_LIB_NAME])
+AC_SUBST([VG_LIB_NAME])
+AC_SUBST([GLAPI_LIB_NAME])
+AC_SUBST([WAYLAND_EGL_LIB_NAME])
+
+AC_SUBST([GL_LIB_GLOB])
+AC_SUBST([GLU_LIB_GLOB])
+AC_SUBST([GLUT_LIB_GLOB])
+AC_SUBST([GLW_LIB_GLOB])
+AC_SUBST([OSMESA_LIB_GLOB])
+AC_SUBST([EGL_LIB_GLOB])
+AC_SUBST([GLESv1_CM_LIB_GLOB])
+AC_SUBST([GLESv2_LIB_GLOB])
+AC_SUBST([VG_LIB_GLOB])
+AC_SUBST([GLAPI_LIB_GLOB])
+AC_SUBST([WAYLAND_EGL_LIB_GLOB])
+
+dnl
+dnl Arch/platform-specific settings
+dnl
+AC_ARG_ENABLE([asm],
+    [AS_HELP_STRING([--disable-asm],
+        [disable assembly usage @<:@default=enabled on supported plaforms@:>@])],
+    [enable_asm="$enableval"],
+    [enable_asm=yes]
+)
+asm_arch=""
+ASM_FLAGS=""
+MESA_ASM_SOURCES=""
+GLAPI_ASM_SOURCES=""
+AC_MSG_CHECKING([whether to enable assembly])
+test "x$enable_asm" = xno && AC_MSG_RESULT([no])
+# disable if cross compiling on x86/x86_64 since we must run gen_matypes
+if test "x$enable_asm" = xyes && test "x$cross_compiling" = xyes; then
+    case "$host_cpu" in
+    i?86 | x86_64)
+        enable_asm=no
+        AC_MSG_RESULT([no, cross compiling])
+        ;;
+    esac
+fi
+# check for supported arches
+if test "x$enable_asm" = xyes; then
+    case "$host_cpu" in
+    i?86)
+        case "$host_os" in
+        linux* | *freebsd* | dragonfly* | *netbsd*)
+            test "x$enable_64bit" = xyes && asm_arch=x86_64 || asm_arch=x86
+            ;;
+        esac
+        ;;
+    x86_64)
+        case "$host_os" in
+        linux* | *freebsd* | dragonfly* | *netbsd*)
+            test "x$enable_32bit" = xyes && asm_arch=x86 || asm_arch=x86_64
+            ;;
+        esac
+        ;;
+    powerpc)
+        case "$host_os" in
+        linux*)
+            asm_arch=ppc
+            ;;
+        esac
+        ;;
+    sparc*)
+        case "$host_os" in
+        linux*)
+            asm_arch=sparc
+            ;;
+        esac
+        ;;
+    esac
+
+    case "$asm_arch" in
+    x86)
+        ASM_FLAGS="-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM"
+        MESA_ASM_SOURCES='$(X86_SOURCES)'
+        GLAPI_ASM_SOURCES='$(X86_API)'
+        AC_MSG_RESULT([yes, x86])
+        ;;
+    x86_64)
+        ASM_FLAGS="-DUSE_X86_64_ASM"
+        MESA_ASM_SOURCES='$(X86-64_SOURCES)'
+        GLAPI_ASM_SOURCES='$(X86-64_API)'
+        AC_MSG_RESULT([yes, x86_64])
+        ;;
+    ppc)
+        ASM_FLAGS="-DUSE_PPC_ASM -DUSE_VMX_ASM"
+        MESA_ASM_SOURCES='$(PPC_SOURCES)'
+        AC_MSG_RESULT([yes, ppc])
+        ;;
+    sparc)
+        ASM_FLAGS="-DUSE_SPARC_ASM"
+        MESA_ASM_SOURCES='$(SPARC_SOURCES)'
+        GLAPI_ASM_SOURCES='$(SPARC_API)'
+        AC_MSG_RESULT([yes, sparc])
+        ;;
+    *)
+        AC_MSG_RESULT([no, platform not supported])
+        ;;
+    esac
+fi
+AC_SUBST([ASM_FLAGS])
+AC_SUBST([MESA_ASM_SOURCES])
+AC_SUBST([GLAPI_ASM_SOURCES])
+
+dnl PIC code macro
+MESA_PIC_FLAGS
+
+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.
+AC_CHECK_FUNC([dlopen], [],
+    [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
+
+dnl See if posix_memalign is available
+AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
+
+dnl SELinux awareness.
+AC_ARG_ENABLE([selinux],
+    [AS_HELP_STRING([--enable-selinux],
+        [Build SELinux-aware Mesa @<:@default=disabled@:>@])],
+    [MESA_SELINUX="$enableval"],
+    [MESA_SELINUX=no])
+if test "x$enable_selinux" = "xyes"; then
+    AC_CHECK_HEADER([selinux/selinux.h],[],
+                    [AC_MSG_ERROR([SELinux headers not found])])
+    AC_CHECK_LIB([selinux],[is_selinux_enabled],[],
+                 [AC_MSG_ERROR([SELinux library not found])])
+    SELINUX_LIBS="-lselinux"
+    DEFINES="$DEFINES -DMESA_SELINUX"
+fi
+
+dnl Determine which APIs to support
+AC_ARG_ENABLE([opengl],
+    [AS_HELP_STRING([--disable-opengl],
+        [disable support for standard OpenGL API @<:@default=no@:>@])],
+    [enable_opengl="$enableval"],
+    [enable_opengl=yes])
+AC_ARG_ENABLE([gles1],
+    [AS_HELP_STRING([--enable-gles1],
+        [enable support for OpenGL ES 1.x API @<:@default=no@:>@])],
+    [enable_gles1="$enableval"],
+    [enable_gles1=no])
+AC_ARG_ENABLE([gles2],
+    [AS_HELP_STRING([--enable-gles2],
+        [enable support for OpenGL ES 2.x API @<:@default=no@:>@])],
+    [enable_gles2="$enableval"],
+    [enable_gles2=no])
+AC_ARG_ENABLE([gles-overlay],
+    [AS_HELP_STRING([--enable-gles-overlay],
+        [DEPRECATED.  Same as --enable-gles1 and --enable-gles2])],
+    [enable_gles1="$enableval"; enable_gles2="$enableval"],
+    [])
+
+AC_ARG_ENABLE([openvg],
+    [AS_HELP_STRING([--enable-openvg],
+        [enable support for OpenVG API @<:@default=no@:>@])],
+    [enable_openvg="$enableval"],
+    [enable_openvg=no])
+
+dnl smooth the transition; should be removed eventually
+if test "x$enable_openvg" = xno; then
+    case "x$with_state_trackers" in
+    x*vega*)
+        AC_MSG_WARN([vega state tracker is enabled without --enable-openvg])
+        enable_openvg=yes
+        ;;
+    esac
+fi
+
+if test "x$enable_opengl" = xno -a \
+        "x$enable_gles1" = xno -a \
+        "x$enable_gles2" = xno -a \
+        "x$enable_openvg" = xno; then
+    AC_MSG_ERROR([at least one API should be enabled])
+fi
+
+API_DEFINES=""
+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
+AC_SUBST([API_DEFINES])
+
+AC_ARG_ENABLE([shared-glapi],
+    [AS_HELP_STRING([--enable-shared-glapi],
+        [EXPERIMENTAL.  Enable shared glapi for OpenGL @<:@default=no@:>@])],
+    [enable_shared_glapi="$enableval"],
+    [enable_shared_glapi=no])
+
+SHARED_GLAPI="0"
+if test "x$enable_shared_glapi" = xyes; then
+    SHARED_GLAPI="1"
+fi
+AC_SUBST([SHARED_GLAPI])
+
+dnl
+dnl Driver configuration. Options are xlib, dri and osmesa right now.
+dnl More later: fbdev, ...
+dnl
+default_driver="xlib"
+
+case "$host_os" in
+linux*)
+    case "$host_cpu" in
+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
+    esac
+    ;;
+*freebsd* | dragonfly* | *netbsd*)
+    case "$host_cpu" in
+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
+    esac
+    ;;
+esac
+
+if test "x$enable_opengl" = xno; then
+    default_driver="no"
+fi
+
+AC_ARG_WITH([driver],
+    [AS_HELP_STRING([--with-driver=DRIVER],
+        [driver for Mesa: xlib,dri,osmesa @<:@default=dri when available, or xlib@:>@])],
+    [mesa_driver="$withval"],
+    [mesa_driver="$default_driver"])
+dnl Check for valid option
+case "x$mesa_driver" in
+xxlib|xdri|xosmesa)
+    if test "x$enable_opengl" = xno; then
+        AC_MSG_ERROR([Driver '$mesa_driver' requires OpenGL enabled])
+    fi
+    ;;
+xno)
+    ;;
+*)
+    AC_MSG_ERROR([Driver '$mesa_driver' is not a valid option])
+    ;;
+esac
+
+dnl
+dnl Driver specific build directories
+dnl
+
+dnl this variable will be prepended to SRC_DIRS and is not exported
+CORE_DIRS=""
+
+SRC_DIRS=""
+GLU_DIRS="sgi"
+GALLIUM_DIRS="auxiliary drivers state_trackers"
+GALLIUM_TARGET_DIRS=""
+GALLIUM_WINSYS_DIRS="sw"
+GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug noop identity"
+GALLIUM_STATE_TRACKERS_DIRS=""
+
+# build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled
+case "x$enable_shared_glapi$enable_gles1$enable_gles2" in
+x*yes*)
+    CORE_DIRS="$CORE_DIRS mapi/shared-glapi"
+    ;;
+esac
+
+# build glapi if OpenGL is enabled
+if test "x$enable_opengl" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/glapi"
+fi
+
+# build es1api if OpenGL ES 1.x is enabled
+if test "x$enable_gles1" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/es1api"
+fi
+
+# build es2api if OpenGL ES 2.x is enabled
+if test "x$enable_gles2" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/es2api"
+fi
+
+# build vgapi if OpenVG is enabled
+if test "x$enable_openvg" = xyes; then
+    CORE_DIRS="$CORE_DIRS mapi/vgapi"
+fi
+
+# build glsl and mesa if OpenGL or OpenGL ES is enabled
+case "x$enable_opengl$enable_gles1$enable_gles2" in
+x*yes*)
+    CORE_DIRS="$CORE_DIRS glsl mesa"
+    ;;
+esac
+
+case "$mesa_driver" in
+xlib)
+    DRIVER_DIRS="x11"
+    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"
+    GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/xlib sw/dri"
+    ;;
+osmesa)
+    DRIVER_DIRS="osmesa"
+    ;;
+no)
+    DRIVER_DRIS=""
+    ;;
+esac
+AC_SUBST([SRC_DIRS])
+AC_SUBST([GLU_DIRS])
+AC_SUBST([DRIVER_DIRS])
+AC_SUBST([GALLIUM_DIRS])
+AC_SUBST([GALLIUM_TARGET_DIRS])
+AC_SUBST([GALLIUM_WINSYS_DIRS])
+AC_SUBST([GALLIUM_DRIVERS_DIRS])
+AC_SUBST([GALLIUM_STATE_TRACKERS_DIRS])
+AC_SUBST([MESA_LLVM])
+
+dnl
+dnl Find out if X is available. The variable have_x is set if libX11 is
+dnl found to mimic AC_PATH_XTRA.
+dnl
+if test -n "$PKG_CONFIG"; then
+    AC_MSG_CHECKING([pkg-config files for X11 are available])
+    PKG_CHECK_EXISTS([x11],[
+        x11_pkgconfig=yes
+        have_x=yes
+        ],[
+        x11_pkgconfig=no
+    ])
+    AC_MSG_RESULT([$x11_pkgconfig])
+else
+    x11_pkgconfig=no
+fi
+dnl Use the autoconf macro if no pkg-config files
+if test "$x11_pkgconfig" = yes; then
+    PKG_CHECK_MODULES([X11], [x11])
+else
+    AC_PATH_XTRA
+    test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS"
+    test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11"
+    AC_SUBST([X11_CFLAGS])
+    AC_SUBST([X11_LIBS])
+fi
+
+dnl Try to tell the user that the --x-* options are only used when
+dnl pkg-config is not available. This must be right after AC_PATH_XTRA.
+m4_divert_once([HELP_BEGIN],
+[These options are only used when the X libraries cannot be found by the
+pkg-config utility.])
+
+dnl We need X for xlib and dri, so bomb now if it's not found
+case "$mesa_driver" in
+xlib|dri)
+    if test "$no_x" = yes; then
+        AC_MSG_ERROR([X11 development libraries needed for $mesa_driver driver])
+    fi
+    ;;
+esac
+
+dnl XCB - this is only used for GLX right now
+AC_ARG_ENABLE([xcb],
+    [AS_HELP_STRING([--enable-xcb],
+        [use XCB for GLX @<:@default=disabled@:>@])],
+    [enable_xcb="$enableval"],
+    [enable_xcb=no])
+if test "x$enable_xcb" = xyes; then
+    DEFINES="$DEFINES -DUSE_XCB"
+else
+    enable_xcb=no
+fi
+
+dnl
+dnl libGL configuration per driver
+dnl
+case "$mesa_driver" in
+xlib)
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([XLIBGL], [x11 xext])
+        GL_PC_REQ_PRIV="x11 xext"
+        X11_INCLUDES="$X11_INCLUDES $XLIBGL_CFLAGS"
+        GL_LIB_DEPS="$XLIBGL_LIBS"
+    else
+        # should check these...
+        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
+        GL_LIB_DEPS="$X_LIBS -lX11 -lXext"
+        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"
+
+    # if static, move the external libraries to the programs
+    # and empty the libraries for libGL
+    if test "$enable_static" = yes; then
+        APP_LIB_DEPS="$APP_LIB_DEPS $GL_LIB_DEPS"
+        GL_LIB_DEPS=""
+    fi
+    ;;
+dri|no) # these checks are still desired when there is no mesa_driver
+    # DRI must be shared, I think
+    if test "$enable_static" = yes; then
+        AC_MSG_ERROR([Can't use static libraries for DRI drivers])
+    fi
+
+    # Check for libdrm
+    PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED])
+    PKG_CHECK_MODULES([DRI2PROTO], [dri2proto >= $DRI2PROTO_REQUIRED])
+    PKG_CHECK_MODULES([GLPROTO], [glproto >= $GLPROTO_REQUIRED])
+    GL_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED dri2proto >= $DRI2PROTO_REQUIRED glproto >= $GLPROTO_REQUIRED"
+    DRI_PC_REQ_PRIV="libdrm >= $LIBDRM_REQUIRED"
+
+    # find the DRI deps for libGL
+    if test "$x11_pkgconfig" = yes; then
+        dri_modules="x11 xext xdamage xfixes"
+
+        # add xf86vidmode if available
+        PKG_CHECK_MODULES([XF86VIDMODE], [xxf86vm], HAVE_XF86VIDMODE=yes, HAVE_XF86VIDMODE=no)
+        if test "$HAVE_XF86VIDMODE" = yes ; then
+            dri_modules="$dri_modules xxf86vm"
+        fi
+
+        # add xcb modules if necessary
+        if test "$enable_xcb" = yes; then
+            dri_modules="$dri_modules x11-xcb xcb-glx"
+        fi
+
+        PKG_CHECK_MODULES([DRIGL], [$dri_modules])
+        GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV $dri_modules"
+        X11_INCLUDES="$X11_INCLUDES $DRIGL_CFLAGS"
+        GL_LIB_DEPS="$DRIGL_LIBS"
+    else
+        # should check these...
+        X11_INCLUDES="$X11_INCLUDES $X_CFLAGS"
+        GL_LIB_DEPS="$X_LIBS -lX11 -lXext -lXxf86vm -lXdamage -lXfixes"
+        GL_PC_LIB_PRIV="$GL_LIB_DEPS"
+        GL_PC_CFLAGS="$X11_INCLUDES"
+
+        # XCB can only be used from pkg-config
+        if test "$enable_xcb" = yes; then
+            PKG_CHECK_MODULES([XCB],[x11-xcb xcb-glx])
+            GL_PC_REQ_PRIV="$GL_PC_REQ_PRIV x11-xcb xcb-glx"
+            X11_INCLUDES="$X11_INCLUDES $XCB_CFLAGS"
+            GL_LIB_DEPS="$GL_LIB_DEPS $XCB_LIBS"
+        fi
+    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
+    GL_LIB_DEPS=""
+    ;;
+esac
+AC_SUBST([GL_LIB_DEPS])
+AC_SUBST([GL_PC_REQ_PRIV])
+AC_SUBST([GL_PC_LIB_PRIV])
+AC_SUBST([GL_PC_CFLAGS])
+AC_SUBST([DRI_PC_REQ_PRIV])
+AC_SUBST([GLESv1_CM_LIB_DEPS])
+AC_SUBST([GLESv1_CM_PC_LIB_PRIV])
+AC_SUBST([GLESv2_LIB_DEPS])
+AC_SUBST([GLESv2_PC_LIB_PRIV])
+
+GLAPI_LIB_DEPS="-lpthread"
+AC_SUBST([GLAPI_LIB_DEPS])
+
+
+dnl Setup default DRI CFLAGS
+DRI_CFLAGS='$(CFLAGS)'
+DRI_CXXFLAGS='$(CXXFLAGS)'
+DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
+MESA_MODULES='$(TOP)/src/mesa/libmesa.a'
+
+AC_ARG_ENABLE([shared-dricore],
+    [AS_HELP_STRING([--enable-shared-dricore],
+        [link DRI modules with shared core DRI routines @<:@default=disabled@:>@])],
+    [enable_dricore="$enableval"],
+    [enable_dricore=no])
+if test "$mesa_driver" = dri ; then
+   if test "$enable_dricore" = yes ; then
+      if test "$GCC$GXX" != yesyes ; then
+      	 AC_MSG_WARN([Shared dricore requires GCC-compatible rpath handling.  Disabling shared dricore])
+	 enable_dricore=no
+      else
+	 DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
+	 DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
+	 DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'
+      	 DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'
+      	 DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'
+      	 DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'
+      	 MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
+      fi
+   fi
+fi
+AC_SUBST([DRICORE_LIBS])
+AC_SUBST([DRICORE_GLSL_LIBS])
+AC_SUBST([DRICORE_LIB_DEPS])
+AC_SUBST([DRI_CXXFLAGS])
+AC_SUBST([DRI_CFLAGS])
+AC_SUBST([MESA_MODULES])
+
+AC_SUBST([HAVE_XF86VIDMODE])
+
+PKG_CHECK_MODULES([LIBDRM_RADEON],
+		  [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED],
+		  HAVE_LIBDRM_RADEON=yes,
+		  HAVE_LIBDRM_RADEON=no)
+
+dnl
+dnl More X11 setup
+dnl
+if test "$mesa_driver" = xlib; then
+    DEFINES="$DEFINES -DUSE_XSHM"
+fi
+
+dnl
+dnl TLS detection
+dnl
+
+AC_ARG_ENABLE([glx-tls],
+    [AS_HELP_STRING([--enable-glx-tls],
+        [enable TLS support in GLX @<:@default=disabled@:>@])],
+    [GLX_USE_TLS="$enableval"],
+    [GLX_USE_TLS=no])
+AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
+
+dnl
+dnl More DRI setup
+dnl
+dnl Directory for DRI drivers
+AC_ARG_WITH([dri-driverdir],
+    [AS_HELP_STRING([--with-dri-driverdir=DIR],
+        [directory for the DRI drivers @<:@${libdir}/dri@:>@])],
+    [DRI_DRIVER_INSTALL_DIR="$withval"],
+    [DRI_DRIVER_INSTALL_DIR='${libdir}/dri'])
+AC_SUBST([DRI_DRIVER_INSTALL_DIR])
+dnl Extra search path for DRI drivers
+AC_ARG_WITH([dri-searchpath],
+    [AS_HELP_STRING([--with-dri-searchpath=DIRS...],
+        [semicolon delimited DRI driver search directories @<:@${libdir}/dri@:>@])],
+    [DRI_DRIVER_SEARCH_DIR="$withval"],
+    [DRI_DRIVER_SEARCH_DIR='${DRI_DRIVER_INSTALL_DIR}'])
+AC_SUBST([DRI_DRIVER_SEARCH_DIR])
+dnl Direct rendering or just indirect rendering
+AC_ARG_ENABLE([driglx-direct],
+    [AS_HELP_STRING([--disable-driglx-direct],
+        [enable direct rendering in GLX and EGL for DRI @<:@default=enabled@:>@])],
+    [driglx_direct="$enableval"],
+    [driglx_direct="yes"])
+dnl Which drivers to build - default is chosen by platform
+AC_ARG_WITH([dri-drivers],
+    [AS_HELP_STRING([--with-dri-drivers@<:@=DIRS...@:>@],
+        [comma delimited DRI drivers list, e.g.
+        "swrast,i965,radeon" @<:@default=auto@:>@])],
+    [with_dri_drivers="$withval"],
+    [with_dri_drivers=yes])
+if test "x$with_dri_drivers" = x; then
+    with_dri_drivers=no
+fi
+
+dnl If $with_dri_drivers is yes, directories will be added through
+dnl platform checks
+DRI_DIRS=""
+case "$with_dri_drivers" in
+no) ;;
+yes)
+    DRI_DIRS="yes"
+    ;;
+*)
+    # verify the requested driver directories exist
+    dri_drivers=`IFS=', '; echo $with_dri_drivers`
+    for driver in $dri_drivers; do
+        test -d "$srcdir/src/mesa/drivers/dri/$driver" || \
+            AC_MSG_ERROR([DRI driver directory '$driver' doesn't exist])
+    done
+    DRI_DIRS="$dri_drivers"
+    ;;
+esac
+
+dnl Set DRI_DIRS, DEFINES and LIB_DEPS
+if test "$mesa_driver" = dri -o "$mesa_driver" = no; then
+    # Use TLS in GLX?
+    if test "x$GLX_USE_TLS" = xyes; then
+        DEFINES="$DEFINES -DGLX_USE_TLS -DPTHREADS"
+    fi
+
+    # Platform specific settings and drivers to build
+    case "$host_os" in
+    linux*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"
+
+        case "$host_cpu" in
+        x86_64)
+            # sis is missing because they have not be converted to use
+            # the new interface.  i810 are missing because there is no
+            # x86-64 system where they could *ever* be used.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="i915 i965 mach64 mga r128 r200 r300 r600 radeon \
+                    savage tdfx unichrome swrast"
+            fi
+            ;;
+        powerpc*)
+            # Build only the drivers for cards that exist on PowerPC.
+            # At some point MGA will be added, but not yet.
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon tdfx swrast"
+            fi
+            ;;
+        sparc*)
+            # Build only the drivers for cards that exist on sparc`
+            if test "x$DRI_DIRS" = "xyes"; then
+                DRI_DIRS="mach64 r128 r200 r300 r600 radeon swrast"
+            fi
+            ;;
+        esac
+        ;;
+    freebsd* | dragonfly* | *netbsd*)
+        DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1"
+        DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+
+        if test "x$DRI_DIRS" = "xyes"; then
+            DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \
+                unichrome savage sis swrast"
+        fi
+        ;;
+    gnu*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS"
+	;;
+    solaris*)
+        DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
+        DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING"
+        if test "x$driglx_direct" = xyes; then
+            DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+        fi
+        ;;
+    esac
+
+    # default drivers
+    if test "x$DRI_DIRS" = "xyes"; then
+        DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \
+            savage sis tdfx unichrome swrast"
+    fi
+
+    DRI_DIRS=`echo "$DRI_DIRS" | $SED 's/  */ /g'`
+
+    # Check for expat
+    if test "$mesa_driver" = dri; then
+        EXPAT_INCLUDES=""
+        EXPAT_LIB=-lexpat
+        AC_ARG_WITH([expat],
+            [AS_HELP_STRING([--with-expat=DIR],
+                [expat install directory])],[
+            EXPAT_INCLUDES="-I$withval/include"
+            CPPFLAGS="$CPPFLAGS $EXPAT_INCLUDES"
+            LDFLAGS="$LDFLAGS -L$withval/$LIB_DIR"
+            EXPAT_LIB="-L$withval/$LIB_DIR -lexpat"
+            ])
+        AC_CHECK_HEADER([expat.h],[],[AC_MSG_ERROR([Expat required for DRI.])])
+        AC_CHECK_LIB([expat],[XML_ParserCreate],[],
+            [AC_MSG_ERROR([Expat required for DRI.])])
+    fi
+
+    # put all the necessary libs together, including possibly libdricore
+    DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS"
+fi
+AC_SUBST([DRI_DIRS])
+AC_SUBST([EXPAT_INCLUDES])
+AC_SUBST([DRI_LIB_DEPS])
+
+case $DRI_DIRS in
+*i915*|*i965*)
+    PKG_CHECK_MODULES([INTEL], [libdrm_intel >= $LIBDRM_INTEL_REQUIRED])
+    ;;
+esac
+
+case $DRI_DIRS in
+*radeon*|*r200*|*r300*|*r600*)
+    if test "x$HAVE_LIBDRM_RADEON" = xyes; then
+	RADEON_CFLAGS="-DHAVE_LIBDRM_RADEON=1 $LIBDRM_RADEON_CFLAGS"
+	RADEON_LDFLAGS=$LIBDRM_RADEON_LIBS
+    fi
+    ;;
+esac
+AC_SUBST([RADEON_CFLAGS])
+AC_SUBST([RADEON_LDFLAGS])
+
+
+dnl
+dnl OSMesa configuration
+dnl
+if test "$mesa_driver" = xlib; then
+    default_gl_osmesa=yes
+else
+    default_gl_osmesa=no
+fi
+AC_ARG_ENABLE([gl-osmesa],
+    [AS_HELP_STRING([--enable-gl-osmesa],
+        [enable OSMesa with libGL @<:@default=enabled for xlib driver@:>@])],
+    [gl_osmesa="$enableval"],
+    [gl_osmesa="$default_gl_osmesa"])
+if test "x$gl_osmesa" = xyes; then
+    if test "x$enable_opengl" = xno; then
+        AC_MSG_ERROR([OpenGL is not available for OSMesa driver])
+    fi
+    if test "$mesa_driver" = osmesa; then
+        AC_MSG_ERROR([libGL is not available for OSMesa driver])
+    else
+        DRIVER_DIRS="$DRIVER_DIRS osmesa"
+    fi
+fi
+
+dnl Configure the channel bits for OSMesa (libOSMesa, libOSMesa16, ...)
+AC_ARG_WITH([osmesa-bits],
+    [AS_HELP_STRING([--with-osmesa-bits=BITS],
+        [OSMesa channel bits and library name: 8, 16, 32 @<:@default=8@:>@])],
+    [osmesa_bits="$withval"],
+    [osmesa_bits=8])
+if test "$mesa_driver" != osmesa && test "x$osmesa_bits" != x8; then
+    AC_MSG_WARN([Ignoring OSMesa channel bits for non-OSMesa driver])
+    osmesa_bits=8
+fi
+case "x$osmesa_bits" in
+x8)
+    OSMESA_LIB=OSMesa
+    ;;
+x16|x32)
+    OSMESA_LIB="OSMesa$osmesa_bits"
+    DEFINES="$DEFINES -DCHAN_BITS=$osmesa_bits -DDEFAULT_SOFTWARE_DEPTH_BITS=31"
+    ;;
+*)
+    AC_MSG_ERROR([OSMesa bits '$osmesa_bits' is not a valid option])
+    ;;
+esac
+AC_SUBST([OSMESA_LIB])
+
+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"
+    else
+        OSMESA_LIB_DEPS=""
+    fi
+    OSMESA_MESA_DEPS=""
+    OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
+    ;;
+esac
+AC_SUBST([OSMESA_LIB_DEPS])
+AC_SUBST([OSMESA_MESA_DEPS])
+AC_SUBST([OSMESA_PC_REQ])
+AC_SUBST([OSMESA_PC_LIB_PRIV])
+
+dnl
+dnl EGL configuration
+dnl
+AC_ARG_ENABLE([egl],
+    [AS_HELP_STRING([--disable-egl],
+        [disable EGL library @<:@default=enabled@:>@])],
+    [enable_egl="$enableval"],
+    [enable_egl=yes])
+if test "x$enable_egl" = xno; then
+    if test "x$mesa_driver" = xno; then
+        AC_MSG_ERROR([cannot disable EGL when there is no mesa driver])
+    fi
+    if test "x$enable_openvg" = xyes; then
+        AC_MSG_ERROR([cannot enable OpenVG without EGL])
+    fi
+fi
+if test "x$enable_egl" = xyes; then
+    SRC_DIRS="$SRC_DIRS egl"
+    EGL_LIB_DEPS="$DLOPEN_LIBS -lpthread"
+    EGL_DRIVERS_DIRS=""
+    if test "$enable_static" != yes; then
+        # build egl_glx when libGL is built
+        if test "$mesa_driver" = xlib -o "$mesa_driver" = dri; then
+            EGL_DRIVERS_DIRS="glx"
+        fi
+
+        if test "$mesa_driver" = dri; then
+            # build egl_dri2 when xcb-dri2 is available
+            PKG_CHECK_MODULES([XCB_DRI2], [x11-xcb xcb-dri2 xcb-xfixes],
+            		  [have_xcb_dri2=yes],[have_xcb_dri2=no])
+            PKG_CHECK_MODULES([LIBUDEV], [libudev > 150],
+            		  [have_libudev=yes],[have_libudev=no])
+            
+            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
+
+        EGL_DRIVERS_DIRS="$EGL_DRIVERS_DIRS $EGL_DRIVER_DRI2"
+    fi
+fi
+AC_SUBST([EGL_LIB_DEPS])
+AC_SUBST([EGL_DRIVERS_DIRS])
+
+dnl
+dnl GLU configuration
+dnl
+AC_ARG_ENABLE([glu],
+    [AS_HELP_STRING([--disable-glu],
+        [enable OpenGL Utility library @<:@default=enabled@:>@])],
+    [enable_glu="$enableval"],
+    [enable_glu=yes])
+
+if test "x$enable_glu" = xyes -a "x$mesa_driver" = xno; then
+    AC_MSG_NOTICE([Disabling GLU since there is no OpenGL driver])
+    enable_glu=no
+fi
+
+if test "x$enable_glu" = xyes; then
+    SRC_DIRS="$SRC_DIRS glu"
+
+    case "$mesa_driver" in
+    osmesa)
+        # Link libGLU to libOSMesa instead of libGL
+        GLU_LIB_DEPS=""
+        GLU_PC_REQ="osmesa"
+        if test "$enable_static" = no; then
+            GLU_MESA_DEPS='-l$(OSMESA_LIB)'
+        else
+            GLU_MESA_DEPS=""
+        fi
+        ;;
+    *)
+        # If static, empty GLU_LIB_DEPS and add libs for programs to link
+        GLU_PC_REQ="gl"
+        GLU_PC_LIB_PRIV="-lm"
+        if test "$enable_static" = no; then
+            GLU_LIB_DEPS="-lm"
+            GLU_MESA_DEPS='-l$(GL_LIB)'
+        else
+            GLU_LIB_DEPS=""
+            GLU_MESA_DEPS=""
+            APP_LIB_DEPS="$APP_LIB_DEPS -lstdc++"
+        fi
+        ;;
+    esac
+fi
+if test "$enable_static" = no; then
+    GLU_LIB_DEPS="$GLU_LIB_DEPS $OS_CPLUSPLUS_LIBS"
+fi
+GLU_PC_LIB_PRIV="$GLU_PC_LIB_PRIV $OS_CPLUSPLUS_LIBS"
+AC_SUBST([GLU_LIB_DEPS])
+AC_SUBST([GLU_MESA_DEPS])
+AC_SUBST([GLU_PC_REQ])
+AC_SUBST([GLU_PC_REQ_PRIV])
+AC_SUBST([GLU_PC_LIB_PRIV])
+AC_SUBST([GLU_PC_CFLAGS])
+
+dnl
+dnl GLw configuration
+dnl
+AC_ARG_ENABLE([glw],
+    [AS_HELP_STRING([--disable-glw],
+        [enable Xt/Motif widget library @<:@default=enabled@:>@])],
+    [enable_glw="$enableval"],
+    [enable_glw=yes])
+dnl Don't build GLw on osmesa
+if test "x$enable_glw" = xyes; then
+    case "$mesa_driver" in
+    osmesa|no)
+        AC_MSG_NOTICE([Disabling GLw since there is no OpenGL driver])
+        enable_glw=no
+        ;;
+    esac
+fi
+AC_ARG_ENABLE([motif],
+    [AS_HELP_STRING([--enable-motif],
+        [use Motif widgets in GLw @<:@default=disabled@:>@])],
+    [enable_motif="$enableval"],
+    [enable_motif=no])
+
+if test "x$enable_glw" = xyes; then
+    SRC_DIRS="$SRC_DIRS glw"
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([GLW],[x11 xt])
+        GLW_PC_REQ_PRIV="x11 xt"
+        GLW_LIB_DEPS="$GLW_LIBS"
+    else
+        # should check these...
+        GLW_LIB_DEPS="$X_LIBS -lXt -lX11"
+        GLW_PC_LIB_PRIV="$GLW_LIB_DEPS"
+        GLW_PC_CFLAGS="$X11_INCLUDES"
+    fi
+
+    GLW_SOURCES="GLwDrawA.c"
+    MOTIF_CFLAGS=
+    if test "x$enable_motif" = xyes; then
+        GLW_SOURCES="$GLW_SOURCES GLwMDrawA.c"
+        AC_PATH_PROG([MOTIF_CONFIG], [motif-config], [no])
+        if test "x$MOTIF_CONFIG" != xno; then
+            MOTIF_CFLAGS=`$MOTIF_CONFIG --cflags`
+            MOTIF_LIBS=`$MOTIF_CONFIG --libs`
+        else
+            AC_CHECK_HEADER([Xm/PrimitiveP.h], [],
+                [AC_MSG_ERROR([Can't locate Motif headers])])
+            AC_CHECK_LIB([Xm], [XmGetPixmap], [MOTIF_LIBS="-lXm"],
+                [AC_MSG_ERROR([Can't locate Motif Xm library])])
+        fi
+        # MOTIF_LIBS is prepended to GLW_LIB_DEPS since Xm needs Xt/X11
+        GLW_LIB_DEPS="$MOTIF_LIBS $GLW_LIB_DEPS"
+        GLW_PC_LIB_PRIV="$MOTIF_LIBS $GLW_PC_LIB_PRIV"
+        GLW_PC_CFLAGS="$MOTIF_CFLAGS $GLW_PC_CFLAGS"
+    fi
+
+    # If static, empty GLW_LIB_DEPS and add libs for programs to link
+    GLW_PC_LIB_PRIV="$GLW_PC_LIB_PRIV"
+    if test "$enable_static" = no; then
+        GLW_MESA_DEPS='-l$(GL_LIB)'
+        GLW_LIB_DEPS="$GLW_LIB_DEPS"
+    else
+        APP_LIB_DEPS="$APP_LIB_DEPS $GLW_LIB_DEPS"
+        GLW_LIB_DEPS=""
+        GLW_MESA_DEPS=""
+    fi
+fi
+AC_SUBST([GLW_LIB_DEPS])
+AC_SUBST([GLW_MESA_DEPS])
+AC_SUBST([GLW_SOURCES])
+AC_SUBST([MOTIF_CFLAGS])
+AC_SUBST([GLW_PC_REQ_PRIV])
+AC_SUBST([GLW_PC_LIB_PRIV])
+AC_SUBST([GLW_PC_CFLAGS])
+
+dnl
+dnl GLUT configuration
+dnl
+if test -f "$srcdir/include/GL/glut.h"; then
+    default_glut=yes
+else
+    default_glut=no
+fi
+AC_ARG_ENABLE([glut],
+    [AS_HELP_STRING([--disable-glut],
+        [enable GLUT library @<:@default=enabled if source available@:>@])],
+    [enable_glut="$enableval"],
+    [enable_glut="$default_glut"])
+
+dnl Don't build glut on osmesa
+if test "x$enable_glut" = xyes; then
+    case "$mesa_driver" in
+    osmesa|no)
+        AC_MSG_NOTICE([Disabling glut since there is no OpenGL driver])
+        enable_glut=no
+        ;;
+    esac
+fi
+dnl Can't build glut if GLU not available
+if test "x$enable_glu$enable_glut" = xnoyes; then
+    AC_MSG_WARN([Disabling glut since GLU is disabled])
+    enable_glut=no
+fi
+
+if test "x$enable_glut" = xyes; then
+    SRC_DIRS="$SRC_DIRS glut/glx"
+    if test "$x11_pkgconfig" = yes; then
+        PKG_CHECK_MODULES([GLUT],[x11 xmu xi])
+        GLUT_PC_REQ_PRIV="x11 xmu xi"
+        GLUT_LIB_DEPS="$GLUT_LIBS"
+    else
+        # should check these...
+        GLUT_LIB_DEPS="$X_LIBS -lX11 -lXmu -lXi"
+        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 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)'
+    else
+        APP_LIB_DEPS="$APP_LIB_DEPS $GLUT_LIB_DEPS"
+        GLUT_LIB_DEPS=""
+        GLUT_MESA_DEPS=""
+    fi
+fi
+AC_SUBST([GLUT_LIB_DEPS])
+AC_SUBST([GLUT_MESA_DEPS])
+AC_SUBST([GLUT_CFLAGS])
+AC_SUBST([GLUT_PC_REQ_PRIV])
+AC_SUBST([GLUT_PC_LIB_PRIV])
+AC_SUBST([GLUT_PC_CFLAGS])
+
+dnl
+dnl Program library dependencies
+dnl    Only libm is added here if necessary as the libraries should
+dnl    be pulled in by the linker
+dnl
+if test "x$APP_LIB_DEPS" = x; then
+    case "$host_os" in
+    solaris*)
+        APP_LIB_DEPS="-lX11 -lsocket -lnsl -lm"
+        ;;
+    cygwin*)
+        APP_LIB_DEPS="-lX11"
+        ;;
+    *)
+        APP_LIB_DEPS="-lm"
+        ;;
+    esac
+fi
+AC_SUBST([APP_LIB_DEPS])
+AC_SUBST([PROGRAM_DIRS])
+
+dnl
+dnl Gallium configuration
+dnl
+AC_ARG_ENABLE([gallium],
+    [AS_HELP_STRING([--disable-gallium],
+        [build gallium @<:@default=enabled@:>@])],
+    [enable_gallium="$enableval"],
+    [enable_gallium=yes])
+if test "x$enable_gallium" = xno -a "x$enable_openvg" = xyes; then
+    AC_MSG_ERROR([cannot enable OpenVG without Gallium])
+fi
+if test "x$enable_gallium" = xyes; then
+    SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
+    AC_CHECK_HEADER([udis86.h], [HAS_UDIS86="yes"],
+                [HAS_UDIS86="no"])
+    AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
+fi
+
+AC_SUBST([LLVM_CFLAGS])
+AC_SUBST([LLVM_LIBS])
+AC_SUBST([LLVM_LDFLAGS])
+AC_SUBST([LLVM_VERSION])
+
+dnl
+dnl Gallium state trackers configuration
+dnl
+
+AC_ARG_ENABLE([gallium-egl],
+    [AS_HELP_STRING([--enable-gallium-egl],
+        [enable gallium EGL state tracker @<:@default=auto@:>@])],
+    [enable_gallium_egl="$enableval"],
+    [enable_gallium_egl=auto])
+if test "x$enable_gallium_egl" = xauto; then
+    case "$mesa_driver" in
+    dri|no)
+        enable_gallium_egl=$enable_egl
+        ;;
+    *)
+        enable_gallium_egl=$enable_openvg
+        ;;
+    esac
+fi
+case "x$enable_egl$enable_gallium_egl" in
+xnoyes)
+    AC_MSG_ERROR([cannot build Gallium EGL state tracker without EGL])
+esac
+
+AC_ARG_WITH([state-trackers],
+    [AS_HELP_STRING([--with-state-trackers@<:@=DIRS...@:>@],
+        [comma delimited state_trackers list, e.g.
+        "egl,glx" @<:@default=auto@:>@])],
+    [with_state_trackers="$withval"],
+    [with_state_trackers=yes])
+
+case "$with_state_trackers" in
+no)
+    GALLIUM_STATE_TRACKERS_DIRS=""
+    ;;
+yes)
+    # look at what else is built
+    case "$mesa_driver" in
+    xlib)
+        GALLIUM_STATE_TRACKERS_DIRS=glx
+        ;;
+    dri)
+        GALLIUM_STATE_TRACKERS_DIRS="dri"
+        HAVE_ST_DRI="yes"
+        # Have only tested st/xorg on 1.6.0 servers
+        PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6.0 libdrm >= $LIBDRM_XORG_REQUIRED libkms >= $LIBKMS_XORG_REQUIRED],
+            HAVE_ST_XORG="yes"; GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS xorg",
+            HAVE_ST_XORG="no")
+        ;;
+    esac
+
+    if test "x$enable_egl" = xyes; then
+        if test "$enable_openvg" = yes; then
+            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS vega"
+            st_egl="yes"
+        fi
+
+        if test "$enable_gallium_egl" = yes; then
+            GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS egl"
+            HAVE_ST_EGL="yes"
+        fi
+    fi
+    ;;
+*)
+    # verify the requested state tracker exist
+    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
+                AC_MSG_ERROR([cannot build dri state tracker without mesa driver set to dri])
+            fi
+            HAVE_ST_DRI="yes"
+            ;;
+        egl)
+            if test "x$enable_egl" != xyes; then
+                AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+            fi
+            HAVE_ST_EGL="yes"
+            ;;
+        xorg)
+            PKG_CHECK_MODULES([XORG], [xorg-server >= 1.6.0])
+            PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED])
+            PKG_CHECK_MODULES([LIBKMS_XORG], [libkms >= $LIBKMS_XORG_REQUIRED])
+            HAVE_ST_XORG="yes"
+            ;;
+        vega)
+            if test "x$enable_openvg" != xyes; then
+                AC_MSG_ERROR([cannot build vega state tracker without --enable-openvg])
+            fi
+            have_st_vega="yes"
+            ;;
+        esac
+
+	if test -n "$tracker"; then
+            test -d "$srcdir/src/gallium/state_trackers/$tracker" || \
+                AC_MSG_ERROR([state tracker '$tracker' doesn't exist])
+            if test -n "$state_trackers"; then
+                state_trackers="$state_trackers $tracker"
+            else
+                state_trackers="$tracker"
+            fi
+        fi
+    done
+    GALLIUM_STATE_TRACKERS_DIRS="$state_trackers"
+
+    # append --enable-openvg/--enable-gallium-egl to --with-state-trackers
+    if test "x$have_st_vega" != xyes -a "x$enable_openvg" = xyes; then
+        AC_MSG_ERROR([--with-state-trackers specified but vega is missing])
+    fi
+    if test "x$HAVE_ST_EGL" != xyes -a "x$enable_gallium_egl" = xyes; then
+        AC_MSG_ERROR([--with-state-trackers specified but egl is missing])
+    fi
+    ;;
+esac
+
+
+EGL_CLIENT_APIS=""
+VG_LIB_DEPS=""
+
+case "x$enable_opengl$enable_gles1$enable_gles2" in
+x*yes*)
+    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GL_LIB)'
+    ;;
+esac
+if test "x$enable_openvg" = xyes; then
+    EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)'
+    VG_LIB_DEPS="$VG_LIB_DEPS -lpthread"
+fi
+
+AC_SUBST([VG_LIB_DEPS])
+AC_SUBST([EGL_CLIENT_APIS])
+
+if test "x$HAVE_ST_EGL" = xyes; then
+	GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl"
+fi
+
+if test "x$HAVE_ST_XORG" = xyes; then
+    PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
+        HAVE_XEXTPROTO_71="yes"; DEFINES="$DEFINES -DHAVE_XEXTPROTO_71",
+        HAVE_XEXTPROTO_71="no")
+fi
+
+AC_ARG_WITH([egl-platforms],
+    [AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
+        [comma delimited native platforms libEGL supports, e.g.
+        "x11,drm" @<:@default=auto@:>@])],
+    [with_egl_platforms="$withval"],
+    [with_egl_platforms=yes])
+AC_ARG_WITH([egl-displays],
+    [AS_HELP_STRING([--with-egl-displays@<:@=DIRS...@:>@],
+        [DEPRECATED.  Use --with-egl-platforms instead])],
+    [with_egl_platforms="$withval"])
+
+EGL_PLATFORMS=""
+WAYLAND_EGL_LIB_DEPS=""
+
+case "$with_egl_platforms" in
+yes)
+    if test "x$enable_egl" = xyes && test "x$mesa_driver" != xosmesa; then
+        EGL_PLATFORMS="x11"
+        if test "$mesa_driver" = dri; then
+            EGL_PLATFORMS="$EGL_PLATFORMS drm"
+        fi
+    fi
+    ;;
+*)
+    if test "x$enable_egl" != xyes; then
+        AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+    fi
+    # verify the requested driver directories exist
+    egl_platforms=`IFS=', '; echo $with_egl_platforms`
+    for plat in $egl_platforms; do
+        test -d "$srcdir/src/gallium/state_trackers/egl/$plat" || \
+            AC_MSG_ERROR([EGL platform '$plat' doesn't exist])
+        if test "$plat" = "fbdev"; then
+                GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/fbdev"
+        fi
+	if test "$plat" = "wayland"; then
+		PKG_CHECK_MODULES([WAYLAND], [wayland-client],, \
+				  [AC_MSG_ERROR([cannot find libwayland-client])])
+		WAYLAND_EGL_LIB_DEPS="$WAYLAND_LIBS $LIBDRM_LIBS"
+	fi
+    done
+    EGL_PLATFORMS="$egl_platforms"
+    ;;
+esac
+AC_SUBST([EGL_PLATFORMS])
+
+AC_SUBST([WAYLAND_EGL_LIB_DEPS])
+WAYLAND_EGL_PC_REQ_PRIV="wayland-client libdrm"
+WAYLAND_EGL_PC_LIB_PRIV=
+WAYLAND_EGL_PC_CFLAGS=
+
+AC_SUBST([WAYLAND_EGL_PC_REQ_PRIV])
+AC_SUBST([WAYLAND_EGL_PC_LIB_PRIV])
+AC_SUBST([WAYLAND_EGL_PC_CFLAGS])
+
+
+AC_ARG_WITH([egl-driver-dir],
+    [AS_HELP_STRING([--with-egl-driver-dir=DIR],
+                    [directory for EGL drivers [[default=${libdir}/egl]]])],
+    [EGL_DRIVER_INSTALL_DIR="$withval"],
+    [EGL_DRIVER_INSTALL_DIR='${libdir}/egl'])
+AC_SUBST([EGL_DRIVER_INSTALL_DIR])
+
+AC_ARG_WITH([xorg-driver-dir],
+    [AS_HELP_STRING([--with-xorg-driver-dir=DIR],
+                    [Default xorg driver directory[[default=${libdir}/xorg/modules/drivers]]])],
+    [XORG_DRIVER_INSTALL_DIR="$withval"],
+    [XORG_DRIVER_INSTALL_DIR="${libdir}/xorg/modules/drivers"])
+AC_SUBST([XORG_DRIVER_INSTALL_DIR])
+
+AC_ARG_WITH([max-width],
+    [AS_HELP_STRING([--with-max-width=N],
+                    [Maximum framebuffer width (4096)])],
+    [DEFINES="${DEFINES} -DMAX_WIDTH=${withval}";
+     AS_IF([test "${withval}" -gt "4096"],
+           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]
+)
+AC_ARG_WITH([max-height],
+    [AS_HELP_STRING([--with-max-height=N],
+                    [Maximum framebuffer height (4096)])],
+    [DEFINES="${DEFINES} -DMAX_HEIGHT=${withval}";
+     AS_IF([test "${withval}" -gt "4096"],
+           [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])]
+)
+
+dnl
+dnl Gallium LLVM
+dnl
+AC_ARG_ENABLE([gallium-llvm],
+    [AS_HELP_STRING([--enable-gallium-llvm],
+        [build gallium LLVM support @<:@default=disabled@:>@])],
+    [enable_gallium_llvm="$enableval"],
+    [enable_gallium_llvm=auto])
+if test "x$enable_gallium_llvm" = xyes; then
+    if test "x$LLVM_CONFIG" != xno; then
+	LLVM_VERSION=`$LLVM_CONFIG --version`
+	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
+	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
+
+dnl
+dnl Gallium helper functions
+dnl
+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
+}
+
+
+dnl
+dnl Gallium SVGA configuration
+dnl
+AC_ARG_ENABLE([gallium-svga],
+    [AS_HELP_STRING([--enable-gallium-svga],
+        [build gallium SVGA @<:@default=disabled@:>@])],
+    [enable_gallium_svga="$enableval"],
+    [enable_gallium_svga=auto])
+if test "x$enable_gallium_svga" = xyes; then
+    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
+
+dnl
+dnl Gallium i915 configuration
+dnl
+AC_ARG_ENABLE([gallium-i915],
+    [AS_HELP_STRING([--enable-gallium-i915],
+        [build gallium i915 @<:@default=disabled@:>@])],
+    [enable_gallium_i915="$enableval"],
+    [enable_gallium_i915=auto])
+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
+
+dnl
+dnl Gallium i965 configuration
+dnl
+AC_ARG_ENABLE([gallium-i965],
+    [AS_HELP_STRING([--enable-gallium-i965],
+        [build gallium i965 @<:@default=disabled@:>@])],
+    [enable_gallium_i965="$enableval"],
+    [enable_gallium_i965=auto])
+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
+
+dnl
+dnl Gallium Radeon r300g configuration
+dnl
+AC_ARG_ENABLE([gallium-radeon],
+    [AS_HELP_STRING([--enable-gallium-radeon],
+        [build gallium radeon @<:@default=disabled@:>@])],
+    [enable_gallium_radeon="$enableval"],
+    [enable_gallium_radeon=auto])
+if test "x$enable_gallium_radeon" = xauto; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+    gallium_check_st "radeon/drm" "dri-r300"
+fi
+if test "x$enable_gallium_radeon" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r300"
+    gallium_check_st "radeon/drm" "dri-r300" "xorg-radeon"
+fi
+
+dnl
+dnl Gallium Radeon r600g configuration
+dnl
+AC_ARG_ENABLE([gallium-r600],
+    [AS_HELP_STRING([--enable-gallium-r600],
+        [build gallium radeon @<:@default=disabled@:>@])],
+    [enable_gallium_r600="$enableval"],
+    [enable_gallium_r600=auto])
+if test "x$enable_gallium_r600" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600"
+    gallium_check_st "r600/drm" "dri-r600"
+fi
+
+dnl
+dnl Gallium Nouveau configuration
+dnl
+AC_ARG_ENABLE([gallium-nouveau],
+    [AS_HELP_STRING([--enable-gallium-nouveau],
+        [build gallium nouveau @<:@default=disabled@:>@])],
+    [enable_gallium_nouveau="$enableval"],
+    [enable_gallium_nouveau=no])
+if test "x$enable_gallium_nouveau" = xyes; then
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0"
+    gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau"
+fi
+
+dnl
+dnl Gallium swrast configuration
+dnl
+AC_ARG_ENABLE([gallium-swrast],
+    [AS_HELP_STRING([--enable-gallium-swrast],
+        [build gallium swrast @<:@default=auto@:>@])],
+    [enable_gallium_swrast="$enableval"],
+    [enable_gallium_swrast=auto])
+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
+
+dnl prepend CORE_DIRS to SRC_DIRS
+SRC_DIRS="$CORE_DIRS $SRC_DIRS"
+
+dnl Restore LDFLAGS and CPPFLAGS
+LDFLAGS="$_SAVE_LDFLAGS"
+CPPFLAGS="$_SAVE_CPPFLAGS"
+
+dnl Substitute the config
+AC_CONFIG_FILES([configs/autoconf])
+
+dnl Replace the configs/current symlink
+AC_CONFIG_COMMANDS([configs],[
+if test -f configs/current || test -L configs/current; then
+    rm -f configs/current
+fi
+ln -s autoconf configs/current
+])
+
+AC_OUTPUT
+
+dnl
+dnl Output some configuration info for the user
+dnl
+echo ""
+echo "        prefix:          $prefix"
+echo "        exec_prefix:     $exec_prefix"
+echo "        libdir:          $libdir"
+echo "        includedir:      $includedir"
+
+dnl API info
+echo ""
+echo "        OpenGL:          $enable_opengl (ES1: $enable_gles1 ES2: $enable_gles2)"
+echo "        OpenVG:          $enable_openvg"
+
+dnl Driver info
+echo ""
+echo "        Driver:          $mesa_driver"
+if test "$mesa_driver" != no; then
+    if echo "$DRIVER_DIRS" | grep 'osmesa' >/dev/null 2>&1; then
+        echo "        OSMesa:          lib$OSMESA_LIB"
+    else
+        echo "        OSMesa:          no"
+    fi
+    if test "$mesa_driver" = dri; then
+        # cleanup the drivers var
+        dri_dirs=`echo $DRI_DIRS | $SED 's/^ *//;s/  */ /;s/ *$//'`
+        if test "x$DRI_DIRS" = x; then
+            echo "        DRI drivers:     no"
+        else
+            echo "        DRI drivers:     $dri_dirs"
+        fi
+        echo "        DRI driver dir:  $DRI_DRIVER_INSTALL_DIR"
+        echo "        Use XCB:         $enable_xcb"
+        echo "        Shared dricore:  $enable_dricore"
+    fi
+fi
+echo ""
+echo "        GLU:             $enable_glu"
+echo "        GLw:             $enable_glw (Motif: $enable_motif)"
+echo "        glut:            $enable_glut"
+
+dnl EGL
+echo ""
+echo "        EGL:             $enable_egl"
+if test "$enable_egl" = yes; then
+    echo "        EGL platforms:   $EGL_PLATFORMS"
+
+    egl_drivers=""
+    for d in $EGL_DRIVERS_DIRS; do
+        egl_drivers="$egl_drivers builtin:egl_$d"
+    done
+
+    if test "$enable_gallium" = yes -a "$HAVE_ST_EGL" = yes; then
+        echo "        EGL drivers:    ${egl_drivers} egl_gallium"
+        echo "        EGL Gallium STs:$EGL_CLIENT_APIS"
+    else
+        echo "        EGL drivers:    $egl_drivers"
+    fi
+fi
+
+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 "        Driver dirs:     $GALLIUM_DRIVERS_DIRS"
+    echo "        Trackers dirs:   $GALLIUM_STATE_TRACKERS_DIRS"
+else
+    echo "        Gallium:         no"
+fi
+
+dnl Libraries
+echo ""
+echo "        Shared libs:     $enable_shared"
+echo "        Static libs:     $enable_static"
+
+dnl Compiler options
+# cleanup the CFLAGS/CXXFLAGS/DEFINES vars
+cflags=`echo $CFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
+    $SED 's/^ *//;s/  */ /;s/ *$//'`
+cxxflags=`echo $CXXFLAGS $OPT_FLAGS $PIC_FLAGS $ARCH_FLAGS | \
+    $SED 's/^ *//;s/  */ /;s/ *$//'`
+defines=`echo $DEFINES $ASM_FLAGS | $SED 's/^ *//;s/  */ /;s/ *$//'`
+echo ""
+echo "        CFLAGS:          $cflags"
+echo "        CXXFLAGS:        $cxxflags"
+echo "        Macros:          $defines"
+echo ""
+echo "        PYTHON2:         $PYTHON2"
+
+echo ""
+echo "        Run '${MAKE-make}' to build Mesa"
+echo ""
diff --git a/xorg-server/exa/exa_migration_mixed.c b/xorg-server/exa/exa_migration_mixed.c
index 4f49905d3..fb4715135 100644
--- a/xorg-server/exa/exa_migration_mixed.c
+++ b/xorg-server/exa/exa_migration_mixed.c
@@ -138,7 +138,6 @@ void
 exaDamageReport_mixed(DamagePtr pDamage, RegionPtr pRegion, void *closure)
 {
     PixmapPtr pPixmap = closure;
-    ScreenPtr pScreen = pPixmap->drawable.pScreen;
     ExaPixmapPriv(pPixmap);
 
     /* Move back results of software rendering on system memory copy of mixed driver
@@ -150,18 +149,10 @@ exaDamageReport_mixed(DamagePtr pDamage, RegionPtr pRegion, void *closure)
     if (!pExaPixmap->use_gpu_copy && exaPixmapHasGpuCopy(pPixmap)) {
 	ExaScreenPriv(pPixmap->drawable.pScreen);
 
-	/* Front buffer: Don't wait for the block handler to copy back the data.
-	 * This avoids annoying latency if you encounter a lot of software rendering.
-	 */
-	if (pPixmap == pScreen->GetScreenPixmap(pScreen))
-		exaMoveInPixmap_mixed(pPixmap);
-	else {
-		if (pExaScr->deferred_mixed_pixmap &&
-		    pExaScr->deferred_mixed_pixmap != pPixmap)
-		    exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
-
-		pExaScr->deferred_mixed_pixmap = pPixmap;
-	}
+	if (pExaScr->deferred_mixed_pixmap &&
+	    pExaScr->deferred_mixed_pixmap != pPixmap)
+	    exaMoveInPixmap_mixed(pExaScr->deferred_mixed_pixmap);
+	pExaScr->deferred_mixed_pixmap = pPixmap;
     }
 }
 
diff --git a/xorg-server/xkeyboard-config/rules/compat/Makefile.am b/xorg-server/xkeyboard-config/rules/compat/Makefile.am
index 087263427..814bd25cf 100644
--- a/xorg-server/xkeyboard-config/rules/compat/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/compat/Makefile.am
@@ -20,8 +20,7 @@ base.ml4v4_s.part \
 base.ml_s.part \
 base.ml1_s.part \
 base.mlv_s.part \
-base.ml1v1_s.part \
-base.ml_s.part
+base.ml1v1_s.part
 
 if USE_COMPAT_RULES
 
diff --git a/xorg-server/xkeyboard-config/rules/extras/Makefile.am b/xorg-server/xkeyboard-config/rules/extras/Makefile.am
index 16119a3f0..fafed6033 100644
--- a/xorg-server/xkeyboard-config/rules/extras/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/extras/Makefile.am
@@ -1,52 +1,51 @@
-transform_files=layoutsMapping.lst variantsMapping.lst

-

-scripts_dir=$(srcdir)/../bin

-

-scripts= \

-base.ml2_s.part \

-base.ml3_s.part \

-base.ml4_s.part \

-base.ml2v2_s.part \

-base.ml3v3_s.part \

-base.ml4v4_s.part \

-base.ml_s.part \

-base.ml1_s.part \

-base.mlv_s.part \

-base.ml1v1_s.part \

-base.ml_s.part

-

-noinst_SCRIPTS=$(scripts)

-

-base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files)

-	sh $< 2 $(srcdir)

-

-base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files)

-	sh $< 3 $(srcdir)

-

-base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files)

-	sh $< 4 $(srcdir)

-

-base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)

-	sh $< 2 $(srcdir)

-

-base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)

-	sh $< 3 $(srcdir)

-

-base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)

-	sh $< 4 $(srcdir)

-

-base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-EXTRA_DIST=$(transform_files)

-

-CLEANFILES=$(scripts)

+transform_files=layoutsMapping.lst variantsMapping.lst
+
+scripts_dir=$(srcdir)/../bin
+
+scripts= \
+base.ml2_s.part \
+base.ml3_s.part \
+base.ml4_s.part \
+base.ml2v2_s.part \
+base.ml3v3_s.part \
+base.ml4v4_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.mlv_s.part \
+base.ml1v1_s.part
+
+noinst_SCRIPTS=$(scripts)
+
+base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
+	sh $< 2 $(srcdir)
+
+base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
+	sh $< 3 $(srcdir)
+
+base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files)
+	sh $< 4 $(srcdir)
+
+base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
+	sh $< 2 $(srcdir)
+
+base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
+	sh $< 3 $(srcdir)
+
+base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)
+	sh $< 4 $(srcdir)
+
+base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
+	sh $< $(srcdir)
+
+base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)
+	sh $< $(srcdir)
+
+base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)
+	sh $< $(srcdir)
+
+base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)
+	sh $< $(srcdir)
+
+EXTRA_DIST=$(transform_files)
+
+CLEANFILES=$(scripts)