| https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940 |
| |
| --- a/configure |
| +++ b/configure |
| @@ -26488,7 +26488,6 @@ |
| |
| # Assume that delegate headers reside under same directory as ImageMagick |
| # installation prefix. |
| -MAGICK_CPPFLAGS="-I$INCLUDE_DIR/ImageMagick $MAGICK_CPPFLAGS" |
| |
| # |
| # Find the X11 RGB database |
| @@ -29490,8 +29490,8 @@ |
| then |
| freetype_prefix=`${freetype_config} --prefix` |
| freetype_exec_prefix=`${freetype_config} --exec-prefix` |
| - LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib" |
| - CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2" |
| + LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`" |
| + CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`" |
| fi |
| |
| dnl First see if there is a library |
| @@ -35767,7 +35767,7 @@ |
| MAGICK_CXXFLAGS="$CXXFLAGS" |
| MAGICK_CPPFLAGS=`echo $MAGICK_CPPFLAGS | sed -e 's/ */ /g'` |
| MAGICK_PCFLAGS=`echo $MAGICK_PCFLAGS | sed -e 's/ */ /g'` |
| -MAGICK_LDFLAGS="-L$LIB_DIR $LDFLAGS" |
| +MAGICK_LDFLAGS="$LDFLAGS" |
| MAGICK_LIBS="-lMagickCore $MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL" |
| |
| |