summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-05-21 09:32:38 -0700
committerEric Anholt <eric@anholt.net>2010-05-21 12:20:39 -0700
commit68fc4b415e322f6744299e39864fbc377c6eff74 (patch)
tree4bafffd8b0105174f3c5c0ae327a005be9145990 /configure.ac
parente4f4489e3fc0b36d72821b55794fb843b2b7fa5f (diff)
Remove demos that have moved to git+ssh://git.freedesktop.org/git/mesa/demos.
The remaining programs are ones I've had difficulty finding a build environment for to make the build system or are unit tests that should probably live next to their code instead. Hopefully people can bring over the build for remaining pieces they care about.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac20
1 files changed, 2 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac
index eb3460e9eb6..116620c7c96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -524,12 +524,7 @@ dnl If $with_demos is yes, directories will be added as libs available
PROGRAM_DIRS=""
case "$with_demos" in
no) ;;
-yes)
- # If the driver isn't osmesa, we have libGL and can build xdemos
- if test "$mesa_driver" != osmesa; then
- PROGRAM_DIRS="xdemos"
- fi
- ;;
+yes) ;;
*)
# verify the requested demos directories exist
demos=`IFS=,; echo $with_demos`
@@ -1026,7 +1021,7 @@ if test "x$enable_egl" = xyes; then
fi
if test "$with_demos" = yes; then
- PROGRAM_DIRS="$PROGRAM_DIRS egl/eglut egl/opengl"
+ PROGRAM_DIRS="$PROGRAM_DIRS egl/eglut"
fi
fi
AC_SUBST([EGL_LIB_DEPS])
@@ -1045,12 +1040,6 @@ if test "x$enable_glu" = xyes; then
case "$mesa_driver" in
osmesa)
- # If GLU is available and we have libOSMesa (not 16 or 32),
- # we can build the osdemos
- if test "$with_demos" = yes && test "$osmesa_bits" = 8; then
- PROGRAM_DIRS="$PROGRAM_DIRS osdemos"
- fi
-
# Link libGLU to libOSMesa instead of libGL
GLU_LIB_DEPS=""
GLU_PC_REQ="osmesa"
@@ -1201,11 +1190,6 @@ if test "x$enable_glut" = xyes; then
GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm"
GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm"
- # If glut is available, we can build most programs
- if test "$with_demos" = yes; then
- PROGRAM_DIRS="$PROGRAM_DIRS demos redbook samples glsl"
- fi
-
# If static, empty GLUT_LIB_DEPS and add libs for programs to link
if test "$enable_static" = no; then
GLUT_MESA_DEPS='-l$(GLU_LIB) -l$(GL_LIB)'