New --with-gtk=VERSION syntax, and restore --disable-gtk2 for backward compatibility

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

diff --git a/configure b/configure
index 8d98e02cf56c5d11ebf99da8da4a04a4237f30bb..161937af43041a8b153a03a2b144ea3f05afcfea 100755 (executable)
--- a/configure
+++ b/configure
@@ -872,6 +872,7 @@ Optional Features:
   --enable-plugins        build parts of wxWidgets as loadable components
   --enable-universal      use wxWidgets GUI controls instead of native ones
   --enable-nanox          use NanoX
   --enable-plugins        build parts of wxWidgets as loadable components
   --enable-universal      use wxWidgets GUI controls instead of native ones
   --enable-nanox          use NanoX

+  --disable-gtk2          use GTK+ 1.2 instead of 2.0

   --enable-gpe            use GNOME PDA Environment features if possible
   --enable-shared         create shared library code
   --enable-optimise       create optimised code
   --enable-gpe            use GNOME PDA Environment features if possible
   --enable-shared         create shared library code
   --enable-optimise       create optimised code


@@ -1052,9 +1053,7 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)

-  --with-gtk              use GTK+ (currently uses 2.0)
-  --with-gtk1             use GTK+ 1.2
-  --with-gtk2             use GTK+ 2.0
+  --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"

   --with-motif            use Motif/Lesstif
   --with-mac              use Mac OS X
   --with-cocoa            use Cocoa
   --with-motif            use Motif/Lesstif
   --with-mac              use Mac OS X
   --with-cocoa            use Cocoa


@@ -2223,9 +2222,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
   DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no

-
-  DEFAULT_wxUSE_GTK1=no
-  DEFAULT_wxUSE_GTK2=no

 else
   DEFAULT_wxUSE_UNIVERSAL=no
   DEFAULT_wxUSE_STL=no
 else
   DEFAULT_wxUSE_UNIVERSAL=no
   DEFAULT_wxUSE_STL=no


@@ -2424,18 +2420,23 @@ else
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 

-    DEFAULT_wxUSE_GTK1=no
-  DEFAULT_wxUSE_GTK2=no
+    DEFAULT_wxUSE_GTK2=yes

 fi
 
 
 
 fi
 
 
 

+

 for toolkit in `echo $ALL_TOOLKITS`; do
   LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
   if test "x$LINE" != "x" ; then
     has_toolkit_in_cache=1
     eval "DEFAULT_$LINE"
     eval "CACHE_$toolkit=1"
 for toolkit in `echo $ALL_TOOLKITS`; do
   LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
   if test "x$LINE" != "x" ; then
     has_toolkit_in_cache=1
     eval "DEFAULT_$LINE"
     eval "CACHE_$toolkit=1"

+
+    LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
+    if test "x$LINE" != "x" ; then
+        eval "DEFAULT_$LINE"
+    fi

   fi
 done
 
   fi
 done
 


@@ -2614,88 +2615,6 @@ if test "${with_gtk+set}" = set; then
   wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1
 fi;
 
   wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1
 fi;
 

-          echo "$as_me:$LINENO: checking for --with-gtk1" >&5
-echo $ECHO_N "checking for --with-gtk1... $ECHO_C" >&6
-          no_cache=0
-
-# Check whether --with-gtk1 or --without-gtk1 was given.
-if test "${with_gtk1+set}" = set; then
-  withval="$with_gtk1"
-
-                        if test "$withval" = yes; then
-                          ac_cv_use_gtk1='wxUSE_GTK1=yes'
-                        else
-                          ac_cv_use_gtk1='wxUSE_GTK1=no'
-                        fi
-
-else
-
-                        LINE=`grep "wxUSE_GTK1" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        ac_cv_use_gtk1='wxUSE_GTK1='$DEFAULT_wxUSE_GTK1
-
-fi;
-
-          eval "$ac_cv_use_gtk1"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_gtk1 >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_GTK1" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-
-          echo "$as_me:$LINENO: checking for --with-gtk2" >&5
-echo $ECHO_N "checking for --with-gtk2... $ECHO_C" >&6
-          no_cache=0
-
-# Check whether --with-gtk2 or --without-gtk2 was given.
-if test "${with_gtk2+set}" = set; then
-  withval="$with_gtk2"
-
-                        if test "$withval" = yes; then
-                          ac_cv_use_gtk2='wxUSE_GTK2=yes'
-                        else
-                          ac_cv_use_gtk2='wxUSE_GTK2=no'
-                        fi
-
-else
-
-                        LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}`
-                        if test "x$LINE" != x ; then
-                          eval "DEFAULT_$LINE"
-                        else
-                          no_cache=1
-                        fi
-
-                        ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2
-
-fi;
-
-          eval "$ac_cv_use_gtk2"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_gtk2 >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_GTK2" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-

 # Check whether --with-motif or --without-motif was given.
 if test "${with_motif+set}" = set; then
   withval="$with_motif"
 # Check whether --with-motif or --without-motif was given.
 if test "${with_motif+set}" = set; then
   withval="$with_motif"


