Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 65127 invoked from network); 26 Jul 2010 13:05:34 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Jul 2010 13:05:34 -0000 Received: (qmail 17205 invoked by uid 500); 26 Jul 2010 13:05:34 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 17073 invoked by uid 500); 26 Jul 2010 13:05:31 -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 17065 invoked by uid 99); 26 Jul 2010 13:05:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jul 2010 13:05:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jul 2010 13:05:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8A16623889EA; Mon, 26 Jul 2010 13:04:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r979267 - in /couchdb/trunk: THANKS configure.ac Date: Mon, 26 Jul 2010 13:04:37 -0000 To: commits@couchdb.apache.org From: jan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100726130437.8A16623889EA@eris.apache.org> Author: jan Date: Mon Jul 26 13:04:37 2010 New Revision: 979267 URL: http://svn.apache.org/viewvc?rev=979267&view=rev Log: Check if Erlang has been compiled with crypto support at ./configure time. Patch by Kev Jackson. Closes COUCHDB-106 and COUCHDB-131. Modified: couchdb/trunk/THANKS couchdb/trunk/configure.ac Modified: couchdb/trunk/THANKS URL: http://svn.apache.org/viewvc/couchdb/trunk/THANKS?rev=979267&r1=979266&r2=979267&view=diff ============================================================================== --- couchdb/trunk/THANKS (original) +++ couchdb/trunk/THANKS Mon Jul 26 13:04:37 2010 @@ -63,5 +63,6 @@ suggesting improvements or submitting ch * Paul Bonser * Caleb Land * Juhani Ränkimies + * Kev Jackson For a list of authors see the `AUTHORS` file. Modified: couchdb/trunk/configure.ac URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=979267&r1=979266&r2=979267&view=diff ============================================================================== --- couchdb/trunk/configure.ac (original) +++ couchdb/trunk/configure.ac Mon Jul 26 13:04:37 2010 @@ -259,6 +259,12 @@ if test `echo $version | ${AWK} "{print fi fi +has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop` + +if test -n "$has_crypto"; then + AC_MSG_ERROR([Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?]) +fi + AC_PATH_PROG([ERLC], [erlc]) if test x${ERLC} = x; then