X-Git-Url: https://perl5.git.perl.org/metaconfig.git/blobdiff_plain/386366d394102b598271831d6a0dd6baa241451b..HEAD:/U/perl/Extensions.U

diff --git a/U/perl/Extensions.U b/U/perl/Extensions.U
index 1bb79f0..a6052d5 100644
--- a/U/perl/Extensions.U
+++ b/U/perl/Extensions.U
@@ -8,10 +8,10 @@
 ?RCS: $Log: Extensions.U,v $
 ?RCS:
 ?MAKE:known_extensions extensions dynamic_ext static_ext nonxs_ext \
-	useposix useopcode : \
+	useposix useopcode uselanginfo : \
 	Myread hint usedl d_sem d_socket i_db i_dbm i_rpcsvcdbm i_gdbm \
-	d_ndbm usethreads use5005threads package test cat rsrc \
-	d_msg d_shm osname use64bitint i_langinfo d_nl_langinfo \
+	d_ndbm package test cat rsrc \
+	d_msg d_shm osname use64bitint \
 	libs d_cplusplus sed ls rm contains trnl sort
 ?MAKE:	-pick add $@ %<
 ?Y:BOTTOM
@@ -57,11 +57,19 @@
 ?S:	for users to skip the Opcode extension from the Configure
 ?S:	command line.
 ?S:.
+?S:uselanginfo:
+?S:	This variable holds either 'true' or 'false' to indicate
+?S:	whether the I18N::Langinfo extension should be used.  The sole
+?S:	use for this currently is to allow an easy mechanism for users to skip
+?S:	this extension from the Configure command line.
+?S:.
 ?T:xxx avail_ext this_ext tdir xs_extensions nonxs_extensions find_extensions
 ?INIT:: set useposix=false in your hint file to disable the POSIX extension.
 ?INIT:useposix=true
 ?INIT:: set useopcode=false in your hint file to disable the Opcode extension.
 ?INIT:useopcode=true
+?INIT:: set uselanginfo=false in your hint file to disable the I18N::Langinfo extension.
+?INIT:uselanginfo=true
 ?LINT:extern noextensions
 ?LINT:extern onlyextensions
 ?T:keepextensions i
@@ -86,13 +94,13 @@ find_extensions='
 	case "$xxx" in
 	    DynaLoader|dynaload) ;;
 	    *)
-	    this_ext=`echo $xxx | $sed -e s/-/\\\//g`;
+	    this_ext=`echo "$xxx" | $sed -e s/-/\\\//g`;
 	    case "$this_ext" in
 		Scalar/List/Utils) this_ext="List/Util"	;;
 		PathTools)         this_ext="Cwd"	;;
 	    esac;
-	    echo " $xs_extensions $nonxs_extensions" > $$.tmp;
-	    if $contains " $this_ext " $$.tmp; then
+	    echo " $xs_extensions $nonxs_extensions" > "$tdir/$$.tmp";
+	    if $contains " $this_ext " "$tdir/$$.tmp"; then
 		echo >&4;
 		echo "Duplicate directories detected for extension $xxx" >&4;
 		echo "Configure cannot correctly recover from this - shall I abort?" >&4;
@@ -110,15 +118,15 @@ find_extensions='
 		esac;
 		echo "Ok.  You will need to correct config.sh before running make." >&4;
 	    fi;
-	    $ls -1 $xxx > $$.tmp;
-	    if   $contains "\.xs$" $$.tmp > /dev/null 2>&1; then
+	    $ls -1 "$xxx" > "$tdir/$$.tmp";
+	    if   $contains "\.xs$" "$tdir/$$.tmp" > /dev/null 2>&1; then
 		xs_extensions="$xs_extensions $this_ext";
-	    elif $contains "\.c$"  $$.tmp > /dev/null 2>&1; then
+	    elif $contains "\.c$"  "$tdir/$$.tmp" > /dev/null 2>&1; then
 		xs_extensions="$xs_extensions $this_ext";
-	    elif $test -d $xxx; then
+	    elif $test -d "$xxx"; then
 		nonxs_extensions="$nonxs_extensions $this_ext";
 	    fi;
-	    $rm -f $$.tmp;
+	    $rm -f "$tdir/$$.tmp";
 	    ;;
 	esac;
     done'
@@ -150,6 +158,11 @@ avail_ext=''
 for xxx in $xs_extensions ; do
 	case "$xxx" in
 ?X: Handle possible DOS 8.3 filename and case alterations
+	Amiga*)
+		case "$osname" in
+		amigaos) avail_ext="$avail_ext $xxx" ;;
+		esac
+		;;
 	DB_File|db_file)
 		case "$i_db" in
 		$define) avail_ext="$avail_ext $xxx" ;;
@@ -160,11 +173,6 @@ for xxx in $xs_extensions ; do
 		$define) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
-	I18N/Langinfo|i18n_lan)
-		case "$i_langinfo$d_nl_langinfo" in
-		$define$define) avail_ext="$avail_ext $xxx" ;;
-		esac
-		;;
 	IPC/SysV|ipc/sysv)
 		: XXX Do we need a useipcsysv variable here
 		case "${d_msg}${d_sem}${d_shm}" in
@@ -218,18 +226,20 @@ for xxx in $xs_extensions ; do
 		true|$define|y) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
-	Sys/Syslog|sys/syslog)
-		: XXX syslog requires socket
-		case "$d_socket" in
-		true|$define|y) avail_ext="$avail_ext $xxx" ;;
+	I18N/Langinfo|langinfo)
+		case "$uselanginfo" in
+		true|define|y) avail_ext="$avail_ext $xxx" ;;
 		esac
 		;;
-	Thread|thread)
-                case "$usethreads" in
-                true|$define|y)
-                        case "$use5005threads" in
-                        $define|true|[yY]*) avail_ext="$avail_ext $xxx" ;;
-                        esac
+	Sys/Syslog|sys/syslog)
+		case $osname in
+			amigaos) ;; # not really very useful on AmigaOS
+			*)
+			: XXX syslog requires socket
+			case "$d_socket" in
+			true|$define|y) avail_ext="$avail_ext $xxx" ;;
+			esac
+			;;
 		esac
 		;;
 	threads|threads/shared)
@@ -479,7 +489,7 @@ case " $extensions"  in
 *" Fcntl "*"_File "*" IO "*) ;; # GDBM_File
 *" Fcntl "*" IO "*"_File "*) ;; # NDBM_File
 *) echo "WARNING: Extensions DB_File or *DBM_File, Fcntl, and IO not configured." >&4
-   echo "WARNING: The Perl you are building will be quite crippled." >& 4
+   echo "WARNING: The Perl you are building will be quite crippled." >&4
    ;;
 esac