don't give an error when OpenGL libraries aren't available; give a warning, put wxUSE...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index e1d0017b17c9f1793621147431a86c311d0fcb44..234598f7b63da8a9aafbc5f12b3c74940f50e7a1 100755 (executable)
--- 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 8e47679a4b65ebfa339a75f61ca3fec032d2c2e1..df0e3ee75d4b396cdb00239d762d70d2f0f9e5c6 100644 (file)
--- 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