Add probe for memmem

16 files changed, 40 insertions, 2 deletions

diff --git a/Configure b/Configure
index f8d4abd379..ff864b063a 100755
--- a/Configure
+++ b/Configure
@@ -654,6 +654,7 @@ d_mbtowc=''
 d_memchr=''
 d_memcmp=''
 d_memcpy=''
+d_memmem=''
 d_memmove=''
 d_memset=''
 d_mkdir=''
@@ -16353,6 +16354,10 @@ eval $inlibc
 set memcpy d_memcpy
 eval $inlibc
 
+: see if memmem exists
+set memmem d_memmem
+eval $inlibc
+
 : see if memmove exists
 set memmove d_memmove
 eval $inlibc
@@ -24494,6 +24499,7 @@ d_mbtowc='$d_mbtowc'
 d_memchr='$d_memchr'
 d_memcmp='$d_memcmp'
 d_memcpy='$d_memcpy'
+d_memmem='$d_memmem'
 d_memmove='$d_memmove'
 d_memset='$d_memset'
 d_mkdir='$d_mkdir'
diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index ea203661e2..7c4de32760 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -362,6 +362,7 @@ d_mbtowc='define'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
diff --git a/NetWare/config.wc b/NetWare/config.wc
index bf8dc11e0e..a06d89cae0 100644
--- a/NetWare/config.wc
+++ b/NetWare/config.wc
@@ -351,6 +351,7 @@ d_mbtowc='define'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
diff --git a/Porting/Glossary b/Porting/Glossary
index 4ff252f8ac..b5e7544f64 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -1614,6 +1614,12 @@ d_memcpy (d_memcpy.U):
 	indicates to the C program that the memcpy() routine is available
 	to copy blocks of memory.
 
+d_memmem (d_memmem.U):
+	This variable conditionally defines the HAS_MEMMEM symbol, which
+	indicates to the C program that the memmem() routine is available
+	to return a pointer to the start of the first occurance of a
+	substring in a memory area (or NULL if not found).
+
 d_memmove (d_memmove.U):
 	This variable conditionally defines the HAS_MEMMOVE symbol, which
 	indicates to the C program that the memmove() routine is available
diff --git a/Porting/config.sh b/Porting/config.sh
index 11704dd2b2..b433b50c81 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -372,6 +372,7 @@ d_mbtowc='define'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
diff --git a/config_h.SH b/config_h.SH
index 532238e26f..6bd7c30beb 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -4099,6 +4099,13 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 #$d_malloc_good_size HAS_MALLOC_GOOD_SIZE	/**/
 
+/* HAS_MEMMEM:
+ *	This symbol, if defined, indicates that the memmem routine is
+ *	available to return a pointer to the start of the first occurance
+ *	of a substring in a memory area (or NULL if not found).
+ */
+#$d_memmem HAS_MEMMEM		/**/
+
 /* HAS_MKDTEMP:
  *	This symbol, if defined, indicates that the mkdtemp routine is
  *	available to exclusively create a uniquely named temporary directory.
diff --git a/configure.com b/configure.com
index 75a4f5b3b2..f15db215b8 100644
--- a/configure.com
+++ b/configure.com
@@ -6156,6 +6156,7 @@ $ WC "d_mbtowc='" + d_mbtowc + "'"
 $ WC "d_memchr='" + d_memchr + "'"
 $ WC "d_memcmp='define'"
 $ WC "d_memcpy='define'"
+$ WC "d_memmem='undef'"
 $ WC "d_memmove='define'"
 $ WC "d_memset='define'"
 $ WC "d_mkdir='define'"
diff --git a/metaconfig.h b/metaconfig.h
index f2151a5c26..84580f59f0 100644
--- a/metaconfig.h
+++ b/metaconfig.h
@@ -26,6 +26,7 @@
  * HAS_ISLESS
  * HAS_J0
  * HAS_LOCALTIME64
+ * HAS_MEMMEM
  * HAS_MKTIME64
  * HAS_NEWLOCALE
  * HAS_PRCTL
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index 913e87dc25..06a369bdba 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -362,6 +362,7 @@ d_mbtowc='define'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
diff --git a/symbian/config.sh b/symbian/config.sh
index 603ef443ac..48cb7a5c84 100644
--- a/symbian/config.sh
+++ b/symbian/config.sh
@@ -308,6 +308,7 @@ d_mbtowc='undef'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
diff --git a/uconfig.h b/uconfig.h
index f87fb1aabc..3648f89035 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -4064,6 +4064,13 @@
  */
 /*#define HAS_MALLOC_GOOD_SIZE	/ **/
 
+/* HAS_MEMMEM:
+ *	This symbol, if defined, indicates that the memmem routine is
+ *	available to return a pointer to the start of the first occurance
+ *	of a substring in a memory area (or NULL if not found).
+ */
+# HAS_MEMMEM		/**/
+
 /* HAS_MKDTEMP:
  *	This symbol, if defined, indicates that the mkdtemp routine is
  *	available to exclusively create a uniquely named temporary directory.
@@ -5241,6 +5248,6 @@
 #endif
 
 /* Generated from:
- * 01a33ec4d20289fa524203757339606daef1a014ff6b693d38234495023ac9e7 config_h.SH
- * d2f05caf5dc56031d3338c8f42e9e317ae1e53faa7b51285d0d6ebc343f8a333 uconfig.sh
+ * dc6a0dd949dd1c707248914e2fdada06beb0e6193be5e94cb1423c6f050e65c3 config_h.SH
+ * ea0c70d2693a5911f8c16818794db0e782e9c4b40b9688a200dea7bcfcdfd820 uconfig.sh
  * ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index 12bbfd1d65..d0cb2de80d 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -301,6 +301,7 @@ d_mbtowc='undef'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='undef'
 d_memset='define'
 d_mkdir='undef'
diff --git a/uconfig64.sh b/uconfig64.sh
index 4b8c3ac9d6..218e92d098 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -302,6 +302,7 @@ d_mbtowc='undef'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='undef'
 d_memset='define'
 d_mkdir='undef'
diff --git a/win32/config.ce b/win32/config.ce
index 7e6fe40367..a5ee73774a 100644
--- a/win32/config.ce
+++ b/win32/config.ce
@@ -349,6 +349,7 @@ d_mbtowc='define'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
diff --git a/win32/config.gc b/win32/config.gc
index e8179cc4a6..e9cf4ed4eb 100644
--- a/win32/config.gc
+++ b/win32/config.gc
@@ -349,6 +349,7 @@ d_mbtowc='define'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'
diff --git a/win32/config.vc b/win32/config.vc
index 4972db8f1f..2fc37b0c6e 100644
--- a/win32/config.vc
+++ b/win32/config.vc
@@ -349,6 +349,7 @@ d_mbtowc='define'
 d_memchr='define'
 d_memcmp='define'
 d_memcpy='define'
+d_memmem='undef'
 d_memmove='define'
 d_memset='define'
 d_mkdir='define'