diff --git a/Makefile.am b/Makefile.am
index bd11c8c..ea79e46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = tools man
 
-INCLUDES = $(top_srcdir)/include/
+AM_CPPFLAGS = $(top_srcdir)/include/
 
 .PHONY: ChangeLog INSTALL
 INSTALL:
diff --git a/autogen.sh b/autogen.sh
index a4fa9a2..8197943 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,3 +8,15 @@ cd $srcdir
 
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
+
+$srcdir/configure "$@"
+
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
+
+        if [ "$1" = "--help" ]; then exit 0 else
+                echo "Now type 'make' to compile mtview" || exit 1
+        fi
+else
+        echo "Skipping configure process."
+fi