--- config.orig	Sun Jan 17 15:20:20 1999
+++ config	Tue Mar 30 12:58:19 1999
@@ -125,16 +125,12 @@
 	echo "${MACHINE}-whatever-bsdi"; exit 0
 	;;
 
-    FreeBSD:3*:*:*)
-	echo "${MACHINE}-whatever-freebsd3"; exit 0
-	;;
-
-    FreeBSD:*:*:*486*)
-	echo "i486-whatever-freebsd"; exit 0
+    FreeBSD:[12]*:*:*)
+	echo "${MACHINE}-whatever-freebsd"; exit 0
 	;;
 
     FreeBSD:*)
-	echo "${MACHINE}-whatever-freebsd"; exit 0
+	echo "${MACHINE}-whatever-freebsd3"; exit 0
 	;;
 
     NetBSD:*:*:*486*)
@@ -282,15 +278,6 @@
 esac
 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`
-if [ $? = "0" ]; then
-  CC=gcc
-else
-  CC=cc
-fi
-
 # read the output of the embedded GuessOS 
 read GUESSOS
 
@@ -334,7 +321,7 @@
 # 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
@@ -349,7 +336,7 @@
 if [ "$TEST" = "true" ]; then
   echo ./Configure $OUT $options
 else
-  perl ./Configure $OUT $options
+  ${PERL} ./Configure $OUT $options
 fi
 
 )