aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-01-21 15:56:12 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-01-21 15:56:12 +0000
commit004f4abe6e6e139f94aea16c6569ecada95f4fb8 (patch)
tree60eb441a378ed2769ef484421168bc8eb1c668e4 /configure
parent[w3m-dev 02876] w3mmail.cgi.in backport from w3mmee (diff)
downloadw3m-004f4abe6e6e139f94aea16c6569ecada95f4fb8.tar.gz
w3m-004f4abe6e6e139f94aea16c6569ecada95f4fb8.zip
[w3m-dev 02877] some fixes for urimethodmap
* config.h.dist (RC_DIR): remove tailing / * configure (mailer): if use_w3mmailer = y, don't ask mailer * configure (RC_DIR): remove tailing / * fm.h (Mailer): ifndef USE_W3MMAILER * main.c (MAIN): ifndef USE_W3MMAILER getenv("MAILER") * rc.c ("mailer"): ifndef USE_W3MMAILER * regex.c (newRegex0): \ escape kanji chars * url.c (searchURIMethods): need escape for - * scripts/w3mmail.cgi.in: move $url, $qurl * scripts/w3mmail.cgi.in: url_unquote $to From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Diffstat (limited to '')
-rwxr-xr-xconfigure19
1 files changed, 11 insertions, 8 deletions
diff --git a/configure b/configure
index ee0308b..1dfcd68 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: configure,v 1.54 2002/01/18 13:06:14 ukai Exp $
+# $Id: configure,v 1.55 2002/01/21 15:56:13 ukai Exp $
# Configuration.
#
@@ -744,7 +744,8 @@ readdir "$ded"
editor=$_dir
echo "ded='$editor'" >> config.param
-if [ -z "$dmail" ] ; then
+if [ "$use_w3mmailer" != 'y' ]; then
+ if [ -z "$dmail" ] ; then
if ./which \mailx > /dev/null
then
dmail=`./which \mailx`
@@ -752,14 +753,16 @@ if [ -z "$dmail" ] ; then
dmail=`./which \mail`
fi
if [ -n "`echo $dmail | grep 'no'`" ] ; then dmail=mailx ; fi
+ fi
+ echo "Input your favorite mailer program."
+ Echo "(Default: $dmail) "
+ readdir "$dmail"
+ mailer=$_dir
+else
+ mailer="$dmail"
fi
-echo "Input your favorite mailer program."
-Echo "(Default: $dmail) "
-readdir "$dmail"
-mailer=$_dir
echo "dmail='$mailer'" >> config.param
-
if [ -z "$dbrowser" ] ; then
if ./which netscape > /dev/null
then
@@ -2086,7 +2089,7 @@ $def_use_help_cgi
#define HELP_CGI "w3mhelp"
#define W3MCONFIG "w3mconfig"
-#define RC_DIR "~/.w3m/"
+#define RC_DIR "~/.w3m"
#define BOOKMARK "bookmark.html"
#define CONFIG_FILE "config"
#define KEYMAP_FILE "keymap"