diff options
| author | foobar <sniper@php.net> | 2002-08-30 02:44:45 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-08-30 02:44:45 +0000 |
| commit | 55b22b16a21fc75c76febdbb56b4d3fb42f29b14 (patch) | |
| tree | cca25780c7844553a3e038ff3cc23ea8716c5f72 | |
| parent | bda34955db66f34d1e190fe80671b540cbf4cf6c (diff) | |
| download | php-git-55b22b16a21fc75c76febdbb56b4d3fb42f29b14.tar.gz | |
xpm.h is sometimes in /usr/include/X11 (or /usr/X11R6/include/X11)
| -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) ],[ |