Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 22772 invoked from network); 30 Mar 2011 12:46:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Mar 2011 12:46:17 -0000 Received: (qmail 97445 invoked by uid 500); 30 Mar 2011 12:46:17 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 97373 invoked by uid 500); 30 Mar 2011 12:46: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 97366 invoked by uid 99); 30 Mar 2011 12:46:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Mar 2011 12:46:17 +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.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Mar 2011 12:46:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F0E7323889B2; Wed, 30 Mar 2011 12:45:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1086934 - in /couchdb/trunk: configure.ac src/couchdb/priv/Makefile.am Date: Wed, 30 Mar 2011 12:45:52 -0000 To: commits@couchdb.apache.org From: davisp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110330124552.F0E7323889B2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davisp Date: Wed Mar 30 12:45:52 2011 New Revision: 1086934 URL: http://svn.apache.org/viewvc?rev=1086934&view=rev Log: Avoid -lcurl when libcurl is not found. Closes COUCHDB-1042 Modified: couchdb/trunk/configure.ac couchdb/trunk/src/couchdb/priv/Makefile.am Modified: couchdb/trunk/configure.ac URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=1086934&r1=1086933&r2=1086934&view=diff ============================================================================== --- couchdb/trunk/configure.ac (original) +++ couchdb/trunk/configure.ac Wed Mar 30 12:45:52 2011 @@ -212,20 +212,18 @@ AC_ARG_WITH([win32-curl], [AC_HELP_STRIN [set PATH to the Win32 native curl directory])], [ # default build on windows is a static lib, and that's what we want too CURL_CFLAGS="-I$withval/include -DCURL_STATICLIB" - CURL_LIBS="$withval/lib/libcurl" - CURL_LDFLAGS="-l$CURL_LIBS -lWs2_32 -lkernel32 -luser32 -ladvapi32 -lWldap32" + CURL_LIBS="-L$withval/lib -lcurl -lWs2_32 -lkernel32 -luser32 -ladvapi32 -lWldap32" ], [ AC_CHECK_CURL([7.18.0], [AC_DEFINE([HAVE_CURL], [1], ["Provide HTTP support to couchjs"])], [ AC_MSG_WARN([You will be unable to run some JavaScript unit tests.]) use_curl=no + CURL_LIBS= ]) - CURL_LDFLAGS=-lcurl ]) AC_SUBST(CURL_CFLAGS) AC_SUBST(CURL_LIBS) -AC_SUBST(CURL_LDFLAGS) case "$(uname -s)" in Linux) Modified: couchdb/trunk/src/couchdb/priv/Makefile.am URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/priv/Makefile.am?rev=1086934&r1=1086933&r2=1086934&view=diff ============================================================================== --- couchdb/trunk/src/couchdb/priv/Makefile.am (original) +++ couchdb/trunk/src/couchdb/priv/Makefile.am Wed Mar 30 12:45:52 2011 @@ -46,9 +46,8 @@ COUCHJS_SRCS = \ locallibbin_PROGRAMS = couchjs couchjs_SOURCES = $(COUCHJS_SRCS) -couchjs_LDFLAGS = $(CURL_LDFLAGS) couchjs_CFLAGS = -D_BSD_SOURCE $(CURL_CFLAGS) -couchjs_LDADD = $(CURL_LDFLAGS) @JSLIB@ +couchjs_LDADD = $(CURL_LIBS) @JSLIB@ couchpriv_DATA = stat_descriptions.cfg couchpriv_PROGRAMS = couchspawnkillable