X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=configure.ac;h=849b1859058228dc17031c62a7325005b02324a8;hb=c9959e41ee1d72aa0ca28d51580f1ad3c06f0e8b;hp=4d83dbcf44ea8ea85e2e433f3ab669a913dd2b76;hpb=dc5b9bd64d1c1f544e4813dc946b5a83ad304cee;p=ghc-hetmet.git diff --git a/configure.ac b/configure.ac index 4d83dbc..849b185 100644 --- a/configure.ac +++ b/configure.ac @@ -129,9 +129,11 @@ if test "$WithGhc" != ""; then FP_COMPARE_VERSIONS($GhcVersion,[-ge],[6.10.2], [ghc_ge_6102=YES], [ghc_ge_6102=NO]) if test $GhcCanonVersion -ge 611; then ghc_ge_611=YES; else ghc_ge_611=NO; fi + if test $GhcCanonVersion -ge 613; then ghc_ge_613=YES; else ghc_ge_613=NO; fi AC_SUBST(ghc_ge_609)dnl AC_SUBST(ghc_ge_6102)dnl AC_SUBST(ghc_ge_611)dnl + AC_SUBST(ghc_ge_613)dnl fi dnl ** Must have GHC to build GHC, unless --enable-hc-boot is on @@ -902,11 +904,17 @@ fi AC_SUBST(BUILD_DOCBOOK_PS) AC_SUBST(BUILD_DOCBOOK_PDF) +LIBRARY_VERSION(base) +LIBRARY_VERSION(Cabal) +LIBRARY_VERSION(ghc-prim) +LIBRARY_ghc_VERSION="$ProjectVersion" +AC_SUBST(LIBRARY_ghc_VERSION) + if grep ' ' compiler/ghc.cabal.in 2>&1 >/dev/null; then AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them]) fi -AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss distrib/configure.ac]) +AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml libraries/prologue.txt distrib/ghc.iss distrib/configure.ac]) AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) AC_OUTPUT