Changeset 823d8e1

Timestamp:

06/29/18 09:49:20 (2 years ago)

Author:

Alistair King <alistair@…>

Branches:

cachetimestamps, develop, master, rc-4.0.4, ringdecrementfix, ringperformance

Children:

47d64ce

Parents:

c7f1faf

Message:

Replace AC_CHECK_FUNCS with AC_CHECK_DECLS

It seems that AC_CHECK_FUNCS does not correctly detect when these "functions" are implemented as macros. (I've seen this happening on macOS, and Ubuntu 16.04 with snprintf and strndup respectively.) Replacing AC_CHECK_FUNCS (and the similar AC_REPLACE_FUNCS) with AC_CHECK_DECLS seems to solve this problem, though I don't have access to any systems that do not have these functions to be sure that it correctly detects them as missing.

Files:

• configure.in (modified) (2 diffs)
• lib/Makefile.am (modified) (1 diff)
• lib/libtrace_int.h (modified) (2 diffs)
• lib/strndup.c (modified) (1 diff)

configure.in

@@ -87 +87 @@
 AC_FUNC_REALLOC
 
-# *BSD doesn't have strndup. Currently provide our own.
-AC_REPLACE_FUNCS(strndup)
-
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -126 +122 @@
 
 # Fail if any of these functions are missing
-AC_CHECK_FUNCS(socket strdup strlcpy strcasecmp strncasecmp snprintf vsnprintf recvmmsg)
+AC_CHECK_DECLS([socket, strdup, strlcpy, strcasecmp, strncasecmp, snprintf, vsnprintf, recvmmsg, strndup])
 
 AC_CHECK_SIZEOF([long int])

lib/Makefile.am

@@ -78 +78 @@
                 data-struct/buckets.c data-struct/simple_circular_buffer.c \
                 combiner_sorted.c combiner_unordered.c \
-                pthread_spinlock.c pthread_spinlock.h
+                pthread_spinlock.c pthread_spinlock.h \
+                strndup.c
 
 if DAG2_4

lib/libtrace_int.h

@@ -99 +99 @@
 #endif
 
-#ifndef HAVE_STRNDUP
+#if !HAVE_DECL_STRNDUP
 char *strndup(const char *s, size_t size);
 #endif
 
-#ifndef HAVE_STRNCASECMP
+#if !HAVE_DECL_STRNCASECMP
 # ifndef HAVE__STRNICMP
 /** A local implementation of strncasecmp (as some systems do not have it) */
@@ -112 +112 @@
 #endif
 
-#ifndef HAVE_SNPRINTF
+#if !HAVE_DECL_SNPRINTF
 # ifndef HAVE_SPRINTF_S
 /** A local implementation of snprintf (as some systems do not have it) */

lib/strndup.c

@@ -24 +24 @@
  *
  */
-#ifndef HAVE_STRNDUP
+#include "config.h"
+#if !HAVE_DECL_STRNDUP
 
 #include <stdlib.h>