--- configure.orig	Sun Mar 31 22:17:49 2002
+++ configure	Sun Mar 31 22:16:46 2002
@@ -53,19 +53,22 @@
     shift
     ;;
   -prefix=*|--prefix=*)
-    prefix=`expr "$1" : "-*prefix=\(.*\)"`
+    prefix=`expr \( "$1" : "-*prefix=\(.*\)" \)`
     ;;
   -bindir=*|--bindir=*)
-    bindir=`expr "$1" : "-*bindir=\(.*\)"`
+    bindir=`expr \( "$1" : "-*bindir=\(.*\)" \)`
     ;;
   -libdir=*|--libdir=*)
-    libdir=`expr "$1" : "-*libdir=\(.*\)"`
+    libdir=`expr \( "$1" : "-*libdir=\(.*\)" \)`
     ;;
   -helpdir=*|--helpdir=*)
-    helpdir=`expr "$1" : "-*helpdir=\(.*\)"`
+    helpdir=`expr \( "$1" : "-*helpdir=\(.*\)" \)`
+    ;;
+  -helpdir-ja=*|--helpdir-ja=*)
+    helpdir_ja=`expr \( "$1" : "-*helpdir-ja=\(.*\)" \)`
     ;;
   -sysconfdir=*|--sysconfdir=*)
-    sysconfdir=`expr "$1" : "-*sysconfdir=\(.*\)"`
+    sysconfdir=`expr \( "$1" : "-*sysconfdir=\(.*\)" \)`
     ;;
   -lang=en|--lang=en|-lang=EN|--lang=EN)
     lang=EN
@@ -101,19 +104,19 @@
     dldflags=`echo $1 | sed -e 's/-*ldflags=//'`
     ;;
   --ssl-includedir=*)
-    ssl_includedir=`expr "$1" : "--ssl-includedir=\(.*\)"`
+    ssl_includedir=`expr \( "$1" : "--ssl-includedir=\(.*\)" \)`
     ;;
   --ssl-libdir=*)
-    ssl_libdir=`expr "$1" : "--ssl-libdir=\(.*\)"`
+    ssl_libdir=`expr \( "$1" : "--ssl-libdir=\(.*\)" \)`
     ;;
   --gc-includedir=*)
-    gc_includedir=`expr "$1" : "--gc-includedir=\(.*\)"`
+    gc_includedir=`expr \( "$1" : "--gc-includedir=\(.*\)" \)`
     ;;
   --gc-libdir=*)
-    gc_libdir=`expr "$1" : "--gc-libdir=\(.*\)"`
+    gc_libdir=`expr \( "$1" : "--gc-libdir=\(.*\)" \)`
     ;;
   --mimetypes=*)
-    mimetypes=`expr "$1" : "--mimetypes=\(.*\)"`
+    mimetypes=`expr \( "$1" : "--mimetypes=\(.*\)" \)`
     ;;
 
   -help|--help)
@@ -541,6 +544,16 @@
 helpdir=$_dir
 echo "helpdir='$helpdir'" >> config.param
 
+d_helpdir_ja=$helpdir_ja
+if [ -z "$d_helpdir_ja" ]; then
+  d_helpdir_ja="$topdir/share/w3m"
+fi
+echo "Which directory do you want to put the Japanese helpfile?"
+Echo "(default: $d_helpdir_ja) "
+readdir "$d_helpdir_ja"
+helpdir_ja=$_dir
+echo "helpdir_ja='$helpdir_ja'" >> config.param
+
 d_sysconfdir=$sysconfdir
 if [ -z "$d_sysconfdir" ]; then
   d_sysconfdir="$topdir/etc/w3m"
@@ -1189,7 +1202,7 @@
 
 ####### perl
 perl=`./which perl`
-if [ `expr "$perl" : 'not found'` != 0 ]; then
+if [ `expr \( "$perl" : 'not found' \)` != 0 ]; then
   echo "You don't have perl."
   perl=/usr/local/bin/perl
   have_perl=n
@@ -1976,7 +1989,7 @@
 cur_ver=`sed -n 's/^#define CURRENT_VERSION *"w3m\/\([^"]*\)".*$/\1/p' version.c`
 for h_in in w3mhelp-*_*.html.in
 do
-  h=`expr "$h_in" : '\(.*\)\.in'`
+  h=`expr \( "$h_in" : '\(.*\)\.in' \)`
   sed -e 's/@CURRENT_VERSION@/'$cur_ver'/' $h_in > $h
 done
 
@@ -2067,6 +2080,7 @@
 
 BIN_DIR = $bindir
 HELP_DIR = $helpdir
+HELP_DIR_JA = $helpdir_ja
 LIB_DIR = $libdir
 ETC_DIR = $sysconfdir
 RC_DIR = ~/.w3m
@@ -2140,6 +2154,7 @@
 
 #define LIB_DIR      "$libdir"
 #define HELP_DIR     "$helpdir"
+#define HELP_DIR_JA  "$helpdir_ja"
 #define ETC_DIR	     "$sysconfdir"
 #define HELP_FILE    "w3mhelp.html"
 #define HELP_CGI     "w3mhelp"