configure: Make sure opengl is not built with --without-opengl is specified.

This commit is contained in:
Alexandre Julliard 2008-09-24 13:11:11 +02:00
parent 254349fb4d
commit 8e9504da5c
2 changed files with 10 additions and 6 deletions

8
configure vendored
View File

@ -11387,6 +11387,11 @@ fi
else
opengl_msg="OpenGL development headers not found."
fi
test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no}
test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no}
else
enable_opengl32=${enable_opengl32:-no}
enable_glu32=${enable_glu32:-no}
fi
if test -n "$opengl_msg"; then
case "x$with_opengl" in
@ -11404,9 +11409,6 @@ esac
fi
test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no}
test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no}
NASLIBS=""

View File

@ -790,13 +790,15 @@ This probably prevents linking to OpenGL. Try deleting the file and restarting c
else
opengl_msg="OpenGL development headers not found."
fi
test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no}
test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no}
else
enable_opengl32=${enable_opengl32:-no}
enable_glu32=${enable_glu32:-no}
fi
WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg
OpenGL and Direct3D won't be supported.])
test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no}
test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no}
dnl **** Check for NAS ****
AC_SUBST(NASLIBS,"")
AC_CHECK_HEADERS(audio/audiolib.h,