commit 8fdab010bb0009792bef615c55833e847edd22dc
parent 8ca167f5abc73c87e725d57d69468654946213c3
Author: ukai <ukai>
Date: Sun, 27 Oct 2002 16:59:32 +0000
[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 <ukai@debian.or.jp>
Diffstat:
4 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-28 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [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 <ukai@debian.or.jp>
* 0.3.2 release candidate 2
diff --git a/configure b/configure
@@ -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
@@ -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
@@ -1,5 +1,5 @@
/* $Id$ */
-#define CURRENT_VERSION "w3m/0.3.2rc2"
+#define CURRENT_VERSION "w3m/0.3.2rc2+cvs"
#ifndef FM_H
char *w3m_version = CURRENT_VERSION;
