diff options
| author | bringert <unknown> | 2005-05-19 12:48:00 +0000 |
|---|---|---|
| committer | bringert <unknown> | 2005-05-19 12:48:00 +0000 |
| commit | fb90359e3273963985799595f00937169bc49fb9 (patch) | |
| tree | 8d578451e8c4ef4d13f407c34e091bf867dac5e5 | |
| parent | a3bdf26f22cf21cdaace5d03ca04d0550e4b3ed8 (diff) | |
Allow setting GHCFLAGS with configure.
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/config.mk.in | 1 | ||||
| -rw-r--r-- | src/configure.ac | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index fe55f32d0..30e4be8b6 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,7 +3,7 @@ include config.mk GHMAKE=$(GHC) --make GHCXMAKE=ghcxmake -GHCFLAGS= -fglasgow-exts -package util +GHCFLAGS+= -fglasgow-exts -package util GHCOPTFLAGS=-O2 GHCFUDFLAG= JAVAFLAGS=-target 1.4 -source 1.4 @@ -21,8 +21,8 @@ GRAMMAR_DIST_DIR=GF-grammars-$(PACKAGE_VERSION) SNAPSHOT_DIR=GF-$(shell date +%Y%m%d) -# use the temporary binary file name 'gf-bin' name to not clash with directory 'GF' -# on case insensitive file systems (such as MacOSX) +# use the temporary binary file name 'gf-bin' to not clash with directory 'GF' +# on case insensitive file systems (such as FAT) GF_EXE=gf$(EXEEXT) GF_EXE_TMP=gf-bin$(EXEEXT) GF_DOC_EXE=gfdoc$(EXEEXT) diff --git a/src/config.mk.in b/src/config.mk.in index 13395ff54..cf2b6d794 100644 --- a/src/config.mk.in +++ b/src/config.mk.in @@ -11,6 +11,7 @@ datadir = @datadir@ host = @host@ +GHCFLAGS = @GHCFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/src/configure.ac b/src/configure.ac index b63d1c840..56c910976 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -4,7 +4,7 @@ AC_INIT([GF],[2.2],[aarne@cs.chalmers.se],[GF]) AC_PREREQ(2.53) -AC_REVISION($Revision: 1.18 $) +AC_REVISION($Revision: 1.19 $) AC_CONFIG_FILES([config.mk jgf]) @@ -130,6 +130,7 @@ dnl *********************************************** dnl Program flags dnl *********************************************** +AC_SUBST(GHCFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) |