fixed handling of --with-opengl=auto (default value) for Mac/MSW (it behaved as ...

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

diff --git a/configure b/configure
index 59c6e2140ea9d2eb2914a351e481723bb8b27c30..96c3d829e6ef4228c17d07179de2d8086179516e 100755 (executable)
--- a/configure
+++ b/configure
@@ -33400,8 +33400,6 @@ echo "$as_me: WARNING: OpenGL libraries not available, disabling support for Ope
                 wxUSE_OPENGL=no
                 USE_OPENGL=0
             fi
                 wxUSE_OPENGL=no
                 USE_OPENGL=0
             fi

-        else
-                        wxUSE_OPENGL=yes

         fi
     else
         { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
         fi
     else
         { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5


@@ -33409,6 +33407,10 @@ echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be
         wxUSE_OPENGL="no"
     fi
 
         wxUSE_OPENGL="no"
     fi
 

+    if test "$wxUSE_OPENGL" = "auto"; then
+                                wxUSE_OPENGL=yes
+    fi
+

     if test "$wxUSE_OPENGL" = "yes"; then
         USE_OPENGL=1
         cat >>confdefs.h <<\_ACEOF
     if test "$wxUSE_OPENGL" = "yes"; then
         USE_OPENGL=1
         cat >>confdefs.h <<\_ACEOF

diff --git a/configure.in b/configure.in
index 2ab3ea808bda3587a5a1bcc7e2b2f92fef074993..3a484b0cca58c78fed4754b8d5d730799dd1e21f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3671,15 +3671,19 @@ if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
                 wxUSE_OPENGL=no
                 USE_OPENGL=0
             fi
                 wxUSE_OPENGL=no
                 USE_OPENGL=0
             fi

-        else
-            dnl libraries are available... change 'auto' in 'yes'
-            wxUSE_OPENGL=yes

         fi
     else
         AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
         wxUSE_OPENGL="no"
     fi
 
         fi
     else
         AC_MSG_WARN([wxGLCanvas not implemented for this port, library will be compiled without it.])
         wxUSE_OPENGL="no"
     fi
 

+    if test "$wxUSE_OPENGL" = "auto"; then
+        dnl if the OpenGL libraries were unavailable, this would have been
+        dnl changed to "no" above, if it wasn't, change it to "yes" as we've
+        dnl verified that we can indeed use OpenGL
+        wxUSE_OPENGL=yes
+    fi
+

     if test "$wxUSE_OPENGL" = "yes"; then
         USE_OPENGL=1
         AC_DEFINE(wxUSE_OPENGL)
     if test "$wxUSE_OPENGL" = "yes"; then
         USE_OPENGL=1
         AC_DEFINE(wxUSE_OPENGL)