From 05867e397e9dd51134c9db6be534467bb0cdfc9b Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Mon, 8 Dec 2008 19:33:08 +0000 Subject: [PATCH] don't give an error when OpenGL libraries aren't available; give a warning, put wxUSE_OPENGL=no and proceed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 9 +++++---- configure.in | 7 +++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure b/configure index e1d0017b17..234598f7b6 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.in b/configure.in index 8e47679a4b..df0e3ee75d 100644 --- a/configure.in +++ b/configure.in @@ -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 -- 2.45.2