Mercurial > octave
diff configure.ac @ 23835:6ae0292aaa5c stable
configure: ensure empty pkg-config results are actually empty (bug #51680)
* configure.ac (MAGICK_CPPFLAGS, MAGICK_LDFLAGS, MAGICK_LIBS): Trim pkg-config
results to eliminate strings that are entirely spaces. This is a workaround
for versions of pkg-config older than 0.28 that may emit an answer that looks
empty but actually contains space characters.
* acinclude.m4 (OCTAVE_CHECK_LIB, OCTAVE_CHECK_QT_VERSION): Likewise.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Mon, 07 Aug 2017 08:19:28 -0700 |
| parents | 22ff14feb26e |
| children | 2a9c617bbaaa f52d91f6ef80 |
line wrap: on
line diff
--- a/configure.ac Tue Aug 01 17:04:52 2017 -0700 +++ b/configure.ac Mon Aug 07 08:19:28 2017 -0700 @@ -1564,9 +1564,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."