don't fall back to GTK 1.x if --with-gtk2 was specified; don't try to build in Unicode when using GTK 1.x

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

configure.in

@@ -1976,18 +1976,18 @@ if test "$wxUSE_GUI" = "yes"; then
                     GTK_MODULES=gthread
                 fi
 
+                dnl note that if we fail to find GTK2 we abort and don't fall
+                dnl back to GTK1.x
                 wx_cv_lib_gtk=
                 if test "x$wxUSE_GTK2" = "xyes"; then
                     AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
-                fi
-
-                if test -z "$wx_cv_lib_gtk"; then
+                else
                     AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
-                fi
 
                     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
 
                 if test -z "$wx_cv_lib_gtk"; then
                     dnl looks better in AC_MSG_RESULT
@@ -2037,6 +2037,11 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                     ]
                 )
             fi
+        else
+            if test "$wxUSE_UNICODE" = "yes"; then
+                AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x])
+                wxUSE_UNICODE=no
+            fi
         fi
 
         dnl we need poll() in src/gtk/app.cpp (we know that Darwin doesn't