Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't give an error when OpenGL libraries aren't available; give a warning, put wxUSE_OPENGL=no and proceed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-12-08 19:33:08 +00:00
parent 2f365fcbd5
commit 05867e397e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in 56932 2008-11-23 12:33:32Z VZ .
# From configure.in Id: configure.in 57199 2008-12-08 16:51:43Z FM .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
@@ -33392,9 +33392,10 @@ fi
if test "x$OPENGL_LIBS" = "x"; then
{ { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5
echo "$as_me: error: OpenGL libraries not available" >&2;}
{ (exit 1); exit 1; }; }
{ echo "$as_me:$LINENO: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&5
echo "$as_me: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&2;}
wxUSE_OPENGL=no
USE_OPENGL=0
fi
fi

7
configure.in
View File

@@ -3702,10 +3702,9 @@ if test "$wxUSE_OPENGL" = "yes"; then
[ ])
if test "x$OPENGL_LIBS" = "x"; then
dnl it should be an error and not a warning because OpenGL is not on
dnl by default and so if it had been explicitly requested, we
dnl shouldn't just fall back to compiling the library without it
AC_MSG_ERROR(OpenGL libraries not available)
AC_MSG_WARN([OpenGL libraries not available, disabling support for OpenGL])
wxUSE_OPENGL=no
USE_OPENGL=0
fi
fi