@@ -2791,6 +2710,11 @@ echo "${ECHO_T}no" >&6
           fi
 
 
           fi
 
 

+# Check whether --enable-gtk2 or --disable-gtk2 was given.
+if test "${enable_gtk2+set}" = set; then
+  enableval="$enable_gtk2"
+  wxUSE_GTK2="$enableval"
+fi;

 
          enablestring=
           echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5
 
          enablestring=
           echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5


@@ -10530,10 +10454,6 @@ if test "$wxUSE_WINE" = "yes"; then
     wxUSE_SHARED=no
 fi
 
     wxUSE_SHARED=no
 fi
 

-if test "$wxUSE_GTK1" = "yes" -o "$wxUSE_GTK2" = "yes"; then
-    wxUSE_GTK=yes
-    TOOLKIT_GIVEN=1
-fi

 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
 


@@ -10547,7 +10467,15 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
             for toolkit in `echo $ALL_TOOLKITS`; do
         var=wxUSE_$toolkit
         eval "value=\$${var}"
             for toolkit in `echo $ALL_TOOLKITS`; do
         var=wxUSE_$toolkit
         eval "value=\$${var}"

-        eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
+        if test "x$value" = "xno"; then
+          eval "$var=0"
+        elif test "x$value" != "x"; then
+          eval "$var=1"
+        fi
+
+        if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
+          eval "wx${toolkit}_VERSION=$value"
+        fi

       done
     else
             for toolkit in `echo $ALL_TOOLKITS`; do
       done
     else
             for toolkit in `echo $ALL_TOOLKITS`; do


@@ -10555,6 +10483,11 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
           var=DEFAULT_DEFAULT_wxUSE_$toolkit
         else
           var=DEFAULT_wxUSE_$toolkit
           var=DEFAULT_DEFAULT_wxUSE_$toolkit
         else
           var=DEFAULT_wxUSE_$toolkit

+
+          eval "version=\$DEFAULT_wx${toolkit}_VERSION"
+          if test "x$version" != "x"; then
+            eval "wx${toolkit}_VERSION=$version"
+          fi

         fi
         eval "wxUSE_$toolkit=\$${var}"
       done
         fi
         eval "wxUSE_$toolkit=\$${var}"
       done


@@ -10583,6 +10516,13 @@ echo "$as_me: error: Please specify at most one toolkit (maybe some are cached i
    { (exit 1); exit 1; }; }
     esac
 
    { (exit 1); exit 1; }; }
     esac
 

+    # to be removed when --disable-gtk2 isn't needed
+    if test "x$wxUSE_GTK2" = "xyes"; then
+        wxGTK_VERSION=2
+    elif test "x$wxUSE_GTK2" = "xno"; then
+        wxGTK_VERSION=1
+    fi
+

         for toolkit in `echo $ALL_TOOLKITS`; do
       var=wxUSE_$toolkit
       eval "value=\$${var}"
         for toolkit in `echo $ALL_TOOLKITS`; do
       var=wxUSE_$toolkit
       eval "value=\$${var}"


@@ -10591,6 +10531,10 @@ echo "$as_me: error: Please specify at most one toolkit (maybe some are cached i
         eval "cache=\$${cache_var}"
         if test "$cache" = 1; then
           echo "$var=$value" >> ${wx_arg_cache_file}
         eval "cache=\$${cache_var}"
         if test "$cache" = 1; then
           echo "$var=$value" >> ${wx_arg_cache_file}

+          eval "version=\$wx${toolkit}_VERSION"
+          if test "x$version" != "x"; then
+            echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
+          fi

         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`
         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`


@@ -24332,12 +24276,8 @@ echo "${ECHO_T}" >&6
                     GTK_MODULES=gthread
                 fi
 
                     GTK_MODULES=gthread
                 fi
 

-                                if test "x$wxUSE_GTK1" != "xyes" -a "x$wxUSE_GTK2" != "xyes"; then
-                    wxUSE_GTK2=yes
-                fi
-

                                 wx_cv_lib_gtk=
                                 wx_cv_lib_gtk=

-                if test "x$wxUSE_GTK2" = "xyes"; then
+                if test "x$wxGTK_VERSION" != "x1"; then

                     # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"
                     # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
   enableval="$enable_gtktest"


