[w3m-dev 03380] fix configure

* configure: s/INSTALL_W3MIMGDISPLAY/install_w3mimgdisplay/
		already define
* config.h.dist (INSTALL_W3MIMGDISPLAY): added
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-06 14:58:02 +00:00
parent 3d14e2fe4e
commit fcf7c4af06
3 changed files with 13 additions and 6 deletions

View File

@@ -1,3 +1,10 @@
2002-11-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03380] fix configure
* configure: s/INSTALL_W3MIMGDISPLAY/install_w3mimgdisplay/
already define
* config.h.dist (INSTALL_W3MIMGDISPLAY): added
2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03379] setuid w3mimgdisplay and check console tty
@@ -4353,4 +4360,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.480 2002/11/06 03:50:48 ukai Exp $
$Id: ChangeLog,v 1.481 2002/11/06 14:58:02 ukai Exp $

View File

@@ -98,6 +98,7 @@ MKDIR=mkdir -p
PERL=/usr/local/bin/perl
VERSION=0.2.2
MODEL=Linux.i686-monster-ja
INSTALL_W3MIMGDISPLAY=$(INSTALL_PROGRAM)
#else

9
configure vendored
View File

@@ -1,5 +1,5 @@
#!/bin/sh
# $Id: configure,v 1.83 2002/11/06 03:50:49 ukai Exp $
# $Id: configure,v 1.84 2002/11/06 14:58:03 ukai Exp $
# Configuration.
#
@@ -798,6 +798,7 @@ ask_param "Inline image support" use_image n
if [ "$use_image" = y ]; then
def_use_image="#define USE_IMAGE"
imgtarget='$(IMGDISPLAY)'
install_w3mimgdisplay='$(INSTALL_PROGRAM)'
ask_param "X11 inline image support (you need Imlib1 or GdkPixbuf library)" use_w3mimg_x11 y
d_w3mimg_fb=n
case $sysname in
@@ -809,9 +810,7 @@ if [ "$use_image" = y ]; then
if [ "$use_w3mimg_fb" = y ]; then
ask_param "setuid w3mimgdisplay to open /dev/fb0?" w3mimgdisplay_setuid y
if [ "$w3mimgdisplay_setuid" = y ]; then
INSTALL_W3MIMGDISPLAY='$(INSTALL) -o root -m 4755 -s'
else
INSTALL_W3MIMGDISPLAY='$(INSTALL_PROGRAM)'
install_w3mimgdisplay='$(INSTALL) -o root -m 4755 -s'
fi
fi
;;
@@ -2327,7 +2326,7 @@ MKDIR=$MKDIR
PERL=$perl
VERSION=$w3mversion
MODEL=$sysname.$platform-$modelname-$lang
INSTALL_W3MIMGDISPLAY=$INSTALL_W3MIMGDISPLAY
INSTALL_W3MIMGDISPLAY=$install_w3mimgdisplay
#else
$special_sys