aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-10-01 15:29:05 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-10-01 15:29:05 +0000
commit46d4935b0b097bf0c2f5958dee51a35f0f22651c (patch)
tree540534bfd6f331bbeb44f51e8c6e86b668dfa2ff
parent[w3m-dev 03330] Re: hang up when seeing web page that contains xbm file (diff)
downloadw3m-46d4935b0b097bf0c2f5958dee51a35f0f22651c.tar.gz
w3m-46d4935b0b097bf0c2f5958dee51a35f0f22651c.zip
[w3m-dev 03331] Re: hang up when seeing web page that contains xbm file
* configure: check gdk-pixbuf-config existence From: Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
-rw-r--r--ChangeLog7
-rwxr-xr-xconfigure9
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8efc136..66bca7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-02 Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
+
+ * [w3m-dev 03331] Re: hang up when seeing web page that contains xbm file
+ * configure: check gdk-pixbuf-config existence
+
2002-10-01 Yuji Abe <cbo46560@pop12.odn.ne.jp>
* [w3m-dev 03330] Re: hang up when seeing web page that contains xbm file
@@ -3866,4 +3871,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.435 2002/09/30 17:44:30 ukai Exp $
+$Id: ChangeLog,v 1.436 2002/10/01 15:29:05 ukai Exp $
diff --git a/configure b/configure
index 46d42d7..93b54bc 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: configure,v 1.77 2002/09/29 15:29:12 ukai Exp $
+# $Id: configure,v 1.78 2002/10/01 15:29:05 ukai Exp $
# Configuration.
#
@@ -486,7 +486,12 @@ find_gdkpixbuf() {
if [ "x$GDKPIXBUF_CONFIG" = x ]; then
GDKPIXBUF_CONFIG=gdk-pixbuf-config
fi
- version=`$GDKPIXBUF_CONFIG --version`
+ if ./which $GDKPIXBUF_CONFIG > /dev/null
+ then
+ version=`$GDKPIXBUF_CONFIG --version`
+ else
+ version=""
+ fi
if [ "x$version" = x ]; then
echo "You don't have GdkPixbuf. Install GdkPixbuf (version >= $gdkpixbuf_version)."
return 1