diff options
| -rw-r--r-- | ext/gd/config.m4 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 3c9c5ce9cf..19bc0a23c6 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -101,9 +101,17 @@ AC_DEFUN(PHP_GD_XPM,[ AC_MSG_ERROR([libXpm.(a|so) not found.]) fi + for i in include include/X11; do + test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/$i + done + + if test -z "$GD_XPM_INC"; then + AC_MSG_ERROR([xpm.h not found.]) + fi + PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, [ - PHP_ADD_INCLUDE($GD_XPM_DIR/include) + PHP_ADD_INCLUDE($GD_XPM_INC) PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) ],[ |