com php-src: Rewrite Xpm library check so it doesn't break on MultiArch systems: ext/gd/config.m4
| From: | Remi Collet | Date: | Sat, 04 May 2013 14:50:08 +0000 |
| Subject: | com php-src: Rewrite Xpm library check so it doesn't break on MultiArch systems: ext/gd/config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72115@lists.php.net to get a copy of this message | ||
Commit: 5e9c6c3b644b290255fb10c8eb34778665c2f8a3
Author: Ondřej Surý <ondrej@sury.org> Fri, 3 May 2013 14:01:27 +0200
Committer: Remi Collet <remi@php.net> Sat, 4 May 2013 16:50:08 +0200
Parents: 8a90aad35b3647a104458d5af4dcb315b9e8d80c
Branches: PHP-5.5
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5e9c6c3b644b290255fb10c8eb34778665c2f8a3
Log:
Rewrite Xpm library check so it doesn't break on MultiArch systems
Changed paths:
M ext/gd/config.m4
Diff:
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index c440782..4a29ab9 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -159,18 +159,11 @@ AC_DEFUN([PHP_GD_XPM],[
if test "$PHP_XPM_DIR" != "no"; then
for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
- test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a
&& GD_XPM_DIR=$i && break
+ test -f $i/include/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i && break
+ test -f $i/include/X11/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i/X11 &&
break
done
if test -z "$GD_XPM_DIR"; then
- 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/include
- done
-
- if test -z "$GD_XPM_INC"; then
AC_MSG_ERROR([xpm.h not found.])
fi