Return-Path: Delivered-To: apmail-incubator-couchdb-commits-archive@locus.apache.org Received: (qmail 88369 invoked from network); 25 Oct 2008 16:42:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Oct 2008 16:42:09 -0000 Received: (qmail 65136 invoked by uid 500); 25 Oct 2008 16:42:12 -0000 Delivered-To: apmail-incubator-couchdb-commits-archive@incubator.apache.org Received: (qmail 65118 invoked by uid 500); 25 Oct 2008 16:42:12 -0000 Mailing-List: contact couchdb-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: couchdb-dev@incubator.apache.org Delivered-To: mailing list couchdb-commits@incubator.apache.org Received: (qmail 65109 invoked by uid 99); 25 Oct 2008 16:42:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Oct 2008 09:42:12 -0700 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; Sat, 25 Oct 2008 16:40:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0AD692388970; Sat, 25 Oct 2008 09:41:38 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r707861 - in /incubator/couchdb/trunk: bin/Makefile.am configure.ac Date: Sat, 25 Oct 2008 16:41:37 -0000 To: couchdb-commits@incubator.apache.org From: jan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081025164138.0AD692388970@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jan Date: Sat Oct 25 09:41:37 2008 New Revision: 707861 URL: http://svn.apache.org/viewvc?rev=707861&view=rev Log: Only link against -lcrypt on Linux & BSD systems. Modified: incubator/couchdb/trunk/bin/Makefile.am incubator/couchdb/trunk/configure.ac Modified: incubator/couchdb/trunk/bin/Makefile.am URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/bin/Makefile.am?rev=707861&r1=707860&r2=707861&view=diff ============================================================================== --- incubator/couchdb/trunk/bin/Makefile.am (original) +++ incubator/couchdb/trunk/bin/Makefile.am Sat Oct 25 09:41:37 2008 @@ -15,7 +15,8 @@ bin_PROGRAMS = couchpw couchpw_SOURCES = couchpw.c -couchpw_LDADD = -lcrypt + +couchpw_LDADD = $(LIBS) if HELP2MAN dist_man1_MANS = couchdb.1 couchjs.1 Modified: incubator/couchdb/trunk/configure.ac URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/configure.ac?rev=707861&r1=707860&r2=707861&view=diff ============================================================================== --- incubator/couchdb/trunk/configure.ac (original) +++ incubator/couchdb/trunk/configure.ac Sat Oct 25 09:41:37 2008 @@ -108,6 +108,12 @@ AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_LIBS) +case "$(uname -s)" in + Linux | *BSD) + LIBS="$LIBS -lcrypt" + ;; +esac + AC_PATH_PROG([ERL], [erl]) if test x${ERL} = x; then