Further integration from Configure works

2 files changed, 33 insertions, 0 deletions

diff --git a/Porting/Glossary b/Porting/Glossary
index e285e52c49..16acb5e26f 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -1358,6 +1358,10 @@ d_grpasswd (i_grp.U):
 	This variable conditionally defines GRPASSWD, which indicates
 	that struct group in <grp.h> contains gr_passwd.
 
+d_has_C_UTF8 (d_setlocale.U):
+	This variable is set to either "true" or "false" depending on
+	whether the compilation system supports the C.UTF-8 locale.
+
 d_hasmntopt (d_hasmntopt.U):
 	This variable conditionally defines the HAS_HASMNTOPT symbol, which
 	indicates to the C program that the hasmntopt() routine is available
@@ -2280,6 +2284,10 @@ d_setlocale (d_setlocale.U):
 	This variable conditionally defines HAS_SETLOCALE if setlocale() is
 	available to handle locale-specific ctype implementations.
 
+d_setlocale_accepts_any_locale_name (d_setlocale.U):
+	This variable conditionally defines SETLOCALE_ACCEPTS_ANY_LOCALE_NAME
+	if setlocale() accepts any locale name.
+
 d_setlocale_r (d_setlocale_r.U):
 	This variable conditionally defines the HAS_SETLOCALE_R symbol,
 	which indicates to the C program that the setlocale_r()
@@ -2630,6 +2638,10 @@ d_strtod (d_strtod.U):
 	indicates to the C program that the strtod() routine is available
 	to provide better numeric string conversion than atof().
 
+d_strtod_l (d_strtod_l.U):
+	This variable conditionally defines the HAS_STRTOD_L symbol, which
+	indicates to the C program that the strtod_l() routine is available.
+
 d_strtol (d_strtol.U):
 	This variable conditionally defines the HAS_STRTOL symbol, which
 	indicates to the C program that the strtol() routine is available
@@ -2761,6 +2773,14 @@ d_tmpnam_r (d_tmpnam_r.U):
 	which indicates to the C program that the tmpnam_r()
 	routine is available.
 
+d_towlower (d_towlower.U):
+	This variable conditionally defines the HAS_TOWLOWER symbol, which
+	indicates to the C program that the towlower() routine is available.
+
+d_towupper (d_towupper.U):
+	This variable conditionally defines the HAS_TOWUPPER symbol, which
+	indicates to the C program that the towupper() routine is available.
+
 d_trunc (d_trunc.U):
 	This variable conditionally defines the HAS_TRUNC symbol, which
 	indicates to the C program that the trunc() routine is available
@@ -3792,6 +3812,10 @@ i_wchar (i_wchar.U):
 	This variable conditionally defines the I_WCHAR symbol,
 	that indicates whether a C program may include <wchar.h>.
 
+i_wctype (i_wctype.U):
+	This variable conditionally defines the I_WCTYPE symbol,
+	that indicates whether a C program may include <wctype.h>.
+
 i_xlocale (d_newlocale.U):
 	This symbol, if defined, indicates to the C program that it should
 	include <xlocale.h> to get uselocale() and its friends
@@ -5533,6 +5557,12 @@ usekernprocpathname (usekernprocpathname.U):
 	KERN_PROC_PATHNAME to get a full path for the executable, and hence
 	convert $^X to an absolute path.
 
+uselanginfo (Extensions.U):
+	This variable holds either 'true' or 'false' to indicate
+	whether the I18N::Langinfo extension should be used.  The sole
+	use for this currently is to allow an easy mechanism for users to skip
+	this extension from the Configure command line.
+
 uselargefiles (uselfs.U):
 	This variable conditionally defines the USE_LARGE_FILES symbol,
 	and indicates that large file interfaces should be used when
diff --git a/config_h.SH b/config_h.SH
index a24daa6f1f..ef135e2528 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -3011,6 +3011,9 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  *	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).
+ *	In glibc, memmem is a GNU extension.  The function is visible in
+ *	libc, but the prototype is only visible if _GNU_SOURCE is #defined.
+ *	Thus we only define this if both the prototype and symbol are found.
  */
 #$d_memmem HAS_MEMMEM		/**/