コミット: a087aa9929a1921713cbb66dd337fafc55928379 - mfiler4 (git)

mfiler4のgitリポジトリ

コミットメタ情報

• リビジョン: a087aa9929a1921713cbb66dd337fafc55928379 (tree)
• 日時: 2012-10-30 01:30:39
• 作者: ab25cq <ab25cq@gmai...>
• コミッター: ab25cq

ログメッセージ

made runnable cygwin

変更サマリ

• modified: CHANGELOG
• modified: configure
• modified: configure.in
• modified: src/filer.c

差分

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,9 @@
 
+2012 30th Octorber version 1.0.1
+
+	Made runnable on cygwin
+
+
 2012 26th Octorber version 1.0.1
 
     Check mfiler4 with migemo and fixed bug

--- a/configure
+++ b/configure
@@ -1,9 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69.
+# Generated by GNU Autoconf 2.68.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -132,31 +134,6 @@ export LANGUAGE
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -190,8 +167,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
+test x\$exitcode = x0 || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -236,25 +212,21 @@ IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -356,14 +328,6 @@ $as_echo X"$as_dir" |
 
 
 } # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -485,10 +449,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -523,16 +483,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -544,8 +504,28 @@ else
   as_mkdir_p=false
 fi
 
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -624,7 +604,6 @@ LIBOBJS
 EGREP
 GREP
 CPP
-CYGWIN_DLL
 SYSTEM_MIGEMODIR
 INSTALL_DATA
 INSTALL_SCRIPT
@@ -679,7 +658,6 @@ ac_user_opts='
 enable_option_checking
 with_debug
 with_gprof_debug
-with_socket
 with_optimize
 with_migemo
 with_migemo_dir
@@ -1151,6 +1129,8 @@ target=$target_alias
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
+    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1304,7 +1284,6 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-debug              include debug info
   --with-gprof-debug        include debug info
-  --with-socket             enable remote control
   --with-optimize           with optimize flag(-O2) CFLAGS
   --with-migemo             enable migemo
   --with-migemo-dir=DIR     set migemo directory
@@ -1389,9 +1368,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.69
+generated by GNU Autoconf 2.68
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1636,12 +1615,58 @@ $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -1899,7 +1924,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
   fi
 done
 
@@ -2014,7 +2039,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2054,7 +2079,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2107,7 +2132,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2148,7 +2173,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -2206,7 +2231,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2250,7 +2275,7 @@ do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2293,7 +2318,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -2408,7 +2433,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -2451,7 +2476,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -2510,7 +2535,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
     fi
   fi
 fi
@@ -2562,7 +2587,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -2696,7 +2721,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-struct stat;
+#include <sys/types.h>
+#include <sys/stat.h>
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -2847,7 +2873,7 @@ case $as_dir/ in #((
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2929,12 +2955,6 @@ if test "${with_gprof_debug+set}" = set; then :
 fi
 
 
-# Check whether --with-socket was given.
-if test "${with_socket+set}" = set; then :
-  withval=$with_socket;  ENABLE_SOCKET=1;
-fi
-
-
 # Check whether --with-optimize was given.
 if test "${with_optimize+set}" = set; then :
   withval=$with_optimize;  ENABLE_OPTIMIZE=1
@@ -3047,11 +3067,6 @@ then
     fi
 fi
 
-if test -n "$ENABLE_SOCKET"
-then
-    CFLAGS="$CFLAGS -DENABLE_SOCKET"
-fi
-
 if test $ENABLE_OPTIMIZE = 1
 then
     CFLAGS="$CFLAGS -O2"
@@ -3063,37 +3078,38 @@ CFLAGS="-DSYSCONFDIR=\"\\\"$sysconfdir/mfiler4/\\\"\" -DDATAROOTDIR=\"\\\"$datar
 
 
 #####################################################################
-# OSの判定 cygwinとLinuxのみ
+# Operating System
 #####################################################################
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Operating System" >&5
 $as_echo_n "checking Operating System... " >&6; }
 
