[w3m-dev 03981] w3mman とヘル プがインストールされない

Mamoru KOMACHI <[email protected]>
Newsgroups gmane.comp.web.w3m.devel
Message-ID <86brswr5h7.wl%[email protected]> 

CVS HEAD  1.877  w3mman 
 H 
scripts/w3mman/Makefile.in 


w3mimgdisplay  
--with-imglib 
autoconf 

 acinclude.m4 aclocal 
 aclocal.m4  POMAKEFILEDEPS po 
 make 
 acinclude.m4  aclocal.m4 


--disable-m17n  --disable-nls  make 

m17n  nls 



-- 
Mamoru KOMACHI <[email protected]>
http://www.sodan.ecc.u-tokyo.ac.jp/~usata/

=w3mman  help 

diff -urN w3m-0.4.2.ORIG/Makefile.in w3m-0.4.2/Makefile.in
--- w3m-0.4.2.ORIG/Makefile.in	2003-09-25 00:36:41.000000000 +0900
+++ w3m-0.4.2/Makefile.in	2003-09-25 03:27:57.000000000 +0900
@@ -112,7 +112,7 @@
 HELP_ALLFILES=w3mhelp-w3m_en.html w3mhelp-w3m_ja.html \
 	w3mhelp-lynx_en.html w3mhelp-lynx_ja.html
 
-SCRIPTSUBDIRS= scripts
+SCRIPTSUBDIRS= scripts scripts/multipart scripts/w3mman
 SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po
 
 .PHONY: $(SUBDIRS)
diff -urN w3m-0.4.2.ORIG/configure.in w3m-0.4.2/configure.in
--- w3m-0.4.2.ORIG/configure.in	2003-09-25 00:36:50.000000000 +0900
+++ w3m-0.4.2/configure.in	2003-09-25 04:10:35.000000000 +0900
@@ -138,6 +138,9 @@
 AC_W3M_SIGSETJMP
 AC_W3M_SIGNAL
 
+AC_SUBST(HELP_DIR)
+HELP_DIR="/usr/share/w3m"
+AC_DEFINE_UNQUOTED(HELP_DIR, "$HELP_DIR")
 AC_SUBST(RC_DIR)
 RC_DIR="~/.$PACKAGE"
 AC_DEFINE_UNQUOTED(RC_DIR, "$RC_DIR")
diff -urN w3m-0.4.2.ORIG/scripts/w3mman/Makefile.in w3m-0.4.2/scripts/w3mman/Makefile.in
--- w3m-0.4.2.ORIG/scripts/w3mman/Makefile.in	2003-09-23 07:53:53.000000000 +0900
+++ w3m-0.4.2/scripts/w3mman/Makefile.in	2003-09-25 03:46:38.000000000 +0900
@@ -28,6 +28,7 @@
 RC_DIR = ~/.$(package)
 ETC_DIR = $(sysconfdir)
 CONF_DIR = $(sysconfdir)/$(package)
+MAN1_DIR = $(mandir)/man1
 
 TARGETS		= w3mman
 LIB_TARGETS	= w3mman2html.cgi
@@ -37,17 +38,17 @@
 MKDIR		= mkdir -p
 INSTALL		= @INSTALL@
 INSTALL_SCRIPT	= @INSTALL_SCRIPT@
-INSTALL_MAN	= @INSTALL_MAN@
+INSTALL_MAN	= @INSTALL_DATA@
 
 all: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
 
 install: $(TARGETS) $(LIB_TARGETS) $(MAN_TARGETS)
-	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
+	-$(MKDIR) $(DESTDIR)$(bindir)
 	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
 	-$(MKDIR) $(DESTDIR)$(MAN1_DIR)
 	for file in $(TARGETS);     \
 	do      \
-		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(BIN_DIR);	\
+		$(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir);	\
 	done
 	for file in $(LIB_TARGETS);     \
 	do      \
@@ -61,7 +62,7 @@
 uninstall:
 	-for file in $(TARGETS);     \
 	do      \
-		rm -f $(BIN_DIR)/$$file;	\
+		rm -f $(bindir)/$$file;	\
 	done
 	-for file in $(LIB_TARGETS);     \
 	do      \

=w3mman  help 

=--with-imglib 

diff -urN w3m-0.4.2.ORIG/acinclude.m4 w3m-0.4.2/acinclude.m4
--- w3m-0.4.2.ORIG/acinclude.m4	2003-10-03 07:24:52.000000000 +0900
+++ w3m-0.4.2/acinclude.m4	2003-10-05 04:18:31.000000000 +0900
@@ -599,6 +599,12 @@
 	  enable_image=x11,fb
         fi;;
     esac
