storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 03804] fix autoconf

Browse Source 
* acinclude.m4 (AC_W3M_MENU): default enabled
		(AC_W3M_MOUSE): default enabled
		(AC_W3M_COOKIE): default enabled
		(AC_W3M_LANG): can't detect locale here.
			autoconf set LANG=C
		(AC_W3M_DIGEST_AUTH): default enabled
		(AC_W3M_SSL): default enabled
* configure.in (AC_W3M_DIGEST_AUTH): added
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2003-03-10 17:50:50 +00:00
parent 1e8dcd968f
commit 2415b36cf7
6 changed files with 247 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,5 +1,15 @@
2003-03-11 Fumitoshi UKAI <ukai@ukai.org>
* [w3m-dev 03804] fix autoconf
* acinclude.m4 (AC_W3M_MENU): default enabled
(AC_W3M_MOUSE): default enabled
(AC_W3M_COOKIE): default enabled
(AC_W3M_LANG): can't detect locale here.
autoconf set LANG=C
(AC_W3M_DIGEST_AUTH): default enabled
(AC_W3M_SSL): default enabled
* configure.in (AC_W3M_DIGEST_AUTH): added
* [w3m-dev 03804] fix autoconf
* config.h.in (EAMCS_LIKE_LINEEDIT): define
(VI_PREC_NUM): define
@@ -7422,4 +7432,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
$Id: ChangeLog,v 1.780 2003/03/10 17:33:21 ukai Exp $
$Id: ChangeLog,v 1.781 2003/03/10 17:50:50 ukai Exp $

6
Makefile
View File

@@ -22,11 +22,11 @@ sysconfdir = ${prefix}/etc
top_srcdir = .
DESTDIR =
CFLAGS = $(OPTS) -g -O2 $(DEFS)
CFLAGS = $(OPTS) -g -O2 -I/usr/include/openssl $(DEFS)
CPPFLAGS = -I/usr/include/gc -I/usr/include/gc
DEFS = -DHAVE_CONFIG_H -I. -I$(top_srcdir) -DAUXBIN_DIR=\"$(libexecdir)\" -DLIB_DIR=\"$(libdir)\" -DHELP_DIR=\"$(datadir)\" -DETC_DIR=\"$(sysconfdir)\"
LDFLAGS =
LIBS = -L. -lindep -lncurses -lcurses -ltermcap -lm -lnsl -lgc
LIBS = -L. -lindep -lncurses -lcurses -ltermcap -lm -lnsl -lgpm -lgc -L/usr/lib -lssl -lcrypto
IMGCFLAGS = -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/include/gdk-pixbuf-1.0 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include
IMGLDFLAGS = -L/usr/lib -lgdk_pixbuf -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm -lgdk_pixbuf_xlib -L/usr/lib -lgdk_pixbuf -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXi -lXext -lX11 -lm
@@ -49,7 +49,7 @@ KEYBIND_SRC = keybind.c
KEYBIND_OBJ = keybind.o
GCLIB=@gclib@
VERSION=0.4.1+cvs-1.779
VERSION=0.4.1+cvs-1.780
MODEL=@W3M_TARGET@-@W3M_MODEL@-EN
SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \

23
acinclude.m4
View File

@@ -52,8 +52,8 @@ AC_DEFUN([AC_W3M_MENU],
[AC_SUBST(USE_MENU)
AC_MSG_CHECKING(if popup menu is enabled)
AC_ARG_ENABLE(menu,
[ --enable-menu enable popup menu],,
[enable_menu="no"])
[ --disable-menu disable popup menu],,
[enable_menu="yes"])
test x$enable_menu = xyes && AC_DEFINE(USE_MENU)
AC_MSG_RESULT($enable_menu)])
#
@@ -64,8 +64,8 @@ AC_DEFUN([AC_W3M_MOUSE],
[AC_SUBST(USE_MOUSE)
AC_MSG_CHECKING(if mouse operation enabled)
AC_ARG_ENABLE(mouse,
[ --enable-mouse enable mouse operation],,
[enable_mouse="no"])
[ --disable-mouse disable mouse operation],,
[enable_mouse="yes"])
test x$enable_mouse = xyes && AC_DEFINE(USE_MOUSE)
AC_MSG_RESULT($enable_mouse)])
#
@@ -76,8 +76,8 @@ AC_DEFUN([AC_W3M_COOKIE],
[AC_SUBST(USE_COOKIE)
AC_MSG_CHECKING(if cookie is enabled)
AC_ARG_ENABLE(cookie,
[ --enable-cookie enable cookie],,
[enable_cookie="no"])
[ --disable-cookie disable cookie],,
[enable_cookie="yes"])
test x$enable_cookie = xyes && AC_DEFINE(USE_COOKIE)
AC_MSG_RESULT($enable_cookie)])
#
@@ -140,10 +140,7 @@ AC_SUBST(SYSTEM_CODE)
AC_MSG_CHECKING(if japanese support is enabled)
AC_ARG_ENABLE(japanese,
[ --enable-japanese=CODE support Japanese character sets, CODE=(S|E|j|N|n|m)],,
[case "${LC_ALL:-$LANG}" in
ja*) enable_japanese="yes";;
*) enable_japanese="no";;
esac])
[enable_japanese="no"])
AC_MSG_RESULT($enable_japanese)
if test x$enable_japanese = xno; then
w3m_lang="en"
@@ -210,8 +207,8 @@ AC_DEFUN([AC_W3M_DIGEST_AUTH],
[AC_SUBST(USE_DIGEST_AUTH)
AC_MSG_CHECKING(if digest auth is enabled)
AC_ARG_ENABLE(digest_auth,
[ --enable-digest-auth enable digest auth],,
[enable_digest_auth="no"])
[ --disable-digest-auth disable digest auth],,
[enable_digest_auth="yes"])
test x$enable_digest_auth = xyes && AC_DEFINE(USE_DIGEST_AUTH)
AC_MSG_RESULT($enable_digest_auth)])
#
@@ -383,7 +380,7 @@ AC_SUBST(USE_SSL_VERIFY)
AC_MSG_CHECKING(if SSL is suported)
AC_ARG_WITH(ssl,
[ --with-ssl=PATH support https protocol],,
[with_ssl="no"])
[with_ssl="yes"])
AC_MSG_RESULT($with_ssl)
if test x$with_ssl != xno; then
AC_DEFINE(USE_SSL)

