diff --git a/autogen.sh b/autogen.sh
index 378696c..3bb71f7 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-autoreconf -fis
+autoreconf -i --warnings=all -v
diff --git a/configure.ac b/configure.ac
index 1ddeffa..0d7cf06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 dnl ----------------- CONFIGURE ---------------------
 
-AC_INIT( [sgpemv2], [0.00], [matteo@member.fsf.org])
+AC_INIT([sgpemv2],[0.00],[matteo@member.fsf.org])
 
 if test -f "`pwd`/configure.ac"; then
         AC_MSG_FAILURE([
@@ -43,7 +43,6 @@ AC_CANONICAL_TARGET
 
 dnl starting automake
 AM_INIT_AUTOMAKE( [$PACKAGE_NAME], [$PACKAGE_VERSION] )
-AM_CONFIG_HEADER(config.h)
 
 dnl various requisites
 #GTKMM_VERSION=2.8.0
@@ -63,16 +62,19 @@ AC_PROG_MAKE_SET
 dnl check for gtkmm & cairo
 #PKG_CHECK_MODULES([CAIRO], 
 #		[cairo >= $CAIRO_VERSION],
-#		:, AC_ERROR([$ADDITIONAL_PKG_ERRORS]))
+#		:, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS]))
 #PKG_CHECK_MODULES([GTKMM], 
 #		[gtkmm-2.4 >= $GTKMM_VERSION],
-#		:, AC_ERROR([$ADDITIONAL_PKG_ERRORS]))
+#		:, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS]))
 #PKG_CHECK_MODULES([GTHREAD], 
 #		[gthread-2.0 >= $GTKMM_VERSION],
-#		:, AC_ERROR([$ADDITIONAL_PKG_ERRORS]))
+#		:, AC_MSG_ERROR([$ADDITIONAL_PKG_ERRORS]))
 
-AC_OUTPUT([ 
+AC_CONFIG_HEADERS([config.h:config.h.in])
+
+AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 m4/Makefile
 ])
+AC_OUTPUT