--- configure.orig	Wed Feb 16 14:16:08 2005
+++ configure	Wed Feb 16 14:16:54 2005
@@ -1323,11 +1323,6 @@
 ARCH_TYPE=`uname -m`
 echo "$ac_t""$ARCH_TYPE" 1>&6
 
-CC=
-CFLAGS=
-LDFLAGS=
-CFLAGS_ARCH=
-
 
 
 
@@ -1340,17 +1335,10 @@
     ;;
 
   Linux|FreeBSD)
-    CC="gcc"
-    if test "$ARCH_TYPE" = "i486" ; then
-      CFLAGS_ARCH="-m486"
-    fi
-    if test "$ARCH_TYPE" = "i586" ; then
-      CFLAGS_ARCH="-i586 -pipe"
-    fi
     if test "$OS_TYPE" = "FreeBSD" ; then
       OS_TYPE="BSD"
     fi
-    CFLAGS="-O6 -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
+    CFLAGS="${CFLAGS} -ffast-math -fomit-frame-pointer -DNO_BYTE_SWAPPING ${CFLAGS_ARCH}"
     ;;
 
   SunOS)
