From commits-return-49598-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Sat Oct 27 20:55:56 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 3B62D180649 for ; Sat, 27 Oct 2018 20:55:56 +0200 (CEST) Received: (qmail 23525 invoked by uid 500); 27 Oct 2018 18:55:55 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 23515 invoked by uid 99); 27 Oct 2018 18:55:55 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Oct 2018 18:55:55 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id A47533A18F5 for ; Sat, 27 Oct 2018 18:55:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1844983 - /subversion/trunk/build/ac-macros/serf.m4 Date: Sat, 27 Oct 2018 18:55:54 -0000 To: commits@subversion.apache.org From: brane@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181027185554.A47533A18F5@svn01-us-west.apache.org> Author: brane Date: Sat Oct 27 18:55:54 2018 New Revision: 1844983 URL: http://svn.apache.org/viewvc?rev=1844983&view=rev Log: Fix search for Serf via pkg-config when the include directory contains '-D'. * build/ac-macros/serf.m4 (SVN_SERF_PKG_CONFIG): Use "pkg-config --cflags-only-I". Patch by: Ian Miller Fixes #4670 Modified: subversion/trunk/build/ac-macros/serf.m4 Modified: subversion/trunk/build/ac-macros/serf.m4 URL: http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/serf.m4?rev=1844983&r1=1844982&r2=1844983&view=diff ============================================================================== --- subversion/trunk/build/ac-macros/serf.m4 (original) +++ subversion/trunk/build/ac-macros/serf.m4 Sat Oct 27 18:55:54 2018 @@ -168,8 +168,8 @@ AC_DEFUN(SVN_SERF_PKG_CONFIG, if $PKG_CONFIG $serf_pc_arg --atleast-version=$serf_check_version; then AC_MSG_RESULT([yes]) serf_found=yes - SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags | $SED -e 's/ -D[^ ]*//g' -e 's/^-D[^ ]*//g'`] - SVN_SERF_LIBS=`$PKG_CONFIG $serf_pc_arg --libs-only-l` + SVN_SERF_INCLUDES=[`$PKG_CONFIG $serf_pc_arg --cflags-only-I`] + SVN_SERF_LIBS=[`$PKG_CONFIG $serf_pc_arg --libs-only-l`] dnl don't use --libs-only-L because then we might miss some options LDFLAGS=["$LDFLAGS `$PKG_CONFIG $serf_pc_arg --libs | $SED -e 's/-l[^ ]*//g'`"] break