From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org> platform m4/configure.m4 file can make use of ODP_ABI_COMPAT. So let's set it before calling into platform file.
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org> --- /** Email created from pull request 440 (lumag:build-fixes) ** https://github.com/Linaro/odp/pull/440 ** Patch: https://github.com/Linaro/odp/pull/440.patch ** Base sha: b95ccd3db6eeb7358a877541747e06354429acdd ** Merge commit sha: 6f20299f993632a4dda987a31b37160d80c25279 **/ configure.ac | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 6d76bead8..1edc01f4e 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,21 @@ fi PKGCONFIG_VERSION=$(echo $VERSION | awk -F '.git' '{print $1}') AC_SUBST(PKGCONFIG_VERSION) +########################################################################## +# Enable/disable ABI compatible build +########################################################################## +ODP_ABI_COMPAT=1 +abi_compat=yes +AC_ARG_ENABLE([abi-compat], + [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files], + [if test "x$enableval" = "xno"; then + ODP_ABI_COMPAT=0 + abi_compat=no + #if there is no ABI compatibility the .so numbers are meaningless + ODP_LIBSO_VERSION=0:0:0 + fi]) +AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"]) + ########################################################################## # Determine which platform to build for ########################################################################## @@ -282,21 +297,6 @@ AS_IF([test "x$enable_helper_debug_print" != "xno"], [ODPH_DEBUG_PRINT=1], AC_DEFINE_UNQUOTED([ODPH_DEBUG_PRINT], [$ODPH_DEBUG_PRINT], [Define to 1 to display helper debug information]) -########################################################################## -# Enable/disable ABI compatible build -########################################################################## -ODP_ABI_COMPAT=1 -abi_compat=yes -AC_ARG_ENABLE([abi-compat], - [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files], - [if test "x$enableval" = "xno"; then - ODP_ABI_COMPAT=0 - abi_compat=no - #if there is no ABI compatibility the .so numbers are meaningless - ODP_LIBSO_VERSION=0:0:0 - fi]) -AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"]) - ########################################################################## # Enable/disable deprecated API definitions ##########################################################################