diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-06 14:58:02 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2002-11-06 14:58:02 +0000 |
| commit | fcf7c4af06fd28571a7e7106ac62d0db3a1c4af7 (patch) | |
| tree | 2f0af90813fcf89afee8379a9fb985849c7def89 | |
| parent | w3mimgdisplay setuid done (diff) | |
| download | w3m-fcf7c4af06fd28571a7e7106ac62d0db3a1c4af7.tar.gz w3m-fcf7c4af06fd28571a7e7106ac62d0db3a1c4af7.zip | |
[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>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | config.h.dist | 1 | ||||
| -rwxr-xr-x | configure | 9 |
3 files changed, 13 insertions, 6 deletions
@@ -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 $ diff --git a/config.h.dist b/config.h.dist index 5b5241e..22c94f7 100644 --- a/config.h.dist +++ b/config.h.dist @@ -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 @@ -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 |