-if test `uname -s | sed -e 's/\(.*\)-\(.*\)/\1/'` = "CYGWIN_NT"; then
-    echo "CYGWIN_NT"
+if uname -s | grep -q CYGWIN; then
+    echo "CYGWIN"
     $as_echo "#define __CYGWIN__ 1" >>confdefs.h
 
-
-    CYGWIN_DLL=xyzsh.dll
-
+    OS=CYGWIN
 elif test `uname -s` = "Darwin"; then
     echo "Darwin"
 
     $as_echo "#define __DARWIN__ 1" >>confdefs.h
 
+    OS=DARWIN
 elif test `uname -s` = "FreeBSD"; then
     echo "FreeBSD"
 
     $as_echo "#define __FREEBSD__ 1" >>confdefs.h
 
+    OS=FREEBSD
 else
     echo "Linux"
 
     $as_echo "#define __LINUX__ 1" >>confdefs.h
 
+    OS=LINUX
 fi
 
-###########################################################################
-# cursesのインストールの有無を調べる
+##########################################################################
+# libxyzsh
 ###########################################################################
 
 ac_ext=c
@@ -3224,7 +3240,7 @@ else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 
 ac_ext=c
@@ -3250,7 +3266,7 @@ do
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -3316,7 +3332,7 @@ do
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -3493,6 +3509,78 @@ fi
 done
 
 
+ac_fn_c_check_header_mongrel "$LINENO" "xyzsh/xyzsh.h" "ac_cv_header_xyzsh_xyzsh_h" "$ac_includes_default"
+if test "x$ac_cv_header_xyzsh_xyzsh_h" = xyes; then :
+   LIBS="$LIBS -lxyzsh"; $as_echo "#define HAVE_XYZSH_H 1" >>confdefs.h
+
+else
+   exit
+fi
+
+
+
+######################################################################
+# readline settings
+######################################################################
+ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+if test "x$ac_cv_header_readline_readline_h" = xyes; then :
+  $as_echo "#define HAVE_READLINE_H 1" >>confdefs.h
+
+else
+   exit
+fi
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
+if test "x$ac_cv_header_readline_history_h" = xyes; then :
+  $as_echo "#define HAVE_READLINE_HISTORY_H 1" >>confdefs.h
+
+else
+   exit
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lreadline" >&5
+$as_echo_n "checking for main in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_main+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lreadline  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_readline_main=yes
+else
+  ac_cv_lib_readline_main=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_main" >&5
+$as_echo "$ac_cv_lib_readline_main" >&6; }
+if test "x$ac_cv_lib_readline_main" = xyes; then :
+   LIBS="$LIBS -lreadline"
+else
+   exit
+fi
+ac_cv_lib_readline=ac_cv_lib_readline_main
+
+
+###########################################################################
+# libcurses
+###########################################################################
 ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
 if test "x$ac_cv_header_ncurses_h" = xyes; then :
   NCURSES_OK=1; LIBS="$LIBS -lncurses"; $as_echo "#define HAVE_NCURSES_H 1" >>confdefs.h
@@ -3514,7 +3602,7 @@ then
 fi
 
 ###########################################################################
-# 数学ライブラリのインストールの有無を調べる
+# math library
 ###########################################################################
 ac_fn_c_check_header_mongrel "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default"
 if test "x$ac_cv_header_math_h" = xyes; then :
@@ -3527,7 +3615,7 @@ fi
 
 
 ##########################################################################
-# 鬼車のインストールの有無を調べる
+# oniguruma
 ###########################################################################
 ac_fn_c_check_header_mongrel "$LINENO" "oniguruma.h" "ac_cv_header_oniguruma_h" "$ac_includes_default"
 if test "x$ac_cv_header_oniguruma_h" = xyes; then :
@@ -3539,21 +3627,8 @@ fi
 
 
 