@@ -24642,7 +24582,8 @@ rm -f conftest.err conftest.$ac_objext \
 
                 fi
 
 
                 fi
 

-                                if test -z "$wx_cv_lib_gtk" -a "x$wxUSE_GTK1" = "xyes"; then
+                                if test -z "$wx_cv_lib_gtk"; then
+                    if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then

 
 # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
 
 # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then


@@ -24957,7 +24898,7 @@ rm -f conftest.err conftest.$ac_objext \
   rm -f conf.gtktest
 
 
   rm -f conf.gtktest
 
 

-                    if test -z "$wx_cv_lib_gtk"; then
+                        if test -z "$wx_cv_lib_gtk"; then

 
 # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
 
 # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then


@@ -25271,6 +25212,7 @@ rm -f conftest.err conftest.$ac_objext \
 
   rm -f conf.gtktest
 
 
   rm -f conf.gtktest
 

+                        fi

                     fi
                 fi
 
                     fi
                 fi
 

diff --git a/configure.in b/configure.in
index 1e23f1919471c3ec18c9a2076eb2acb58b88f949..93133cdf154fcc01d7566497441f7cc7eaf0a6e4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -567,9 +567,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
   DEFAULT_wxUSE_MONOLITHIC=no
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no

-
-  DEFAULT_wxUSE_GTK1=no
-  DEFAULT_wxUSE_GTK2=no

 else
   DEFAULT_wxUSE_UNIVERSAL=no
   DEFAULT_wxUSE_STL=no
 else
   DEFAULT_wxUSE_UNIVERSAL=no
   DEFAULT_wxUSE_STL=no


@@ -768,11 +765,11 @@ else
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
   DEFAULT_wxUSE_PLUGINS=no
   DEFAULT_wxUSE_OFFICIAL_BUILD=no
 

-  dnl Implies --with-gtk. Should be no here, the default is set to yes below
-  DEFAULT_wxUSE_GTK1=no
-  DEFAULT_wxUSE_GTK2=no
+  dnl Appliable only when --with-gtk was used:
+  DEFAULT_wxUSE_GTK2=yes

 fi
 
 fi
 

+

 dnl WX_ARG_WITH should be used to select whether an external package will be
 dnl used or not, to configure compile-time features of this package itself,
 dnl use WX_ARG_ENABLE instead
 dnl WX_ARG_WITH should be used to select whether an external package will be
 dnl used or not, to configure compile-time features of this package itself,
 dnl use WX_ARG_ENABLE instead


@@ -789,6 +786,11 @@ for toolkit in `echo $ALL_TOOLKITS`; do
     has_toolkit_in_cache=1
     eval "DEFAULT_$LINE"
     eval "CACHE_$toolkit=1"
     has_toolkit_in_cache=1
     eval "DEFAULT_$LINE"
     eval "CACHE_$toolkit=1"

+    
+    LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
+    if test "x$LINE" != "x" ; then
+        eval "DEFAULT_$LINE"
+    fi

   fi
 done
 
   fi
 done
 


@@ -807,9 +809,7 @@ WX_ARG_ENABLE(plugins,     [  --enable-plugins        build parts of wxWidgets a
 if test "$wxUSE_GUI" = "yes"; then
 
 WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)
 if test "$wxUSE_GUI" = "yes"; then
 
 WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)

-AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+ (currently uses 2.0)], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
-WX_ARG_WITH(gtk1,          [  --with-gtk1             use GTK+ 1.2], wxUSE_GTK1)
-WX_ARG_WITH(gtk2,          [  --with-gtk2             use GTK+ 2.0], wxUSE_GTK2)
+AC_ARG_WITH(gtk,          [[  --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])

 AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(cocoa,         [  --with-cocoa            use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1])
 AC_ARG_WITH(cocoa,         [  --with-cocoa            use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1])


@@ -821,6 +821,7 @@ AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
 WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
 
 AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
 WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
 

+AC_ARG_ENABLE(gtk2,        [  --disable-gtk2          use GTK+ 1.2 instead of 2.0], [wxUSE_GTK2="$enableval"])

 WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
 
 WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
 WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
 
 WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)


@@ -1218,11 +1219,6 @@ if test "$wxUSE_WINE" = "yes"; then
     wxUSE_SHARED=no
 fi
 
     wxUSE_SHARED=no
 fi
 

-dnl --with-gtk1 or --with-gtk2 imply --with-gtk
-if test "$wxUSE_GTK1" = "yes" -o "$wxUSE_GTK2" = "yes"; then
-    wxUSE_GTK=yes
-    TOOLKIT_GIVEN=1
-fi

 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
 


