シェルスクリプト言語xyzshのソースコード。
Révision | 5b937b3a0b092471c50ed67048687aa2a7d92c8b (tree) |
---|---|
l'heure | 2013-01-22 10:37:40 |
Auteur | ab25cq <ab25cq@gmai...> |
Commiter | ab25cq |
1.3.3
@@ -1,4 +1,12 @@ | ||
1 | 1 | |
2 | +2013 January version 1.3.3 | |
3 | + | |
4 | + 1. Modified configure.in and Makfile.in especially for related docdir and sysconfdir | |
5 | + | |
6 | + 2. Added XYZSH_DOCDIR for help.xyzsh. Remained XYZSH_DATAROOTDIR. | |
7 | + | |
8 | + 3. After runned on command line, changed "HIT ANY KEY" working. | |
9 | + | |
2 | 10 | 2013 20th January version 1.3.2 |
3 | 11 | |
4 | 12 | 1. Added "strip" and "objinfo" inner command |
@@ -1,11 +1,9 @@ | ||
1 | 1 | #! /bin/sh |
2 | 2 | # Guess values for system-dependent variables and create Makefiles. |
3 | -# Generated by GNU Autoconf 2.68. | |
3 | +# Generated by GNU Autoconf 2.69. | |
4 | 4 | # |
5 | 5 | # |
6 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, | |
7 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software | |
8 | -# Foundation, Inc. | |
6 | +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. | |
9 | 7 | # |
10 | 8 | # |
11 | 9 | # This configure script is free software; the Free Software Foundation |
@@ -134,6 +132,31 @@ export LANGUAGE | ||
134 | 132 | # CDPATH. |
135 | 133 | (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
136 | 134 | |
135 | +# Use a proper internal environment variable to ensure we don't fall | |
136 | + # into an infinite loop, continuously re-executing ourselves. | |
137 | + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then | |
138 | + _as_can_reexec=no; export _as_can_reexec; | |
139 | + # We cannot yet assume a decent shell, so we have to provide a | |
140 | +# neutralization value for shells without unset; and this also | |
141 | +# works around shells that cannot unset nonexistent variables. | |
142 | +# Preserve -v and -x to the replacement shell. | |
143 | +BASH_ENV=/dev/null | |
144 | +ENV=/dev/null | |
145 | +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | |
146 | +case $- in # (((( | |
147 | + *v*x* | *x*v* ) as_opts=-vx ;; | |
148 | + *v* ) as_opts=-v ;; | |
149 | + *x* ) as_opts=-x ;; | |
150 | + * ) as_opts= ;; | |
151 | +esac | |
152 | +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} | |
153 | +# Admittedly, this is quite paranoid, since all the known shells bail | |
154 | +# out after a failed `exec'. | |
155 | +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 | |
156 | +as_fn_exit 255 | |
157 | + fi | |
158 | + # We don't want this to propagate to other subprocesses. | |
159 | + { _as_can_reexec=; unset _as_can_reexec;} | |
137 | 160 | if test "x$CONFIG_SHELL" = x; then |
138 | 161 | as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : |
139 | 162 | emulate sh |
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : | ||
167 | 190 | else |
168 | 191 | exitcode=1; echo positional parameters were not saved. |
169 | 192 | fi |
170 | -test x\$exitcode = x0 || exit 1" | |
193 | +test x\$exitcode = x0 || exit 1 | |
194 | +test -x / || exit 1" | |
171 | 195 | as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO |
172 | 196 | as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO |
173 | 197 | eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && |
@@ -212,21 +236,25 @@ IFS=$as_save_IFS | ||
212 | 236 | |
213 | 237 | |
214 | 238 | if test "x$CONFIG_SHELL" != x; then : |
215 | - # We cannot yet assume a decent shell, so we have to provide a | |
216 | - # neutralization value for shells without unset; and this also | |
217 | - # works around shells that cannot unset nonexistent variables. | |
218 | - # Preserve -v and -x to the replacement shell. | |
219 | - BASH_ENV=/dev/null | |
220 | - ENV=/dev/null | |
221 | - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | |
222 | - export CONFIG_SHELL | |
223 | - case $- in # (((( | |
224 | - *v*x* | *x*v* ) as_opts=-vx ;; | |
225 | - *v* ) as_opts=-v ;; | |
226 | - *x* ) as_opts=-x ;; | |
227 | - * ) as_opts= ;; | |
228 | - esac | |
229 | - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} | |
239 | + export CONFIG_SHELL | |
240 | + # We cannot yet assume a decent shell, so we have to provide a | |
241 | +# neutralization value for shells without unset; and this also | |
242 | +# works around shells that cannot unset nonexistent variables. | |
243 | +# Preserve -v and -x to the replacement shell. | |
244 | +BASH_ENV=/dev/null | |
245 | +ENV=/dev/null | |
246 | +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV | |
247 | +case $- in # (((( | |
248 | + *v*x* | *x*v* ) as_opts=-vx ;; | |
249 | + *v* ) as_opts=-v ;; | |
250 | + *x* ) as_opts=-x ;; | |
251 | + * ) as_opts= ;; | |
252 | +esac | |
253 | +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} | |
254 | +# Admittedly, this is quite paranoid, since all the known shells bail | |
255 | +# out after a failed `exec'. | |
256 | +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 | |
257 | +exit 255 | |
230 | 258 | fi |
231 | 259 | |
232 | 260 | if test x$as_have_required = xno; then : |
@@ -328,6 +356,14 @@ $as_echo X"$as_dir" | | ||
328 | 356 | |
329 | 357 | |
330 | 358 | } # as_fn_mkdir_p |
359 | + | |
360 | +# as_fn_executable_p FILE | |
361 | +# ----------------------- | |
362 | +# Test if FILE is an executable regular file. | |
363 | +as_fn_executable_p () | |
364 | +{ | |
365 | + test -f "$1" && test -x "$1" | |
366 | +} # as_fn_executable_p | |
331 | 367 | # as_fn_append VAR VALUE |
332 | 368 | # ---------------------- |
333 | 369 | # Append the text in VALUE to the end of the definition contained in VAR. Take |
@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits | ||
449 | 485 | chmod +x "$as_me.lineno" || |
450 | 486 | { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } |
451 | 487 | |
488 | + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have | |
489 | + # already done that, so ensure we don't try to do so again and fall | |
490 | + # in an infinite loop. This has already happened in practice. | |
491 | + _as_can_reexec=no; export _as_can_reexec | |
452 | 492 | # Don't try to exec as it changes $[0], causing all sort of problems |
453 | 493 | # (the dirname of $[0] is not the place where we might find the |
454 | 494 | # original and so on. Autoconf is especially sensitive to this). |
@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then | ||
483 | 523 | # ... but there are two gotchas: |
484 | 524 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
485 | 525 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
486 | - # In both cases, we have to default to `cp -p'. | |
526 | + # In both cases, we have to default to `cp -pR'. | |
487 | 527 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
488 | - as_ln_s='cp -p' | |
528 | + as_ln_s='cp -pR' | |
489 | 529 | elif ln conf$$.file conf$$ 2>/dev/null; then |
490 | 530 | as_ln_s=ln |
491 | 531 | else |
492 | - as_ln_s='cp -p' | |
532 | + as_ln_s='cp -pR' | |
493 | 533 | fi |
494 | 534 | else |
495 | - as_ln_s='cp -p' | |
535 | + as_ln_s='cp -pR' | |
496 | 536 | fi |
497 | 537 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
498 | 538 | rmdir conf$$.dir 2>/dev/null |
@@ -504,28 +544,8 @@ else | ||
504 | 544 | as_mkdir_p=false |
505 | 545 | fi |
506 | 546 | |
507 | -if test -x / >/dev/null 2>&1; then | |
508 | - as_test_x='test -x' | |
509 | -else | |
510 | - if ls -dL / >/dev/null 2>&1; then | |
511 | - as_ls_L_option=L | |
512 | - else | |
513 | - as_ls_L_option= | |
514 | - fi | |
515 | - as_test_x=' | |
516 | - eval sh -c '\'' | |
517 | - if test -d "$1"; then | |
518 | - test -d "$1/."; | |
519 | - else | |
520 | - case $1 in #( | |
521 | - -*)set "./$1";; | |
522 | - esac; | |
523 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | |
524 | - ???[sx]*):;;*)false;;esac;fi | |
525 | - '\'' sh | |
526 | - ' | |
527 | -fi | |
528 | -as_executable_p=$as_test_x | |
547 | +as_test_x='test -x' | |
548 | +as_executable_p=as_fn_executable_p | |
529 | 549 | |
530 | 550 | # Sed expression to map a string onto a valid CPP name. |
531 | 551 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
@@ -1136,8 +1156,6 @@ target=$target_alias | ||
1136 | 1156 | if test "x$host_alias" != x; then |
1137 | 1157 | if test "x$build_alias" = x; then |
1138 | 1158 | cross_compiling=maybe |
1139 | - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. | |
1140 | - If a cross compiler is detected then cross compile mode will be used" >&2 | |
1141 | 1159 | elif test "x$build_alias" != "x$host_alias"; then |
1142 | 1160 | cross_compiling=yes |
1143 | 1161 | fi |
@@ -1376,9 +1394,9 @@ test -n "$ac_init_help" && exit $ac_status | ||
1376 | 1394 | if $ac_init_version; then |
1377 | 1395 | cat <<\_ACEOF |
1378 | 1396 | configure |
1379 | -generated by GNU Autoconf 2.68 | |
1397 | +generated by GNU Autoconf 2.69 | |
1380 | 1398 | |
1381 | -Copyright (C) 2010 Free Software Foundation, Inc. | |
1399 | +Copyright (C) 2012 Free Software Foundation, Inc. | |
1382 | 1400 | This configure script is free software; the Free Software Foundation |
1383 | 1401 | gives unlimited permission to copy, distribute and modify it. |
1384 | 1402 | _ACEOF |
@@ -1651,7 +1669,7 @@ $as_echo "$ac_try_echo"; } >&5 | ||
1651 | 1669 | test ! -s conftest.err |
1652 | 1670 | } && test -s conftest$ac_exeext && { |
1653 | 1671 | test "$cross_compiling" = yes || |
1654 | - $as_test_x conftest$ac_exeext | |
1672 | + test -x conftest$ac_exeext | |
1655 | 1673 | }; then : |
1656 | 1674 | ac_retval=0 |
1657 | 1675 | else |
@@ -1674,7 +1692,7 @@ This file contains any messages produced by compilers while | ||
1674 | 1692 | running configure, to aid debugging if configure makes a mistake. |
1675 | 1693 | |
1676 | 1694 | It was created by $as_me, which was |
1677 | -generated by GNU Autoconf 2.68. Invocation command line was | |
1695 | +generated by GNU Autoconf 2.69. Invocation command line was | |
1678 | 1696 | |
1679 | 1697 | $ $0 $@ |
1680 | 1698 |
@@ -1932,7 +1950,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} | ||
1932 | 1950 | || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
1933 | 1951 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
1934 | 1952 | as_fn_error $? "failed to load site script $ac_site_file |
1935 | -See \`config.log' for more details" "$LINENO" 5 ; } | |
1953 | +See \`config.log' for more details" "$LINENO" 5; } | |
1936 | 1954 | fi |
1937 | 1955 | done |
1938 | 1956 |
@@ -2047,7 +2065,7 @@ do | ||
2047 | 2065 | IFS=$as_save_IFS |
2048 | 2066 | test -z "$as_dir" && as_dir=. |
2049 | 2067 | for ac_exec_ext in '' $ac_executable_extensions; do |
2050 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2068 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
2051 | 2069 | ac_cv_prog_CC="${ac_tool_prefix}gcc" |
2052 | 2070 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2053 | 2071 | break 2 |
@@ -2087,7 +2105,7 @@ do | ||
2087 | 2105 | IFS=$as_save_IFS |
2088 | 2106 | test -z "$as_dir" && as_dir=. |
2089 | 2107 | for ac_exec_ext in '' $ac_executable_extensions; do |
2090 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2108 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
2091 | 2109 | ac_cv_prog_ac_ct_CC="gcc" |
2092 | 2110 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2093 | 2111 | break 2 |
@@ -2140,7 +2158,7 @@ do | ||
2140 | 2158 | IFS=$as_save_IFS |
2141 | 2159 | test -z "$as_dir" && as_dir=. |
2142 | 2160 | for ac_exec_ext in '' $ac_executable_extensions; do |
2143 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2161 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
2144 | 2162 | ac_cv_prog_CC="${ac_tool_prefix}cc" |
2145 | 2163 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2146 | 2164 | break 2 |
@@ -2181,7 +2199,7 @@ do | ||
2181 | 2199 | IFS=$as_save_IFS |
2182 | 2200 | test -z "$as_dir" && as_dir=. |
2183 | 2201 | for ac_exec_ext in '' $ac_executable_extensions; do |
2184 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2202 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
2185 | 2203 | if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then |
2186 | 2204 | ac_prog_rejected=yes |
2187 | 2205 | continue |
@@ -2239,7 +2257,7 @@ do | ||
2239 | 2257 | IFS=$as_save_IFS |
2240 | 2258 | test -z "$as_dir" && as_dir=. |
2241 | 2259 | for ac_exec_ext in '' $ac_executable_extensions; do |
2242 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2260 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
2243 | 2261 | ac_cv_prog_CC="$ac_tool_prefix$ac_prog" |
2244 | 2262 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2245 | 2263 | break 2 |
@@ -2283,7 +2301,7 @@ do | ||
2283 | 2301 | IFS=$as_save_IFS |
2284 | 2302 | test -z "$as_dir" && as_dir=. |
2285 | 2303 | for ac_exec_ext in '' $ac_executable_extensions; do |
2286 | - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | |
2304 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
2287 | 2305 | ac_cv_prog_ac_ct_CC="$ac_prog" |
2288 | 2306 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
2289 | 2307 | break 2 |
@@ -2326,7 +2344,7 @@ fi | ||
2326 | 2344 | test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2327 | 2345 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2328 | 2346 | as_fn_error $? "no acceptable C compiler found in \$PATH |
2329 | -See \`config.log' for more details" "$LINENO" 5 ; } | |
2347 | +See \`config.log' for more details" "$LINENO" 5; } | |
2330 | 2348 | |
2331 | 2349 | # Provide some information about the compiler. |
2332 | 2350 | $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 |
@@ -2441,7 +2459,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 | ||
2441 | 2459 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2442 | 2460 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2443 | 2461 | as_fn_error 77 "C compiler cannot create executables |
2444 | -See \`config.log' for more details" "$LINENO" 5 ; } | |
2462 | +See \`config.log' for more details" "$LINENO" 5; } | |
2445 | 2463 | else |
2446 | 2464 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
2447 | 2465 | $as_echo "yes" >&6; } |
@@ -2484,7 +2502,7 @@ else | ||
2484 | 2502 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2485 | 2503 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2486 | 2504 | as_fn_error $? "cannot compute suffix of executables: cannot compile and link |
2487 | -See \`config.log' for more details" "$LINENO" 5 ; } | |
2505 | +See \`config.log' for more details" "$LINENO" 5; } | |
2488 | 2506 | fi |
2489 | 2507 | rm -f conftest conftest$ac_cv_exeext |
2490 | 2508 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 |
@@ -2543,7 +2561,7 @@ $as_echo "$ac_try_echo"; } >&5 | ||
2543 | 2561 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2544 | 2562 | as_fn_error $? "cannot run C compiled programs. |
2545 | 2563 | If you meant to cross compile, use \`--host'. |
2546 | -See \`config.log' for more details" "$LINENO" 5 ; } | |
2564 | +See \`config.log' for more details" "$LINENO" 5; } | |
2547 | 2565 | fi |
2548 | 2566 | fi |
2549 | 2567 | fi |
@@ -2595,7 +2613,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 | ||
2595 | 2613 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
2596 | 2614 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
2597 | 2615 | as_fn_error $? "cannot compute suffix of object files: cannot compile |
2598 | -See \`config.log' for more details" "$LINENO" 5 ; } | |
2616 | +See \`config.log' for more details" "$LINENO" 5; } | |
2599 | 2617 | fi |
2600 | 2618 | rm -f conftest.$ac_cv_objext conftest.$ac_ext |
2601 | 2619 | fi |
@@ -2729,8 +2747,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
2729 | 2747 | /* end confdefs.h. */ |
2730 | 2748 | #include <stdarg.h> |
2731 | 2749 | #include <stdio.h> |
2732 | -#include <sys/types.h> | |
2733 | -#include <sys/stat.h> | |
2750 | +struct stat; | |
2734 | 2751 | /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ |
2735 | 2752 | struct buf { int x; }; |
2736 | 2753 | FILE * (*rcsopen) (struct buf *, struct stat *, int); |
@@ -2881,7 +2898,7 @@ case $as_dir/ in #(( | ||
2881 | 2898 | # by default. |
2882 | 2899 | for ac_prog in ginstall scoinst install; do |
2883 | 2900 | for ac_exec_ext in '' $ac_executable_extensions; do |
2884 | - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then | |
2901 | + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then | |
2885 | 2902 | if test $ac_prog = install && |
2886 | 2903 | grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then |
2887 | 2904 | # AIX install. It has an incompatible calling convention. |
@@ -3192,8 +3209,13 @@ fi | ||
3192 | 3209 | |
3193 | 3210 | |
3194 | 3211 | |
3195 | -CFLAGS="-I./src $CFLAGS" | |
3196 | -CFLAGS="-DSYSCONFDIR=\"\\\"$sysconfdir/xyzsh/\\\"\" -DDATAROOTDIR=\"\\\"$datarootdir/doc/xyzsh/\\\"\" -DSYSTEM_MIGEMODIR=\"\\\"$SYSTEM_MIGEMODIR\\\"\" $CFLAGS" | |
3212 | +########################################################## | |
3213 | +# environmnet variables | |
3214 | +########################################################## | |
3215 | +CC=gcc | |
3216 | +INSTALL="/usr/bin/install -c" | |
3217 | +CFLAGS='-DSYSCONFDIR="\"${sysconfdir}/\"" -DDOCDIR="\"${docdir}/\"" -DSYSTEM_MIGEMODIR="\"${SYSTEM_MIGEMODIR}\"" -I./src -Isrc/ -I. -L. -I/usr/local/include -L/usr/local/lib -fPIC -I/usr/local/include -L/usr/local/lib -O3' | |
3218 | +LIBS="-lreadline -lcursesw -lncursesw -lm -lonig -lmigemo" | |
3197 | 3219 | |
3198 | 3220 | |
3199 | 3221 |
@@ -3329,7 +3351,7 @@ else | ||
3329 | 3351 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
3330 | 3352 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
3331 | 3353 | as_fn_error $? "C preprocessor \"$CPP\" fails sanity check |
3332 | -See \`config.log' for more details" "$LINENO" 5 ; } | |
3354 | +See \`config.log' for more details" "$LINENO" 5; } | |
3333 | 3355 | fi |
3334 | 3356 | |
3335 | 3357 | ac_ext=c |
@@ -3355,7 +3377,7 @@ do | ||
3355 | 3377 | for ac_prog in grep ggrep; do |
3356 | 3378 | for ac_exec_ext in '' $ac_executable_extensions; do |
3357 | 3379 | ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" |
3358 | - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue | |
3380 | + as_fn_executable_p "$ac_path_GREP" || continue | |
3359 | 3381 | # Check for GNU ac_path_GREP and select it if it is found. |
3360 | 3382 | # Check for GNU $ac_path_GREP |
3361 | 3383 | case `"$ac_path_GREP" --version 2>&1` in |
@@ -3421,7 +3443,7 @@ do | ||
3421 | 3443 | for ac_prog in egrep; do |
3422 | 3444 | for ac_exec_ext in '' $ac_executable_extensions; do |
3423 | 3445 | ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" |
3424 | - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue | |
3446 | + as_fn_executable_p "$ac_path_EGREP" || continue | |
3425 | 3447 | # Check for GNU ac_path_EGREP and select it if it is found. |
3426 | 3448 | # Check for GNU $ac_path_EGREP |
3427 | 3449 | case `"$ac_path_EGREP" --version 2>&1` in |
@@ -4387,16 +4409,16 @@ if (echo >conf$$.file) 2>/dev/null; then | ||
4387 | 4409 | # ... but there are two gotchas: |
4388 | 4410 | # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. |
4389 | 4411 | # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. |
4390 | - # In both cases, we have to default to `cp -p'. | |
4412 | + # In both cases, we have to default to `cp -pR'. | |
4391 | 4413 | ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || |
4392 | - as_ln_s='cp -p' | |
4414 | + as_ln_s='cp -pR' | |
4393 | 4415 | elif ln conf$$.file conf$$ 2>/dev/null; then |
4394 | 4416 | as_ln_s=ln |
4395 | 4417 | else |
4396 | - as_ln_s='cp -p' | |
4418 | + as_ln_s='cp -pR' | |
4397 | 4419 | fi |
4398 | 4420 | else |
4399 | - as_ln_s='cp -p' | |
4421 | + as_ln_s='cp -pR' | |
4400 | 4422 | fi |
4401 | 4423 | rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file |
4402 | 4424 | rmdir conf$$.dir 2>/dev/null |
@@ -4456,28 +4478,16 @@ else | ||
4456 | 4478 | as_mkdir_p=false |
4457 | 4479 | fi |
4458 | 4480 | |
4459 | -if test -x / >/dev/null 2>&1; then | |
4460 | - as_test_x='test -x' | |
4461 | -else | |
4462 | - if ls -dL / >/dev/null 2>&1; then | |
4463 | - as_ls_L_option=L | |
4464 | - else | |
4465 | - as_ls_L_option= | |
4466 | - fi | |
4467 | - as_test_x=' | |
4468 | - eval sh -c '\'' | |
4469 | - if test -d "$1"; then | |
4470 | - test -d "$1/."; | |
4471 | - else | |
4472 | - case $1 in #( | |
4473 | - -*)set "./$1";; | |
4474 | - esac; | |
4475 | - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( | |
4476 | - ???[sx]*):;;*)false;;esac;fi | |
4477 | - '\'' sh | |
4478 | - ' | |
4479 | -fi | |
4480 | -as_executable_p=$as_test_x | |
4481 | + | |
4482 | +# as_fn_executable_p FILE | |
4483 | +# ----------------------- | |
4484 | +# Test if FILE is an executable regular file. | |
4485 | +as_fn_executable_p () | |
4486 | +{ | |
4487 | + test -f "$1" && test -x "$1" | |
4488 | +} # as_fn_executable_p | |
4489 | +as_test_x='test -x' | |
4490 | +as_executable_p=as_fn_executable_p | |
4481 | 4491 | |
4482 | 4492 | # Sed expression to map a string onto a valid CPP name. |
4483 | 4493 | as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" |
@@ -4499,7 +4509,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 | ||
4499 | 4509 | # values after options handling. |
4500 | 4510 | ac_log=" |
4501 | 4511 | This file was extended by $as_me, which was |
4502 | -generated by GNU Autoconf 2.68. Invocation command line was | |
4512 | +generated by GNU Autoconf 2.69. Invocation command line was | |
4503 | 4513 | |
4504 | 4514 | CONFIG_FILES = $CONFIG_FILES |
4505 | 4515 | CONFIG_HEADERS = $CONFIG_HEADERS |
@@ -4561,10 +4571,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | ||
4561 | 4571 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4562 | 4572 | ac_cs_version="\\ |
4563 | 4573 | config.status |
4564 | -configured by $0, generated by GNU Autoconf 2.68, | |
4574 | +configured by $0, generated by GNU Autoconf 2.69, | |
4565 | 4575 | with options \\"\$ac_cs_config\\" |
4566 | 4576 | |
4567 | -Copyright (C) 2010 Free Software Foundation, Inc. | |
4577 | +Copyright (C) 2012 Free Software Foundation, Inc. | |
4568 | 4578 | This config.status script is free software; the Free Software Foundation |
4569 | 4579 | gives unlimited permission to copy, distribute and modify it." |
4570 | 4580 |
@@ -4653,7 +4663,7 @@ fi | ||
4653 | 4663 | _ACEOF |
4654 | 4664 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4655 | 4665 | if \$ac_cs_recheck; then |
4656 | - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | |
4666 | + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion | |
4657 | 4667 | shift |
4658 | 4668 | \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 |
4659 | 4669 | CONFIG_SHELL='$SHELL' |
@@ -4685,7 +4695,7 @@ do | ||
4685 | 4695 | "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; |
4686 | 4696 | "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
4687 | 4697 | |
4688 | - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; | |
4698 | + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; | |
4689 | 4699 | esac |
4690 | 4700 | done |
4691 | 4701 |
@@ -5002,7 +5012,7 @@ do | ||
5002 | 5012 | esac |
5003 | 5013 | case $ac_mode$ac_tag in |
5004 | 5014 | :[FHL]*:*);; |
5005 | - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; | |
5015 | + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; | |
5006 | 5016 | :[FH]-) ac_tag=-:-;; |
5007 | 5017 | :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; |
5008 | 5018 | esac |
@@ -5030,7 +5040,7 @@ do | ||
5030 | 5040 | [\\/$]*) false;; |
5031 | 5041 | *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; |
5032 | 5042 | esac || |
5033 | - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; | |
5043 | + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; | |
5034 | 5044 | esac |
5035 | 5045 | case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac |
5036 | 5046 | as_fn_append ac_file_inputs " '$ac_f'" |
@@ -5057,7 +5067,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} | ||
5057 | 5067 | |
5058 | 5068 | case $ac_tag in |
5059 | 5069 | *:-:* | *:-) cat >"$ac_tmp/stdin" \ |
5060 | - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; | |
5070 | + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; | |
5061 | 5071 | esac |
5062 | 5072 | ;; |
5063 | 5073 | esac |
@@ -194,8 +194,13 @@ AC_SUBST(LIBXYZSHA) | ||
194 | 194 | AC_SUBST(LIBXYZSHSO1) |
195 | 195 | AC_SUBST(LIBXYZSHSO) |
196 | 196 | |
197 | -CFLAGS="-I./src $CFLAGS" | |
198 | -CFLAGS="-DSYSCONFDIR=\"\\\"$sysconfdir/xyzsh/\\\"\" -DDATAROOTDIR=\"\\\"$datarootdir/doc/xyzsh/\\\"\" -DSYSTEM_MIGEMODIR=\"\\\"$SYSTEM_MIGEMODIR\\\"\" $CFLAGS" | |
197 | +########################################################## | |
198 | +# environmnet variables | |
199 | +########################################################## | |
200 | +CC=gcc | |
201 | +INSTALL="/usr/bin/install -c" | |
202 | +CFLAGS='-DSYSCONFDIR="\"${sysconfdir}/\"" -DDOCDIR="\"${docdir}/\"" -DSYSTEM_MIGEMODIR="\"${SYSTEM_MIGEMODIR}\"" -I./src -Isrc/ -I. -L. -I/usr/local/include -L/usr/local/lib -fPIC -I/usr/local/include -L/usr/local/lib -O3' | |
203 | +LIBS="-lreadline -lcursesw -lncursesw -lm -lonig -lmigemo" | |
199 | 204 | |
200 | 205 | AC_SUBST(CFLAGS) |
201 | 206 |
@@ -39,7 +39,7 @@ class Help ( | ||
39 | 39 | if(ary -size ARGV |= 0\n) ( |
40 | 40 | if(funinfo | egrep -q '^current object: help<-root$') ( |
41 | 41 | print "-+- マニュアル -+-" \n \n |
42 | - cat $XYZSH_DATAROOTDIR/USAGE.ja | |
42 | + cat $XYZSH_DOCDIR/USAGE.ja | |
43 | 43 | print "-+- コマンド -+-" \n \n |
44 | 44 | hash -La HELPS.ja| each -La -number 2 ( | lines -La 1 (|chomp|add \n\n) ) |
45 | 45 | ) else ( |
@@ -54,7 +54,7 @@ class Help ( | ||
54 | 54 | ) else ( |
55 | 55 | ary -size ARGV | if(| = 0\n ) ( |
56 | 56 | if(funinfo | egrep -q '^current object: help<-root$') ( |
57 | - cat $XYZSH_DATAROOTDIR/USAGE | |
57 | + cat $XYZSH_DOCDIR/USAGE | |
58 | 58 | hash -La HELPS| each -La -number 2 ( | lines -La 1 (|chomp|add \n\n) ) |
59 | 59 | ) else ( |
60 | 60 | hash -La HELPS| each -La -number 2 ( | lines -La 1 (|chomp|add \n\n) ) |
@@ -230,6 +230,8 @@ void readline_write_history() | ||
230 | 230 | } |
231 | 231 | } |
232 | 232 | |
233 | +// EOF --> rcode == -2 | |
234 | +// errors --> rcode == -1 | |
233 | 235 | BOOL xyzsh_readline_interface_onetime(int* rcode, char* cmdline, int cursor_point, char* source_name, char** argv, int argc, fXyzshJobDone xyzsh_job_done_) |
234 | 236 | { |
235 | 237 | /// start interactive shell /// |
@@ -258,6 +260,7 @@ BOOL xyzsh_readline_interface_onetime(int* rcode, char* cmdline, int cursor_poin | ||
258 | 260 | |
259 | 261 | /// run /// |
260 | 262 | if(buf == NULL) { |
263 | + *rcode = -2; | |
261 | 264 | } |
262 | 265 | else if(*buf) { |
263 | 266 | stack_start_stack(); |
@@ -85,8 +85,9 @@ static void xyzsh_read_rc() | ||
85 | 85 | |
86 | 86 | void xyzsh_init(enum eAppType app_type, BOOL no_runtime_script) |
87 | 87 | { |
88 | - setenv("XYZSH_VERSION", "1.3.2", 1); | |
89 | - setenv("XYZSH_DATAROOTDIR", DATAROOTDIR, 1); | |
88 | + setenv("XYZSH_VERSION", "1.3.3", 1); | |
89 | + setenv("XYZSH_DOCDIR", DOCDIR, 1); | |
90 | + setenv("XYZSH_DATAROOTDIR", DOCDIR, 1); | |
90 | 91 | |
91 | 92 | setlocale(LC_ALL, ""); |
92 | 93 |