-##########################################################################
-# xyzshのインストールの有無を調べる
-###########################################################################
-ac_fn_c_check_header_mongrel "$LINENO" "xyzsh/xyzsh.h" "ac_cv_header_xyzsh_xyzsh_h" "$ac_includes_default"
-if test "x$ac_cv_header_xyzsh_xyzsh_h" = xyes; then :
-   LIBS="$LIBS -lxyzsh"; $as_echo "#define HAVE_XYZSH_H 1" >>confdefs.h
-
-else
-   exit
-fi
-
-
-
 ####################################################################
-# iconv(必須)
+# iconv settings
 ####################################################################
 ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
 if test "x$ac_cv_header_iconv_h" = xyes; then :
@@ -3565,8 +3640,13 @@ fi
 
 
 
+if test "$OS" = CYGWIN|| test "$OS" = DARWIN || test "$OS" = FREEBSD
+then
+    LIBS="$LIBS -liconv"
+fi
+
 ##########################################################################
-# migemoのインストールの有無を調べる
+# migemo
 ###########################################################################
 if test $ENABLE_MIGEMO = 1
 then
@@ -3992,16 +4072,16 @@ if (echo >conf$$.file) 2>/dev/null; then
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
+    # In both cases, we have to default to `cp -p'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
+      as_ln_s='cp -p'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -pR'
+    as_ln_s='cp -p'
   fi
 else
-  as_ln_s='cp -pR'
+  as_ln_s='cp -p'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -4061,16 +4141,28 @@ else
   as_mkdir_p=false
 fi
 
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -4092,7 +4184,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -4154,10 +4246,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.69,
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -4246,7 +4338,7 @@ fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -4278,7 +4370,7 @@ do
     "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
   esac
 done
 
@@ -4595,7 +4687,7 @@ do
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -4623,7 +4715,7 @@ do
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -4650,7 +4742,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
 
     case $ac_tag in
     *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
     esac
     ;;
   esac

--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,6 @@ DEBUGGING=0
 
 AC_ARG_WITH(debug,              [  --with-debug              include debug info ], [ DEBUGGING=1; ], [])
 AC_ARG_WITH(gprof-debug,        [  --with-gprof-debug        include debug info ], [ DEBUGGING=2; ], [])
-AC_ARG_WITH(socket,             [  --with-socket             enable remote control ], [ ENABLE_SOCKET=1; ], [])
 AC_ARG_WITH(optimize,           [  --with-optimize           with optimize flag(-O2) CFLAGS ], [ ENABLE_OPTIMIZE=1 ], [ ENABLE_OPTIMIZE=0 ])
 AC_ARG_WITH(migemo,             [  --with-migemo             enable migemo ], [ ENABLE_MIGEMO=1 ], [ ENABLE_MIGEMO=0 ])
 AC_ARG_WITH(migemo-dir,         [  --with-migemo-dir=DIR     set migemo directory ], [ MIGEMO_DIR="$with_val"  ], [ MIGEMO_DIR= ])
@@ -88,11 +87,6 @@ then
     fi
 fi
 
-if test -n "$ENABLE_SOCKET"
-then
-    CFLAGS="$CFLAGS -DENABLE_SOCKET"
-fi
-
 if test $ENABLE_OPTIMIZE = 1
 then
     CFLAGS="$CFLAGS -O2"
@@ -104,32 +98,45 @@ AC_SUBST(CFLAGS)
 AC_SUBST(SYSTEM_MIGEMODIR)
 
 #####################################################################
-# OSの判定 cygwinとLinuxのみ
+# Operating System
 #####################################################################
 AC_MSG_CHECKING(Operating System)
 
-if test `uname -s | sed -e 's/\(.*\)-\(.*\)/\1/'` = "CYGWIN_NT"; then
-    echo "CYGWIN_NT"
+if uname -s | grep -q CYGWIN; then
+    echo "CYGWIN"
     AC_DEFINE(__CYGWIN__, 1)
-    
-    CYGWIN_DLL=xyzsh.dll
-    AC_SUBST(CYGWIN_DLL)
+    OS=CYGWIN
 elif test `uname -s` = "Darwin"; then
     echo "Darwin"
 
     AC_DEFINE(__DARWIN__, 1)
