Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AC0FF101C3 for ; Wed, 12 Feb 2014 06:24:48 +0000 (UTC) Received: (qmail 5257 invoked by uid 500); 12 Feb 2014 06:22:00 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 4822 invoked by uid 500); 12 Feb 2014 06:21:48 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 4531 invoked by uid 99); 12 Feb 2014 06:21:35 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Feb 2014 06:21:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BB6C3554FB; Wed, 12 Feb 2014 06:21:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Wed, 12 Feb 2014 06:22:07 -0000 Message-Id: <94c4833a4240456594df58628c4aa9f7@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [35/50] [abbrv] mochiweb commit: updated refs/heads/import-master to 3a54dbf 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 Authored: Sat Nov 27 13:43:44 2010 +0000 Committer: Jan Lehnardt 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) $<