sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16

--- a/configure.ac
+++ b/configure.ac
@@ -1560,11 +1560,11 @@
   MAGICK_LIBS=
 
   PKG_CHECK_EXISTS([$magick++], [
-    ## Make sure we only get -I, -L, and -l flags.  Some Graphics/ImageMagick++
+    ## Make sure we only get -I, -D, -L, and -l flags.  Some Graphics/ImageMagick++
     ## packages add extra flags that are useful when building
     ## Graphics/ImageMagick++ extentions.  These extra flags break the
     ## Octave build.
-    MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
+    MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'`
     MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
     MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`