[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:
		@@ -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>
 | 
					2002-11-06  Fumitoshi UKAI  <ukai@debian.or.jp>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* [w3m-dev 03379] setuid w3mimgdisplay and check console tty
 | 
						* [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
 | 
						* release-0-2-1
 | 
				
			||||||
	* import w3m-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 $
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -98,6 +98,7 @@ MKDIR=mkdir -p
 | 
				
			|||||||
PERL=/usr/local/bin/perl
 | 
					PERL=/usr/local/bin/perl
 | 
				
			||||||
VERSION=0.2.2
 | 
					VERSION=0.2.2
 | 
				
			||||||
MODEL=Linux.i686-monster-ja
 | 
					MODEL=Linux.i686-monster-ja
 | 
				
			||||||
 | 
					INSTALL_W3MIMGDISPLAY=$(INSTALL_PROGRAM)
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										9
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								configure
									
									
									
									
										vendored
									
									
								
							@@ -1,5 +1,5 @@
 | 
				
			|||||||
#!/bin/sh
 | 
					#!/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.
 | 
					#	Configuration.
 | 
				
			||||||
#
 | 
					#
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -798,6 +798,7 @@ 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
 | 
				
			||||||
@@ -809,9 +810,7 @@ if [ "$use_image" = y ]; then
 | 
				
			|||||||
    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
 | 
						if [ "$w3mimgdisplay_setuid" = y ]; then
 | 
				
			||||||
	    INSTALL_W3MIMGDISPLAY='$(INSTALL) -o root -m 4755 -s'
 | 
						    install_w3mimgdisplay='$(INSTALL) -o root -m 4755 -s'
 | 
				
			||||||
	else
 | 
					 | 
				
			||||||
	    INSTALL_W3MIMGDISPLAY='$(INSTALL_PROGRAM)'
 | 
					 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
    ;;
 | 
					    ;;
 | 
				
			||||||
@@ -2327,7 +2326,7 @@ MKDIR=$MKDIR
 | 
				
			|||||||
PERL=$perl
 | 
					PERL=$perl
 | 
				
			||||||
VERSION=$w3mversion
 | 
					VERSION=$w3mversion
 | 
				
			||||||
MODEL=$sysname.$platform-$modelname-$lang
 | 
					MODEL=$sysname.$platform-$modelname-$lang
 | 
				
			||||||
INSTALL_W3MIMGDISPLAY=$INSTALL_W3MIMGDISPLAY
 | 
					INSTALL_W3MIMGDISPLAY=$install_w3mimgdisplay
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
$special_sys
 | 
					$special_sys
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user