diff --git a/configure b/configure
index f76479773..36b3e66cf 100755
--- a/configure
+++ b/configure
@@ -19,23 +19,11 @@ fi
 
 echo Switching to directory "\`${buildir}'" to continue configuration.
 
-cd ${buildir}
-${srcdir}/configure --srcdir=${srcdir} $*
-exit
-
-#########################################################################
-# THE FOLLOWING HAS BEEN DEACTIVATED. ENSURE YOU PASS THE RIGHT FLAGS
-# TO GCC!
 #
 # There are two ways to configure ECL. If we use our own version of GMP,
 # we let it configure itself and later on retrieve the appropiate flags
 #
-if ( echo $* | grep enable-local-gmp ) ||\
-   ( echo $* | grep enable-simple-conf ) ||\
-   ( echo $* | grep help ) ; then
-  cd ${buildir}
-  ${srcdir}/configure --srcdir=${srcdir} $*
-else
+if ( echo $* | grep guess-host-cflags ) ||\
   #
   # In some architectures/OS, a flag is required to select the ABI. GMP
   # guesses these flags, and stores them in CFLAGS and GMP_LDFLAGS.
@@ -53,11 +41,11 @@ else
   # some options could be prefixed by -Wc, which means "flag for the compiler".
   LDFLAGS=`grep '^s,@LDFLAGS@' config.status| sed 's&s,@LDFLAGS@,\(.*\),;t t&\1&'`;
   LDFLAGS=`echo ${LDFLAGS} ${GMP_LDFLAGS} | sed 's%-Wc,%%'`
-  host=`grep '^s,@host@' config.status | sed 's&s,@host@,\(.*\),;t t&\1&'`
+  #host=`grep '^s,@host@' config.status | sed 's&s,@host@,\(.*\),;t t&\1&'`
   echo Guessed values:
   echo CFLAGS:  ${CFLAGS}
   echo LDFLAGS: ${LDFLAGS}
-  echo host:    ${host}
+  #echo host:    ${host}
   cd .. && rm -rf tmp
   echo ====
   echo ==== Configuring ECL
@@ -70,6 +58,9 @@ else
   #    cp ${srcdir}/gmp/$i ${srcdir}/gc/
   #done;
   LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" \
-  ${srcdir}/configure --srcdir=${srcdir} $* --host=${host}
+  ${srcdir}/configure --srcdir=${srcdir} $*
+else
+  cd ${buildir}
+  ${srcdir}/configure --srcdir=${srcdir} $*
 fi
 echo Configuration complete. To build ECL, issue 'make' in this directory.