Commit d7ac3295 authored by Benoît Sigoure's avatar Benoît Sigoure
Browse files

Provide backward compatibility with GHC 6.4.

	* configure.ac: Pick up the right -package option depending on
	whether ghc is 6.4 or newer and save this in AM_GHC_FLAGS.
	* src/Makefile.am (GHC_FLAGS): Use AM_GHC_FLAGS.
parent 10206aa8
2007-08-24 Benoit Sigoure <tsuna@lrde.epita.fr>
Provide backward compatibility with GHC 6.4.
* configure.ac: Pick up the right -package option depending on
whether ghc is 6.4 or newer and save this in AM_GHC_FLAGS.
* src/Makefile.am (GHC_FLAGS): Use AM_GHC_FLAGS.
2007-03-28 SIGOURE Benoit <tsuna@lrde.epita.fr>
* src/Opt.hs: Don't mix French and English.
......
......@@ -22,7 +22,19 @@ AC_INIT([HAVM], [0.23a], [tiger-patches@lrde.epita.fr])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.9.6 dist-bzip2])
HAVM_PROG([ghc], [6.6], [GHC], [Glasgow Haskell Compiler])
HAVM_PROG([ghc], [6.4], [GHC], [Glasgow Haskell Compiler])
# Pick up the right package depending on GHC's version.
dnl $actual_version is set by HAVM_PROG
case "$actual_version" in
6.4*)
AM_GHC_FLAGS='-package data'
;;
*) # >6.4
AM_GHC_FLAGS='-package base'
;;
esac
AC_SUBST([AM_GHC_FLAGS])
AM_MISSING_PROG([HAPPY], [happy])
AC_CONFIG_FILES([
......
......@@ -53,7 +53,7 @@ dist_noinst_DATA = $(havm_sources) Parse.hs
# Redirects all generated interface files into directory, instead of
# the default which is to place the interface file in the same
# directory as the source file.
GHC_FLAGS = -i.:$(srcdir) -odir. -hidir. --make -package base
GHC_FLAGS = -i.:$(srcdir) -odir. -hidir. --make $(AM_GHC_FLAGS)
havm_dependencies = $(havm_sources) Config.hs Parse.hs
havm: $(havm_dependencies)
$(GHC) $(GHC_FLAGS) $(srcdir)/Main.hs -o havm
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment