cvs: php4 /ext/gd config.m4
| From: | Jani Taskinen | Date: | Fri, 30 Aug 2002 02:44:46 +0000 |
| Subject: | cvs: php4 /ext/gd config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13765@lists.php.net to get a copy of this message | ||
sniper Thu Aug 29 22:44:46 2002 EDT
Modified files:
/php4/ext/gd config.m4
Log:
xpm.h is sometimes in /usr/include/X11 (or /usr/X11R6/include/X11)
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.106 php4/ext/gd/config.m4:1.107
--- php4/ext/gd/config.m4:1.106 Mon Aug 12 09:59:01 2002
+++ php4/ext/gd/config.m4 Thu Aug 29 22:44:45 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.106 2002/08/12 13:59:01 helly Exp $
+dnl $Id: config.m4,v 1.107 2002/08/30 02:44:45 sniper Exp $
dnl
dnl
@@ -101,9 +101,17 @@
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)
],[