@@ -1231,11 +1227,19 @@ if test "$wxUSE_GUI" = "yes"; then
     fi
 
     if test "$TOOLKIT_GIVEN" = 1; then
     fi
 
     if test "$TOOLKIT_GIVEN" = 1; then

-      dnl convert "yes" to 1 and "no" to 0
+      dnl convert "yes", "any" or a number to 1 and "no" to 0

       for toolkit in `echo $ALL_TOOLKITS`; do
         var=wxUSE_$toolkit
         eval "value=\$${var}"
       for toolkit in `echo $ALL_TOOLKITS`; do
         var=wxUSE_$toolkit
         eval "value=\$${var}"

-        eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
+        if test "x$value" = "xno"; then
+          eval "$var=0"
+        elif test "x$value" != "x"; then
+          eval "$var=1"
+        fi
+
+        if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
+          eval "wx${toolkit}_VERSION=$value"
+        fi

       done
     else
       dnl try to guess the most apropriate toolkit for this platform
       done
     else
       dnl try to guess the most apropriate toolkit for this platform


@@ -1244,6 +1248,11 @@ if test "$wxUSE_GUI" = "yes"; then
           var=DEFAULT_DEFAULT_wxUSE_$toolkit
         else
           var=DEFAULT_wxUSE_$toolkit
           var=DEFAULT_DEFAULT_wxUSE_$toolkit
         else
           var=DEFAULT_wxUSE_$toolkit

+
+          eval "version=\$DEFAULT_wx${toolkit}_VERSION"
+          if test "x$version" != "x"; then
+            eval "wx${toolkit}_VERSION=$version"
+          fi

         fi
         eval "wxUSE_$toolkit=\$${var}"
       done
         fi
         eval "wxUSE_$toolkit=\$${var}"
       done


@@ -1271,6 +1280,13 @@ if test "$wxUSE_GUI" = "yes"; then
         AC_MSG_ERROR(Please specify at most one toolkit (maybe some are cached in configarg.cache?))
     esac
 
         AC_MSG_ERROR(Please specify at most one toolkit (maybe some are cached in configarg.cache?))
     esac
 

+    # to be removed when --disable-gtk2 isn't needed
+    if test "x$wxUSE_GTK2" = "xyes"; then
+        wxGTK_VERSION=2
+    elif test "x$wxUSE_GTK2" = "xno"; then
+        wxGTK_VERSION=1
+    fi
+

     dnl cache the wxUSE_<TOOLKIT> values too
     for toolkit in `echo $ALL_TOOLKITS`; do
       var=wxUSE_$toolkit
     dnl cache the wxUSE_<TOOLKIT> values too
     for toolkit in `echo $ALL_TOOLKITS`; do
       var=wxUSE_$toolkit


@@ -1280,6 +1296,10 @@ if test "$wxUSE_GUI" = "yes"; then
         eval "cache=\$${cache_var}"
         if test "$cache" = 1; then
           echo "$var=$value" >> ${wx_arg_cache_file}
         eval "cache=\$${cache_var}"
         if test "$cache" = 1; then
           echo "$var=$value" >> ${wx_arg_cache_file}

+          eval "version=\$wx${toolkit}_VERSION"
+          if test "x$version" != "x"; then
+            echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
+          fi

         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`
         fi
         if test "$value" = 1; then
           toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`


@@ -2591,23 +2611,20 @@ if test "$wxUSE_GUI" = "yes"; then
                     GTK_MODULES=gthread
                 fi
 
                     GTK_MODULES=gthread
                 fi
 

-                dnl GTK+2 is currently the default
-                if test "x$wxUSE_GTK1" != "xyes" -a "x$wxUSE_GTK2" != "xyes"; then
-                    wxUSE_GTK2=yes
-                fi
-
-                dnl test for GTK2
+                dnl detect GTK2

                 wx_cv_lib_gtk=
                 wx_cv_lib_gtk=

-                if test "x$wxUSE_GTK2" = "xyes"; then
+                if test "x$wxGTK_VERSION" != "x1"; then

                     AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
                 fi
 
                     AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
                 fi
 

-                dnl test for GTK1.x
-                if test -z "$wx_cv_lib_gtk" -a "x$wxUSE_GTK1" = "xyes"; then
-                    AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
+                dnl detect GTK1.x
+                if test -z "$wx_cv_lib_gtk"; then
+                    if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then
+                        AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)

 
 

-                    if test -z "$wx_cv_lib_gtk"; then
-                        AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
+                        if test -z "$wx_cv_lib_gtk"; then
+                            AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
+                        fi

                     fi
                 fi
 
                     fi
                 fi