+    AC_ARG_WITH(imglib,
+    [  --with-imglib=IMGLIB	image library to link
+			(IMGLIB should be either gdk_pixbuf, imlib or imlib2.
+			Note that you need to use gdk_pixbuf or imlib2 to enable
+			inline image handler support for framebuffer device.)],
+    [test x"$with_imglib" = xyes || imglib="$with_imglib"])
   fi   
   save_ifs="$IFS"; IFS=",";
   for img in $enable_image; do
@@ -640,21 +646,27 @@
 	[have_imlib2="yes"],
 	[have_imlib2="no"])])
   if test x"$x11" = xyes; then
-   if test x"$have_gdkpixbuf" = xyes; then
+   if test x"$have_gdkpixbuf" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = xgdk_pixbuf; then
      AC_DEFINE(USE_W3MIMG_X11)
      AC_DEFINE(USE_GDKPIXBUF)
      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
      IMGTARGETS="x11"    
-   elif test x"$have_imlib" = xyes; then
+   elif test x"$have_imlib" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = ximlib; then
      AC_DEFINE(USE_W3MIMG_X11)
      AC_DEFINE(USE_IMLIB)
      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
      IMGTARGETS="x11"    
-   elif test x"$have_imlib2" = xyes; then
+   elif test x"$have_imlib2" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = ximlib2; then
      AC_DEFINE(USE_W3MIMG_X11)
      AC_DEFINE(USE_IMLIB2)
      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
@@ -666,14 +678,18 @@
    fi
   fi
   if test x"$fb" = xyes; then
-   if test x"$have_gdkpixbuf" = xyes; then
+   if test x"$have_gdkpixbuf" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = xgdk_pixbuf; then
      AC_DEFINE(USE_W3MIMG_FB)
      AC_DEFINE(USE_GDKPIXBUF)
      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
      IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
      IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
      IMGTARGETS="${IMGTARGETS} fb"
-   elif test x"$have_imlib2" = xyes; then
+   elif test x"$have_imlib2" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = ximlib2; then
      AC_DEFINE(USE_W3MIMG_FB)
      AC_DEFINE(USE_IMLIB2)
      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
diff -urN w3m-0.4.2.ORIG/aclocal.m4 w3m-0.4.2/aclocal.m4
--- w3m-0.4.2.ORIG/aclocal.m4	2003-10-03 07:24:52.000000000 +0900
+++ w3m-0.4.2/aclocal.m4	2003-10-05 04:22:54.000000000 +0900
@@ -611,6 +611,12 @@
 	  enable_image=x11,fb
         fi;;
     esac
+    AC_ARG_WITH(imglib,
+    [  --with-imglib=IMGLIB	image library to link
+				(IMGLIB should be either gdk_pixbuf, imlib or imlib2.
+				Note that you need to use gdk_pixbuf or imlib2 to enable
+				inline image handler support for framebuffer device.)],
+    [test x"$with_imglib" = xyes || imglib="$with_imglib"])
   fi   
   save_ifs="$IFS"; IFS=",";
   for img in $enable_image; do
@@ -652,21 +658,27 @@
 	[have_imlib2="yes"],
 	[have_imlib2="no"])])
   if test x"$x11" = xyes; then
-   if test x"$have_gdkpixbuf" = xyes; then
+   if test x"$have_gdkpixbuf" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = xgdk_pixbuf; then
      AC_DEFINE(USE_W3MIMG_X11)
      AC_DEFINE(USE_GDKPIXBUF)
      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
      IMGTARGETS="x11"    
-   elif test x"$have_imlib" = xyes; then
+   elif test x"$have_imlib" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = ximlib; then
      AC_DEFINE(USE_W3MIMG_X11)
      AC_DEFINE(USE_IMLIB)
      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
      IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
      IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
      IMGTARGETS="x11"    
-   elif test x"$have_imlib2" = xyes; then
+   elif test x"$have_imlib2" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = ximlib2; then
      AC_DEFINE(USE_W3MIMG_X11)
      AC_DEFINE(USE_IMLIB2)
      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
@@ -678,14 +690,18 @@
    fi
   fi
   if test x"$fb" = xyes; then
-   if test x"$have_gdkpixbuf" = xyes; then
+   if test x"$have_gdkpixbuf" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = xgdk_pixbuf; then
      AC_DEFINE(USE_W3MIMG_FB)
      AC_DEFINE(USE_GDKPIXBUF)
      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
      IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
      IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
      IMGTARGETS="${IMGTARGETS} fb"
-   elif test x"$have_imlib2" = xyes; then
+   elif test x"$have_imlib2" = xyes \
+     -a -z "$with_imglib" \
+     -o x"$with_imglib" = ximlib2; then
      AC_DEFINE(USE_W3MIMG_FB)
      AC_DEFINE(USE_IMLIB2)
      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"

=--with-imglib
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.