diff mbox series

[v4,2/10] configure: use AC_CONFIG_COMMANDS_PRE to set conditionals

Message ID 1508317209-23610-3-git-send-email-odpbot@yandex.ru
State New
Headers show
Series [v4,1/10] configure: use AS_HELP_STRING instead of AC_HELP_STRING | expand

Commit Message

Github ODP bot Oct. 18, 2017, 9 a.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 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 mbox series

Patch

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 ])
+])