couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [35/50] [abbrv] mochiweb commit: updated refs/heads/import-master to 3a54dbf
Date Wed, 12 Feb 2014 06:22:07 GMT
Merge branch 'optional-nm' into trunk

* optional-nm:
  Make +native compilation of mochijson2.erl a ./configure option.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1039679 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/a89afc62
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/a89afc62
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/a89afc62

Branch: refs/heads/import-master
Commit: a89afc628580122336b12dcb39b75ef98dda27d1
Parents: 6978589
Author: Jan Lehnardt <jan@apache.org>
Authored: Sat Nov 27 13:43:44 2010 +0000
Committer: Jan Lehnardt <jan@apache.org>
Committed: Sat Nov 27 13:43:44 2010 +0000

----------------------------------------------------------------------
 Makefile.am | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/blob/a89afc62/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 3e77da8..b622ff0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,10 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
+if USE_NATIVE_MOCHIJSON
+MOCHIJSON_ERLC_FLAGS=+native
+endif
+
 mochiwebebindir = $(localerlanglibdir)/mochiweb-7c2bc2/ebin
 
 mochiweb_file_collection = \
@@ -98,7 +102,7 @@ CLEANFILES = \
 	cp $< $@
 
 mochijson2.beam: mochijson2.erl
-	$(ERLC) $(ERLC_FLAGS) +native $<
+	$(ERLC) $(ERLC_FLAGS) $(MOCHIJSON_ERLC_FLAGS) $<
 
 %.beam: %.erl
 	$(ERLC) $(ERLC_FLAGS) $<


Mime
View raw message