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

diff --git a/ghc/configure.ac b/ghc/configure.ac
index 2d9e602..b6d9a4c 100644
--- a/ghc/configure.ac
+++ b/ghc/configure.ac
@@ -1,15 +1,40 @@
 # Initialise and check sanity.
-AC_INIT([ghc.spec.in])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.5], [glasgow-haskell-bugs@haskell.org], [ghc])
+AC_CONFIG_SRCDIR([ghc.spec.in])
 
-# Compute the version number.
-version=`sed -e 's/.*\([[0-9]]\)\.\([[0-9]]*\).*/\1.\2/' VERSION`
+# duplicate from ../configure.ac
+AC_ARG_WITH([ghc],
+[AC_HELP_STRING([--with-ghc=ARG],
+  [Use ARG as the path to GHC  [default=autodetect]])],
+  [WithGhc="$withval"],
+  [if test "$GHC" = ""; then
+    AC_PATH_PROG([GHC], [ghc])
+  fi
+  WithGhc="$GHC"])
+AC_SUBST([WithGhc])
 
-# ToDo: CVS snapshots should probably use the date here
-release=1
+FP_SETUP_PROJECT_INFO
 
-# These are needed by the .spec file.
-AC_SUBST([version])
-AC_SUBST([release])
+# Hmmm, we fix the RPM release number to 1 here... Is this convenient?
+AC_SUBST([release], [1])
+
+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_OUTPUT([ghc.spec])
+AC_CONFIG_FILES([ghc.spec VERSION docs/users_guide/ug-book.xml mk/config.mk mk/version.mk])
+AC_OUTPUT