Update the metaconfig units for #7855.

p4raw-id: //depot/metaconfig@7856

diff --git a/U/perl/useperlio.U b/U/perl/useperlio.U
index 8abaa9e..a8f1c3f 100644 (file)
--- a/U/perl/useperlio.U
+++ b/U/perl/useperlio.U
@@ -7,7 +7,7 @@
 ?RCS:
 ?RCS: $Log: d_perlio.U,v $
 ?RCS:
-?MAKE:useperlio: Myread Oldconfig Setvar package
+?MAKE:useperlio: Myread Oldconfig Setvar package usesocks
 ?MAKE: -pick add $@ %<
 ?Y:TOP
 ?S:useperlio:
@@ -31,13 +31,12 @@ $define|true|[yY]*) dflt='y';;
 esac
 cat <<EOM
 
-Previous version of $package used the standard IO mechanisms as defined
-in <stdio.h>.  Versions 5.003_02 and later of perl allow alternate IO
-mechanisms via a "PerlIO" abstraction, but the stdio mechanism is still
-the default.  This abstraction layer can use AT&T's sfio (if you already
-have sfio installed) or regular stdio.  Using PerlIO with sfio may cause
-problems with some extension modules.  Using PerlIO with stdio is safe,
-but it is slower than plain stdio and therefore is not the default.
+Previous version of $package used the standard IO mechanisms as
+defined in <stdio.h>.  Versions 5.003_02 and later of perl allow
+alternate IO mechanisms via the PerlIO abstraction layer, but the
+stdio mechanism is still the default.  This abstraction layer can
+use AT&T's sfio (if you already have sfio installed) or regular stdio.
+Using PerlIO with sfio may cause problems with some extension modules.
 
 If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
@@ -48,10 +47,26 @@ y|Y)
        val="$define"
        ;;     
 *)      
-       echo "Ok, doing things the stdio way"
+       echo "Ok, doing things the stdio way."
        val="$undef"
        ;;
 esac
 set useperlio
 eval $setvar 
 
+case "$usesocks" in
+$define|true|[yY]*)
+       case "$useperlio" in
+       $define|true|[yY]*) ;;
+       *)      cat >&4 <<EOM
+
+You are using the SOCKS proxy protocol library which means that you
+should also use the PerlIO layer.  You may be headed for trouble.
+
+EOM
+               ;;
+       esac
+       ;;
+esac
+
+       

diff --git a/U/perl/usesocks.U b/U/perl/usesocks.U
index 6f74f7d..df62588 100644 (file)
--- a/U/perl/usesocks.U
+++ b/U/perl/usesocks.U
@@ -21,6 +21,9 @@
 ?H:?%<:#endif
 ?H:.
 ?LINT:set usesocks
+?LINT:set useperlio
+?LINT:extern useperlio
+?LINT:change useperlio
 ?INIT:: set usesocks on the Configure command line to enable socks.
 ?X: We should really have some explanatory text here, and some
 ?X: automatic setting of sensible defaults.
@@ -31,7 +34,8 @@ esac
 cat <<EOM
 
 Perl can be built to use the SOCKS proxy protocol library.  To do so,
-Configure must be run with -Dusesocks.
+Configure must be run with -Dusesocks.  If you use SOCKS you also need
+to use the PerlIO abstraction layer, this will be implicitly selected.
 
 If this doesn't make any sense to you, just accept the default '$dflt'.
 EOM
@@ -44,3 +48,7 @@ esac
 set usesocks
 eval $setvar
 
+case "$usesocks" in
+$define|true|[yY]*) useperlio="$define";;
+esac
+