[patch] Use pkgconfig to obtain the GraphicsMagick flags

dvdauthor-graphicsmagick.patch (text/plain), 1.47 KB, created by Andrew John Hughes on 2013-04-02 16:45:39 UTC

--- src/Makefile.am~	2012-04-03 06:09:08.000000000 +0100
+++ src/Makefile.am	2013-03-28 20:18:43.657019713 +0000
@@ -8,7 +8,7 @@
 nodist_bin_SCRIPTS = dvddirdel
 
 AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" \
-    @XML_CPPFLAGS@ @MAGICK_CPPFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
+    @XML_CPPFLAGS@ @MAGICK_CFLAGS@ @FREETYPE_CPPFLAGS@ @FRIBIDI_CFLAGS@ @FONTCONFIG_CFLAGS@
 AM_CFLAGS = -Wall
 
 dvdauthor_SOURCES = dvdauthor.c common.h dvdauthor.h da-internal.h \
--- configure.ac.old	2012-08-20 05:09:51.000000000 +0100
+++ configure.ac	2013-03-28 20:21:05.483198062 +0000
@@ -59,21 +59,7 @@
 fi
 
 if test "$usemagick" != 1; then
-    AC_CHECK_PROGS(GMAGICKCONFIG, [GraphicsMagick-config])
-    if test -n "$GMAGICKCONFIG"; then
-        ac_save_CPPFLAGS="$CPPFLAGS"
-        ac_save_LIBS="$LIBS"
-        MAGICK_CPPFLAGS="`$GMAGICKCONFIG --cppflags`"
-        MAGICK_LIBS="`$GMAGICKCONFIG --ldflags` `$GMAGICKCONFIG --libs`"
-        CPPFLAGS="$CPPFLAGS $MAGICK_CPPFLAGS"
-        LIBS="$MAGICK_LIBS $LIBS"
-        AC_CHECK_FUNC(DispatchImage, usemagick=1)
-        CPPFLAGS="$ac_save_CPPFLAGS"
-        LIBS="$ac_save_LIBS"
-        if test "$usemagick" = 1; then
-            AC_DEFINE(HAVE_GMAGICK, 1, [Whether the GraphicsMagick libraries are available])
-        fi
-    fi
+    PKG_CHECK_MODULES([MAGICK], [GraphicsMagick], usemagick=1; [AC_DEFINE(HAVE_GMAGICK, 1, [whether the GraphicsMagick libraries are available])], [:])
 fi
 
 if test "$usemagick" != 1; then