--- test/Makefile.am.old	2006-08-01 01:00:03.000000000 +0200
+++ test/Makefile.am	2008-06-26 15:05:03.098283257 +0200
@@ -7,10 +7,10 @@
 
 check_PROGRAMS = test-geoip
 
+EXTRA_PROGRAMS = benchmark test-geoip-region
+
 #if WITH_CITY
-noinst_PROGRAMS = benchmark test-geoip-region test-geoip-city test-geoip-org test-geoip-asnum test-geoip-isp test-geoip-netspeed
-#else
-#noinst_PROGRAMS = benchmark test-geoip-region
+EXTRA_PROGRAMS += test-geoip-city test-geoip-org test-geoip-asnum test-geoip-isp test-geoip-netspeed
 #endif
 
 DEPS = $(top_builddir)/libGeoIP/libGeoIP.la