summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2009-11-10 13:37:24 +0100
committerGravatar Matt Colyer2009-11-11 07:34:29 -0800
commit28d1fcac0eda09e829ef8c8b46fad0e45590af16 (patch)
tree4d7064468d46a4d4dfbae7dfa9b0e7d812aeecda
parenteaf80002c6e82c6b7a376bb61c9884ec3cf750b4 (diff)
downloadlibimobiledevice-28d1fcac0eda09e829ef8c8b46fad0e45590af16.tar.gz
libimobiledevice-28d1fcac0eda09e829ef8c8b46fad0e45590af16.tar.bz2
Require libplist++ in order to fix linking of Python bindings
[#84 state:resolved] Signed-off-by: Matt Colyer <matt@colyer.name>
-rw-r--r--configure.ac1
-rw-r--r--swig/Makefile.am2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index ccbf59b..58aee42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,7 @@ PKG_CHECK_MODULES(libgthread2, gthread-2.0 >= 2.14.1)
26PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 ) 26PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3 )
27PKG_CHECK_MODULES(libtasn1, libtasn1 >= 1.1) 27PKG_CHECK_MODULES(libtasn1, libtasn1 >= 1.1)
28PKG_CHECK_MODULES(libplist, libplist >= 0.15) 28PKG_CHECK_MODULES(libplist, libplist >= 0.15)
29PKG_CHECK_MODULES(libplistmm, libplist++ >= 0.15)
29AC_CHECK_LIB(gcrypt, gcry_control, [AC_SUBST(libgcrypt_LIBS,[-lgcrypt])], ["libgcrypt is required to build libiphone"]) 30AC_CHECK_LIB(gcrypt, gcry_control, [AC_SUBST(libgcrypt_LIBS,[-lgcrypt])], ["libgcrypt is required to build libiphone"])
30 31
31# Checks for header files. 32# Checks for header files.
diff --git a/swig/Makefile.am b/swig/Makefile.am
index f3f9714..0da739b 100644
--- a/swig/Makefile.am
+++ b/swig/Makefile.am
@@ -24,7 +24,7 @@ iPhone_LTLIBRARIES = _iPhone.la
24nodist__iPhone_la_SOURCES = iphone_wrap.cxx $(SWIG_SOURCES) 24nodist__iPhone_la_SOURCES = iphone_wrap.cxx $(SWIG_SOURCES)
25_iPhone_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src 25_iPhone_la_CFLAGS = $(PYTHON_CPPFLAGS) -I$(top_srcdir)/src
26_iPhone_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS) 26_iPhone_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
27_iPhone_la_LIBADD = $(top_builddir)/src/libiphone.la 27_iPhone_la_LIBADD = $(top_builddir)/src/libiphone.la $(libplistmm_LIBS)
28 28
29iphone_wrap.cxx : $(SWIG_SOURCES) 29iphone_wrap.cxx : $(SWIG_SOURCES)
30 $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $< 30 $(SWIG) $(SWIG_PYTHON_OPT) $(INCLUDES) -I$(top_srcdir)/src -o $@ $<