From patchwork Thu Mar 26 21:39:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Greear X-Patchwork-Id: 455205 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 938EE1400B7 for ; Fri, 27 Mar 2015 08:41:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 616CE9D3B9; Thu, 26 Mar 2015 17:41:11 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KvG-BJRN6fIW; Thu, 26 Mar 2015 17:41:11 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 5520F9D3BB; Thu, 26 Mar 2015 17:40:34 -0400 (EDT) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 974DE9D36E for ; Thu, 26 Mar 2015 17:40:31 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FlD-O948ltyc for ; Thu, 26 Mar 2015 17:40:25 -0400 (EDT) Received: from mail2.candelatech.com (mail2.candelatech.com [208.74.158.173]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id D799C9D3AE for ; Thu, 26 Mar 2015 17:40:24 -0400 (EDT) Received: from localhost.localdomain (unknown [50.251.239.81]) by mail2.candelatech.com (Postfix) with ESMTP id F30FB40EA26; Thu, 26 Mar 2015 14:40:22 -0700 (PDT) From: greearb@candelatech.com To: hostap@lists.shmoo.com Subject: [PATCH 02/12] hs20: Allow custom lib-curl linkage. Date: Thu, 26 Mar 2015 17:39:48 -0400 Message-Id: <1427405998-13038-2-git-send-email-greearb@candelatech.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1427405998-13038-1-git-send-email-greearb@candelatech.com> References: <1427405998-13038-1-git-send-email-greearb@candelatech.com> Cc: j@w1.fi, Ben Greear X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com From: Ben Greear In case someone is compiling their own curl and wants to link it statically, for instance. Signed-off-by: Ben Greear --- hs20/client/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hs20/client/Makefile b/hs20/client/Makefile index ca67b54..d8cab0f 100644 --- a/hs20/client/Makefile +++ b/hs20/client/Makefile @@ -67,7 +67,13 @@ OBJS += ../../src/crypto/sha256-internal.o CFLAGS += $(shell xml2-config --cflags) LIBS += $(shell xml2-config --libs) + +# Allow static/custom linking of curl. +ifdef CUST_CURL_LINKAGE +LIBS += ${CUST_CURL_LINKAGE} +else LIBS += -lcurl +endif CFLAGS += -DEAP_TLS_OPENSSL LIBS += -lssl -lcrypto