w3m

commit 9ac2937f3e46b1c62220257e56b11e6a610ee5a9
parent 7e12f5649813ec9e7a3f538eb06437fca9d13b75
Author: ukai <ukai>
Date:   Tue, 12 Nov 2002 12:44:49 +0000

[w3m-dev 03417] install_w3mimgdisplay
* configure: define install_w3mimgdisplay
		after use_w3mimg_fb determined
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
configure
 | 
10
++++++----

2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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>
 
 	* [w3m-dev 03415] fix a build issue for 64bit arch
diff --git a/configure b/configure
@@ -819,7 +819,6 @@ 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
@@ -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
     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'
-	fi
     fi
     ;;
   esac
@@ -2202,6 +2198,12 @@ if [ "$use_image" = y ]; then
 	  echo "Disable Linux framebuffer inline image"
       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
 
 rm -f _zmachdep$extension _zmachdep.c _zmachdep.o