2 files changed, 16 insertions, 3 deletions
diff --git a/autogen.sh b/autogen.sh
index 17e4d21..2a9825d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,15 @@
 #!/bin/bash
-aclocal
+gprefix=`which glibtoolize 2>&1 >/dev/null`
+if [ $? -eq 0 ]; then 
+  glibtoolize --force
+else
+  libtoolize --force
+fi
+aclocal -I m4
+autoheader
+automake --add-missing
 autoconf
-automake
-./configure
+
+if [ -z "$NOCONFIGURE" ]; then
+    ./configure "$@"
+fi
diff --git a/configure.ac b/configure.ac
index 59f9310..6e0a7f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,10 @@ AC_INIT(idevicerestore, 1.0)
 
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE()
+
+AC_PROG_CC
 AM_PROG_CC_C_O
+AC_PROG_LIBTOOL
 
 PKG_CHECK_MODULES(libimobiledevice, libimobiledevice-1.0 >= 1.1.0)
 PKG_CHECK_MODULES(libplist, libplist >= 0.15)