-# Look for both GTK 1 and GTK 2.
-AM_PATH_GTK([1.2.0], [gtk=1], [gtk=none])
-AM_PATH_GTK_2_0([2.0.0], [gtk=2], [])
-if test "$gtk" = "none"; then
- all_targets="all-cli"
-else
- all_targets="all-cli all-gtk"
-fi
+# Look for both GTK 2 and GTK 1, in descending order of preference. If
+# we can't find either, have the makefile only build the CLI programs.
+
+gtk=none
+
+case "$gtk_version_desired:$gtk" in
+ 2:none | any:none)
+ ifdef([AM_PATH_GTK_2_0],[
+ AM_PATH_GTK_2_0([2.0.0], [gtk=2], [])
+ ],[AC_WARNING([generating configure script without GTK 2 autodetection])])
+ ;;
+esac
+
+case "$gtk_version_desired:$gtk" in
+ 1:none | any:none)
+ ifdef([AM_PATH_GTK],[
+ AM_PATH_GTK([1.2.0], [gtk=1], [])
+ ],[
+ # manual check for gtk1
+ AC_PATH_PROG(GTK1_CONFIG, gtk-config, absent)
+ if test "$GTK1_CONFIG" != "absent"; then
+ GTK_CFLAGS=`"$GTK1_CONFIG" --cflags`
+ GTK_LIBS=`"$GTK1_CONFIG" --libs`
+ gtk=1
+ fi
+ ])
+ ;;
+esac
+
+AM_CONDITIONAL(HAVE_GTK, [test "$gtk" != "none"])
+