[w3m-dev 03858] configure cleanup
* acinclude.m4 configure.in: update From: Fumitoshi UKAI <ukai@debian.or.jp>
This commit is contained in:
@@ -1,3 +1,8 @@
|
||||
2003-04-08 Fumitoshi UKAI <ukai@debian.or.jp>
|
||||
|
||||
* [w3m-dev 03858] configure cleanup
|
||||
* acinclude.m4 configure.in: update
|
||||
|
||||
2003-04-08 Fumitoshi UKAI <ukai@debian.or.jp>
|
||||
|
||||
* [w3m-dev 03856] <gc.h>
|
||||
@@ -7685,4 +7690,4 @@ a * [w3m-dev 03276] compile error on EWS4800
|
||||
* release-0-2-1
|
||||
* import w3m-0.2.1
|
||||
|
||||
$Id: ChangeLog,v 1.815 2003/04/07 16:27:09 ukai Exp $
|
||||
$Id: ChangeLog,v 1.816 2003/04/07 16:39:23 ukai Exp $
|
||||
|
@@ -16,7 +16,7 @@ AC_DEFUN([AC_W3M_COLOR],
|
||||
[AC_SUBST(USE_COLOR)
|
||||
AC_MSG_CHECKING(if color escape sequence for kterm/pxvt is enabled)
|
||||
AC_ARG_ENABLE(color,
|
||||
[ --disable-color disable color escape sequence for kterm/pxvt],,
|
||||
[ --disable-color disable color for vt100 terminal],,
|
||||
[enable_color="yes"])
|
||||
test x"$enable_color" = xyes && AC_DEFINE(USE_COLOR)
|
||||
AC_MSG_RESULT($enable_color)])
|
||||
@@ -171,7 +171,7 @@ AC_DEFUN([AC_W3M_KANJI_SYMBOLS],
|
||||
if test x"$enable_japanese" != xno; then
|
||||
AC_MSG_CHECKING(if kanji symbols is used)
|
||||
AC_ARG_ENABLE(kanjisymbols,
|
||||
[ --enable-kanjisymbols use kanji symbols (enable japanese only)],,
|
||||
[ --disable-kanjisymbols use kanji symbols (enable japanese only)],,
|
||||
[enable_kanjisymbols="yes"])
|
||||
test x"$enable_kanjisymbols" = xyes && AC_DEFINE(KANJI_SYMBOLS)
|
||||
AC_MSG_RESULT($enable_kanjisymbols)
|
||||
@@ -499,7 +499,7 @@ AC_DEFUN([AC_W3M_IMAGE],
|
||||
AC_SUBST(IMGFBLDFLAGS)
|
||||
AC_MSG_CHECKING(if image is enabled)
|
||||
AC_ARG_ENABLE(image,
|
||||
[ --enable-image[=x11,fb,fb+s] enable inline image handler],,
|
||||
[ --disable-image[=x11,fb,fb+s] enable inline image handler],,
|
||||
[enable_image="yes"])
|
||||
AC_MSG_RESULT($enable_image)
|
||||
if test x"$enable_image" != xno; then
|
||||
@@ -604,7 +604,7 @@ AC_DEFUN([AC_W3M_XFACE],
|
||||
[AC_SUBST(USE_XFACE)
|
||||
AC_MSG_CHECKING(if xface is enabled)
|
||||
AC_ARG_ENABLE(xface,
|
||||
[ --enable-xface enable xface support],,
|
||||
[ --disable-xface enable xface support],,
|
||||
[enable_xface="$enable_image"])
|
||||
test x"$enable_xface" = xyes && AC_DEFINE(USE_XFACE)
|
||||
AC_MSG_RESULT($enable_xface)
|
||||
|
8
aclocal.m4
vendored
8
aclocal.m4
vendored
@@ -28,7 +28,7 @@ AC_DEFUN([AC_W3M_COLOR],
|
||||
[AC_SUBST(USE_COLOR)
|
||||
AC_MSG_CHECKING(if color escape sequence for kterm/pxvt is enabled)
|
||||
AC_ARG_ENABLE(color,
|
||||
[ --disable-color disable color escape sequence for kterm/pxvt],,
|
||||
[ --disable-color disable color for vt100 terminal],,
|
||||
[enable_color="yes"])
|
||||
test x"$enable_color" = xyes && AC_DEFINE(USE_COLOR)
|
||||
AC_MSG_RESULT($enable_color)])
|
||||
@@ -183,7 +183,7 @@ AC_DEFUN([AC_W3M_KANJI_SYMBOLS],
|
||||
if test x"$enable_japanese" != xno; then
|
||||
AC_MSG_CHECKING(if kanji symbols is used)
|
||||
AC_ARG_ENABLE(kanjisymbols,
|
||||
[ --enable-kanjisymbols use kanji symbols (enable japanese only)],,
|
||||
[ --disable-kanjisymbols use kanji symbols (enable japanese only)],,
|
||||
[enable_kanjisymbols="yes"])
|
||||
test x"$enable_kanjisymbols" = xyes && AC_DEFINE(KANJI_SYMBOLS)
|
||||
AC_MSG_RESULT($enable_kanjisymbols)
|
||||
@@ -511,7 +511,7 @@ AC_DEFUN([AC_W3M_IMAGE],
|
||||
AC_SUBST(IMGFBLDFLAGS)
|
||||
AC_MSG_CHECKING(if image is enabled)
|
||||
AC_ARG_ENABLE(image,
|
||||
[ --enable-image[=x11,fb,fb+s] enable inline image handler],,
|
||||
[ --disable-image[=x11,fb,fb+s] enable inline image handler],,
|
||||
[enable_image="yes"])
|
||||
AC_MSG_RESULT($enable_image)
|
||||
if test x"$enable_image" != xno; then
|
||||
@@ -616,7 +616,7 @@ AC_DEFUN([AC_W3M_XFACE],
|
||||
[AC_SUBST(USE_XFACE)
|
||||
AC_MSG_CHECKING(if xface is enabled)
|
||||
AC_ARG_ENABLE(xface,
|
||||
[ --enable-xface enable xface support],,
|
||||
[ --disable-xface enable xface support],,
|
||||
[enable_xface="$enable_image"])
|
||||
test x"$enable_xface" = xyes && AC_DEFINE(USE_XFACE)
|
||||
AC_MSG_RESULT($enable_xface)
|
||||
|
35
configure.in
35
configure.in
@@ -32,26 +32,33 @@ AC_W3M_COLOR
|
||||
AC_W3M_ANSI_COLOR
|
||||
AC_W3M_BG_COLOR
|
||||
|
||||
AC_W3M_MIGEMO
|
||||
|
||||
AC_W3M_MOUSE
|
||||
AC_W3M_IMAGE
|
||||
if test x"$enable_image" != xno; then
|
||||
AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)"
|
||||
AC_W3M_XFACE
|
||||
fi
|
||||
|
||||
AC_W3M_KEYMAP
|
||||
AC_W3M_MENU
|
||||
AC_W3M_COOKIE
|
||||
AC_W3M_DICT
|
||||
AC_W3M_MOUSE
|
||||
AC_W3M_HISTORY
|
||||
AC_W3M_ALARM
|
||||
|
||||
AC_W3M_COOKIE
|
||||
AC_W3M_DIGEST_AUTH
|
||||
AC_W3M_NNTP
|
||||
AC_W3M_GOPHER
|
||||
AC_W3M_IPv6
|
||||
AC_W3M_SSL
|
||||
|
||||
AC_W3M_KEYMAP
|
||||
|
||||
AC_W3M_EDITOR
|
||||
AC_W3M_MAILER
|
||||
AC_W3M_EXT_BROWSER
|
||||
AC_W3M_DICT
|
||||
AC_W3M_HELP_CGI
|
||||
AC_W3M_EXTERNAL_URI_LOADER
|
||||
AC_W3M_W3MMAILER
|
||||
AC_W3M_MIGEMO
|
||||
AC_W3M_EDITOR
|
||||
AC_W3M_MAILER
|
||||
AC_W3M_EXT_BROWSER
|
||||
|
||||
dnl Checks for ext libs
|
||||
for lib in bsd BSD 44bsd socket nsl dld dl
|
||||
@@ -69,18 +76,10 @@ if test x"$enable_mouse" = xyes; then
|
||||
AC_TRY_CPP([#include <machine/console.h>
|
||||
MOUSE_GETINFO], [AC_DEFINE(USE_SYSMOUSE)])
|
||||
fi
|
||||
AC_W3M_ALARM
|
||||
AC_SUBST(AUXBIN_TARGETS)
|
||||
AUXBIN_TARGETS=
|
||||
AC_W3M_IMAGE
|
||||
if test x"$enable_image" != xno; then
|
||||
AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)"
|
||||
AC_W3M_XFACE
|
||||
fi
|
||||
AC_W3M_TERMLIB
|
||||
AC_W3M_GC
|
||||
AC_W3M_SSL
|
||||
AC_W3M_IPv6
|
||||
AC_CHECK_LIB(z, zError, [AUXBIN_TARGETS="$AUXBIN_TARGETS inflate\$(EXT)"])
|
||||
|
||||
AC_DEFINE(AUXBIN_TARGETS, "$AUXBIN_TARGETS")
|
||||
|
Reference in New Issue
Block a user