2 files changed, 8 insertions, 6 deletions

diff --git a/configure.ac b/configure.ac
index fcc20ff..12e364d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,16 +4,18 @@
 AC_PREREQ(2.61)
 AC_INIT(libiphone, 0.1.0, nospam@nowhere.com)
 AM_INIT_AUTOMAKE(libiphone, 0.1.0)
-AC_CONFIG_SRCDIR([src/lockdown.c])
+AC_CONFIG_SRCDIR([src/])
 AC_CONFIG_HEADER([config.h])
 
 # Checks for programs.
 AC_PROG_CC
 
 # Checks for libraries.
-AC_CHECK_LIB(xml2,xmlFree,,[AC_MSG_ERROR([libxml2 library missing])])
-AC_CHECK_LIB(usb,usb_bulk_write,,[AC_MSG_ERROR([libusb library missing])])
-AC_CHECK_LIB(gnutls,gnutls_record_send,,[AC_MSG_ERROR([libgnutls library missing])])
+PKG_CHECK_MODULES(libxml2, libxml-2.0 >= 2.6.30)
+PKG_CHECK_MODULES(libusb, libusb >= 0.1.12)
+PKG_CHECK_MODULES(libglib2, glib-2.0 >= 2.14.1)
+PKG_CHECK_MODULES(libgnutls, gnutls >= 1.6.3)
+PKG_CHECK_MODULES(libfuse, fuse >= 2.7.0)
 
 # Checks for header files.
 AC_HEADER_STDC
diff --git a/src/Makefile.am b/src/Makefile.am
index ed1ae59..65701d9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-AM_CFLAGS = `xml2-config --cflags` `pkg-config fuse --cflags` `pkg-config glib-2.0 --cflags` -g
-AM_LDFLAGS = `xml2-config --libs` `pkg-config fuse --libs` `pkg-config glib-2.0 --libs` -lusb -lgnutls 
+AM_CFLAGS = $(libxml2_CFLAGS) $(libusb_CFLAGS) $(libglib2_CFLAGS) $(libfuse_CFLAGS) $(libgnutls_CFLAGS) -g
+AM_LDFLAGS = $(libxml2_LIBS) $(libusb_LIBS) $(libglib2_LIBS) $(libfuse_LIBS) $(libgnutls_LIBS)
 
 bin_PROGRAMS = iphoneclient ifuse
 iphoneclient_SOURCES = usbmux.c main.c iphone.c plist.c lockdown.c AFC.c