summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2009-07-28 10:02:27 +0200
committerGravatar Martin Szulecki2009-07-28 10:02:27 +0200
commitc443a1fbc2fe5e9858015193628ef66623535766 (patch)
treee1726fe45f9fb66f1b1f1c3d828288cd6307296e
parent5ae5591052583e93aaf40dc367e30413fda6d859 (diff)
parentdd97a88597eb00fa688ee9f28cadac117c47f6f0 (diff)
downloadlibimobiledevice-c443a1fbc2fe5e9858015193628ef66623535766.tar.gz
libimobiledevice-c443a1fbc2fe5e9858015193628ef66623535766.tar.bz2
Merge branch 'master' of git://github.com/MattColyer/libiphone into martin
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac2
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 39ee8e8..6761838 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-dev-tools
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libiphone-1.0.pc
+EXTRA_DIST= docs
+dist-hook: doc
+
doc:
+ rm -fr docs
doxygen doxygen.cfg
indent:
diff --git a/configure.ac b/configure.ac
index 4433f5c..2acc6be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ PKG_CHECK_MODULES(libglib2, glib-2.0 >= 2.14.1)
PKG_CHECK_MODULES(libgthread2, gthread-2.0 >= 2.14.1)
PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 )
PKG_CHECK_MODULES(libtasn1, libtasn1 >= 1.1)
-PKG_CHECK_MODULES(libplist, libplist >= 0.12)
+PKG_CHECK_MODULES(libplist, libplist >= 0.13)
AC_CHECK_LIB(gcrypt, gcry_control, [AC_SUBST(libgcrypt_LIBS,[-lgcrypt])], ["libgcrypt is required to build libiphone"])
# Checks for header files.