Index: configure.in
===================================================================
RCS file: /cvsroot/crossfire/client/configure.in,v
retrieving revision 1.55
diff -u -r1.55 configure.in
--- configure.in	6 Sep 2005 06:46:16 -0000	1.55
+++ configure.in	31 Oct 2005 12:17:38 -0000
@@ -92,6 +92,9 @@
 AC_ARG_ENABLE(gtk, [  --disable-gtk           make x11 client [default=make gtk client if available]],
 		gtk=$enableval, gtk=yes )
 
+AC_ARG_ENABLE(cfgtk2, [  --enable-cfgtk2         build the gtkv1 client with gtk2],
+		cfgtk2=$enableval, cfgtk2=no)
+
 AC_ARG_ENABLE(sdl, [  --disable-sdl              Disable linking with the SDL library, default is to use it if available ],
                 use_sdl=$enableval, use_sdl=yes)
 
@@ -143,11 +146,19 @@
 dnl Simple hack - if we want standard x11 client, don't check for the gtk
 dnl libraries.  Then we fall through below
 
-if eval "test x$gtk = xyes"; then
-AM_PATH_GTK(1.0.0,CFGTK="yes",CFGTK="no")
+if eval "test x$cfgtk2 = xyes" ; then
+	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.0) 
+	GTK_CFLAGS="`$PKG_CONFIG --cflags gtk+-2.0` -DCFGTK2 -DGTK_ENABLE_BROKEN -DGTK_WINDOW_DIALOG=GTK_WINDOW_TOPLEVEL"
+	GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0`
+	CF_SUBDIRS="$CF_SUBDIRS gtk"
+	CFGTK="no"
+	AC_MSG_RESULT(Building original gtk client with gtk 2.0.0)
+else
+	if eval "test x$gtk = xyes"; then
+		AM_PATH_GTK(1.0.0,CFGTK="yes",CFGTK="no")
+	fi
 fi
 
-
 AC_SUBST(CFGTK)
 
 if eval "test x$CFGTK = xyes"; then
Index: gtk/gx11.c
===================================================================
RCS file: /cvsroot/crossfire/client/gtk/gx11.c,v
retrieving revision 1.79
diff -u -r1.79 gx11.c
--- gtk/gx11.c	29 Oct 2005 18:44:51 -0000	1.79
+++ gtk/gx11.c	31 Oct 2005 12:17:42 -0000
@@ -2693,7 +2694,7 @@
   GdkBitmap *buggdkmask;
 
   GtkStyle *style;
-#ifndef WIN32
+#ifndef CFGTK2
   GdkFont* font;
 #endif
   if(!gtkwin_bug) {
@@ -2737,7 +2738,7 @@
     gtk_widget_show (hbox);
     hbox = gtk_hbox_new(FALSE, 2);
     createBugTracker();
-#ifndef WIN32
+#ifndef CFGTK2
     /* Win32 uses GTK2, this apparently doesn't work... */
     font = gdk_font_load ("-*-fixed-*-*-*-*-12-*-*-*-*-*-*-*");
     if (font){
@@ -3733,7 +3734,7 @@
     gtkwin_root = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     style = gtk_rc_get_style(gtkwin_root);
     if (style) {
-#ifdef WIN32 /* GTK 2.2 stuff */
+#ifdef CFGTK2 /* GTK 2.2 stuff */
 	gcw = gdk_char_width(gdk_font_from_description(style->font_desc), '0') + 4;
 	gch = gdk_char_height(gdk_font_from_description(style->font_desc), '0') + 2;
 #else
Index: gtk/keys.c
===================================================================
RCS file: /cvsroot/crossfire/client/gtk/keys.c,v
retrieving revision 1.19
diff -u -r1.19 keys.c
--- gtk/keys.c	30 Jul 2005 19:31:44 -0000	1.19
+++ gtk/keys.c	31 Oct 2005 12:17:42 -0000
@@ -473,7 +473,7 @@
 	    cpl.input_state = Command_Mode;
    	    gtk_entry_set_text(GTK_ENTRY(entrytext),cpl.input_text);
 	    gtk_widget_grab_focus (GTK_WIDGET(entrytext));
-#ifdef WIN32
+#ifdef CFGTK2
         gtk_editable_select_region(GTK_EDITABLE(entrytext),strlen(cpl.input_text),-1);
 #endif
 	    return;
@@ -1012,7 +1012,7 @@
 	if (event->keyval == completekeysym) gtk_complete_command();
 	if (event->keyval == prevkeysym || event->keyval == nextkeysym) 
 	    gtk_command_history(event->keyval==nextkeysym?0:1);
-#ifdef WIN32
+#ifdef CFGTK2
     else
         gtk_widget_event(GTK_WIDGET(entrytext), (GdkEvent*)event);
 #endif