[w3m-dev 03417] install_w3mimgdisplay

* configure: define install_w3mimgdisplay
		after use_w3mimg_fb determined
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-12 12:44:49 +00:00
parent 54fd2d7e83
commit b1b21ada7a
2 changed files with 14 additions and 6 deletions

View File

@@ -1,3 +1,9 @@
2002-11-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03417] install_w3mimgdisplay
* configure: define install_w3mimgdisplay
after use_w3mimg_fb determined
2002-11-12 Akira TAGOH <at@gclab.org> 2002-11-12 Akira TAGOH <at@gclab.org>
* [w3m-dev 03415] fix a build issue for 64bit arch * [w3m-dev 03415] fix a build issue for 64bit arch
@@ -4577,4 +4583,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.503 2002/11/12 12:41:57 ukai Exp $ $Id: ChangeLog,v 1.504 2002/11/12 12:44:49 ukai Exp $

12
configure vendored
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
# $Id: configure,v 1.85 2002/11/09 21:55:24 ukai Exp $ # $Id: configure,v 1.86 2002/11/12 12:44:49 ukai Exp $
# Configuration. # Configuration.
# #
@@ -819,7 +819,6 @@ ask_param "Inline image support" use_image n
if [ "$use_image" = y ]; then if [ "$use_image" = y ]; then
def_use_image="#define USE_IMAGE" def_use_image="#define USE_IMAGE"
imgtarget='$(IMGDISPLAY)' imgtarget='$(IMGDISPLAY)'
install_w3mimgdisplay='$(INSTALL_PROGRAM)'
ask_param "X11 inline image support (you need Imlib1 or GdkPixbuf library)" use_w3mimg_x11 y ask_param "X11 inline image support (you need Imlib1 or GdkPixbuf library)" use_w3mimg_x11 y
d_w3mimg_fb=n d_w3mimg_fb=n
case $sysname in case $sysname in
@@ -830,9 +829,6 @@ if [ "$use_image" = y ]; then
ask_param "Linux Framebuffer inline image support (you need Imlib2 or GdkPixbuf)" use_w3mimg_fb $d_w3mimg_fb ask_param "Linux Framebuffer inline image support (you need Imlib2 or GdkPixbuf)" use_w3mimg_fb $d_w3mimg_fb
if [ "$use_w3mimg_fb" = y ]; then if [ "$use_w3mimg_fb" = y ]; then
ask_param "setuid w3mimgdisplay to open /dev/fb0?" w3mimgdisplay_setuid y ask_param "setuid w3mimgdisplay to open /dev/fb0?" w3mimgdisplay_setuid y
if [ "$w3mimgdisplay_setuid" = y ]; then
install_w3mimgdisplay='$(INSTALL) -o root -m 4755 -s'
fi
fi fi
;; ;;
esac esac
@@ -2202,6 +2198,12 @@ if [ "$use_image" = y ]; then
echo "Disable Linux framebuffer inline image" echo "Disable Linux framebuffer inline image"
fi fi
fi fi
install_w3mimgdisplay='$(INSTALL_PROGRAM)'
if [ "$use_w3mimg_fb" = y ]; then
if [ "$w3mimgdisplay_setuid" = y ]; then
install_w3mimgdisplay='$(INSTALL) -o root -m 4755 -s'
fi
fi
fi fi
rm -f _zmachdep$extension _zmachdep.c _zmachdep.o rm -f _zmachdep$extension _zmachdep.c _zmachdep.o