From patchwork Fri Apr 1 20:13:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 64901 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp22051lbc; Fri, 1 Apr 2016 13:13:10 -0700 (PDT) X-Received: by 10.107.132.88 with SMTP id g85mr7035329iod.95.1459541590580; Fri, 01 Apr 2016 13:13:10 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r197si17033954ior.42.2016.04.01.13.13.09; Fri, 01 Apr 2016 13:13:10 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C2D4D61A52; Fri, 1 Apr 2016 20:13:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9567661BFD; Fri, 1 Apr 2016 20:13:04 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id D5F9161C76; Fri, 1 Apr 2016 20:13:02 +0000 (UTC) Received: from mail-io0-f180.google.com (mail-io0-f180.google.com [209.85.223.180]) by lists.linaro.org (Postfix) with ESMTPS id B6EA761A52 for ; Fri, 1 Apr 2016 20:13:01 +0000 (UTC) Received: by mail-io0-f180.google.com with SMTP id e3so164152601ioa.1 for ; Fri, 01 Apr 2016 13:13:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=LTefw/YOCSjVTYtgcUkCvYYoNwpnu1C38n+8QUlUc2Q=; b=eeXNlg7Nf4EPNdVVfpj/yJYvn+mjICkmPYtn+EAQMO5iHdUs93BCrj9/xMqAshJfZD Th4kyhxXbRYlySeuG0FbYieEPxmJxwslsB7j6iHbPcD+u32Lm15qx9aUCqOzXvYbIZM0 DahKtZwzLJAaTLhlIucQwwLGErcChwxLPGIN9Gyua3GJK+RYQuMGnA/7oAvslRDovvEW jf8acG5xsB/0JCpq7UE5ZEPSy80xJIslb2P5mPZ6ZdU3/VcDwpIdC7UM694MqysU63sP R6SBGG1sXQ3nv3Rf5zPGJlTmBt1tol+OV2Vmp8IyCllbMSsCS1CnVjNxbvYy5ZYbHWel BT8A== X-Gm-Message-State: AD7BkJKKwhdTeKz6SpPP287b5ZvcDFNfQyeNmlsmk6vicMianBuUU6Rz3WCO097t3Vuc5eZLTfLzJA1nDW99JnWS4Ls= MIME-Version: 1.0 X-Received: by 10.107.130.148 with SMTP id m20mr4346907ioi.137.1459541581238; Fri, 01 Apr 2016 13:13:01 -0700 (PDT) Received: by 10.107.8.217 with HTTP; Fri, 1 Apr 2016 13:13:01 -0700 (PDT) In-Reply-To: <1458933927-77722-2-git-send-email-brian.brooks@linaro.org> References: <1458933927-77722-1-git-send-email-brian.brooks@linaro.org> <1458933927-77722-2-git-send-email-brian.brooks@linaro.org> Date: Fri, 1 Apr 2016 22:13:01 +0200 Message-ID: From: Anders Roxell To: Brian Brooks X-Topics: patch Cc: LNG ODP Mailman List Subject: Re: [lng-odp] [PATCH 2/2] configure: remove dead code X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" On 25 March 2016 at 20:25, Brian Brooks wrote: > Remove dead code which potentially acted as a workaround for making > AC_CHECK_LIB to work with --with-cunit-path. Workaround you may say that. I would put it, one way to do checks for libs and headers that is in the path or not. > > Signed-off-by: Brian Brooks > --- > configure.ac | 14 -------------- > 1 file changed, 14 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 4d86817..6c712b9 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -172,20 +172,6 @@ AC_ARG_ENABLE([debug], > ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG" > > ########################################################################## > -# Save and set temporary compilation flags > -########################################################################## > -OLD_LDFLAGS=$LDFLAGS > -OLD_CPPFLAGS=$CPPFLAGS > -LDFLAGS="$AM_LDFLAGS $LDFLAGS" > -CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" > - > -########################################################################## > -# Restore old saved variables > -########################################################################## > -LDFLAGS=$OLD_LDFLAGS > -CPPFLAGS=$OLD_CPPFLAGS > - > -########################################################################## The code isn't dead just not moved to the correct location. =/ The patch should look like this, see below. Cheers, Anders if test x$cunit_support = xyes @@ -42,3 +50,9 @@ then else cunit_support=no fi + +########################################################################## +# Restore old saved variables +########################################################################## +LDFLAGS=$OLD_LDFLAGS +CPPFLAGS=$OLD_CPPFLAGS diff --git a/configure.ac b/configure.ac index d0d3ca6..6361f14 100644 --- a/configure.ac +++ b/configure.ac @@ -172,20 +172,6 @@ AC_ARG_ENABLE([debug], ODP_CFLAGS="$ODP_CFLAGS -DODP_DEBUG=$ODP_DEBUG" ########################################################################## -# Save and set temporary compilation flags -########################################################################## -OLD_LDFLAGS=$LDFLAGS -OLD_CPPFLAGS=$CPPFLAGS -LDFLAGS="$AM_LDFLAGS $LDFLAGS" -CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" - -########################################################################## -# Restore old saved variables -########################################################################## -LDFLAGS=$OLD_LDFLAGS -CPPFLAGS=$OLD_CPPFLAGS - -########################################################################## # Default warning setup ########################################################################## ODP_CFLAGS="$ODP_CFLAGS -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes" diff --git a/test/m4/validation.m4 b/test/m4/validation.m4 index b137118..d32f675 100644 --- a/test/m4/validation.m4 +++ b/test/m4/validation.m4 @@ -31,6 +31,14 @@ AC_HELP_STRING([--with-cunit-path=DIR path to CUnit libs and headers], cunit_support=yes],[]) ########################################################################## +# Save and set temporary compilation flags +########################################################################## +OLD_LDFLAGS=$LDFLAGS +OLD_CPPFLAGS=$CPPFLAGS +LDFLAGS="$AM_LDFLAGS $LDFLAGS" +CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" + +########################################################################## # Check for CUnit availability ##########################################################################