diff options
| author | Matias Elo <matias.elo@nokia.com> | 2021-05-31 16:47:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 16:47:50 +0300 |
| commit | 5aeb1e9968a6a232850e0f8160b24a2a87e426b9 (patch) | |
| tree | 8eb44476987f1b746b50fcaa5ff614b77a366210 /configure.ac | |
| parent | 3cc4177b551f32aa4b3b0d76c248f5342362a028 (diff) | |
| parent | 121ea2bbc5f145301f8d42c6310a4d249f1d8abf (diff) | |
Merge ODP v1.29.0.0v1.29.0.0_DPDK_19.11
Merge ODP linux-generic v1.29.0.0 into ODP-DPDK.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index f92195772..e84cb3297 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.5]) # ODP API version ########################################################################## m4_define([odpapi_generation_version], [1]) -m4_define([odpapi_major_version], [28]) +m4_define([odpapi_major_version], [29]) m4_define([odpapi_minor_version], [0]) m4_define([odpapi_point_version], [0]) m4_define([odpapi_version], @@ -226,27 +226,28 @@ AC_SUBST(PKGCONFIG_VERSION) ########################################################################## # Enable/disable ABI compatible build ########################################################################## -ODP_ABI_COMPAT=1 -abi_compat=yes +ODP_ABI_COMPAT=0 +abi_compat=no AC_ARG_ENABLE([abi-compat], - [AS_HELP_STRING([--disable-abi-compat], - [disables ABI compatible mode, enables inline code in header files] - [[default=enabled]])], - [if test "x$enableval" = "xno"; then - ODP_ABI_COMPAT=0 - abi_compat=no - - #if there is no ABI compatibility the .so numbers are meaningless + [AS_HELP_STRING([--enable-abi-compat], + [enables ABI compatible mode, disables inline code in header files] + [[default=disabled]])], + [if test "x$enableval" = "xyes"; then + ODP_ABI_COMPAT=1 + abi_compat=yes + fi]) +if test "x$abi_compat" = "xno" ; then + # If there is no ABI compatibility the .so numbers are meaningless ODP_LIBSO_VERSION=0:0:0 - # do not use -march=native with clang (due to possible failures on + # Do not use -march=native with clang (due to possible failures on # clang optimizations). $CC --version | grep -q clang if test $? -ne 0; then ODP_CHECK_CFLAG([-march=native]) fi - fi]) +fi AM_CONDITIONAL(ODP_ABI_COMPAT, [test "x$ODP_ABI_COMPAT" = "x1"]) ########################################################################## |