diff --git a/ChangeLog b/ChangeLog
index c1bebd8..fde19bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-22 Paul Jakma <paul@dishone.st>
+
+	* configure.ac: modify default CFLAGS to be compiler agnostic
+	  build Makefile for tests/ subdir.
+	  
 2004-07-14  Greg Troxel  <gdt@poblano.ir.bbn.com>
 
 	* Makefile.am (EXTRA_DIST): Add missing \, so tools stuff is
diff --git a/configure.ac b/configure.ac
index 632de2a..8eacf47 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.55 2004/06/30 17:36:11 gdt Exp $
+## $Id: configure.ac,v 1.56 2004/07/22 18:16:59 paul Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net])
@@ -46,8 +46,11 @@
 dnl -----------------------------------------
 dnl If CLFAGS doesn\'t exist set default value
 dnl -----------------------------------------
+dnl (Wall is gcc specific... have to make sure
+dnl  gcc is being used before setting it)
+dnl
 if test "x$cflags_specified" = "x" ; then
-  CFLAGS="$CFLAGS -Wall"
+  CFLAGS="$CFLAGS -O"
 fi
 
 dnl --------------
@@ -1122,6 +1125,7 @@
 	  vtysh/extract.pl
 	  redhat/Makefile redhat/quagga.spec
 	  lib/version.h,
+	  tests/Makefile,
 	  [chmod +x vtysh/extract.pl])
 
 echo "