blob: 18c490659397c5e39f5049545c1a16328153499e (
plain) (
blame)
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
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
--- configure.orig 2008-11-20 04:31:11.000000000 +0100
+++ configure 2013-12-13 12:12:27.000000000 +0100
@@ -32116,7 +32116,7 @@
fi
# Some Freetype installs appear to require that <ft2build.h> be
- # included prior to including <freetype/freetype.h>. Oops!
+ # included prior to including <freetype.h>. Oops!
if test "${ac_cv_header_ft2build_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for ft2build.h" >&5
echo $ECHO_N "checking for ft2build.h... $ECHO_C" >&6; }
@@ -32249,8 +32249,8 @@
fi
- { echo "$as_me:$LINENO: checking for freetype/freetype.h" >&5
-echo $ECHO_N "checking for freetype/freetype.h... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for freetype.h" >&5
+echo $ECHO_N "checking for freetype.h... $ECHO_C" >&6; }
if test "${ac_cv_header_freetype_freetype_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -32262,7 +32262,7 @@
/* end confdefs.h. */
$FT2BUILD_H
-#include <freetype/freetype.h>
+#include <freetype.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
@@ -34050,7 +34050,7 @@
#define MagickLibConfigSubDir "$MagickLibConfigSubDir"
_ACEOF
-MagickLibConfigPath="${LIB_DIR}/${MagickLibConfigSubDir}"
+MagickLibConfigPath="${DATA_DIR}/GraphicsMagick/config"
MagickLibConfigPathDefine="${MagickLibConfigPath}/"
if test "$native_win32_build" = 'yes'
then
@@ -34108,7 +34108,7 @@
#
# Path to GraphicsMagick share files
MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
-MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
+MagickSharePath="${DATA_DIR}/GraphicsMagick/"
MagickSharePathDefine="${MagickSharePath}/"
if test "$native_win32_build" = 'yes'
then
@@ -34128,7 +34128,7 @@
#define MagickShareConfigSubDir "$MagickShareConfigSubDir"
_ACEOF
-MagickShareConfigPath="${DATA_DIR}/${MagickShareConfigSubDir}"
+MagickShareConfigPath="${MagickLibConfigPath}"
MagickShareConfigPathDefine="${MagickShareConfigPath}/"
if test "$native_win32_build" = 'yes'
then
|
