summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2012-02-01 17:31:47 +0100
committerGravatar Nikias Bassen2012-02-01 17:31:47 +0100
commit4e23f6d1ce67d9155a2e201592dec0d963a1d822 (patch)
treea04ebcb27259f821892168586ceb22fe4e089625
parentfbd886916337446e6245a52cd3b7be0f306529a1 (diff)
downloadidevicerestore-4e23f6d1ce67d9155a2e201592dec0d963a1d822.tar.gz
idevicerestore-4e23f6d1ce67d9155a2e201592dec0d963a1d822.tar.bz2
updated autofoo stuff so linking actually works
-rwxr-xr-xautogen.sh16
-rw-r--r--configure.ac3
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)