vl: Get softpipe building again.

[mesa.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bcf4104515e5f96e83f510704e395ce3a499a790..7062817ea1c69764913fb2d1f9c3bb76a2a4e77d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -955,7 +955,7 @@ if test "x$enable_egl" = xyes; then
     fi
 
     if test "$with_demos" = yes; then
-        PROGRAM_DIRS="$PROGRAM_DIRS egl/opengl"
+        PROGRAM_DIRS="$PROGRAM_DIRS egl/eglut egl/opengl"
     fi
 fi
 AC_SUBST([EGL_LIB_DEPS])
@@ -1185,16 +1185,6 @@ if test "x$enable_gallium" = xyes; then
     AC_CHECK_HEADER([udis86.h], [HAS_UDIS86="yes"],
                 [HAS_UDIS86="no"])
     AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no])
-    if test "x$LLVM_CONFIG" != xno; then
-       LLVM_VERSION=`$LLVM_CONFIG --version`
-       LLVM_CFLAGS=`$LLVM_CONFIG --cflags`
-       LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++"
-
-       if test "x$HAS_UDIS86" != xno; then
-               LLVM_LIBS="$LLVM_LIBS -ludis86"
-       fi
-       LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
-    fi
 fi
 
 AC_SUBST([LLVM_CFLAGS])
@@ -1344,18 +1334,24 @@ AC_ARG_ENABLE([gallium-llvm],
     [enable_gallium_llvm="$enableval"],
     [enable_gallium_llvm=auto])
 if test "x$enable_gallium_llvm" = xyes; then
-       if test "x$LLVM_CONFIG" != xno; then
-               GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
-               DEFINES="$DEFINES -DMESA_LLVM -D__STDC_CONSTANT_MACROS"
-               if test "x$HAS_UDIS86" != xno; then
-                       DEFINES="$DEFINES -DHAVE_UDIS86"
-               fi
-               MESA_LLVM=1
-       else
-               MESA_LLVM=0
+    if test "x$LLVM_CONFIG" != xno; then
+       LLVM_VERSION=`$LLVM_CONFIG --version`
+       LLVM_CFLAGS=`$LLVM_CONFIG --cflags`
+       LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++"
+
+       if test "x$HAS_UDIS86" != xno; then
+           LLVM_LIBS="$LLVM_LIBS -ludis86"
+           DEFINES="$DEFINES -DHAVE_UDIS86"
        fi
-else
+       LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+       GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
+       DEFINES="$DEFINES -DMESA_LLVM -D__STDC_CONSTANT_MACROS"
+       MESA_LLVM=1
+    else
        MESA_LLVM=0
+    fi
+else
+    MESA_LLVM=0
 fi
 
 dnl
@@ -1437,6 +1433,18 @@ if test "x$enable_gallium_nouveau" = xyes; then
     gallium_check_st "nouveau/drm" "dri-nouveau" "egl-nouveau" "xorg-nouveau"
 fi
 
+dnl
+dnl Gallium G3DVL configuration
+dnl
+AC_ARG_ENABLE([gallium-g3dvl],
+    [AS_HELP_STRING([--enable-gallium-g3dvl],
+        [build gallium g3dvl @<:@default=disabled@:>@])],
+    [enable_gallium_g3dvl="$enableval"],
+    [enable_gallium_g3dvl=no])
+if test "x$enable_gallium_g3dvl" = xyes; then
+    GALLIUM_TARGET_DIRS="$GALLIUM_TARGET_DIRS xvmc-softpipe"
+fi
+
 dnl
 dnl Gallium swrast configuration
 dnl
@@ -1503,6 +1511,15 @@ fi
 fi
 echo "        Use XCB:         $enable_xcb"
 
+echo ""
+if test "x$MESA_LLVM" == x1; then
+    echo "        llvm:            yes"
+    echo "        llvm-config:     $LLVM_CONFIG"
+    echo "        llvm-version:    $LLVM_VERSION"
+else
+    echo "        llvm:            no"
+fi
+
 echo ""
 if echo "$SRC_DIRS" | grep 'gallium' >/dev/null 2>&1; then
     echo "        Gallium:         yes"