summaryrefslogtreecommitdiff
blob: 3ae4ad49f00b90be65de9d3fc12642c8fe248d3f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940

--- a/configure
+++ b/configure
@@ -26488,7 +26488,6 @@
 # directory as GraphicsMagick installation prefix.
 #LDFLAGS="$LDFLAGS -L$LIB_DIR"
 #CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
-MAGICK_API_CPPFLAGS="-I$INCLUDE_DIR/GraphicsMagick $MAGICK_API_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_API_CFLAGS=$CFLAGS
 MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/  */ /g'`
-MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
+MAGICK_API_LDFLAGS="$LDFLAGS"
 MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS $MAGICK_API_LIBLTDL"
 MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS"