From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 25 Nov 2002 23:12:15 +0000 (+0000)
Subject: MFH (fixed a compile failure when --with-xpm-dir is used).
X-Git-Tag: php-4.3.0RC2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9b28977a5ef1cd2ec2bc4f656b06f35dfbaf255;p=php

MFH (fixed a compile failure when --with-xpm-dir is used).
---

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