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 22B4E11CDF for ; Mon, 19 May 2014 16:30:56 +0000 (UTC) Received: (qmail 79451 invoked by uid 500); 19 May 2014 16:22:07 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 77873 invoked by uid 500); 19 May 2014 16:22:06 -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 75918 invoked by uid 99); 19 May 2014 16:17:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 May 2014 16:17:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B1AA69878E1; Mon, 19 May 2014 16:17:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garren@apache.org To: commits@couchdb.apache.org Date: Mon, 19 May 2014 16:17:43 -0000 Message-Id: In-Reply-To: <49fb1b4064d446ba9720e079b49bbd01@git.apache.org> References: <49fb1b4064d446ba9720e079b49bbd01@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/47] couchdb commit: updated refs/heads/Update-Sidebar-Ui to c173e52 Fix ejson nif configure against R14B04 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7d29ade0 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7d29ade0 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7d29ade0 Branch: refs/heads/Update-Sidebar-Ui Commit: 7d29ade0b5b678ce35af184ef6c53824d0b0e250 Parents: 8c07af2 Author: Alexander Shorin Authored: Fri May 2 02:50:18 2014 +0400 Committer: Alexander Shorin Committed: Fri May 2 02:50:18 2014 +0400 ---------------------------------------------------------------------- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/7d29ade0/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 103f029..01d0a7b 100644 --- a/configure.ac +++ b/configure.ac @@ -440,7 +440,7 @@ AC_SUBST(otp_release) AM_CONDITIONAL([USE_OTP_NIFS], [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)")]) AM_CONDITIONAL([USE_EJSON_COMPARE_NIF], - [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")]) + [can_use_ejson=$(echo $otp_release | grep -E "^(R14B0[[34]]|R15|R16|17)")]) has_crypto=`\ ${ERL} -eval "\