--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@
 
 # Init autoconf and automake
 AC_INIT([gnet], [2.0.8], [gnet@gnetlibrary.org])
+AC_CONFIG_MACRO_DIR([macros])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_MAINTAINER_MODE
@@ -127,7 +128,6 @@
 ###############################
 # Check for programs
 AC_PROG_CC
-AM_PROG_CC_STDC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_LIBTOOL_WIN32_DLL
@@ -551,9 +551,6 @@
 if test "x$GCC" = "xyes"; then
   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes \
     -Wmissing-prototypes -Wmissing-declarations"
-  if test "x$enable_debug" = "xyes"; then
-    CFLAGS="$CFLAGS -Werror"
-  fi
 
   if test "x$enable_ansi" = "xyes"; then
     CFLAGS="$CFLAGS -ansi"
@@ -610,7 +607,7 @@
 # Outputs
 ###############################
 
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile