[w3m-dev 03865] Re: configure --help

* acinclude.m4 (AC_W3M_ANSI_COLOR): depends USE_COLOR
	(AC_W3M_BG_COLOR): depends USE_COLOR
	(AC_W3M_W3MMAILER): depends external_uri_loader
* fm.h: undef USE_BG_COLOR ifndef USE_COLOR
From: Fumitoshi UKAI  <ukai@debian.or.jp>

5 files changed, 26 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 4c0b6d0..dc45b4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2003-04-09  Fumitoshi UKAI  <ukai@debian.or.jp>
 
+	* [w3m-dev 03865] Re: configure --help
+	* acinclude.m4 (AC_W3M_ANSI_COLOR): depends USE_COLOR
+		(AC_W3M_BG_COLOR): depends USE_COLOR
+		(AC_W3M_W3MMAILER): depends external_uri_loader
+	* fm.h: undef USE_BG_COLOR ifndef USE_COLOR
+
+2003-04-09  Fumitoshi UKAI  <ukai@debian.or.jp>
+
 	* [w3m-dev 03864] doc/README
 	* doc/README doc-jp/README: update
 
@@ -7709,4 +7717,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.818 2003/04/08 16:19:59 ukai Exp $
+$Id: ChangeLog,v 1.819 2003/04/08 16:27:16 ukai Exp $
diff --git a/acinclude.m4 b/acinclude.m4
index f250ec6..7b33492 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -28,8 +28,8 @@ AC_DEFUN([AC_W3M_ANSI_COLOR],
 [AC_SUBST(USE_ANSI_COLOR)
 AC_MSG_CHECKING(if ansi color escape sequence support is enabled)
 AC_ARG_ENABLE(ansi_color,
- [  --disable-ansi-color		disable ansi color escape sequence],,
- [enable_ansi_color="yes"])
+ [   --disable-ansi-color		disable ansi color escape sequence],,
+ [enable_ansi_color="$enable_color"])
  test x"$enable_ansi_color" = xyes && AC_DEFINE(USE_ANSI_COLOR)
  AC_MSG_RESULT($enable_ansi_color)])
 #
@@ -40,8 +40,8 @@ AC_DEFUN([AC_W3M_BG_COLOR],
 [AC_SUBST(USE_BG_COLOR)
 AC_MSG_CHECKING(if background color support is enabled)
 AC_ARG_ENABLE(bgcolor,
- [  --disable-bgcolor		disable to set background color],,
- [enable_bgcolor="yes"])
+ [   --disable-bgcolor		disable to set background color],,
+ [enable_bgcolor="$enable_color"])
  test x"$enable_bgcolor" = xyes && AC_DEFINE(USE_BG_COLOR)
 AC_MSG_RESULT($enable_bgcolor)])
 #
@@ -300,7 +300,7 @@ AC_DEFUN([AC_W3M_W3MMAILER],
 [AC_SUBST(USE_W3MMAILER)
  AC_MSG_CHECKING(if w3mmail is used)
  AC_ARG_ENABLE(w3mmailer,
- [  --disable-w3mmailer		disable w3mmailer],,
+ [   --disable-w3mmailer		disable w3mmailer],,
  [enable_w3mmailer="$enable_external_uri_loader"])
  test x"$enable_external_uri_loader" = xno && enable_w3mmailer=no
  test x"$enable_w3mmailer" = xyes && AC_DEFINE(USE_W3MMAILER)
diff --git a/aclocal.m4 b/aclocal.m4
index 1968c2f..1294b55 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -40,8 +40,8 @@ AC_DEFUN([AC_W3M_ANSI_COLOR],
 [AC_SUBST(USE_ANSI_COLOR)
 AC_MSG_CHECKING(if ansi color escape sequence support is enabled)
 AC_ARG_ENABLE(ansi_color,
- [  --disable-ansi-color		disable ansi color escape sequence],,
- [enable_ansi_color="yes"])
+ [   --disable-ansi-color		disable ansi color escape sequence],,
+ [enable_ansi_color="$enable_color"])
  test x"$enable_ansi_color" = xyes && AC_DEFINE(USE_ANSI_COLOR)
  AC_MSG_RESULT($enable_ansi_color)])
 #
@@ -52,8 +52,8 @@ AC_DEFUN([AC_W3M_BG_COLOR],
 [AC_SUBST(USE_BG_COLOR)
 AC_MSG_CHECKING(if background color support is enabled)
 AC_ARG_ENABLE(bgcolor,
- [  --disable-bgcolor		disable to set background color],,
- [enable_bgcolor="yes"])
+ [   --disable-bgcolor		disable to set background color],,
+ [enable_bgcolor="$enable_color"])
  test x"$enable_bgcolor" = xyes && AC_DEFINE(USE_BG_COLOR)
 AC_MSG_RESULT($enable_bgcolor)])
 #
