--- configure.orig	Sat Oct 23 16:34:58 1999
+++ configure	Sat Oct 23 16:36:53 1999
@@ -1161,8 +1161,8 @@
   fi
 fi
 
-# Extract the first word of "gtk-config", so it can be a program name with args.
-set dummy gtk-config; ac_word=$2
+# Extract the first word of "gtk12-config", so it can be a program name with args.
+set dummy gtk12-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:1168: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GTK_CFLAGS'+set}'`\" = set"; then
@@ -1176,7 +1176,7 @@
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GTK_CFLAGS="`gtk-config --cflags`"
+      ac_cv_prog_GTK_CFLAGS="`gtk12-config --cflags`"
       break
     fi
   done
@@ -1190,8 +1190,8 @@
   echo "$ac_t""no" 1>&6
 fi
 
-# Extract the first word of "gtk-config", so it can be a program name with args.
-set dummy gtk-config; ac_word=$2
+# Extract the first word of "gtk12-config", so it can be a program name with args.
+set dummy gtk12-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:1197: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_GTK_LIBS'+set}'`\" = set"; then
@@ -1205,7 +1205,7 @@
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_GTK_LIBS="`gtk-config --libs`"
+      ac_cv_prog_GTK_LIBS="`gtk12-config --libs`"
       break
     fi
   done
@@ -1306,14 +1306,14 @@
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for main in -lgdk""... $ac_c" 1>&6
-echo "configure:1311: checking for main in -lgdk" >&5
+echo $ac_n "checking for main in -lgdk12""... $ac_c" 1>&6
+echo "configure:1311: checking for main in -lgdk12" >&5
 ac_lib_var=`echo gdk'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lgdk  $LIBS"
+LIBS="-lgdk12  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1319 "configure"
 #include "confdefs.h"
@@ -1343,20 +1343,20 @@
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-lgdk $LIBS"
+  LIBS="-lgdk12 $LIBS"
 
 else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for main in -lglib""... $ac_c" 1>&6
-echo "configure:1354: checking for main in -lglib" >&5
+echo $ac_n "checking for main in -lglib12""... $ac_c" 1>&6
+echo "configure:1354: checking for main in -lglib12" >&5
 ac_lib_var=`echo glib'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lglib  $LIBS"
+LIBS="-lglib12  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1362 "configure"
 #include "confdefs.h"
@@ -1386,20 +1386,20 @@
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-lglib $LIBS"
+  LIBS="-lglib12 $LIBS"
 
 else
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for main in -lgtk""... $ac_c" 1>&6
-echo "configure:1397: checking for main in -lgtk" >&5
+echo $ac_n "checking for main in -lgtk12""... $ac_c" 1>&6
+echo "configure:1397: checking for main in -lgtk12" >&5
 ac_lib_var=`echo gtk'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lgtk  $LIBS"
+LIBS="-lgtk12  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1405 "configure"
 #include "confdefs.h"
@@ -1429,7 +1429,7 @@
 #define $ac_tr_lib 1
 EOF
 
-  LIBS="-lgtk $LIBS"
+  LIBS="-lgtk12 $LIBS"
 
 else
   echo "$ac_t""no" 1>&6
