Mercurial > octave

comparison configure.ac @ 23836:2a9c617bbaaa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
23834:9f31de57ad36 23836:2a9c617bbaaa
1662 PKG_CHECK_EXISTS([$magick++], [ 1662 PKG_CHECK_EXISTS([$magick++], [
1663 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ 1663 ## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++
1664 ## packages add extra flags that are useful when building 1664 ## packages add extra flags that are useful when building
1665 ## Graphics/ImageMagick++ extentions. These extra flags break the 1665 ## Graphics/ImageMagick++ extentions. These extra flags break the
1666 ## Octave build. 1666 ## Octave build.
1667 MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` 1667 MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ *$//')"
1668 MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` 1668 MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^ *$//')"
1669 MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` 1669 MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')"
1670 1670
1671 warn_magick="$magick++ library fails tests. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional." 1671 warn_magick="$magick++ library fails tests. The imread, imwrite, and imfinfo functions for reading and writing image files will not be fully functional."
1672 1672
1673 save_CPPFLAGS="$CPPFLAGS" 1673 save_CPPFLAGS="$CPPFLAGS"
1674 save_LIBS="$LIBS" 1674 save_LIBS="$LIBS"