Mercurial > octave
diff configure.ac @ 23836:2a9c617bbaaa
maint: Merge stable to default.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Mon, 07 Aug 2017 08:21:51 -0700 |
| parents | 528b124e337f 6ae0292aaa5c |
| children | fd6b1339689f |
line wrap: on
line diff
--- a/configure.ac Sun Aug 06 11:26:54 2017 -0700 +++ b/configure.ac Mon Aug 07 08:21:51 2017 -0700 @@ -1664,9 +1664,9 @@ ## 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_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` - MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` + MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')" + MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')" + MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')" warn_magick="$magick++ library fails tests. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."