1 files changed, 12 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index 0592f16c2..8c43a9798 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,13 +1,23 @@
 #!/bin/sh
 
 if [ -x "`which autoreconf 2>/dev/null`" ] ; then
-  exec autoreconf -ivf
+  opt="-if"
+
+  for i in $@; do
+    case "$i" in
+      -v)
+        opt=$opt"v"
+        ;;
+    esac
+  done
+
+  exec autoreconf $opt
 fi
 
 set -e
 
 # Run this to generate all the initial makefiles, etc.
-aclocal && \
+aclocal -I m4 && \
 	autoheader && \
 	autoconf && \
 	automake --add-missing --copy