| author | Craig Mohrman <craig.mohrman@oracle.com> |
| Wed, 22 Apr 2015 06:22:45 -0700 | |
| changeset 4165 | cd344a63e64f |
| permissions | -rw-r--r-- |
|
4165
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
1 |
20854739 the phps do not build |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
2 |
This fix will not be sent upstream since this version has been EOF |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
3 |
by the community. |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
4 |
|
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
5 |
--- php-5.3.29/ext/gd/config.m4_orig 2014-08-13 12:22:50.000000000 -0700 |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
6 |
+++ php-5.3.29/ext/gd/config.m4 2015-04-15 11:35:17.456859370 -0700 |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
7 |
@@ -162,7 +162,7 @@ |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
8 |
if test "$PHP_FREETYPE_DIR" != "no"; then |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
9 |
|
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
10 |
for i in $PHP_FREETYPE_DIR /usr/local /usr; do |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
11 |
- if test -f "$i/include/freetype2/freetype/freetype.h"; then |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
12 |
+ if test -f "$i/include/freetype2/freetype.h" || test -f "$i/include/freetype2/freetype/freetype.h"; then |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
13 |
FREETYPE2_DIR=$i |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
14 |
FREETYPE2_INC_DIR=$i/include/freetype2 |
|
cd344a63e64f
20854739 the phps do not build on s12-71
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
15 |
break |