diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | wsutil/Makefile.am | 11 | ||||
| -rw-r--r-- | wsutil/Makefile.common | 10 |
3 files changed, 24 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2850b4bb23..5c663f63e7 100644 --- a/configure.ac +++ b/configure.ac @@ -2540,10 +2540,15 @@ AC_SUBST(GETOPT_LO) AC_CHECK_FUNC(strncasecmp, [ + STRNCASECMP_INCLUDES="" STRNCASECMP_LO="" AC_DEFINE(HAVE_STRNCASECMP, 1, [Define to 1 if you have the strncasecmp function.]) ], - STRNCASECMP_LO="strncasecmp.lo") + [ + STRNCASECMP_INCLUDES="strncasecmp.h" + STRNCASECMP_LO="strncasecmp.lo" + ]) +AC_SUBST(STRNCASECMP_INCLUDES) AC_SUBST(STRNCASECMP_LO) AC_CHECK_FUNCS(mkstemp mkdtemp) diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index d15d2ae156..c291af6bf1 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -20,6 +20,15 @@ ACLOCAL_AMFLAGS = `../aclocal-flags` +# Optional headers for ABI checking +wsutil_optional_abi_includes = \ + @STRNCASECMP_INCLUDES@ + +# Header files for functions in libwsutil's ABI on this platform. +libwsutil_abi_INCLUDES = \ + $(libwsutil_nonrepl_INCLUDES) \ + $(wsutil_optional_abi_includes) + # Optional objects that I know how to build. These will be # linked into libwsutil if necessary. wsutil_optional_objects = \ @@ -108,7 +117,7 @@ MAINTAINERCLEANFILES = \ dumpabi-libwsutil: all abi-descriptor.xml rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz mkdir abi-check-headers - cp ../config.h ../ws_symbol_export.h *.h abi-check-headers/ + cp ../config.h ../ws_symbol_export.h $(libwsutil_abi_INCLUDES) abi-check-headers/ abi-compliance-checker -l libwsutil -v1 `readlink .libs/libwsutil.so | sed 's/.*\.so\.//'` \ -relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \ cat logs/libwsutil/[0-9]*/log.txt diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index 6201a78591..95736cd1f8 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -76,8 +76,9 @@ LIBWSUTIL_SRC = \ unicode-utils.c \ ws_version_info.c -# Header files that are not generated from other files -LIBWSUTIL_INCLUDES = \ +# Header files that don't declare replacement functions for functions +# present in the APIs/ABIs of some, but not all, targets. +libwsutil_nonrepl_INCLUDES = \ adler32.h \ aes.h \ base64.h \ @@ -131,6 +132,11 @@ LIBWSUTIL_INCLUDES = \ ws_mempbrk.h \ ws_version_info.h +# Header files that are not generated from other files +LIBWSUTIL_INCLUDES = \ + $(libwsutil_nonrepl_INCLUDES) \ + strncasecmp.h + # # Editor modelines - http://www.wireshark.org/tools/modelines.html # |