Integrate with mainperl.

[p5sagit/p5-mst-13.2.git] / Configure

diff --git a/Configure b/Configure
index 2c717fe..1901789 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Sat May 29 13:37:18 EET DST 1999 [metaconfig 3.0 PL70]
+# Generated on Mon Jul  5 02:09:55 EET DST 1999 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -628,6 +628,7 @@ d_pwquota=''
 i_pwd=''
 i_sfio=''
 i_shadow=''
+i_socks=''
 i_stddef=''
 i_stdlib=''
 i_string=''
@@ -2627,7 +2628,7 @@ case "$use64bits" in
                . ./use64bits.cbu
        fi
        case "$osname" in
-       dec_osf|hpux|irix|solaris|unicos)
+       aix|dec_osf|hpux|irix|solaris|unicos)
                # Known 64-bit capable platforms.
                ;;
        *)
@@ -3625,7 +3626,7 @@ int main() {
        exit(0);
 }
 EOM
-if $cc -o gccvers gccvers.c >/dev/null 2>&1; then
+if $cc -o gccvers gccvers.c; then
        gccversion=`./gccvers`
        case "$gccversion" in
        '') echo "You are not using GNU cc." ;;
@@ -4368,18 +4369,26 @@ $grep "^[       ]*#.*\$wanted" | \
 while read cline; do
        name=\`echo \$cline | $awk "\$awkprg" | $tr -d '"'\`
        case "\$name" in
-       *[/\\\\]\$wanted) echo "\$name"; exit 0;;
-       *[\\\\/]\$wanted) echo "\$name"; exit 0;;
-       *) name='';;
+       *[/\\\\]\$wanted) echo "\$name"; exit 1;;
+       *[\\\\/]\$wanted) echo "\$name"; exit 1;;
+       *) exit 2;;
        esac;
 done;
+#
+#status=0: grep returned 0 lines, case statement not executed
+#status=1: headerfile found
+#status=2: while loop executed, no headerfile found
+#
+status=\$?
 $rm -f foo\$\$.c;
-case "\$name" in
-'') exit 1;;
-esac
+if test \$status -eq 1; then
+       exit 0;
+fi
+exit 1
 EOF
 chmod +x findhdr
 
+
 : define an alternate in-header-list? function
 inhdr='echo " "; td=$define; tu=$undef; yyy=$@;
 cont=true; xxf="echo \"<\$1> found.\" >&4";
@@ -11023,7 +11032,7 @@ int main() {
 #  if defined(HAS_SYSCONF) && defined(_SC_OPEN_MAX)
     open_max = sysconf(_SC_OPEN_MAX);
 #  else
-#  ifdef FOPEN_MAX
+#   ifdef FOPEN_MAX
     open_max = FOPEN_MAX;
 #   else
 #    ifdef OPEN_MAX
@@ -11035,6 +11044,7 @@ int main() {
 #    endif
 #   endif
 #  endif
+# endif 
 # ifdef HAS_STDIO_STREAM_ARRAY
     if (open_max > 0) {
       long i;
@@ -11054,8 +11064,8 @@ EOCP
 if $test "X$fflushNULL" = X -o "X$fflushall" = X; then
     output=''
     set try -DTRY_FPUTC
-    $rm -f try.out
     if eval $compile; then
+           $rm -f try.out
            ./try$exe_ext 2>/dev/null
            if $test ! -s try.out -a "X$?" = X42; then
                output=-DTRY_FPUTC
@@ -11066,6 +11076,7 @@ if $test "X$fflushNULL" = X -o "X$fflushall" = X; then
            set try -DTRY_FPRINTF
            $rm -f try.out
            if eval $compile; then
+                   $rm -f try.out
                    ./try$exe_ext 2>/dev/null
                    if $test ! -s try.out -a "X$?" = X42; then
                        output=-DTRY_FPRINTF
@@ -11077,8 +11088,8 @@ fi
 : check for fflush NULL behaviour
 case "$fflushNULL" in
 '')    set try -DTRY_FFLUSH_NULL $output
-       $rm -f try.out
        if eval $compile; then
+               $rm -f try.out
                ./try$exe_ext 2>/dev/null
                code="$?"
                if $test -s try.out -a "X$code" = X42; then
@@ -11124,11 +11135,11 @@ case "$fflushNULL" in
        : check for fflush all behaviour
        case "$fflushall" in
        '')     set try -DTRY_FFLUSH_ALL $output
-               $rm -f try.out
                if eval $compile; then
-               $cat >&4 <<EOM
+                       $cat >&4 <<EOM
 (Now testing the other method--but note that also this may fail.)
 EOM
+                       $rm -f try.out
                        ./try$exe_ext 2>/dev/null
                        if $test -s try.out -a "X$?" = X42; then
                                fflushall="`$cat try.out`"
@@ -12415,6 +12426,10 @@ val=$val3; set i_termios; eval $setvar
 set shadow.h i_shadow
 eval $inhdr
 
+: see if this is a socks.h system
+set socks.h i_socks
+eval $inhdr
+
 : see if stdarg is available
 echo " "
 if $test `./findhdr stdarg.h`; then
@@ -13328,6 +13343,7 @@ i_rpcsvcdbm='$i_rpcsvcdbm'
 i_sfio='$i_sfio'
 i_sgtty='$i_sgtty'
 i_shadow='$i_shadow'
+i_socks='$i_socks'
 i_stdarg='$i_stdarg'
 i_stddef='$i_stddef'
 i_stdlib='$i_stdlib'