+    OS=DARWIN
 elif test `uname -s` = "FreeBSD"; then
     echo "FreeBSD"
 
     AC_DEFINE(__FREEBSD__, 1)
+    OS=FREEBSD
 else
     echo "Linux"
 
     AC_DEFINE(__LINUX__, 1)
+    OS=LINUX
 fi
 
+##########################################################################
+# libxyzsh
+###########################################################################
+AC_CHECK_HEADER(xyzsh/xyzsh.h, [ LIBS="$LIBS -lxyzsh"; AC_DEFINE(HAVE_XYZSH_H, 1) ], [ exit ])
+
+######################################################################
+# readline settings
+######################################################################
+AC_CHECK_HEADER(readline/readline.h, [AC_DEFINE(HAVE_READLINE_H, 1)], [ exit ])
+AC_CHECK_HEADER(readline/history.h, [AC_DEFINE(HAVE_READLINE_HISTORY_H, 1)], [ exit ])
+AC_HAVE_LIBRARY(readline, [ LIBS="$LIBS -lreadline" ], [ exit ])
+
 ###########################################################################
-# cursesのインストールの有無を調べる
+# libcurses
 ###########################################################################
 AC_CHECK_HEADER(ncurses.h, [NCURSES_OK=1; LIBS="$LIBS -lncurses"; AC_DEFINE(HAVE_NCURSES_H, 1)])
 AC_CHECK_HEADER(ncurses/ncurses.h, [NCURSES_OK=1; LIBS="$LIBS -lncurses"; AC_DEFINE(HAVE_NCURSES_NCURSES_H, 1)])
@@ -140,27 +147,27 @@ then
 fi
 
 ###########################################################################
-# 数学ライブラリのインストールの有無を調べる
+# math library
 ###########################################################################
 AC_CHECK_HEADER(math.h, [LIBS="$LIBS -lm"; AC_DEFINE(HAVE_MATH_H, 1)], [ exit ])
 
 ##########################################################################
-# 鬼車のインストールの有無を調べる
+# oniguruma
 ###########################################################################
 AC_CHECK_HEADER(oniguruma.h, [LIBS="$LIBS -lonig"; AC_DEFINE(HAVE_ONIGURUMA_H, 1)], [ exit ])
 
-##########################################################################
-# xyzshのインストールの有無を調べる
-###########################################################################
-AC_CHECK_HEADER(xyzsh/xyzsh.h, [ LIBS="$LIBS -lxyzsh"; AC_DEFINE(HAVE_XYZSH_H, 1) ], [ exit ])
-
 ####################################################################
-# iconv(必須)
+# iconv settings
 ####################################################################
 AC_CHECK_HEADER(iconv.h, [AC_DEFINE(HAVE_ICONV_H, 1)], [ exit ])
 
+if test "$OS" = CYGWIN|| test "$OS" = DARWIN || test "$OS" = FREEBSD
+then
+    LIBS="$LIBS -liconv"
+fi
+
 ##########################################################################
-# migemoのインストールの有無を調べる
+# migemo
 ###########################################################################
 if test $ENABLE_MIGEMO = 1
 then

--- a/src/filer.c
+++ b/src/filer.c
@@ -1336,207 +1336,6 @@ BOOL filer_reset_marks(int dir)
 ///////////////////////////////////////////////////
 // ファイラ描写
 ///////////////////////////////////////////////////
