-Wall implies -Wuninitialized.

[openssl.git] / config

diff --git a/config b/config
index f403a22451f8ac716e52238041048d3648fd45cf..2bc53c24249520b8c3f7773c2f9ca774a78743b8 100755 (executable)
--- a/config
+++ b/config
@@ -125,6 +125,10 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        echo "${MACHINE}-whatever-bsdi"; exit 0
        ;;
 
+    FreeBSD:3*:*:*)
+       echo "${MACHINE}-whatever-freebsd3"; exit 0
+       ;;
+
     FreeBSD:*:*:*486*)
        echo "i486-whatever-freebsd"; exit 0
        ;;
@@ -262,7 +266,7 @@ usage: config [options]
  -t    Test mode, do not run the Configure perl script.
  -h    This help.
 
-Any other text will be passed to ther Configure perl script.
+Any other text will be passed to the Configure perl script.
 Usefull options include
  no-asm Build with no assember code.
  -Dxxx Add xxx define to compilation.
@@ -280,7 +284,7 @@ done
 
 # figure out if gcc is available and if so we use it otherwise
 # we fallback to whatever cc does on the system
-GCCVER=`gcc -v 2>&1`
+GCCVER=`(gcc -v) 2>&1`
 if [ $? = "0" ]; then
   CC=gcc
 else
@@ -299,11 +303,13 @@ fi
 # more time that I want to waste at the moment
 case "$GUESSOS" in
   alpha-*-linux2) OUT="alpha-gcc" ;;
+  ppc-*-linux2) OUT="linux-ppc" ;;
   *-*-linux2) OUT="linux-elf" ;;
-  *-*-linux) OUT="linux-aout" ;;
+  *-*-linux1) OUT="linux-aout" ;;
   sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;;
   *86*-sun-solaris2) OUT="solaris-x86-$CC" ;;
   *-*-sunos4) OUT="sunos-$CC" ;;
+  *-freebsd3) OUT="FreeBSD-elf" ;;
   *-freebsd) OUT="FreeBSD" ;;
   *86*-*-netbsd) OUT="NetBSD-x86" ;;
   sun3*-*-netbsd) OUT="NetBSD-m68" ;;
@@ -326,10 +332,36 @@ if [ -z "$OUT" ]; then
   OUT="$CC"
 fi
 
+if [ ".$PERL" = . ] ; then
+       for i in . `echo $PATH | sed 's/:/ /g'`; do
+               if [ -f "$i/perl5" ] ; then
+                       PERL="$i/perl5"
+                       break;
+               fi;
+       done
+fi
+
+if [ ".$PERL" = . ] ; then
+       for i in . `echo $PATH | sed 's/:/ /g'`; do
+               if [ -f "$i/perl" ] ; then
+                       if "$i/perl" -e 'exit($]<5.0)'; then
+                               PERL="$i/perl"
+                               break;
+                       fi;
+               fi;
+       done
+fi
+
+if [ ".$PERL" = . ] ; then
+       echo "You need Perl 5."
+       exit 1
+fi
+
 # run Configure to check to see if we need to specify the 
 # compiler for the platform ... in which case we add it on
 # the end ... otherwise we leave it off
-perl ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null
+
+$PERL ./Configure 2>&1 | grep "$OUT-$CC" > /dev/null
 if [ $? = "0" ]; then
   OUT="$OUT-$CC"
 fi
@@ -342,9 +374,9 @@ OUT="$PREFIX$OUT"
 echo Configuring for $OUT
 
 if [ "$TEST" = "true" ]; then
-  echo ./Configure $OUT $options
+  echo $PERL ./Configure $OUT $options
 else
-  perl ./Configure $OUT $options
+  $PERL ./Configure $OUT $options
 fi
 
 )