X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fconfigure.ac;h=b6d9a4cb842a962e2fcceaf6426fc802c35ce37f;hb=76dc4dfd2645e9bc44098a8be2b980726605a763;hp=a557a10a3ad79ea5df2214cd37cf865b7558cb75;hpb=c592dcee53b75889285d495683c572f414f9b300;p=ghc-hetmet.git

diff --git a/ghc/configure.ac b/ghc/configure.ac
index a557a10..b6d9a4c 100644
--- a/ghc/configure.ac
+++ b/ghc/configure.ac
@@ -24,13 +24,14 @@ FP_GCC_NEEDS_NO_OMIT_LFPTR
 FP_GHC_HAS_READLINE
 
 # test for GTK+
-AC_PATH_PROGS([GTK_CONFIG], [gtk-config gtk12-config])
+AC_PATH_PROGS([GTK_CONFIG], [pkg-config])
 if test -n "$GTK_CONFIG"; then
-  AC_CACHE_CHECK([for version of GTK+], [fp_cv_gtk_version],
-    [fp_cv_gtk_version=`$GTK_CONFIG --version`])
-  FP_COMPARE_VERSIONS([$fp_cv_gtk_version], [-lt], [1.2],
-    [AC_MSG_WARN([GTK+ not usable, need at least version 1.2])
-     GTK_CONFIG=])
+  if $GTK_CONFIG gtk+-2.0 --atleast-version=2.0; then
+    GTK_CONFIG="$GTK_CONFIG gtk+-2.0"
+  else
+    AC_MSG_WARN([GTK+ not usable, need at least version 2.0])
+    GTK_CONFIG=
+  fi
 fi
 AC_SUBST([GTK_CONFIG])