X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=config;h=2427c4a1aad7d573a9ca2c3ea0d5a56ea38b617a;hb=a8da89186c447932b9f5abced708330a3bff313b;hp=690f6630bc94154e5054ef8d4aafa70b421c5e2b;hpb=dabba1104b74f5f0926af71d2466b0b00fc99c20;p=openssl.git

diff --git a/config b/config
index 690f6630bc..2427c4a1aa 100755
--- a/config
+++ b/config
@@ -266,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.
@@ -284,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
@@ -303,6 +303,7 @@ 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" ;;
   *-*-linux1) OUT="linux-aout" ;;
   sun4*-sun-solaris2) OUT="solaris-sparc-$CC" ;;
@@ -331,10 +332,34 @@ 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
+			PERL="$i/perl"
+			break;
+		fi;
+	done
+fi
+
+if $PERL -e 'exit($]>=5.0);' ; 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
@@ -347,9 +372,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
 
 )