diff options
| author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2018-03-28 17:14:28 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2018-04-04 09:42:48 +0300 |
| commit | aedf019425b66c6308da0cdce2db3bbc17e72578 (patch) | |
| tree | bbb130a31c1fed742a7a56be8326900a33e37def | |
| parent | edd235b2e1ee71a398ed96f99886d974c277b7e4 (diff) | |
build: fix autoconf error caused by double-registering config item
Autoconf uses provided tag as is, when registering config command.
Require platform code to pass platform argument, so that different
config commands will be registered.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
| -rw-r--r-- | m4/odp_libconfig.m4 | 12 | ||||
| -rw-r--r-- | platform/linux-dpdk/m4/configure.m4 | 2 | ||||
| -rw-r--r-- | platform/linux-generic/m4/configure.m4 | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/m4/odp_libconfig.m4 b/m4/odp_libconfig.m4 index 632c271ef..926ceca62 100644 --- a/m4/odp_libconfig.m4 +++ b/m4/odp_libconfig.m4 @@ -1,5 +1,5 @@ -# ODP_LIBCONFIG -# ------------- +# ODP_LIBCONFIG(PLATFORM) +# ----------------------- AC_DEFUN([ODP_LIBCONFIG], [dnl ########################################################################## @@ -19,10 +19,10 @@ fi # Create a header file odp_libconfig_config.h which containins null # terminated hex dump of odp-linux.conf ########################################################################## -AC_CONFIG_COMMANDS([platform/${with_platform}/include/odp_libconfig_config.h], -[mkdir -p platform/${with_platform}/include - (cd ${srcdir}/config ; xxd -i odp-${with_platform}.conf) | \ +AC_CONFIG_COMMANDS([platform/$1/include/odp_libconfig_config.h], +[mkdir -p platform/$1/include + (cd ${srcdir}/config ; xxd -i odp-$1.conf) | \ sed 's/\([[0-9a-f]]\)$/\0, 0x00/' > \ - platform/${with_platform}/include/odp_libconfig_config.h], + platform/$1/include/odp_libconfig_config.h], [with_platform=$with_platform]) ]) # ODP_LIBCONFIG diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4 index 9f21b34a4..7c79e7676 100644 --- a/platform/linux-dpdk/m4/configure.m4 +++ b/platform/linux-dpdk/m4/configure.m4 @@ -10,7 +10,7 @@ AM_CONDITIONAL([PKTIO_DPDK], [false]) ODP_PTHREAD ODP_TIMER ODP_OPENSSL -ODP_LIBCONFIG +ODP_LIBCONFIG([linux-dpdk]) ODP_SCHEDULER ########################################################################## diff --git a/platform/linux-generic/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index d4aa9cd03..7cf0a9b67 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -6,7 +6,7 @@ ODP_ATOMIC ODP_PTHREAD ODP_TIMER ODP_OPENSSL -ODP_LIBCONFIG +ODP_LIBCONFIG([linux-generic]) m4_include([platform/linux-generic/m4/odp_pcap.m4]) m4_include([platform/linux-generic/m4/odp_netmap.m4]) m4_include([platform/linux-generic/m4/odp_dpdk.m4]) |