Regen Configure and Glossary after backport of xlocale.h addition

4 files changed, 92 insertions, 64 deletions

diff --git a/Configure b/Configure
index 1722882468..55e2ebb50f 100755
--- a/Configure
+++ b/Configure
@@ -700,6 +700,7 @@ d_newlocale=''
 d_querylocale=''
 d_uselocale=''
 i_xlocale=''
+xlocale_needed=''
 d_nextafter=''
 d_nexttoward=''
 d_nice=''
@@ -1401,7 +1402,6 @@ installvendorscript=''
 vendorscript=''
 vendorscriptexp=''
 versiononly=''
-xlocale_needed=''
 yacc=''
 yaccflags=''
 CONFIG=''
@@ -12682,6 +12682,10 @@ eval $inlibc
 set dup3 d_dup3
 eval $inlibc
 
+: see if localeconv_l exists
+set localeconv_l d_localeconv_l
+eval $inlibc
+
 : see if this is an xlocale.h system
 set xlocale.h i_xlocale
 eval $inhdr
@@ -12706,6 +12710,54 @@ eval $inlibc
 set querylocale d_querylocale
 eval $inlibc
 
+: if we have xlocale.h, check whether it is needed
+case "$i_xlocale$d_newlocale$xlocale_needed" in
+"$define$define")
+	echo "Checking if xlocale.h is needed..." >&4
+	$cat >try.c <<EOF
+#include <locale.h>
+#include <stdio.h>
+#ifdef TRY_XLOCALE
+#include <xlocale.h>
+#endif
+#$d_localeconv_l HAVE_LOCALECONV_L
+
+#ifdef HAVE_LOCALECONV_L
+struct lconv *(*lcptr)(locale_t) = localeconv_l;
+#endif
+
+int main(void) {
+  locale_t lc = newlocale(LC_ALL_MASK, "C", (locale_t)0);
+
+#ifdef HAVE_LOCALECONV_L
+  /* FreeBSD hides only localeconv_l() in xlocale.h */
+  struct lconv *lcbuf = localeconv_l(lc);
+  printf("decimal: %s\n", lcbuf->decimal_point);
+#endif
+
+  freelocale(lc);
+  return 0;
+}
+EOF
+	set try
+	if eval $compile && $run ./try > /dev/null 2>&1 ; then
+		echo "xlocale.h isn't needed" >&4
+		xlocale_needed=$undef
+	else
+		set try -DTRY_XLOCALE
+		if eval $compile && $run ./try > /dev/null 2>&1 ; then
+			xlocale_needed=$define
+			echo "xlocale.h is needed" >&4
+		else
+			echo "I can't build my test either way" >&4
+			xlocale_needed=$undef
+		fi
+	fi
+	$rm_try
+	;;
+*) xlocale_needed=$undef ;;
+esac
+
 : see if eaccess exists
 set eaccess d_eaccess
 eval $inlibc
@@ -16092,58 +16144,6 @@ eval $inlibc
 set llroundl d_llroundl
 eval $inlibc
 
-: see if localeconv_l exists
-set localeconv_l d_localeconv_l
-eval $inlibc
-
-: if we have xlocale.h, check whether it is needed
-case "$i_xlocale$d_newlocale$xlocale_needed" in
-"$define$define")
-        echo "Checking if xlocale.h is needed..." >&4
-        $cat >try.c <<EOF
-#include <locale.h>
-#include <stdio.h>
-#ifdef TRY_XLOCALE
-#include <xlocale.h>
-#endif
-#$d_localeconv_l HAVE_LOCALECONV_L
-
-#ifdef HAVE_LOCALECONV_L
-struct lconv *(*lcptr)(locale_t) = localeconv_l;
-#endif
-
-int main(void) {
-  locale_t lc = newlocale(LC_ALL_MASK, "C", (locale_t)0);
-
-#ifdef HAVE_LOCALECONV_L
-  /* FreeBSD hides only localeconv_l() in xlocale.h */
-  struct lconv *lcbuf = localeconv_l(lc);
-  printf("decimal: %s\n", lcbuf->decimal_point);
-#endif
-
-  freelocale(lc);
-  return 0;
-}
-EOF
-        set try
-        if eval $compile && $run ./try > /dev/null 2>&1 ; then
-                echo "xlocale.h isn't needed" >&4
-                xlocale_needed=$undef
-        else
-                set try -DTRY_XLOCALE
-                if eval $compile && $run ./try > /dev/null 2>&1 ; then
-                        xlocale_needed=$define
-                        echo "xlocale.h is needed" >&4
-                else
-                        echo "I can't build my test either way" >&4
-                        xlocale_needed=$undef
-                fi
-        fi
-        $rm_try
-        ;;
-*) xlocale_needed=$undef ;;
-esac
-
 : see if localtime_r exists
 set localtime_r d_localtime_r
 eval $inlibc
diff --git a/Porting/Glossary b/Porting/Glossary
index d28e8c58c8..479ed1d72f 100644
--- a/Porting/Glossary
+++ b/Porting/Glossary
@@ -895,6 +895,16 @@ d_fegetround (d_fegetround.U):
 	This variable conditionally defines HAS_FEGETROUND if fegetround() is
 	available to get the floating point rounding mode.
 
+d_ffs (d_ffs.U):
+	This variable conditionally defines the HAS_FFS symbol, which
+	indicates to the C program that the ffs() routine is available
+	to find the first bit which is set in its integer argument.
+
+d_ffsl (d_ffs.U):
+	This variable conditionally defines the HAS_FFSL symbol, which
+	indicates to the C program that the ffsl() routine is available
+	to find the first bit which is set in its long integer argument.
+
 d_fgetpos (d_fgetpos.U):
 	This variable conditionally defines HAS_FGETPOS if fgetpos() is
 	available to get the file position indicator.
