[w3m-dev 03816] --enable-lynx => --enable-keymap=lynx

* acinclude.m4 (AC_W3M_KEYMAP): --enable-lynx => --enable-keymap=lynx
* Bonus/oldconfigure.sh: ditto
From: Fumitoshi UKAI  <ukai@debian.or.jp>

6 files changed, 57 insertions, 51 deletions

diff --git a/Bonus/oldconfigure.sh b/Bonus/oldconfigure.sh
index ff091b4..afa91ca 100755
--- a/Bonus/oldconfigure.sh
+++ b/Bonus/oldconfigure.sh
@@ -100,7 +100,7 @@ opt_enable_set "$use_history" history
 opt_enable_set "$use_digest_auth" digest-auth
 opt_enable_set "$use_nntp" nntp
 opt_enable_set "$use_gopher" gopher
-opt_enable_set "$use_lynx_key" lynx
+opt_enable_set "$use_lynx_key" keymap=lynx
 opt_with_set "$ded" editor
 opt_with_set "$dmail" mailer
 opt_with_set "$dbrowser" browser
diff --git a/ChangeLog b/ChangeLog
index f4e7059..7aa8f66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-12  Fumitoshi UKAI  <ukai@debian.or.jp>
+
+	* [w3m-dev 03816] --enable-lynx => --enable-keymap=lynx 
+	* acinclude.m4 (AC_W3M_KEYMAP): --enable-lynx => --enable-keymap=lynx
+	* Bonus/oldconfigure.sh: ditto
+
 2003-03-12  Yuji Abe <cbo46560@pop12.odn.ne.jp>
 
 	* [w3m-dev 03814] fix autoconf
@@ -7478,4 +7484,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.787 2003/03/11 16:52:09 ukai Exp $
+$Id: ChangeLog,v 1.788 2003/03/11 17:11:12 ukai Exp $
diff --git a/Makefile b/Makefile
index 3e2fcaf..dedcd6f 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ HELP_FILE = w3mhelp-w3m_en.html
 KEYBIND_SRC = keybind.c
 KEYBIND_OBJ = keybind.o
 
-VERSION=0.4.1+cvs-1.786
+VERSION=0.4.1+cvs-1.787
 MODEL=i686-pc-linux-gnu-EN
 
 SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
diff --git a/acinclude.m4 b/acinclude.m4
index 034fca1..359823f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -181,24 +181,24 @@ fi])
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_KEYMAP],
 [AC_SUBST(KEYMAP_FILE)
- w3m_keybind="w3m"
- AC_MSG_CHECKING(lynx style keybind is used)
- AC_ARG_ENABLE(lynx,
-  [  --enable-lynx			lynx style keybind],,
-  [enable_lynx="no"])
- AC_MSG_RESULT($enable_lynx)
- if test x"$enable_lynx" = xyes; then
-  w3m_keybind="lynx"
-  KEYMAP_FILE="keybind_lynx"
- else
-  w3m_keybind="w3m"
-  KEYMAP_FILE="keybind"
- fi
+ AC_MSG_CHECKING(default keymap)
+ AC_ARG_ENABLE(keymap,
+  [  --enable-keymap[=w3m|lynx]	default keybind style(w3m or lynx)],,
+  [enable_keymap="w3m"])
+ AC_MSG_RESULT($enable_keymap)
+ case x"$enable_keymap" in
+ xw3m)
+  KEYMAP_FILE="keybind";;
+ xlynx)
+  KEYMAP_FILE="keybind_lynx";;
+ *)
+  AC_MSG_ERROR([keymap should be either w3m or lynx.]);;
+ esac
  AC_SUBST(HELP_FILE)
- HELP_FILE=w3mhelp-${w3m_keybind}_$w3m_lang.html
+ HELP_FILE=w3mhelp-${enable_keymap}_$w3m_lang.html
  AC_DEFINE_UNQUOTED(HELP_FILE, "$HELP_FILE")
  AC_SUBST(KEYBIND)
- AC_DEFINE_UNQUOTED(KEYBIND, $w3m_keybind)])
+ AC_DEFINE_UNQUOTED(KEYBIND, $enable_keymap)])
 #
 # ----------------------------------------------------------------
 # AC_W3M_DIGEST_AUTH
