diff --git a/configure.in b/configure.in
index 5479842..7c2a4a5 100644
--- a/configure.in
+++ b/configure.in
@@ -52,8 +52,6 @@ else
 dnl Maximum optimisation
 	CFLAGS="-O3"
 fi
-CFLAGS="-Wall $CFLAGS"
-export CFLAGS
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -61,6 +59,13 @@ AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
+dnl Avoid unused static function warnings
+CFLAGS="-Wall $CFLAGS"
+if test "x$GCC" = "xyes"; then
+	CFLAGS="$CFLAGS -Wno-unused-function"
+fi
+export CFLAGS
+
 dnl Solaris
 AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
 AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)])
@@ -500,6 +505,9 @@ AC_ARG_ENABLE(permissive_menu_goto,
   fi,
 )
 
+# check for doxygen
+BB_ENABLE_DOXYGEN
+
 AC_CONFIG_FILES([Makefile
 	shared/Makefile
 	server/Makefile
@@ -512,6 +520,7 @@ AC_CONFIG_FILES([Makefile
 	clients/headlines/Makefile
 	clients/metar/Makefile
 	docs/Makefile
+	docs/Doxyfile
 	docs/lcdproc-dev/Makefile
 	docs/lcdproc-user/Makefile
 	docs/lcdproc-user/drivers/Makefile