--- configure.in.orig	2008-11-20 12:07:20.000000000 +0100
+++ configure.in	2008-11-20 12:15:07.000000000 +0100
@@ -197,7 +197,7 @@
 
 AC_ARG_ENABLE(bz2,
   [  --enable-bz2            Enable BZip2 decompression code  [[default=no]]],
-  USE_BZIP="yes", USE_BZIP="no")
+  USE_BZIP="${enableval}", USE_BZIP="no")
 
 AC_ARG_WITH(bz2,
   [  --with-bz2=DIR          Alternate location for bz2 header files],
@@ -233,7 +233,7 @@
 
 AC_ARG_ENABLE(geoip,
   [  --enable-geoip          Enable GeoIP geolocation code    [[default=no]]],
-  USE_GEOIP="yes", USE_GEOIP="no")
+  USE_GEOIP="${enableval}", USE_GEOIP="no")
 
 AC_ARG_WITH(geoip,
   [  --with-geoip=DIR        Alternate location for libGeoIP header files],