diff options
| author |  Jason Gross <jgross@mit.edu> | 2012-12-12 14:47:06 -0500 |
|---|---|---|
| committer | Jason Gross <jgross@mit.edu> | 2012-12-12 14:47:06 -0500 |
| commit | ddeb9c57ed9b292082503aa10ebc942500ac8950 (patch) | |
| tree | abd07b9c5f5d1525e872391534112720c157fc9d | |
| parent | 87d2e717c0d164759fce1df7d89f25fda8434586 (diff) | |
Add ./configure MLTONARGS option for MLTON arguments
Named MLTONARGS based on CCARGS.
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 946fcae6..24b1eca3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,10 +1,11 @@ ACLOCAL_AMFLAGS = -I m4 -BIN = @BIN@ -SRCLIB = @SRCLIB@ -INCLUDE = @INCLUDE@ -SITELISP = @SITELISP@ -VERSION = @VERSION@ +BIN = @BIN@ +SRCLIB = @SRCLIB@ +INCLUDE = @INCLUDE@ +SITELISP = @SITELISP@ +VERSION = @VERSION@ +MLTONARGS = @MLTONARGS@ LIB_UR = $(SRCLIB)/ur LIB_C = $(SRCLIB)/c @@ -59,7 +60,7 @@ bin/urweb: xml/entities.sml \ src/compiler.mlb src/urweb.mlb src/*.sig src/*.sml \ src/urweb.mlton.lex.sml \ src/urweb.mlton.grm.sig src/urweb.mlton.grm.sml - $(MLTON) -output $@ src/compiler.mlb + $(MLTON) $(MLTONARGS) -output $@ src/compiler.mlb xml/entities.sml: xml/parse xml/xhtml-lat1.ent xml/xhtml-special.ent xml/xhtml-symbol.ent xml/parse >xml/entities.sml diff --git a/configure.ac b/configure.ac index 2f87db85..4bdaacc4 100644 --- a/configure.ac +++ b/configure.ac @@ -119,6 +119,7 @@ AC_SUBST(SRCLIB) AC_SUBST(INCLUDE) AC_SUBST(SITELISP) AC_SUBST(CCARGS) +AC_SUBST(MLTONARGS) AC_SUBST(PGHEADER) AC_SUBST(MSHEADER) AC_SUBST(SQHEADER) @@ -144,6 +145,7 @@ Ur/Web configuration: site-lisp directory: SITELISP $SITELISP C compiler: CC $CC Extra CC args: CCARGS $CCARGS + Extra MLTON args: MLTONARGS $MLTONARGS Postgres C header: PGHEADER $PGHEADER MySQL C header: MSHEADER $MSHEADER SQLite C header: SQHEADER $SQHEADER |