From 537e0c986da43987a29876ad76477414f653f703 Mon Sep 17 00:00:00 2001
From: Martin Lambers <marlam@marlam.de>
Date: Sat, 26 Jan 2013 12:15:23 +0100
Subject: [PATCH] package imagemagick: fix freetype detection, add test

---
 src/imagemagick-test.cpp | 17 +++++++++++++++++
 src/imagemagick.mk       |  7 ++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 src/imagemagick-test.cpp

diff --git a/src/imagemagick-test.cpp b/src/imagemagick-test.cpp
new file mode 100644
index 00000000..7c7305aa
--- /dev/null
+++ b/src/imagemagick-test.cpp
@@ -0,0 +1,17 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ */
+
+#include <Magick++.h>
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+
+    Magick::Image image;
+    image.quality(90);
+
+    return 0;
+}
diff --git a/src/imagemagick.mk b/src/imagemagick.mk
index 195a3778..8f695d81 100644
--- a/src/imagemagick.mk
+++ b/src/imagemagick.mk
@@ -25,8 +25,13 @@ define $(PKG)_BUILD
         --with-x=no \
         --without-zlib \
         --disable-largefile \
-        ac_cv_prog_freetype_config='$(PREFIX)/$(TARGET)/bin/freetype-config'
+	--with-freetype='$(PREFIX)/$(TARGET)/bin/freetype-config'
     $(SED) -i 's/#define MAGICKCORE_ZLIB_DELEGATE 1//g' '$(1)/magick/magick-config.h'
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS=
+
+    '$(1)'/libtool --mode=link --tag=CXX \
+        '$(TARGET)-g++' -Wall -Wextra -std=gnu++0x \
+        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-imagemagick.exe' \
+        `'$(TARGET)-pkg-config' ImageMagick++ --cflags --libs`
 endef