X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fconfigure.ac;h=ea1353ef7ffda04ae055bb335e3607079d6d95aa;hb=b734be7a047ce659cf3bc341bcdbf084bc51a3c7;hp=338678c8092ee34c134db718da091c3213cb9214;hpb=20923f9446fd4b055fcaae5e78430ca9380c6a8f;p=ghc-hetmet.git

diff --git a/ghc/configure.ac b/ghc/configure.ac
index 338678c..ea1353e 100644
--- a/ghc/configure.ac
+++ b/ghc/configure.ac
@@ -1,37 +1,18 @@
 # Initialise and check sanity.
-AC_INIT(ghc.spec.in)
+AC_INIT([Glasgow Haskell Compiler], [6.3], [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`
-patchlevel=1
-
-# These are needed by the .spec file.
-AC_SUBST(version)
-AC_SUBST(patchlevel)
-
-# Uncomment links to unix docs if necessary.
-# NOTE: This is a slight hack: It needs to be synchronized with
-# fptools/configure.ac and fptools/libraries/Makefile and should probably use
-# target features instead of host.
-AC_CANONICAL_HOST
-
-case $host in
-i[[3456]]86-*-mingw32*) fp_supports_unix=no  ;;
-*)                      fp_supports_unix=yes ;;
+# Calculate project version as an integer, using 2 digits for minor version
+case $PACKAGE_VERSION in
+  *.?)  ProjectVersionInt=`echo "$PACKAGE_VERSION" | sed 's,^\(.*\)\.\(.\)$,\10\2,'` ;;
+  *.??) ProjectVersionInt=`echo "$PACKAGE_VERSION" | sed 's,^\(.*\)\.\(..\)$,\1\2,'` ;;
+  *) AC_MSG_ERROR([bad package version $PACKAGE_VERSION]) ;;
 esac
-FP_HTML_COMMENT([test x"$fp_supports_unix" = xyes], [unix])
-
-# Uncomment links to ObjectIO docs if necessary.
-AC_ARG_ENABLE([objectio],
-  AC_HELP_STRING([--enable-objectio],
-                 [Build ObjectIO, a portable GUI library for Haskell.]))
-FP_HTML_COMMENT([test x"$enable_objectio" = xyes], [ObjectIO])
+AC_SUBST([ProjectVersionInt])
 
-# Uncomment links to HOpenGL docs if necessary
-AC_ARG_ENABLE([hopengl],
-  AC_HELP_STRING([--enable-hopengl],
-                 [Build HOpenGL, a Haskell binding for OpenGL/GLUT.]))
-FP_HTML_COMMENT([{ test x"$enable_hopengl" = xyes || test x"$enable_hopengl" = xx11; }], [HOpenGL])
+# Hmmm, we fix the RPM release number to 1 here... Is this convenient?
+AC_SUBST([release], [1])
 
 # Write the results...
-AC_OUTPUT(ghc.spec docs/libraries.html)
+AC_CONFIG_FILES([ghc.spec VERSION docs/users_guide/ug-book.xml])
+AC_OUTPUT