Fix extraction of standard command line arguments in wxX11.

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 2ab3ea808bda3587a5a1bcc7e2b2f92fef074993..642fac260b5470d92268366e5abd5742603ae9b5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
 dnl initialization
 dnl ---------------------------------------------------------------------------
 
 dnl initialization
 dnl ---------------------------------------------------------------------------
 

-AC_INIT([wxWidgets], [2.9.0], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.9.1], [wx-dev@lists.wxwidgets.org])

 
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])
 
 dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
 AC_CONFIG_SRCDIR([wx-config.in])


@@ -43,7 +43,7 @@ dnl wx_release_number += 1
 
 wx_major_version_number=2
 wx_minor_version_number=9
 
 wx_major_version_number=2
 wx_minor_version_number=9

-wx_release_number=0
+wx_release_number=1

 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 wx_subrelease_number=0
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number


@@ -2000,7 +2000,9 @@ SEARCH_INCLUDE="\
     /usr/local/include        \
     /usr/local/X11/include    \
     /usr/local/include/X11    \
     /usr/local/include        \
     /usr/local/X11/include    \
     /usr/local/include/X11    \

+    /usr/local/X11R7/include  \

     /usr/local/X11R6/include  \
     /usr/local/X11R6/include  \

+    /usr/local/include/X11R7  \

     /usr/local/include/X11R6  \
                               \
     /usr/Motif-2.1/include    \
     /usr/local/include/X11R6  \
                               \
     /usr/Motif-2.1/include    \


@@ -2012,9 +2014,11 @@ SEARCH_INCLUDE="\
                               \
     /usr/include/Xm           \
                               \
                               \
     /usr/include/Xm           \
                               \

+    /usr/X11R7/include        \

     /usr/X11R6/include        \
     /usr/X11R6.4/include      \
                               \
     /usr/X11R6/include        \
     /usr/X11R6.4/include      \
                               \

+    /usr/include/X11R7        \

     /usr/include/X11R6        \
                               \
     /usr/X11/include          \
     /usr/include/X11R6        \
                               \
     /usr/X11/include          \


@@ -3671,15 +3675,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)