blob: 3eb43d6918e80cb4e3ec24e62b39685f18269ee2 (
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
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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
--- sapi/apache2handler/config.m4.orig
+++ sapi/apache2handler/config.m4
@@ -113,7 +113,6 @@
PHP_BUILD_THREAD_SAFE
fi
else
- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
if test -n "$APACHE_THREADED_MPM"; then
PHP_BUILD_THREAD_SAFE
fi
--- configure.orig
+++ configure
@@ -6877,7 +6877,6 @@
fi
else
- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
if test -n "$APACHE_THREADED_MPM"; then
enable_maintainer_zts=yes
@@ -30550,6 +30549,9 @@
if test -f $i/include/enchant/enchant.h; then
ENCHANT_DIR=$i
ENCHANT_INCDIR=$i/include/enchant
+ elif test -f $i/include/enchant-2/enchant.h; then
+ ENCHANT_DIR=$i
+ ENCHANT_INCDIR=$i/include/enchant-2
elif test -f $i/include/enchant.h; then
ENCHANT_DIR=$i
ENCHANT_INCDIR=$i/include
@@ -34679,15 +34681,16 @@
if test "$PHP_FREETYPE_DIR" != "no"; then
for i in $PHP_FREETYPE_DIR /usr/local /usr; do
- if test -f "$i/bin/freetype-config"; then
- FREETYPE2_DIR=$i
- FREETYPE2_CONFIG="$i/bin/freetype-config"
+
+ if test -d "$i/include/freetype2"; then
+ FREETYPE2_DIR=$i/include/freetype2
+ FREETYPE2_CONFIG="pkg-config freetype2"
break
fi
done
if test -z "$FREETYPE2_DIR"; then
- as_fn_error $? "freetype-config not found." "$LINENO" 5
+ as_fn_error $? "freetype2 not found." "$LINENO" 5
fi
FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
@@ -36350,15 +36353,16 @@
if test "$PHP_FREETYPE_DIR" != "no"; then
for i in $PHP_FREETYPE_DIR /usr/local /usr; do
- if test -f "$i/bin/freetype-config"; then
- FREETYPE2_DIR=$i
- FREETYPE2_CONFIG="$i/bin/freetype-config"
+
+ if test -d "$i/include/freetype2"; then
+ FREETYPE2_DIR=$i/include/freetype2
+ FREETYPE2_CONFIG="pkg-config freetype2"
break
fi
done
if test -z "$FREETYPE2_DIR"; then
- as_fn_error $? "freetype-config not found." "$LINENO" 5
+ as_fn_error $? "freetype2 not found." "$LINENO" 5
fi
FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
|