From patchwork Wed Oct 18 04:59:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 116193 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp5659594qgn; Tue, 17 Oct 2017 22:02:18 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAaICsL65Y9XDwswQ4JdVSSoCQOqbwGTYXWYUSSuBpWPG25jduN0akwxsx8KMgMtkj8j/V2 X-Received: by 10.107.19.26 with SMTP id b26mr19317619ioj.19.1508302938722; Tue, 17 Oct 2017 22:02:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508302938; cv=none; d=google.com; s=arc-20160816; b=fmn5wrPuDm2SlRNIXSduNUigSn/wAjAvPBAOcodNSBetxBoWPFSxMfKG+Vs0gGyWCm RiYTsQtykIKJZ6eQePwy76emXx4r7uVLNv3+OZcvhhn56vo9boAeWLo8ek97qxBBi0K8 b3WbqfJ9xXrswaPU+FaGWMlzLVcp7zX69CZ9si40I4tFbLrFFbS0N/D2T2rOX0pOFv7E bHiE9kG8s1a7Xo+PTf6yxEb+W8iT6FfsFNjDDjCmCM2R+9VW+GCTdWLFfA4dCzNNYNtj 2rf8RJqza3OffYj+sz7GEQu682BVAhBj+d+CNpcB9FKKdeNxTY1a5BFzw8yZYzWaVGbD dr/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=53gaHrhlJBNqI0zq05V4xVPLDmPq9Kw2wnFGSZax4MY=; b=rK1zjZkNfdbgpPMtQPnnDLZ8UYI+yEoMi86FlGJMiqjMclirbghWggtJB6wuaxld/3 PLMwKLSHNu0D3ls8Lp6ZrQv5fA2aig8uSUCHRhzBFnwafTUgyvcSQrCb0xJIJ4+1ibUY A7gRrP0Zm2Shcvic70AtKSZUZe3dKjoqrgy560qiXZIaX0tlOufBwXbFVkO31FJmHdLm aNFvGsd8Zu9CXFGrkfhL1mfGzjWJq0lbNquVbv6dlfkERnmazW/Iu7NtyhZwuB+vp+mm DRECkUs60TROAmyTQN5BkboSQWwO49ZZ6HerWTtVthrrA7GSB3/c344EAgmgNMbZ0sn+ QoGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id u34si8257791ioi.320.2017.10.17.22.02.18; Tue, 17 Oct 2017 22:02:18 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 4623E62955; Wed, 18 Oct 2017 05:02:18 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 8E4A6628BD; Wed, 18 Oct 2017 05:00:34 +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 DE69962299; Wed, 18 Oct 2017 05:00:21 +0000 (UTC) Received: from forward106j.mail.yandex.net (forward106j.mail.yandex.net [5.45.198.249]) by lists.linaro.org (Postfix) with ESMTPS id 612B762295 for ; Wed, 18 Oct 2017 05:00:16 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward106j.mail.yandex.net (Yandex) with ESMTP id 5D4A31802BA3 for ; Wed, 18 Oct 2017 08:00:15 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id k01kaKCkFZ-0FDSYZvO; Wed, 18 Oct 2017 08:00:15 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id 27A3ttiSEF-0ENOJUXi; Wed, 18 Oct 2017 08:00:14 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Wed, 18 Oct 2017 07:59:58 +0300 Message-Id: <1508302806-20268-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508302806-20268-1-git-send-email-odpbot@yandex.ru> References: <1508302806-20268-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 235 Subject: [lng-odp] [PATCH v3 2/10] configure: use AC_CONFIG_COMMANDS_PRE to set conditionals 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" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 235 (lumag:plat-def-2) ** https://github.com/Linaro/odp/pull/235 ** Patch: https://github.com/Linaro/odp/pull/235.patch ** Base sha: ec0c3145fcafa09ae3a79875e7e07dd4794583cc ** Merge commit sha: c7d08f738718f049cece37227820be39f1274875 **/ configure.ac | 3 --- platform/linux-generic/m4/configure.m4 | 4 ++++ platform/linux-generic/m4/odp_netmap.m4 | 2 ++ platform/linux-generic/m4/odp_pcap.m4 | 4 +++- platform/linux-generic/m4/performance.m4 | 2 ++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 80bc3122a..fbf8fe2dd 100644 --- a/configure.ac +++ b/configure.ac @@ -162,9 +162,6 @@ AC_ARG_WITH([platform], AC_SUBST([with_platform]) -AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], - [test "x$with_platform" = "xlinux-generic"]) - ########################################################################## # Run platform specific checks and settings ########################################################################## diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 7dc83bf87..68a270d89 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -11,6 +11,9 @@ m4_include([platform/linux-generic/m4/odp_schedule.m4]) m4_include([platform/linux-generic/m4/performance.m4]) +AC_CONFIG_COMMANDS_PRE([dnl +AM_CONDITIONAL([PLATFORM_IS_LINUX_GENERIC], + [test "${with_platform}" = "linux-generic"]) AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/libodp-linux.pc platform/linux-generic/include/odp/api/plat/static_inline.h @@ -21,3 +24,4 @@ AC_CONFIG_FILES([platform/linux-generic/Makefile platform/linux-generic/test/pktio_ipc/Makefile platform/linux-generic/test/ring/Makefile platform/linux-generic/test/performance/Makefile]) +]) diff --git a/platform/linux-generic/m4/odp_netmap.m4 b/platform/linux-generic/m4/odp_netmap.m4 index bd04824bb..e14a027f9 100644 --- a/platform/linux-generic/m4/odp_netmap.m4 +++ b/platform/linux-generic/m4/odp_netmap.m4 @@ -43,4 +43,6 @@ fi ########################################################################## CPPFLAGS=$OLD_CPPFLAGS +AC_CONFIG_COMMANDS_PRE([dnl AM_CONDITIONAL([netmap_support], [test x$netmap_support = xyes ]) +]) diff --git a/platform/linux-generic/m4/odp_pcap.m4 b/platform/linux-generic/m4/odp_pcap.m4 index 0b5b8a2e2..0a8f35186 100644 --- a/platform/linux-generic/m4/odp_pcap.m4 +++ b/platform/linux-generic/m4/odp_pcap.m4 @@ -15,4 +15,6 @@ fi AC_SUBST([PCAP_LIBS]) -AM_CONDITIONAL([HAVE_PCAP], [test $have_pcap = yes]) +AC_CONFIG_COMMANDS_PRE([dnl +AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes]) +]) diff --git a/platform/linux-generic/m4/performance.m4 b/platform/linux-generic/m4/performance.m4 index 05b3a9905..f2e7107c0 100644 --- a/platform/linux-generic/m4/performance.m4 +++ b/platform/linux-generic/m4/performance.m4 @@ -5,4 +5,6 @@ AC_ARG_ENABLE([test-perf-proc], [AS_HELP_STRING([--enable-test-perf-proc], [run test in test/performance in process mode])], [test_perf_proc=$enableval], [test_perf_proc=yes]) +AC_CONFIG_COMMANDS_PRE([dnl AM_CONDITIONAL([test_perf_proc], [test x$test_perf_proc = xyes ]) +])