23
aclocal.m4 vendored
View File

@@ -64,8 +64,8 @@ AC_DEFUN([AC_W3M_MENU],
[AC_SUBST(USE_MENU)
AC_MSG_CHECKING(if popup menu is enabled)
AC_ARG_ENABLE(menu,
[ --enable-menu enable popup menu],,
[enable_menu="no"])
[ --disable-menu disable popup menu],,
[enable_menu="yes"])
test x$enable_menu = xyes && AC_DEFINE(USE_MENU)
AC_MSG_RESULT($enable_menu)])
#
@@ -76,8 +76,8 @@ AC_DEFUN([AC_W3M_MOUSE],
[AC_SUBST(USE_MOUSE)
AC_MSG_CHECKING(if mouse operation enabled)
AC_ARG_ENABLE(mouse,
[ --enable-mouse enable mouse operation],,
[enable_mouse="no"])
[ --disable-mouse disable mouse operation],,
[enable_mouse="yes"])
test x$enable_mouse = xyes && AC_DEFINE(USE_MOUSE)
AC_MSG_RESULT($enable_mouse)])
#
@@ -88,8 +88,8 @@ AC_DEFUN([AC_W3M_COOKIE],
[AC_SUBST(USE_COOKIE)
AC_MSG_CHECKING(if cookie is enabled)
AC_ARG_ENABLE(cookie,
[ --enable-cookie enable cookie],,
[enable_cookie="no"])
[ --disable-cookie disable cookie],,
[enable_cookie="yes"])
test x$enable_cookie = xyes && AC_DEFINE(USE_COOKIE)
AC_MSG_RESULT($enable_cookie)])
#
@@ -152,10 +152,7 @@ AC_SUBST(SYSTEM_CODE)
AC_MSG_CHECKING(if japanese support is enabled)
AC_ARG_ENABLE(japanese,
[ --enable-japanese=CODE support Japanese character sets, CODE=(S|E|j|N|n|m)],,
[case "${LC_ALL:-$LANG}" in
ja*) enable_japanese="yes";;
*) enable_japanese="no";;
esac])
[enable_japanese="no"])
AC_MSG_RESULT($enable_japanese)
if test x$enable_japanese = xno; then
w3m_lang="en"
@@ -222,8 +219,8 @@ AC_DEFUN([AC_W3M_DIGEST_AUTH],
[AC_SUBST(USE_DIGEST_AUTH)
AC_MSG_CHECKING(if digest auth is enabled)
AC_ARG_ENABLE(digest_auth,
[ --enable-digest-auth enable digest auth],,
[enable_digest_auth="no"])
[ --disable-digest-auth disable digest auth],,
[enable_digest_auth="yes"])
test x$enable_digest_auth = xyes && AC_DEFINE(USE_DIGEST_AUTH)
AC_MSG_RESULT($enable_digest_auth)])
#
@@ -395,7 +392,7 @@ AC_SUBST(USE_SSL_VERIFY)
AC_MSG_CHECKING(if SSL is suported)
AC_ARG_WITH(ssl,
[ --with-ssl=PATH support https protocol],,
[with_ssl="no"])
[with_ssl="yes"])
AC_MSG_RESULT($with_ssl)
if test x$with_ssl != xno; then
AC_DEFINE(USE_SSL)

408
configure vendored
View File

File diff suppressed because it is too large Load Diff

1
configure.in
View File

@@ -36,6 +36,7 @@ AC_W3M_MENU
AC_W3M_COOKIE
AC_W3M_DICT
AC_W3M_HISTORY
AC_W3M_DIGEST_AUTH
AC_W3M_NNTP
AC_W3M_GOPHER