diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 87 |
1 files changed, 33 insertions, 54 deletions
diff --git a/configure.ac b/configure.ac index 77e7603520..d9220c86b5 100644 --- a/configure.ac +++ b/configure.ac @@ -18,11 +18,11 @@ AC_CONFIG_AUX_DIR([bin]) AC_CANONICAL_HOST dnl Versions for external dependencies -LIBDRM_REQUIRED=2.4.15 -LIBDRM_RADEON_REQUIRED=2.4.17 +LIBDRM_REQUIRED=2.4.23 +LIBDRM_RADEON_REQUIRED=2.4.23 DRI2PROTO_REQUIRED=2.1 GLPROTO_REQUIRED=1.4.11 -LIBDRM_XORG_REQUIRED=2.4.17 +LIBDRM_XORG_REQUIRED=2.4.23 LIBKMS_XORG_REQUIRED=1.0.0 dnl Check for progs @@ -377,14 +377,14 @@ if test "x$enable_asm" = xyes; then case "$host_cpu" in i?86) case "$host_os" in - linux* | *freebsd* | dragonfly*) + 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*) + linux* | *freebsd* | dragonfly* | *netbsd*) test "x$enable_32bit" = xyes && asm_arch=x86 || asm_arch=x86_64 ;; esac @@ -483,9 +483,9 @@ AC_ARG_ENABLE([gles2], [enable_gles2=no]) AC_ARG_ENABLE([gles-overlay], [AS_HELP_STRING([--enable-gles-overlay], - [build separate OpenGL ES only libraries @<:@default=no@:>@])], - [enable_gles_overlay="$enableval"], - [enable_gles_overlay=no]) + [DEPRECATED. Same as --enable-gles1 and --enable-gles2])], + [enable_gles1="$enableval"; enable_gles2="$enableval"], + []) AC_ARG_ENABLE([openvg], [AS_HELP_STRING([--enable-openvg], @@ -506,13 +506,11 @@ fi if test "x$enable_opengl" = xno -a \ "x$enable_gles1" = xno -a \ "x$enable_gles2" = xno -a \ - "x$enable_gles_overlay" = xno -a \ "x$enable_openvg" = xno; then AC_MSG_ERROR([at least one API should be enabled]) fi API_DEFINES="" -GLES_OVERLAY=0 if test "x$enable_opengl" = xno; then API_DEFINES="$API_DEFINES -DFEATURE_GL=0" else @@ -524,11 +522,7 @@ fi if test "x$enable_gles2" = xyes; then API_DEFINES="$API_DEFINES -DFEATURE_ES2=1" fi -if test "x$enable_gles_overlay" = xyes; then - GLES_OVERLAY=1 -fi AC_SUBST([API_DEFINES]) -AC_SUBST([GLES_OVERLAY]) dnl dnl Driver configuration. Options are xlib, dri and osmesa right now. @@ -542,7 +536,7 @@ linux*) i*86|x86_64|powerpc*|sparc*) default_driver="dri";; esac ;; -*freebsd* | dragonfly*) +*freebsd* | dragonfly* | *netbsd*) case "$host_cpu" in i*86|x86_64|powerpc*|sparc*) default_driver="dri";; esac @@ -588,7 +582,7 @@ GLU_DIRS="sgi" GALLIUM_DIRS="auxiliary drivers state_trackers" GALLIUM_TARGET_DIRS="" GALLIUM_WINSYS_DIRS="sw" -GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug identity" +GALLIUM_DRIVERS_DIRS="softpipe failover galahad trace rbug noop identity" GALLIUM_STATE_TRACKERS_DIRS="" # build glapi if OpenGL is enabled @@ -596,12 +590,15 @@ if test "x$enable_opengl" = xyes; then CORE_DIRS="$CORE_DIRS mapi/glapi" fi -# build es1api and es2api if OpenGL ES is enabled -case "x$enable_gles1$enable_gles2$enable_gles_overlay" in -x*yes*) - CORE_DIRS="$CORE_DIRS mapi/es1api mapi/es2api" - ;; -esac +# 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 @@ -609,7 +606,7 @@ if test "x$enable_openvg" = xyes; then fi # build glsl and mesa if OpenGL or OpenGL ES is enabled -case "x$enable_opengl$enable_gles1$enable_gles2$enable_gles_overlay" in +case "x$enable_opengl$enable_gles1$enable_gles2" in x*yes*) CORE_DIRS="$CORE_DIRS glsl mesa" ;; @@ -811,13 +808,19 @@ if test "$mesa_driver" = xlib; then fi dnl -dnl More DRI setup +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], @@ -909,16 +912,13 @@ if test "$mesa_driver" = dri -o "$mesa_driver" = no; then ;; esac ;; - freebsd* | dragonfly*) + 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$GXX" = xyes; then - CXXFLAGS="$CXXFLAGS -ansi -pedantic" - fi if test "x$DRI_DIRS" = "xyes"; then DRI_DIRS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon tdfx \ @@ -972,7 +972,7 @@ AC_SUBST([DRI_LIB_DEPS]) case $DRI_DIRS in *i915*|*i965*) - PKG_CHECK_MODULES([INTEL], [libdrm_intel >= 2.4.21]) + PKG_CHECK_MODULES([INTEL], [libdrm_intel >= 2.4.23]) ;; esac @@ -1352,7 +1352,7 @@ if test "x$enable_gallium_egl" = xauto; then enable_gallium_egl=$enable_egl ;; *) - enable_gallium_egl=no + enable_gallium_egl=$enable_openvg ;; esac fi @@ -1454,9 +1454,6 @@ x*yes*) EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GL_LIB)' ;; esac -if test "x$enable_gles_overlay" = xyes; then - EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GLESv1_CM_LIB) $(GLESv2_LIB)' -fi if test "x$enable_openvg" = xyes; then EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)' VG_LIB_DEPS="$VG_LIB_DEPS -lpthread" @@ -1467,10 +1464,6 @@ AC_SUBST([EGL_CLIENT_APIS]) if test "x$HAVE_ST_EGL" = xyes; then GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS egl" - # define GLX_DIRECT_RENDERING even when the driver is not dri - if test "x$mesa_driver" != xdri -a "x$driglx_direct" = xyes; then - DEFINES="$DEFINES -DGLX_DIRECT_RENDERING" - fi fi if test "x$HAVE_ST_XORG" = xyes; then @@ -1558,7 +1551,7 @@ AC_ARG_ENABLE([gallium-llvm], if test "x$enable_gallium_llvm" = xyes; then if test "x$LLVM_CONFIG" != xno; then LLVM_VERSION=`$LLVM_CONFIG --version` - LLVM_CFLAGS=`$LLVM_CONFIG --cflags` + LLVM_CFLAGS=`$LLVM_CONFIG --cppflags` LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++" if test "x$HAS_UDIS86" != xno; then @@ -1690,7 +1683,7 @@ AC_ARG_ENABLE([gallium-nouveau], [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" + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50 nvc0" gallium_check_st "nouveau/drm" "dri-nouveau" "xorg-nouveau" fi @@ -1708,19 +1701,6 @@ if test "x$enable_gallium_swrast" = xyes || test "x$enable_gallium_swrast" = xau fi fi -dnl -dnl Gallium noop configuration -dnl -AC_ARG_ENABLE([gallium-noop], - [AS_HELP_STRING([--enable-gallium-noop], - [build gallium radeon @<:@default=disabled@:>@])], - [enable_gallium_noop="$enableval"], - [enable_gallium_noop=auto]) -if test "x$enable_gallium_noop" = xyes; then - GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS noop" - GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS dri-noop" -fi - dnl prepend CORE_DIRS to SRC_DIRS SRC_DIRS="$CORE_DIRS $SRC_DIRS" @@ -1753,7 +1733,6 @@ echo " includedir: $includedir" dnl API info echo "" echo " OpenGL: $enable_opengl (ES1: $enable_gles1 ES2: $enable_gles2)" -echo " GLES overlay: $enable_gles_overlay" echo " OpenVG: $enable_openvg" dnl Driver info @@ -1790,7 +1769,7 @@ if test "$enable_egl" = yes; then egl_drivers="" for d in $EGL_DRIVERS_DIRS; do - egl_drivers="$egl_drivers egl_$d" + egl_drivers="$egl_drivers builtin:egl_$d" done if test "$enable_gallium" = yes -a "$HAVE_ST_EGL" = yes; then |