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 1D94ABBCC for ; Fri, 6 Jan 2012 21:38:18 +0000 (UTC) Received: (qmail 8749 invoked by uid 500); 6 Jan 2012 21:38:17 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 8625 invoked by uid 500); 6 Jan 2012 21:38:17 -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 8617 invoked by uid 99); 6 Jan 2012 21:38:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 21:38:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Jan 2012 21:38:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F1EFA53050; Fri, 6 Jan 2012 21:37:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: randall@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: COUCHDB-1042 - restore libcurl as soft dependency Message-Id: <20120106213754.F1EFA53050@tyr.zones.apache.org> Date: Fri, 6 Jan 2012 21:37:54 +0000 (UTC) Updated Branches: refs/heads/master 39d81d5a0 -> bf7c74edb COUCHDB-1042 - restore libcurl as soft dependency Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bf7c74ed Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bf7c74ed Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bf7c74ed Branch: refs/heads/master Commit: bf7c74edb0f645154412fa8df9f092e052ee6f61 Parents: 39d81d5 Author: Randall Leeds Authored: Fri Jan 6 13:35:40 2012 -0800 Committer: Randall Leeds Committed: Fri Jan 6 13:35:40 2012 -0800 ---------------------------------------------------------------------- Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/bf7c74ed/Makefile.am ---------------------------------------------------------------------- diff --git a/Makefile.am b/Makefile.am index de9d4af..b03e580 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,7 +83,9 @@ THANKS.gz: $(top_srcdir)/THANKS check: dev $(top_builddir)/test/etap/run $(top_srcdir)/test/etap +if USE_CURL $(top_builddir)/test/javascript/run +endif cover: dev rm -f cover/*.coverdata