summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2002-11-25 23:12:15 +0000
committerIlia Alshanetsky <iliaa@php.net>2002-11-25 23:12:15 +0000
commite9b28977a5ef1cd2ec2bc4f656b06f35dfbaf255 (patch)
tree1212d30a23a8d0bb1d7659fb8e1a60da15463886
parentc15ae3453562572a313ffe6966122fcac7b383ba (diff)
downloadphp-git-e9b28977a5ef1cd2ec2bc4f656b06f35dfbaf255.tar.gz
MFH (fixed a compile failure when --with-xpm-dir is used).
-rw-r--r--ext/gd/config.m42
-rw-r--r--ext/gd/libgd/gdxpm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index bca110541b..4df9d66ba2 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -112,7 +112,7 @@ AC_DEFUN(PHP_GD_XPM,[
fi
for i in include include/X11; do
- test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/$i
+ test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/include
done
if test -z "$GD_XPM_INC"; then
diff --git a/ext/gd/libgd/gdxpm.c b/ext/gd/libgd/gdxpm.c
index b7eb92e333..c95cb72a03 100644
--- a/ext/gd/libgd/gdxpm.c
+++ b/ext/gd/libgd/gdxpm.c
@@ -20,7 +20,7 @@ gdImageCreateFromXpm (char *filename)
#else
-#include "xpm.h"
+#include <X11/xpm.h>
#include <string.h>
gdImagePtr