From f725f869d875c4764fd89df6ca6c43eb5735b7b9 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Sun, 27 Oct 2002 16:59:32 +0000 Subject: [w3m-dev-en 00795] * configure: IMLIB_CONFIG, IMLIB2_CONFIG, GDKPIXBUF_CONFIG * rc.c (CMT_DISP_IMAGE): need if not defined USE_IMAGE From: Fumitoshi UKAI --- ChangeLog | 8 +++++++- configure | 38 ++++++++++++++++++++------------------ rc.c | 6 +++--- version.c.in | 4 ++-- 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5149cd8..1f766a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-10-28 Fumitoshi UKAI + + * [w3m-dev-en 00795] + * configure: IMLIB_CONFIG, IMLIB2_CONFIG, GDKPIXBUF_CONFIG + * rc.c (CMT_DISP_IMAGE): need if not defined USE_IMAGE + 2002-10-27 Fumitoshi UKAI * 0.3.2 release candidate 2 @@ -3992,4 +3998,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.451 2002/10/27 14:47:35 ukai Exp $ +$Id: ChangeLog,v 1.452 2002/10/27 16:59:32 ukai Exp $ diff --git a/configure b/configure index 93b54bc..acb7789 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: configure,v 1.78 2002/10/01 15:29:05 ukai Exp $ +# $Id: configure,v 1.79 2002/10/27 16:59:33 ukai Exp $ # Configuration. # @@ -146,6 +146,17 @@ do shift done +if [ "x$IMLIB_CONFIG" = x ]; then + IMLIB_CONFIG=imlib-config +fi +if [ "x$IMLIB2_CONFIG" = x ]; then + IMLIB2_CONFIG=imlib2-config +fi +if [ "x$GDKPIXBUF_CONFIG" = x ]; then + GDKPIXBUF_CONFIG=gdk-pixbuf-config +fi + + if [ -z "`echo -n aho | grep n`" ] ; then Echo() { @@ -433,9 +444,6 @@ find_imlib() { imlib_micro=8 imlib_version=$imlib_major.$imlib_minor.$imlib_micro echo "Checking Imlib." - if [ "x$IMLIB_CONFIG" = x ]; then - IMLIB_CONFIG=imlib-config - fi version=`$IMLIB_CONFIG --version` if [ "x$version" = x ]; then echo "You don't have Imlib. Install Imlib (version >= $imlib_version)." @@ -458,9 +466,6 @@ find_imlib2() { imlib_micro=5 imlib_version=$imlib_major.$imlib_minor.$imlib_micro echo "Checking Imlib 2." - if [ "x$IMLIB2_CONFIG" = x ]; then - IMLIB2_CONFIG=imlib2-config - fi version=`$IMLIB2_CONFIG --version` if [ "x$version" = x ]; then echo "You don't have Imlib 2. Install Imlib 2 (version >= $imlib_version)." @@ -483,9 +488,6 @@ find_gdkpixbuf() { gdkpixbuf_micro=0 gdkpixbuf_version=$gdkpixbuf_major.$gdkpixbuf_minor.$gdkpixbuf_micro echo "Checking GdkPixbuf ." - if [ "x$GDKPIXBUF_CONFIG" = x ]; then - GDKPIXBUF_CONFIG=gdk-pixbuf-config - fi if ./which $GDKPIXBUF_CONFIG > /dev/null then version=`$GDKPIXBUF_CONFIG --version` @@ -2141,14 +2143,14 @@ if [ "$use_image" = y ]; then def_use_w3mimg_x11="#define USE_W3MIMG_X11" def_use_gdkpixbuf='#define USE_GDKPIXBUF' imgobjs="$imgobjs w3mimg/x11/x11_w3mimg.o" - imgx11cflags='`gdk-pixbuf-config --cflags`' - imgx11ldflags='`gdk-pixbuf-config --libs` -lgdk_pixbuf_xlib' + imgx11cflags='`$GDKPIXBUF_CONFIG --cflags`' + imgx11ldflags='`$GDKPIXBUF_CONFIG --libs` -lgdk_pixbuf_xlib' elif find_imlib; then def_use_w3mimg_x11="#define USE_W3MIMG_X11" def_use_imlib='#define USE_IMLIB' imgobjs="$imgobjs w3mimg/x11/x11_w3mimg.o" - imgx11cflags='`imlib-config --cflags`' - imgx11ldflags='`imlib-config --libs`' + imgx11cflags='`$IMLIB_CONFIG --cflags`' + imgx11ldflags='`$IMLIB_CONFIG --libs`' else use_w3mimg_x11=n echo "Disable X11 inline image" @@ -2159,14 +2161,14 @@ if [ "$use_image" = y ]; then def_use_w3mimg_fb="#define USE_W3MIMG_FB" imgobjs="$imgobjs w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o" def_use_gdkpixbuf='#define USE_GDKPIXBUF' - imgfbcflags='`gdk-pixbuf-config --cflags`' - imgfbldflags='`gdk-pixbuf-config --libs`' + imgfbcflags='`$GDKPIXBUF_CONFIG --cflags`' + imgfbldflags='`$GDKPIXBUF_CONFIG --libs`' elif find_imlib2; then def_use_imlib2='#define USE_IMLIB2' imgobjs="$imgobjs w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o" def_use_imlib2='#define USE_IMLIB2' - imgfbcflags='`imlib2-config --cflags`' - imgfbldflags='`imlib2-config --libs`' + imgfbcflags='`$IMLIB2_CONFIG --cflags`' + imgfbldflags='`$IMLIB2_CONFIG --libs`' else use_w3mimg_fb=n echo "Disable Linux framebuffer inline image" diff --git a/rc.c b/rc.c index ee51f80..2df1942 100644 --- a/rc.c +++ b/rc.c @@ -1,4 +1,4 @@ -/* $Id: rc.c,v 1.52 2002/10/26 11:19:47 ukai Exp $ */ +/* $Id: rc.c,v 1.53 2002/10/27 16:59:33 ukai Exp $ */ /* * Initialization file etc. */ @@ -67,8 +67,8 @@ static char *config_file = NULL; #define CMT_TSELF "targetが未指定の場合に_selfを使用する" #define CMT_DISPLINK "リンク先の自動表示" #define CMT_DISPLINEINFO "現在の行番号の表示" -#ifdef USE_IMAGE #define CMT_DISP_IMAGE "インライン画像を表示" +#ifdef USE_IMAGE #define CMT_AUTO_IMAGE "インライン画像を自動で読み込む" #define CMT_MAX_LOAD_IMAGE "画像読み込み時の最大プロセス数" #define CMT_EXT_IMAGE_VIEWER "画像を外部ビューワで表示" @@ -210,8 +210,8 @@ static char *config_file = NULL; #define CMT_TSELF "Use _self as default target" #define CMT_DISPLINK "Display link URL automatically" #define CMT_DISPLINEINFO "Display current line number" -#ifdef USE_IMAGE #define CMT_DISP_IMAGE "Display inline images" +#ifdef USE_IMAGE #define CMT_AUTO_IMAGE "Load inline images automatically" #define CMT_MAX_LOAD_IMAGE "Maximum processes for parallel image loading" #define CMT_EXT_IMAGE_VIEWER "Use external image viewer" diff --git a/version.c.in b/version.c.in index 8e94bf8..a1f51b3 100644 --- a/version.c.in +++ b/version.c.in @@ -1,5 +1,5 @@ -/* $Id: version.c.in,v 1.19 2002/10/27 14:47:35 ukai Exp $ */ -#define CURRENT_VERSION "w3m/0.3.2rc2" +/* $Id: version.c.in,v 1.20 2002/10/27 16:59:33 ukai Exp $ */ +#define CURRENT_VERSION "w3m/0.3.2rc2+cvs" #ifndef FM_H char *w3m_version = CURRENT_VERSION; -- cgit v1.2.3