diff --git a/aclocal.m4 b/aclocal.m4
index c2f8534..25a87e8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -193,24 +193,24 @@ fi])
 # ----------------------------------------------------------------
 AC_DEFUN([AC_W3M_KEYMAP],
 [AC_SUBST(KEYMAP_FILE)
- w3m_keybind="w3m"
- AC_MSG_CHECKING(lynx style keybind is used)
- AC_ARG_ENABLE(lynx,
-  [  --enable-lynx			lynx style keybind],,
-  [enable_lynx="no"])
- AC_MSG_RESULT($enable_lynx)
- if test x"$enable_lynx" = xyes; then
-  w3m_keybind="lynx"
-  KEYMAP_FILE="keybind_lynx"
- else
-  w3m_keybind="w3m"
-  KEYMAP_FILE="keybind"
- fi
+ AC_MSG_CHECKING(default keymap)
+ AC_ARG_ENABLE(keymap,
+  [  --enable-keymap[=w3m|lynx]	default keybind style(w3m or lynx)],,
+  [enable_keymap="w3m"])
+ AC_MSG_RESULT($enable_keymap)
+ case x"$enable_keymap" in
+ xw3m)
+  KEYMAP_FILE="keybind";;
+ xlynx)
+  KEYMAP_FILE="keybind_lynx";;
+ *)
+  AC_MSG_ERROR([keymap should be either w3m or lynx.]);;
+ esac
  AC_SUBST(HELP_FILE)
- HELP_FILE=w3mhelp-${w3m_keybind}_$w3m_lang.html
+ HELP_FILE=w3mhelp-${enable_keymap}_$w3m_lang.html
  AC_DEFINE_UNQUOTED(HELP_FILE, "$HELP_FILE")
  AC_SUBST(KEYBIND)
- AC_DEFINE_UNQUOTED(KEYBIND, $w3m_keybind)])
+ AC_DEFINE_UNQUOTED(KEYBIND, $enable_keymap)])
 #
 # ----------------------------------------------------------------
 # AC_W3M_DIGEST_AUTH
diff --git a/configure b/configure
index 4f5c7a9..a3adf8e 100755
--- a/configure
+++ b/configure
@@ -40,7 +40,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-gopher		enable GOPHER"
 ac_help="$ac_help
-  --enable-lynx			lynx style keybind"
+  --enable-keymap[=w3m|lynx]	default keybind style(w3m or lynx)"
 ac_help="$ac_help
   --with-editor=EDITOR		default editor (/usr/bin/vi)"
 ac_help="$ac_help
@@ -1597,34 +1597,34 @@ EOF
  echo "$ac_t""$enable_gopher" 1>&6
 
 
- w3m_keybind="w3m"
- echo $ac_n "checking lynx style keybind is used""... $ac_c" 1>&6
-echo "configure:1603: checking lynx style keybind is used" >&5
- # Check whether --enable-lynx or --disable-lynx was given.
-if test "${enable_lynx+set}" = set; then
-  enableval="$enable_lynx"
+ echo $ac_n "checking default keymap""... $ac_c" 1>&6
+echo "configure:1602: checking default keymap" >&5
+ # Check whether --enable-keymap or --disable-keymap was given.
+if test "${enable_keymap+set}" = set; then
+  enableval="$enable_keymap"
   :
 else
-  enable_lynx="no"
+  enable_keymap="w3m"
 fi
 
- echo "$ac_t""$enable_lynx" 1>&6
- if test x"$enable_lynx" = xyes; then
-  w3m_keybind="lynx"
-  KEYMAP_FILE="keybind_lynx"
- else
-  w3m_keybind="w3m"
-  KEYMAP_FILE="keybind"
- fi
+ echo "$ac_t""$enable_keymap" 1>&6
+ case x"$enable_keymap" in
+ xw3m)
+  KEYMAP_FILE="keybind";;
+ xlynx)
+  KEYMAP_FILE="keybind_lynx";;
+ *)
+  { echo "configure: error: keymap should be either w3m or lynx." 1>&2; exit 1; };;
+ esac
  
- HELP_FILE=w3mhelp-${w3m_keybind}_$w3m_lang.html
+ HELP_FILE=w3mhelp-${enable_keymap}_$w3m_lang.html
  cat >> confdefs.h <<EOF
 #define HELP_FILE "$HELP_FILE"
 EOF
 
  
  cat >> confdefs.h <<EOF
-#define KEYBIND $w3m_keybind
+#define KEYBIND $enable_keymap
 EOF