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

diff --git a/ghc/configure.ac b/ghc/configure.ac
index e87bae7..b6d9a4c 100644
--- a/ghc/configure.ac
+++ b/ghc/configure.ac
@@ -1,80 +1,40 @@
-dnl GHC-only part of fptools configuration
-dnl 
-dnl Copyright (c) 1999 Manuel M. T. Chakravarty <chak@acm.org>
-dnl 
-dnl This file is subject to the same free software license as GHC.
-
-dnl ######################################################################
-dnl Process this file with autoconf to produce a configure script.
-dnl ######################################################################
-
-
-dnl * Initialise and check sanity.
-AC_INIT(ghc.spec.in)
-
-dnl * Compute the version number.
-version=`sed -e 's/.*\([[0-9]]\)\.\([[0-9]]*\).*/\1.\2/' VERSION`
-patchlevel=1
-
-dnl These are needed by the .spec file.
-AC_SUBST(version)
-AC_SUBST(patchlevel)
-
-dnl Uncomment links to unix docs if necessary dnl NOTE: This is a slight
-dnl hack: It needs to be synchronized with fptools/configure.ac and
-dnl fptools/libraries/Makefile and should probably use target features
-dnl instead of host.
-AC_CANONICAL_HOST
-
-case $host in
-i[3456]86-*-mingw32*)
-	unixHTMLStart="<!--"
-	unixHTMLEnd="-->"
-	;;
-*)
-	unixHTMLStart=""
-	unixHTMLEnd=""
-	;;
-esac
-
-AC_SUBST(unixHTMLStart)
-AC_SUBST(unixHTMLEnd)
-
-dnl Uncomment links to ObjectIO docs if necessary
-AC_ARG_ENABLE(objectio,
-[  --enable-objectio
-        Build ObjectIO, a portable GUI library for Haskell.
-],
-[
-ObjectIOHTMLStart=""
-ObjectIOHTMLEnd=""
-],
-[
-ObjectIOHTMLStart="<!--"
-ObjectIOHTMLEnd="-->"
-]
-)
-
-AC_SUBST(ObjectIOHTMLStart)
-AC_SUBST(ObjectIOHTMLEnd)
-
-dnl Uncomment links to HOpenGL docs if necessary
-AC_ARG_ENABLE(hopengl,
-[  --enable-hopengl
-        Build HOpenGL, a Haskell binding for OpenGL/GLUT.
-],
-[
-HOpenGLHTMLStart=""
-HOpenGLHTMLEnd=""
-],
-[
-HOpenGLHTMLStart="<!--"
-HOpenGLHTMLEnd="-->"
-]
-)
-
-AC_SUBST(HOpenGLHTMLStart)
-AC_SUBST(HOpenGLHTMLEnd)
-
-dnl * Write the results...
-AC_OUTPUT(ghc.spec docs/libraries.html)
+# Initialise and check sanity.
+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
+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])
+
+FP_SETUP_PROJECT_INFO
+
+# 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_CONFIG_FILES([ghc.spec VERSION docs/users_guide/ug-book.xml mk/config.mk mk/version.mk])
+AC_OUTPUT