From 319e50279d6dab3477dc89236e6429a7f138599a Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 2 Feb 2011 02:36:55 +0000
Subject: [PATCH] vips: use libtool/autoconf fixups, fix linker errors

SVN-Revision: 25305
---
 libs/vips/Makefile | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/libs/vips/Makefile b/libs/vips/Makefile
index f02ef781e..6304b50c2 100644
--- a/libs/vips/Makefile
+++ b/libs/vips/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.22/
 PKG_MD5SUM:=852913223ce5dc115bc7088e7c9d1596
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,7 +29,7 @@ define Package/vips
   $(call Package/vips/Default)
   SECTION:=multimedia
   CATEGORY:=Multimedia
-  DEPENDS:=+libjpeg +libintl +glib2 +libxml2
+  DEPENDS:=+libjpeg +libintl +glib2 +libxml2 +imagemagick +libfreetype
 endef
 
 define Package/vips/description
@@ -39,16 +40,13 @@ TARGET_CFLAGS+= \
 	-I$(STAGING_DIR)/usr/lib/libintl/include
 
 TARGET_LDFLAGS+= \
-	-L$(STAGING_DIR)/usr/lib/libintl/lib
-
-define Build/Configure
-	( cd "$(PKG_BUILD_DIR)" && aclocal && libtoolize --force && autoconf )
-	$(call Build/Configure/Default, \
-		--disable-cxx \
-		--disable-threads \
-		--without-liboil \
-	)
-endef
+	-L$(STAGING_DIR)/usr/lib/libintl/lib \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
+CONFIGURE_ARGS += \
+	--disable-cxx \
+	--disable-threads \
+	--without-liboil
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/vips
-- 
2.30.2