-#if defined(__CYGWIN__) 
-int filer_make_size_str(char* result, __off64_t size)
-{
-    char* file_size = getenv("VIEW_FILE_SIZE");
-    if(strcmp(file_size, "Human") == 0) {
-        char tmp[256];
-        __off64_t size2;
-        if(size < 1024) {
-            size2 = size;
-            snprintf(tmp, 256, "%ld", size2);
-
-            char* end = tmp + strlen(tmp);
-
-            char* p = tmp;
-            char* p2 = result;
-            
-            while(*p) {
-                if(end - p == 7) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else if(end - p == 4) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else {
-                    *p2++ = *p++;
-                }
-            }
-
-            *p2 = 0;
-        }
-        else if(size < 1024*1024) {
-            size2 = size / 1024;
-            snprintf(tmp, 256, "%ld", size2);
-
-            char* end = tmp + strlen(tmp);
-
-            char* p = tmp;
-            char* p2 = result;
-            
-            while(*p) {
-                if(end - p == 9) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else if(end - p == 6) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else {
-                    *p2++ = *p++;
-                }
-            }
-
-            *p2++ = 'k';
-            *p2 = 0;
-        }
-        else if(size < 1024*1024*1024) {
-            size2 = size / (1024*1024);
-            snprintf(tmp, 256, "%ld", size2);
-
-            char* end = tmp + strlen(tmp);
-
-            char* p = tmp;
-            char* p2 = result;
-            
-            while(*p) {
-                if(end - p == 9) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else if(end - p == 6) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else {
-                    *p2++ = *p++;
-                }
-            }
-
-            *p2++ = 'M';
-            *p2 = 0;
-        }
-        else {
-            size2 = size / (1024*1024*1024);
-            snprintf(tmp, 256, "%ld", size2);
-
-            char* end = tmp + strlen(tmp);
-
-            char* p = tmp;
-            char* p2 = result;
-            
-            while(*p) {
-                if(end - p == 9) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else if(end - p == 6) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else {
-                    *p2++ = *p++;
-                }
-            }
-
-            *p2++ = 'G';
-            *p2 = 0;
-        }
-
-        return 7;
-    }
-    else if(strcmp(file_size, "Normal") == 0) {
-        if(size < 1024*1024) {
-            char tmp[256];
-            snprintf(tmp, 256, "%ld", size);
-            char* end = tmp + strlen(tmp);
-
-            char* p = tmp;
-            char* p2 = result;
-            
-            while(*p) {
-                if(end - p == 7) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else if(end - p == 4) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else {
-                    *p2++ = *p++;
-                }
-            }
-            *p2 = 0;
-        }
-        else {
-            size = size / (1024*1024);
-
-            char tmp[256];
-            snprintf(tmp, 256, "%ld", size);
-            char* end = tmp + strlen(tmp);
-
-            char* p = tmp;
-            char* p2 = result;
-            
-            while(*p) {
-                if(end - p == 9) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else if(end - p == 6) {
-                    *p2++ = *p++;
-                    *p2++ = ',';
-                }
-                else {
-                    *p2++ = *p++;
-                }
-            }
-            *p2++ = 'M';
-            *p2 = 0;
-        }
-
-        return 9;
-    }
-    else if(strcmp(file_size, "Plane") == 0) {
-        char tmp[256];
-        snprintf(tmp, 256, "%ld", size);
-        char* end = tmp + strlen(tmp);
-
-        char* p = tmp;
-        char* p2 = result;
-        
-        while(*p) {
-            if(end - p == 10) {
-                *p2++ = *p++;
-                *p2++ = ',';
-            }
-            else if(end - p == 7) {
-                *p2++ = *p++;
-                *p2++ = ',';
-            }
-            else if(end - p == 4) {
-                *p2++ = *p++;
-                *p2++ = ',';
-            }
-            else {
-                *p2++ = *p++;
-            }
-        }
-        *p2 = 0;
-
-        return 14;
-    }
-    else {
-        fprintf(stderr, "VIEW_FILE_SIZE is Normal or Human or Plane.\n");
-        exit(1);
-    }
-}
-#else
 int filer_make_size_str(char* result, __off64_t size)
 {
     char* file_size = getenv("VIEW_FILE_SIZE");
@@ -1736,16 +1535,11 @@ int filer_make_size_str(char* result, __off64_t size)
         exit(1);
     }
 }
-#endif
 
 static void make_size_str2(char* result, __off64_t size)
 {
     char tmp[256];
-#if defined(__CYGWIN__)
-    snprintf(tmp, 256, "%ld", size);
-#else
     snprintf(tmp, 256, "%lld", size);
-#endif
     char* end = tmp + strlen(tmp);
 
     char* p = tmp;