@@ -312,7 +312,7 @@ AC_DEFUN([AC_W3M_W3MMAILER],
 [AC_SUBST(USE_W3MMAILER)
  AC_MSG_CHECKING(if w3mmail is used)
  AC_ARG_ENABLE(w3mmailer,
- [  --disable-w3mmailer		disable w3mmailer],,
+ [   --disable-w3mmailer		disable w3mmailer],,
  [enable_w3mmailer="$enable_external_uri_loader"])
  test x"$enable_external_uri_loader" = xno && enable_w3mmailer=no
  test x"$enable_w3mmailer" = xyes && AC_DEFINE(USE_W3MMAILER)
diff --git a/configure b/configure
index 10d56fb..ff8714f 100755
--- a/configure
+++ b/configure
@@ -19,9 +19,9 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-color		disable color for vt100 terminal"
 ac_help="$ac_help
-  --disable-ansi-color		disable ansi color escape sequence"
+   --disable-ansi-color		disable ansi color escape sequence"
 ac_help="$ac_help
-  --disable-bgcolor		disable to set background color"
+   --disable-bgcolor		disable to set background color"
 ac_help="$ac_help
   --disable-image[=x11,fb,fb+s]	enable inline image handler"
 ac_help="$ac_help
@@ -57,7 +57,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --disable-external-uri-loader	disable external URI loader"
 ac_help="$ac_help
-  --disable-w3mmailer		disable w3mmailer"
+   --disable-w3mmailer		disable w3mmailer"
 ac_help="$ac_help
   --with-migemo=MIGEMO_COMMAND	migemo command"
 ac_help="$ac_help
@@ -1420,7 +1420,7 @@ if test "${enable_ansi_color+set}" = set; then
   enableval="$enable_ansi_color"
   :
 else
-  enable_ansi_color="yes"
+  enable_ansi_color="$enable_color"
 fi
 
  test x"$enable_ansi_color" = xyes && cat >> confdefs.h <<\EOF
@@ -1436,7 +1436,7 @@ if test "${enable_bgcolor+set}" = set; then
   enableval="$enable_bgcolor"
   :
 else
-  enable_bgcolor="yes"
+  enable_bgcolor="$enable_color"
 fi
 
  test x"$enable_bgcolor" = xyes && cat >> confdefs.h <<\EOF
diff --git a/fm.h b/fm.h
index e4c35bb..f3b7d07 100644
--- a/fm.h
+++ b/fm.h
@@ -1,4 +1,4 @@
-/* $Id: fm.h,v 1.116 2003/04/08 16:01:38 ukai Exp $ */
+/* $Id: fm.h,v 1.117 2003/04/08 16:27:29 ukai Exp $ */
 /* 
  * w3m: WWW wo Miru utility
  * 
@@ -32,6 +32,7 @@
 
 #ifndef USE_COLOR
 #undef USE_ANSI_COLOR
+#undef USE_BG_COLOR
 #endif
 
 #include "ctrlcode.h"