X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fconfigure.ac;h=b6d9a4cb842a962e2fcceaf6426fc802c35ce37f;hp=cc5eaa13ae591aec55f6767a41f94740ce7d89b2;hb=693342ffbb61e1da4c009059755fa0b9b1396bb8;hpb=06e697689c0cda8ef2ef7ec3c3c5818fbe528ec7

diff --git a/ghc/configure.ac b/ghc/configure.ac
index cc5eaa1..b6d9a4c 100644
--- a/ghc/configure.ac
+++ b/ghc/configure.ac
@@ -1,5 +1,5 @@
 # Initialise and check sanity.
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.3], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.5], [glasgow-haskell-bugs@haskell.org], [ghc])
 AC_CONFIG_SRCDIR([ghc.spec.in])
 
 # duplicate from ../configure.ac
@@ -23,6 +23,18 @@ FP_GCC_NEEDS_NO_OMIT_LFPTR
 # Check whether this GHC has readline installed
 FP_GHC_HAS_READLINE
 
+# test for GTK+
+AC_PATH_PROGS([GTK_CONFIG], [pkg-config])
+if test -n "$GTK_CONFIG"; then
+  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])
+
 # Write the results...
 AC_CONFIG_FILES([ghc.spec VERSION docs/users_guide/ug-book.xml mk/config.mk mk/version.mk])
 AC_OUTPUT