[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>
This commit is contained in:
Fumitoshi UKAI
@@ -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
|
||||
@@ -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 $
|
||||
|
||||
38
configure
vendored
38
configure
vendored
@@ -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"
|
||||
|
||||
6
rc.c
6
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<65><74>̤<EFBFBD><CCA4><EFBFBD><EFBFBD><EFBFBD>ξ<EFBFBD><CEBE><EFBFBD><EFBFBD><EFBFBD>_self<6C><66><EFBFBD><EFBFBD><EFBFBD>Ѥ<EFBFBD><D1A4><EFBFBD>"
|
||||
#define CMT_DISPLINK "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>μ<EFBFBD>ưɽ<C6B0><C9BD>"
|
||||
#define CMT_DISPLINEINFO "<22><><EFBFBD>ߤι<DFA4><CEB9>ֹ<EFBFBD><D6B9><EFBFBD>ɽ<EFBFBD><C9BD>"
|
||||
#ifdef USE_IMAGE
|
||||
#define CMT_DISP_IMAGE "<22><><EFBFBD><EFBFBD><EFBFBD>饤<EFBFBD><E9A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
|
||||
#ifdef USE_IMAGE
|
||||
#define CMT_AUTO_IMAGE "<22><><EFBFBD><EFBFBD><EFBFBD>饤<EFBFBD><E9A5A4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ư<EFBFBD><C6B0><EFBFBD>ɤ߹<C9A4><DFB9><EFBFBD>"
|
||||
#define CMT_MAX_LOAD_IMAGE "<22><><EFBFBD><EFBFBD><EFBFBD>ɤ߹<C9A4><DFB9><EFBFBD><DFBB>κ<EFBFBD><CEBA><EFBFBD><EFBFBD>ץ<EFBFBD><D7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
|
||||
#define CMT_EXT_IMAGE_VIEWER "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ӥ塼<D3A5><E5A1BC><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
|
||||
@@ -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"
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user