Mercurial > urweb

changeset 1837:7cf34f8b7b93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add ./configure MLTONARGS option for MLTON arguments Named MLTONARGS based on CCARGS.
author Jason Gross <jgross@mit.edu>
date Wed, 12 Dec 2012 14:47:06 -0500
parents 276fa06428ba
children 6ec243437d12
files Makefile.am configure.ac
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Tue Dec 11 15:58:23 2012 -0500
+++ b/Makefile.am	Wed Dec 12 14:47:06 2012 -0500
@@ -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 @@
 		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
--- a/configure.ac	Tue Dec 11 15:58:23 2012 -0500
+++ b/configure.ac	Wed Dec 12 14:47:06 2012 -0500
@@ -119,6 +119,7 @@
 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 @@
   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