From patchwork Thu Apr 7 13:17:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 65317 Delivered-To: patch@linaro.org Received: by 10.112.43.237 with SMTP id z13csp73545lbl; Thu, 7 Apr 2016 06:18:33 -0700 (PDT) X-Received: by 10.107.131.232 with SMTP id n101mr3450190ioi.132.1460035113390; Thu, 07 Apr 2016 06:18:33 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id n39si7234428ioe.7.2016.04.07.06.18.33; Thu, 07 Apr 2016 06:18:33 -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 E12136177D; Thu, 7 Apr 2016 13:18:32 +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_H3, RCVD_IN_MSPIKE_WL, 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 EBF11619A2; Thu, 7 Apr 2016 13:17:58 +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 4237761779; Thu, 7 Apr 2016 13:17:56 +0000 (UTC) Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com [209.85.215.53]) by lists.linaro.org (Postfix) with ESMTPS id A34466162F for ; Thu, 7 Apr 2016 13:17:54 +0000 (UTC) Received: by mail-lf0-f53.google.com with SMTP id e190so54970988lfe.0 for ; Thu, 07 Apr 2016 06:17:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kbuzTHyU+VBkBzz8IpQG7RQQ1rwnlE24L9aX7fZboec=; b=HLYLU5lhSyByIUxk8d/RTxriwigwQDJyQE/Wgb19ps/wskFnVxhkndjTw01/tuhHWJ DC0i6fIQ6pJHcoN5mYKKmwMZHzZSg8jQAfW2Z/c4tFjrhds63Ai5Y9GXMPnKmDzbjzkW rtP+dXuJWMd3+pVefezjOJG643XJWAFQr7zuklIZIyQYRXM752h4jwtcHt1ptx0OvodK +wws0/IYOQOR3pI2BpOe8+9JQHRS9jpVHmyM0TkTdHctjd3ZINffGLa45C4URQDTySg3 9Dw/AbDS5RDhkdrtciy0hTWhq3XotuFe/C3WGmbxvMV/FXs6cW6rsCUsFp9nGAnBklYt 39iA== X-Gm-Message-State: AD7BkJKcjZjqBOUHhblIcZ0ooIi4P3GCJCKWK7fanh1ruW3Kcwt+Hh65SLARbjVioNTKB5u48Ko= X-Received: by 10.25.29.147 with SMTP id d141mr1166006lfd.121.1460035073433; Thu, 07 Apr 2016 06:17:53 -0700 (PDT) Received: from localhost.localdomain (ppp91-77-173-31.pppoe.mtu-net.ru. [91.77.173.31]) by smtp.gmail.com with ESMTPSA id ez1sm1231722lbc.29.2016.04.07.06.17.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Apr 2016 06:17:52 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Thu, 7 Apr 2016 16:17:45 +0300 Message-Id: <1460035065-8416-2-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 2.7.1.250.gff4ea60 In-Reply-To: <1460035065-8416-1-git-send-email-maxim.uvarov@linaro.org> References: <1460035065-8416-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 2/2] validation: configure: move cflags guards to test/m4 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: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Move cflags guards to test/m4 to fix cunit library search. https://bugs.linaro.org/show_bug.cgi?id=2161 Reported-by: Brian Brooks Suggested-by: Anders Roxell Signed-off-by: Maxim Uvarov --- configure.ac | 14 -------------- test/m4/validation.m4 | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 712d241..9665d1d 100644 --- a/configure.ac +++ b/configure.ac @@ -176,20 +176,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 f6c93f7..22021d3 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 ########################################################################## if test x$cunit_support = xyes -a -z "$CUNIT_PATH" @@ -46,3 +54,9 @@ else AM_LDFLAGS="$AM_LDFLAGS -lcunit" fi fi + +########################################################################## +# Restore old saved variables +########################################################################## +LDFLAGS=$OLD_LDFLAGS +CPPFLAGS=$OLD_CPPFLAGS