[v3,3/20] m4: move timer_create check to common place

Message ID	1507226415-26756-4-git-send-email-odpbot@yandex.ru
State	Superseded
Headers	show Delivered-To: patch@linaro.org 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; From: Github ODP bot <odpbot@yandex.ru> To: lng-odp@lists.linaro.org Date: Thu, 5 Oct 2017 20:59:58 +0300 Message-Id: <1507226415-26756-4-git-send-email-odpbot@yandex.ru> In-Reply-To: <1507226415-26756-1-git-send-email-odpbot@yandex.ru> References: <1507226415-26756-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 213 Subject: [lng-odp] [PATCH v3 3/20] m4: move timer_create check to common place Precedence: list Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>
Series	[v3,1/20] .gitignore: ignore only libtool m4 files \| expand [v3,1/20] .gitignore: ignore only libtool m4 files [v3,2/20] m4: move openssl check to common place [v3,3/20] m4: move timer_create check to common place [v3,4/20] m4: move -fvisibility=hidden check to separate file [v3,5/20] m4: move atomic checks to separate file [v3,6/20] example: switch odp_l3fwd from test_debug.h to example_debug.h [v3,7/20] test: move test/common_plat/common to test_common dir [v3,8/20] test: move run-test script to test_common dir [v3,9/20] test: move common validation tests handling to theirs own Makefile.am [v3,10/20] test: linux-gen: move platform-specific tests to platform directory [v3,11/20] test: move test_debug.h to test_common [v3,12/20] test: drop now-unused common_plat directory [v3,13/20] linux-gen: move libodp-linux.pc.in to platform directory [v3,14/20] helper: move libodphelper.pc.in to helper directory [v3,15/20] build: move handling of include files to include dir [v3,16/20] include: include all ABI files into distribution [v3,17/20] linux-gen: drop unnecessary srcdir from Makefile.am [v3,18/20] linux-gen: stop including autogenerated header into distribution [v3,19/20] example: simplify Makefile.am's [v3,20/20] helper: simplify Makefile.am's

Message ID

1507226415-26756-4-git-send-email-odpbot@yandex.ru

State

Superseded

Headers

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; 
From: Github ODP bot <odpbot@yandex.ru>
To: lng-odp@lists.linaro.org
Date: Thu,  5 Oct 2017 20:59:58 +0300
Message-Id: <1507226415-26756-4-git-send-email-odpbot@yandex.ru>
In-Reply-To: <1507226415-26756-1-git-send-email-odpbot@yandex.ru>
References: <1507226415-26756-1-git-send-email-odpbot@yandex.ru>
Github-pr-num: 213
Subject: [lng-odp] [PATCH v3 3/20] m4: move timer_create check to common
	place
Precedence: list
Errors-To: lng-odp-bounces@lists.linaro.org
Sender: "lng-odp" <lng-odp-bounces@lists.linaro.org>

Series

[v3,1/20] .gitignore: ignore only libtool m4 files | expand

Commit Message

Github ODP bot Oct. 5, 2017, 5:59 p.m. UTC

From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 213 (lumag:plat-def)
 ** https://github.com/Linaro/odp/pull/213
 ** Patch: https://github.com/Linaro/odp/pull/213.patch
 ** Base sha: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497
 ** Merge commit sha: 4157d06d3a16265d7d6152d7ae4918ec5623c10c
 **/
 {platform/linux-generic/m4 => m4}/odp_timer.m4 | 7 +++++--
 platform/linux-generic/m4/configure.m4         | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
 rename {platform/linux-generic/m4 => m4}/odp_timer.m4 (63%)

diff --git a/platform/linux-generic/m4/odp_timer.m4 b/m4/odp_timer.m4
similarity index 63%
rename from platform/linux-generic/m4/odp_timer.m4
rename to m4/odp_timer.m4
index 3122c92b4..9a552f9ff 100644
--- a/platform/linux-generic/m4/odp_timer.m4
+++ b/m4/odp_timer.m4
@@ -1,8 +1,11 @@ 
+# ODP_TIMER([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 ##########################################################################
 # Check for POSIX timer functions
 ##########################################################################
-
+AC_DEFUN([ODP_TIMER], [dnl
 AC_CHECK_LIB([rt], [timer_create], [TIMER_LIBS="-lrt"],
 	     [AC_CHECK_LIB([posix4], [timer_create], [TIMER_LIBS="-lposix4"],
-			   [AC_MSG_FAILURE([timer_create not found])])])
+			   [m4_default([$2], [AC_MSG_FAILURE([timer_create not found])])])])
+m4_default([$1], [:])
 AC_SUBST([TIMER_LIBS])
+]) # ODP_TIMER
diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4
index 63540c7eb..4d6ef49b9 100644
--- a/platform/linux-generic/m4/configure.m4
+++ b/platform/linux-generic/m4/configure.m4
@@ -75,7 +75,7 @@  fi
 AC_SUBST([ATOMIC_LIBS])
 
 m4_include([platform/linux-generic/m4/odp_pthread.m4])
-m4_include([platform/linux-generic/m4/odp_timer.m4])
+ODP_TIMER
 ODP_OPENSSL
 m4_include([platform/linux-generic/m4/odp_pcap.m4])
 m4_include([platform/linux-generic/m4/odp_netmap.m4])