Hook memmem compat code into build.

This fixes builds on platforms that don't have it (at least old DragonFly,
probably others).

diff --git a/configure.ac b/configure.ac
index 958e99fd442c761bf052ef654fc3f4c60d26b225..63e01773388631707e722e48164a6df23cd3d159 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1751,6 +1751,7 @@ AC_CHECK_FUNCS([ \
        llabs \
        login_getcapbool \
        md5_crypt \
+       memmem \
        memmove \
        memset_s \
        mkdtemp \

diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
index 2cc343636ae366886218f084dbb5fcd7770812d0..1162dc55053da4fe0d245b0cb3bab4dcdfe428ea 100644 (file)
--- a/openbsd-compat/Makefile.in
+++ b/openbsd-compat/Makefile.in
@@ -34,6 +34,7 @@ OPENBSD=base64.o \
        inet_ntoa.o \
        inet_ntop.o \
        md5.o \
+       memmem.o \
        mktemp.o \
        pwcache.o \
        readpassphrase.o \

diff --git a/openbsd-compat/memmem.c b/openbsd-compat/memmem.c
index 823443b08a6c7e7ff0144b67a1040914dd2420f7..3e5e6b5e6d51232a94887c99282c81ed77ea176e 100644 (file)
--- a/openbsd-compat/memmem.c
+++ b/openbsd-compat/memmem.c
@@ -27,6 +27,10 @@
  * SUCH DAMAGE.
  */
 
+#include "includes.h"
+
+#ifndef HAVE_MEMMEM
+
 #include <string.h>
 
 /*
@@ -62,3 +66,4 @@ memmem(const void *l, size_t l_len, const void *s, size_t s_len)
        return NULL;
 }
 DEF_WEAK(memmem);
+#endif /* HAVE_MEMMEM */

diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
index 86d45317b642eae1dedac6fc67e6d43ed09b40bd..fda6706f815f29a2595fa6e59a007e906c4f8b28 100644 (file)
--- a/openbsd-compat/openbsd-compat.h
+++ b/openbsd-compat/openbsd-compat.h
@@ -73,6 +73,10 @@ int getpagesize(void);
 char *getcwd(char *pt, size_t size);
 #endif
 
+#ifdef HAVE_MEMMEM
+void *memmem(const void *, size_t, const void *, size_t);
+#endif
+
 #ifndef HAVE_REALLOCARRAY
 void *reallocarray(void *, size_t, size_t);
 #endif