From patchwork Wed Oct 18 09:00:01 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: 116243 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp5827397qgn; Wed, 18 Oct 2017 02:02:30 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SgFdPFOxNQRMex4YrqMr4iWBmqgX9LAGinBjSxiKkFCTeEUx2ZHNl5GGkayI3BrYAsmBQN X-Received: by 10.200.23.196 with SMTP id r4mr1982555qtk.158.1508317350894; Wed, 18 Oct 2017 02:02:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508317350; cv=none; d=google.com; s=arc-20160816; b=xz1Zx1aAe3eYJpUMFH09oedPJnL0CneGIu/OHdIzt7hF59ke8Hwpeo69q+TqAePZnC fOzsc15oO3OyX8GAvBv+bM1OQamS6y/91LdOkGkdi7xQFUuAV835/7S+Jxsi/L8T6ign c+QcxOxkOyukfta02EPv3xPj+SSD4jdPhHXTzUuCMX8rq/w0b1AdX+D0hXqAJr3EEf+c EbxEDoBf/I/dn4+cz7Sb0gaQR3EgS6mWVKlUd3eSe06QfSFoVeU33sA79/8ZHr0MQUaU ECrzt6OCj3TwRkZCgSuc47UB0CLyrIjoVfmiYV7bB1FOnrX0vgAR9wB1syi8UFOG/BcM WpZg== 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=WTaW710HzxohVOtQJ6U8PcrVnqfGy4Q1ywcrmVc0IB4=; b=W+Tij0xNhVU0m0zyYW5VOH4JYeX/iaHwUEAHRkfePgc9iVxa7mgVUIKnmQmxl0C36K f/XQQF6N3t+mlIHBaoL4AQMot+ZJq9QPPiY3JnQvLbNzfNmnToNtUHvgnf1G7uCpspuh 3WdIWuimnwmfP5Yqgug/2G0+VmjoGGJq1MRKqvKPPVebKDUwNeASrDen5HM4tn3Vrrr0 cg7X77ASHoQHkXxyDPpYhUPnhs5FapBsxC82IjZEqd2p9a+P3nnITJPw/rJSwxy6NCR4 zi4Z/1tR6maf+6AJTCiFthPr3jSK+JSHPQg4YtcdaSr5uP0eH2o3g5pw4ZyEj+hPxoPf 816A== 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 w18si4299067qtj.11.2017.10.18.02.02.30; Wed, 18 Oct 2017 02:02:30 -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 8E65E62D1A; Wed, 18 Oct 2017 09:02:30 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, 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 9B03F62CB3; Wed, 18 Oct 2017 09:00:46 +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 1CA6D62C86; Wed, 18 Oct 2017 09:00:29 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id E87F562AC3 for ; Wed, 18 Oct 2017 09:00:21 +0000 (UTC) Received: from mxback1g.mail.yandex.net (mxback1g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:162]) by forward101p.mail.yandex.net (Yandex) with ESMTP id BE7B26A845C7 for ; Wed, 18 Oct 2017 12:00:19 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback1g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id BVxA5I7LMN-0JSCg7jZ; Wed, 18 Oct 2017 12:00:19 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id bYy1BTB7pX-0JbaAm52; Wed, 18 Oct 2017 12:00:19 +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 12:00:01 +0300 Message-Id: <1508317209-23610-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508317209-23610-1-git-send-email-odpbot@yandex.ru> References: <1508317209-23610-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 235 Subject: [lng-odp] [PATCH v4 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: 3ecb623742a4220d83aa8929d5eef60c1abdeb45 **/ 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 dfea5d20e..9144c4189 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 24ed4bc1d..85462c92e 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 ]) +])