@@ -1889,6 +1899,16 @@ d_nl_langinfo (d_nl_langinfo.U):
 	This variable conditionally defines the HAS_NL_LANGINFO symbol, which
 	indicates to the C program that the nl_langinfo() routine is available.
 
+d_nl_langinfo_l (d_nl_langinfo_l.U):
+	This variable contains the eventual value of the
+	HAS_NL_LANGINFO_L symbol, which indicates if the
+	nl_langinfo_l() function exists.
+
+d_non_int_bitfields (d_bitfield.U):
+	This variable conditionally defines HAS_NON_INT_BITFIELDS
+	which indicates that the C compiler accepts struct bitfields of sizes
+	that aren't 'int' or 'unsigned int'
+
 d_nv_preserves_uv (perlxv.U):
 	This variable indicates whether a variable of type nvtype
 	can preserve all the bits a variable of type uvtype.
@@ -2702,6 +2722,10 @@ d_strxfrm (d_strxfrm.U):
 	This variable conditionally defines HAS_STRXFRM if strxfrm() is
 	available to transform strings.
 
+d_strxfrm_l (d_strxfrm_l.U):
+	This variable conditionally defines HAS_STRXFRM_L if strxfrm_l() is
+	available to transform strings.
+
 d_suidsafe (d_dosuid.U):
 	This variable conditionally defines SETUID_SCRIPTS_ARE_SECURE_NOW
 	if setuid scripts can be secure.  This test looks in /dev/fd/.
@@ -3844,8 +3868,8 @@ i_wctype (i_wctype.U):
 	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
+	This symbol, if defined, indicates to the C program that the
+	header xlocale.h is available.  See also xlocale_needed.
 
 ignore_versioned_solibs (libs.U):
 	This variable should be non-empty if non-versioned shared
@@ -5881,6 +5905,10 @@ xlibpth (libpth.U):
 	libraries on this platform, for example CPU-specific libraries
 	(on multi-CPU platforms) may be listed here.
 
+xlocale_needed (d_newlocale.U):
+	This symbol, if defined, indicates that the C program should
+	include <xlocale.h> to get newlocale() and its friends.
+
 yacc (yacc.U):
 	This variable holds the name of the compiler compiler we
 	want to use in the Makefile. It can be yacc, byacc, or bison -y.
diff --git a/config_h.SH b/config_h.SH
index 834dc9f2ee..b172eaec04 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -3143,19 +3143,19 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
  */
 /* I_XLOCALE:
  *	This symbol, if defined, indicates to the C program that the
- *	xlocale.h header is available.  See also NEED_XLOCALE_H.
+ *	header xlocale.h is available.  See also NEED_XLOCALE_H
  */
 /* NEED_XLOCALE_H:
- *      This symbol, if defined, indicates that the C program should
- *      include <xlocale.h> to get newlocale() and its friends.
+ *	This symbol, if defined, indicates that the C program should
+ *	include <xlocale.h> to get newlocale() and its friends.
  */
 #$d_newlocale	HAS_NEWLOCALE	/**/
 #$d_freelocale	HAS_FREELOCALE	/**/
 #$d_uselocale	HAS_USELOCALE	/**/
 #$d_duplocale	HAS_DUPLOCALE	/**/
 #$d_querylocale	HAS_QUERYLOCALE	/**/
-#$i_xlocale	I_XLOCALE               /**/
 #$xlocale_needed	NEED_XLOCALE_H	/**/
+#$i_xlocale	I_XLOCALE               /**/
 
 /* HAS_NEXTAFTER:
  *	This symbol, if defined, indicates that the nextafter routine is
diff --git a/uconfig.h b/uconfig.h
index 49f836bc25..adb7269010 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -3108,19 +3108,19 @@
  */
 /* I_XLOCALE:
  *	This symbol, if defined, indicates to the C program that the
- *	xlocale.h header is available.  See also NEED_XLOCALE_H.
+ *	header xlocale.h is available.  See also NEED_XLOCALE_H
  */
 /* NEED_XLOCALE_H:
- *      This symbol, if defined, indicates that the C program should
- *      include <xlocale.h> to get newlocale() and its friends.
+ *	This symbol, if defined, indicates that the C program should
+ *	include <xlocale.h> to get newlocale() and its friends.
  */
 /*#define	HAS_NEWLOCALE	/ **/
 /*#define	HAS_FREELOCALE	/ **/
 /*#define	HAS_USELOCALE	/ **/
 /*#define	HAS_DUPLOCALE	/ **/
 /*#define	HAS_QUERYLOCALE	/ **/
-/*#define	I_XLOCALE               / **/
 /*#define	NEED_XLOCALE_H	/ **/
+/*#define	I_XLOCALE               / **/
 
 /* HAS_NEXTAFTER:
  *	This symbol, if defined, indicates that the nextafter routine is
@@ -5318,6 +5318,6 @@
 #endif
 
 /* Generated from:
- * c0ae90ad8256740b1a7872cebe079e964a7a9a5c8128038a60de0ab610d9e9fe config_h.SH
+ * f88762343858d290ac1b2bce8613d97ce15c18eada7a5a587fb9b8a8053d0d7f config_h.SH
  * 24570f2ff38b22b436d34127ff85a3f3a075a4dea1359c56f16196bdbe376b1c uconfig.sh
  * ex: set ro: */