====================================================================== GNU texinfo-3.9 for HUMAN68K X6_03 ====================================================================== Free Software FoundationのGNU texinfo-3.9をHUMAN68Kに移植しました。 o 保証 正しく動作するよう意識して移植していますが動作保証はいたしません。 o 著作権 差分ファイルについての著作権は私(WILLs)が有します。 o 再配布 GPLにしたがいます。 o 問い合わせ GNU texinfo-3.9 for HUMAN68Kについての問い合わせはWILLs宛てにお願い します。決してFree Software Foundationに問い合わせるような事はしな いで下さい。 ういるす / WILLs / 岡部 勝幸 hgc02147@niftyserve.or.jp RMN00081@うさぎ倶楽部 WILLS@めんたいネット SUME0008@すめネット WILLs@Network-SCoT WILLs@YASTY-Serve ---------------------------------------------------------------------- diff -u2rN texinfo-3.9/ChangeLog.x68 texinfo-3.9x03/ChangeLog.x68 --- texinfo-3.9/ChangeLog.x68 Thu Jan 01 09:00:00 1970 +++ texinfo-3.9x03/ChangeLog.x68 Sun Sep 07 00:00:18 1997 @@ -0,0 +1,25 @@ +Sat Sep 06 23:46:59 1997 Katsuyuki Okabe (WILLs at x68k) + + * version X6_03 + * based version 3.9 + * libtxi/select.c: 新規ファイル. select() のシミュレート関数. + * info/human68k.c: 削除. + * info/echo_area.c (pause_or_input), info/session.c + (info_get_another_input_char): human68k_readsns() を使用しないよう + にしオリジナルと同じにした. + +Sun Jul 02 20:40:02 1995 Katsuyuki Okabe (WILLs at X68K) + + * version X6_02 + * based version 3.6 + * info/human68k.c: 入力1のみの select() のシュミレートとして + human68k_readsns() を作成 + * info/echo_area.c (pause_or_input), info/session.c + (info_get_another_input_char): human68k_readsns() を使用するように + した + * info/Makefile.in: human68k.c のエントリを追加 + +Mon Jun 26 04:10:56 1995 Katsuyuki Okabe (WILLs at X68K) + + * version X6_01 + diff -u2rN texinfo-3.9/Makefile.in texinfo-3.9x03/Makefile.in --- texinfo-3.9/Makefile.in Sat Oct 05 03:40:32 1996 +++ texinfo-3.9x03/Makefile.in Sat Aug 30 21:47:32 1997 @@ -52,4 +52,5 @@ # Prefix for each installed program, normally empty or `g'. binprefix = +binsuffix = @binsuffix@ # Prefix for each installed man page, normally empty or `g'. manprefix = @@ -73,5 +74,5 @@ MDEFINES = bindir='$(bindir)' mandir='$(mandir)' manext='$(manext)' \ - prefix='$(prefix)' binprefix='$(binprefix)' \ + prefix='$(prefix)' binprefix='$(binprefix)' binsuffix='$(binsuffix)' \ manprefix='$(manprefix)' infodir='$(infodir)' CFLAGS='$(CFLAGS)' \ CC='$(CC)' ALLOCA='$(ALLOCA)' LDFLAGS='$(LDFLAGS)' \ diff -u2rN texinfo-3.9/configure texinfo-3.9x03/configure --- texinfo-3.9/configure Fri Oct 04 03:46:42 1996 +++ texinfo-3.9x03/configure Mon Sep 01 23:57:48 1997 @@ -2,5 +2,5 @@ # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.10 +# Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # @@ -11,4 +11,19 @@ ac_help= ac_default_prefix=/usr/local +# +case "$KSH_VERSION" in +*X6*) + ac_dev_null=nul + ac_path_sep=";" + ac_default_CC=gcc + ac_default_CXX=gcc2 + ;; +*) + ac_dev_null=/dev/null + ac_path_sep=: + ac_default_CC=cc + ac_default_CXX=g++ + ;; +esac # Any additions from configure.in: @@ -50,4 +65,6 @@ subdirs= MFLAGS= MAKEFLAGS= +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 ac_prev= @@ -331,5 +348,5 @@ -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.10" + echo "configure generated by autoconf version 2.12" exit 0 ;; @@ -405,5 +422,5 @@ # 5 compiler messages saved in config.log if test "$silent" = yes; then - exec 6>/dev/null + exec 6>$ac_dev_null else exec 6>&1 @@ -433,9 +450,12 @@ # NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. @@ -497,10 +517,19 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' +case "$KSH_VERSION" in +*X6*) +ac_compile='${CC-gcc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='( ${CC-gcc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>conftest.msg 2>&1; ac_state=$?; cat conftest.msg 1>&5; exit $ac_state )' +;; +*) ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +;; +esac +cross_compiling=$ac_cv_prog_cc_cross -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then +if (echo "testing\c"; echo 1,2,3) | grep c >$ac_dev_null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >$ac_dev_null; then ac_n= ac_c=' ' ac_t=' ' @@ -512,4 +541,10 @@ fi +#case "$KSH_VERSION" in +#*X6*) +# : ${LIBS=-lsignal} ;; +#*) +# ;; +#esac @@ -517,4 +552,5 @@ set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:555: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -523,5 +559,16 @@ ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}$ac_path_sep" + case "$KSH_VERSION" in + *X6*) + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word -o -f $ac_dir/${ac_word}.x; then + ac_cv_prog_CC="gcc" + break + fi + done + ;; + *) for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -531,4 +578,6 @@ fi done + ;; + esac IFS="$ac_save_ifs" fi @@ -545,4 +594,5 @@ set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:597: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -551,6 +601,21 @@ ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}$ac_path_sep" ac_prog_rejected=no + case "$KSH_VERSION" in + *X6*) + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word -o -f $ac_dir/${ac_word}.x; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + ;; + *) for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -564,4 +629,6 @@ fi done + ;; + esac IFS="$ac_save_ifs" if test $ac_prog_rejected = yes; then @@ -591,5 +658,53 @@ fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:662: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +case "$KSH_VERSION" in +*X6*) +ac_compile='${CC-gcc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='( ${CC-gcc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>conftest.msg 2>&1; ac_state=$?; cat conftest.msg 1>&5; exit $ac_state )' +;; +*) +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +;; +esac +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -x conftest; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>$ac_dev_null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:704: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:709: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -600,5 +715,5 @@ #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-$ac_default_CC} -E conftest.c'; { (eval echo configure:718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >$ac_dev_null 2>&1; then ac_cv_prog_gcc=yes else @@ -608,16 +723,20 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + if test $ac_cv_prog_gcc = yes; then GCC=yes - if test "${CFLAGS+set}" != set; then - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then + ac_test_CFLAGS="${CFLAGS+set}" + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-$ac_default_CC} accepts -g""... $ac_c" 1>&6 +echo "configure:733: checking whether ${CC-$ac_default_CC} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_gcc_g=yes +if test -z "`${CC-$ac_default_CC} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes else - ac_cv_prog_gcc_g=no + ac_cv_prog_cc_g=no fi rm -f conftest* @@ -625,10 +744,11 @@ fi -echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 - if test $ac_cv_prog_gcc_g = yes; then - CFLAGS="-g -O" - else - CFLAGS="-O" - fi +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-O2" fi else @@ -638,4 +758,5 @@ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +echo "configure:761: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -648,15 +769,15 @@ # This must be in double quotes, not single quotes, because CPP may get # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" + CPP="${CC-$ac_default_CC} -E" # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_try="$ac_cpp conftest.$ac_ext >$ac_dev_null 2>conftest.out" +{ (eval echo configure:782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -664,14 +785,16 @@ else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" + CPP="${CC-$ac_default_CC} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_try="$ac_cpp conftest.$ac_ext >$ac_dev_null 2>conftest.out" +{ (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -679,4 +802,6 @@ else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* CPP=/lib/cpp @@ -694,5 +819,6 @@ if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 + echo $ac_n "checking whether ${CC-$ac_default_CC} needs -traditional""... $ac_c" 1>&6 +echo "configure:823: checking whether ${CC-$ac_default_CC} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -700,5 +826,5 @@ ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < @@ -706,5 +832,5 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + egrep "$ac_pattern" >$ac_dev_null 2>&1; then rm -rf conftest* ac_cv_prog_gcc_traditional=yes @@ -718,5 +844,5 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < @@ -724,5 +850,5 @@ EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "$ac_pattern" >/dev/null 2>&1; then + egrep "$ac_pattern" >$ac_dev_null 2>&1; then rm -rf conftest* ac_cv_prog_gcc_traditional=yes @@ -769,9 +895,27 @@ # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +echo "configure:898: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}$ac_path_sep" + case "$KSH_VERSION" in + *X6*) + for ac_dir in $PATH; do + case "$ac_dir/" in + ./|.//) ;; + *) + for ac_prog in ginstall installbsd install; do + if test -f $ac_dir/$ac_prog -o -f $ac_dir/${ac_prog}.x; then + ac_cv_path_install="$ac_dir/$ac_prog -c" + break 2 + fi + done + ;; + esac + done + ;; + *) for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. @@ -796,5 +940,7 @@ esac done - IFS="$ac_save_ifs" + ;; + esac + IFS="$ac_save_IFS" fi @@ -820,4 +966,5 @@ set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:969: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -826,5 +973,16 @@ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}$ac_path_sep" + case "$KSH_VERSION" in + *X6*) + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word -o -f $ac_dir/${ac_word}.x; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + ;; + *) for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -834,4 +992,6 @@ fi done + ;; + esac IFS="$ac_save_ifs" test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" @@ -847,6 +1007,7 @@ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 +echo "configure:1010: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 + grep _POSIX_VERSION /usr/include/sys/unistd.h >$ac_dev_null 2>&1 then echo "$ac_t""yes" 1>&6 @@ -866,16 +1027,17 @@ fi -ac_safe=`echo "minix/config.h" | tr './\055' '___'` +ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 +echo "configure:1032: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_try="$ac_cpp conftest.$ac_ext >$ac_dev_null 2>conftest.out" +{ (eval echo configure:1042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -884,4 +1046,6 @@ else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" @@ -914,6 +1078,7 @@ # Needed on sysV68 for sigblock, sigsetmask. -echo $ac_n "checking for -lbsd""... $ac_c" 1>&6 -ac_lib_var=`echo bsd'_'sigblock | tr './+\055' '__p_'` +echo $ac_n "checking for sigblock in -lbsd""... $ac_c" 1>&6 +echo "configure:1082: checking for sigblock in -lbsd" >&5 +ac_lib_var=`echo bsd'_'sigblock | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -922,5 +1087,5 @@ LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +case "$KSH_VERSION" in +*X6*) ac_test="awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1" ;; +*) ac_test="test -s conftest" ;; +esac +if { (eval echo configure:1105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && eval $ac_test; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" @@ -947,5 +1117,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo bsd | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo bsd | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` cat >> confdefs.h <&6 -ac_lib_var=`echo ${termlib}'_'tputs | tr './+\055' '__p_'` + echo $ac_n "checking for tputs in -l${termlib}""... $ac_c" 1>&6 +echo "configure:1136: checking for tputs in -l${termlib}" >&5 +ac_lib_var=`echo ${termlib}'_'tputs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -969,5 +1141,5 @@ LIBS="-l${termlib} $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +case "$KSH_VERSION" in +*X6*) ac_test="awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1" ;; +*) ac_test="test -s conftest" ;; +esac +if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && eval $ac_test; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=no" @@ -1002,36 +1179,120 @@ -# If we cannot run a trivial program, we must be cross compiling. -echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then +case "$KSH_VERSION" in +*X6*) + echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6 +echo "configure:1185: checking for _harderr in -lsignal" >&5 +ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$cross_compiling" = yes; then - ac_cv_c_cross=yes + ac_save_LIBS="$LIBS" +LIBS="-lsignal $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && eval $ac_test; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo signal | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6 +echo "configure:1236: checking for hmemset in -lhmem" >&5 +ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lhmem $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then - ac_cv_c_cross=no +case "$KSH_VERSION" in +*X6*) ac_test="awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1" ;; +*) ac_test="test -s conftest" ;; +esac +if { (eval echo configure:1259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && eval $ac_test; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" else - ac_cv_c_cross=yes + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" fi +rm -f conftest* +LIBS="$ac_save_LIBS" + fi -rm -fr conftest* +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo hmem | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 fi -echo "$ac_t""$ac_cv_c_cross" 1>&6 -cross_compiling=$ac_cv_c_cross + ;; +*) + ;; +esac echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +echo "configure:1292: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -1040,6 +1301,6 @@ #include EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_try="$ac_cpp conftest.$ac_ext >$ac_dev_null 2>conftest.out" +{ (eval echo configure:1305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -1048,4 +1309,6 @@ else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_stdc=no @@ -1056,10 +1319,10 @@ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + egrep "memchr" >$ac_dev_null 2>&1; then : else @@ -1074,10 +1337,10 @@ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + egrep "free" >$ac_dev_null 2>&1; then : else @@ -1094,7 +1357,12 @@ : else -cat > conftest.$ac_ext < conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1106,13 +1374,17 @@ EOF -{ (eval echo configure:1109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -x conftest && (./conftest; exit) 2>$ac_dev_null +then : else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_header_stdc=no fi -fi rm -fr conftest* fi + +fi fi @@ -1128,16 +1400,17 @@ sys/time.h sys/fcntl.h sys/ttold.h sys/ptem.h sys/file.h do -ac_safe=`echo "$ac_hdr" | tr './\055' '___'` +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1405: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_try="$ac_cpp conftest.$ac_ext >$ac_dev_null 2>conftest.out" +{ (eval echo configure:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then @@ -1146,4 +1419,6 @@ else echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_header_$ac_safe=no" @@ -1153,5 +1428,5 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` cat >> confdefs.h <&6 +echo "configure:1443: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS #include +#include #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "off_t" >/dev/null 2>&1; then + egrep "off_t[^a-zA-Z_0-9]" >$ac_dev_null 2>&1; then rm -rf conftest* ac_cv_type_off_t=yes @@ -1196,13 +1473,13 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 +echo "configure:1476: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_c_const=no fi rm -f conftest* - fi @@ -1270,26 +1548,27 @@ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 +echo "configure:1551: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -int main() { return 0; } -int t() { +int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_struct_tm=sys/time.h fi rm -f conftest* - fi @@ -1306,25 +1585,30 @@ # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 +echo "configure:1588: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -int main() { return 0; } -int t() { +int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +case "$KSH_VERSION" in +*X6*) ac_test="awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1" ;; +*) ac_test="test -s conftest" ;; +esac +if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && eval $ac_test; then rm -rf conftest* ac_cv_header_alloca_h=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* ac_cv_header_alloca_h=no fi rm -f conftest* - fi @@ -1338,9 +1622,10 @@ echo $ac_n "checking for alloca""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then +echo "configure:1625: checking for alloca" >&5 +if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +case "$KSH_VERSION" in +*X6*) ac_test="awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1" ;; +*) ac_test="test -s conftest" ;; +esac +if { (eval echo configure:1657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && eval $ac_test; then rm -rf conftest* - ac_cv_func_alloca=yes + ac_cv_func_alloca_works=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_func_alloca=no + ac_cv_func_alloca_works=no fi rm -f conftest* - fi -echo "$ac_t""$ac_cv_func_alloca" 1>&6 -if test $ac_cv_func_alloca = yes; then +echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 +if test $ac_cv_func_alloca_works = yes; then cat >> confdefs.h <<\EOF #define HAVE_ALLOCA 1 @@ -1385,5 +1674,5 @@ fi -if test $ac_cv_func_alloca = no; then +if test $ac_cv_func_alloca_works = no; then # The SVR3 libPW and SVR4 libucb both contain incompatible functions # that cause trouble. Some versions do not even contain alloca or @@ -1397,9 +1686,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +echo "configure:1689: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5 | - egrep "webecray" >/dev/null 2>&1; then + egrep "webecray" >$ac_dev_null 2>&1; then rm -rf conftest* ac_cv_os_cray=yes @@ -1426,9 +1716,10 @@ for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1719: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +case "$KSH_VERSION" in +*X6*) ac_test="awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1" ;; +*) ac_test="test -s conftest" ;; +esac +if { (eval echo configure:1751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && eval $ac_test; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -1479,4 +1775,5 @@ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +echo "configure:1778: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1485,7 +1782,12 @@ ac_cv_c_stack_direction=0 else -cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -x conftest && (./conftest; exit) 2>$ac_dev_null +then ac_cv_c_stack_direction=1 else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_c_stack_direction=-1 fi -fi rm -fr conftest* fi +fi + echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 cat >> confdefs.h <&6 +echo "configure:1832: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1529,7 +1836,12 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else -cat > conftest.$ac_ext < conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -1544,12 +1856,16 @@ } EOF -{ (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -x conftest && (./conftest; exit) 2>$ac_dev_null +then ac_cv_func_setvbuf_reversed=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* ac_cv_func_setvbuf_reversed=no fi -fi rm -fr conftest* +fi + rm -f core core.* *.core fi @@ -1567,9 +1883,10 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1886: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +case "$KSH_VERSION" in +*X6*) ac_test="awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1" ;; +*) ac_test="test -s conftest" ;; +esac +if { (eval echo configure:1918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && eval $ac_test; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -1620,9 +1942,10 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1945: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +case "$KSH_VERSION" in +*X6*) ac_test="awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1" ;; +*) ac_test="test -s conftest" ;; +esac +if { (eval echo configure:1977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && eval $ac_test; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* eval "ac_cv_func_$ac_func=no" fi rm -f conftest* - fi + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then echo "$ac_t""yes" 1>&6 - : + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 LIBOBJS="$LIBOBJS ${ac_func}.o" fi +done + + +case "$KSH_VERSION" in +*X6*) + for ac_func in select +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:2009: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +case "$KSH_VERSION" in +*X6*) ac_test="awk '/^Not found :/ { exit 1 }' conftest.msg >nul 2>&1" ;; +*) ac_test="test -s conftest" ;; +esac +if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && eval $ac_test; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +LIBOBJS="$LIBOBJS ${ac_func}.o" +fi done + binsuffix=.x + ;; +*) + binsuffix= + ;; +esac + + trap '' 1 2 15 cat > confcache <<\EOF @@ -1686,9 +2089,23 @@ # EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \ - >> confcache + case `(ac_space=' '; set) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache if cmp -s $cache_file confcache; then : @@ -1742,5 +2159,5 @@ # Run this file to recreate the current configuration. # This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# on host `(hostname || uname -n) 2>$ac_dev_null | sed 1q`: # # $0 $ac_configure_args @@ -1757,5 +2174,5 @@ exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.10" + echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) @@ -1767,4 +2184,5 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +ac_dev_null=$ac_dev_null trap 'rm -fr `echo "Makefile libtxi/Makefile makeinfo/Makefile info/Makefile util/Makefile emacs/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 @@ -1806,7 +2224,44 @@ s%@ALLOCA@%$ALLOCA%g s%@LIBOBJS@%$LIBOBJS%g +s%@binsuffix@%$binsuffix%g CEOF EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac - # Adjust relative srcdir, etc. for subdirectories. + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. # Remove last slash and all that follows it. Not all systems have dirname. @@ -1841,4 +2296,5 @@ else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + [A-Za-z]:/*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" @@ -1850,4 +2306,5 @@ *) INSTALL="$ac_dots$ac_given_INSTALL" ;; esac + echo creating "$ac_file" rm -f "$ac_file" @@ -1858,4 +2315,6 @@ *) ac_comsub= ;; esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g @@ -1863,9 +2322,13 @@ s%@top_srcdir@%$top_srcdir%g s%@INSTALL@%$INSTALL%g -" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file fi; done -rm -f conftest.subs +rm -f conftest.s* +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF exit 0 @@ -1873,4 +2336,14 @@ chmod +x $CONFIG_STATUS rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_states=0 +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || ac_states=1 +case "$KSH_VERSION" in +*X6*) + exec 6>&- + exec 5>&- + ;; +*) + ;; +esac +exit $ac_states diff -u2rN texinfo-3.9/configure.in texinfo-3.9x03/configure.in --- texinfo-3.9/configure.in Fri Oct 04 03:33:52 1996 +++ texinfo-3.9x03/configure.in Mon Sep 01 23:56:06 1997 @@ -22,4 +22,13 @@ AC_SUBST(TERMLIBS) +case "$KSH_VERSION" in +*X6*) + AC_CHECK_LIB(signal, _harderr) + AC_CHECK_LIB(hmem, hmemset) + ;; +*) + ;; +esac + dnl Checks for header files. AC_HEADER_STDC @@ -39,4 +48,15 @@ dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added. AC_REPLACE_FUNCS(memcpy memmove strdup) + +case "$KSH_VERSION" in +*X6*) + AC_REPLACE_FUNCS(select) + binsuffix=.x + ;; +*) + binsuffix= + ;; +esac +AC_SUBST(binsuffix) AC_OUTPUT(Makefile libtxi/Makefile makeinfo/Makefile info/Makefile util/Makefile emacs/Makefile) diff -u2rN texinfo-3.9/info/Makefile.in texinfo-3.9x03/info/Makefile.in --- texinfo-3.9/info/Makefile.in Wed Oct 02 06:44:44 1996 +++ texinfo-3.9x03/info/Makefile.in Sat Aug 30 21:54:02 1997 @@ -55,4 +55,5 @@ # Prefix for each installed program, normally empty or `g'. binprefix = +binsuffix = @binsuffix@ # Prefix for each installed man page, normally empty or `g'. manprefix = @@ -98,9 +99,9 @@ $(CC) -c $(CPPFLAGS) $(LDEFS) $(DEFS) -I. -I$(srcdir) -I$(common) $(CFLAGS) $< -all: info $(infofiles) +all: info$(binsuffix) $(infofiles) sub-all: all install: all - $(INSTALL_PROGRAM) info $(bindir)/$(binprefix)info + $(INSTALL_PROGRAM) info$(binsuffix) $(bindir)/$(binprefix)info$(binsuffix) -d=$(srcdir); test -f ./info.info && d=.; $(INSTALL_DATA) $$d/info.info $(infodir)/info.info -d=$(srcdir); test -f ./info-stnd.info && d=.; $(INSTALL_DATA) $$d/info-stnd.info $(infodir)/info-stnd.info @@ -111,10 +112,10 @@ uninstall: - $(RM) $(bindir)/info + $(RM) $(bindir)/info$(binsuffix) $(RM) $(infodir)/info.info $(RM) $(infodir)/info-stnd.info $(RM) $(mandir)/$(manprefix)info.$(manext) -info: $(OBJS) ../libtxi/libtxi.a +info$(binsuffix): $(OBJS) ../libtxi/libtxi.a $(CC) $(LDFLAGS) -o info $(OBJS) $(LOADLIBES) @@ -134,5 +135,5 @@ PATH="$(util):$${PATH}" TEXINPUTS="$(srcdir):$(common):$${TEXINPUTS}" texi2dvi $(srcdir)/info-stnd.texi -makedoc: $(MAKEDOC_OBJECTS) ../libtxi/libtxi.a +makedoc$(binsuffix): $(MAKEDOC_OBJECTS) ../libtxi/libtxi.a $(CC) $(LDFLAGS) -o makedoc $(MAKEDOC_OBJECTS) $(LOADLIBES) @@ -141,5 +142,5 @@ clean: - $(RM) info funs.h doc.c makedoc $(OBJS) $(MAKEDOC_OBJECTS) + $(RM) info$(binsuffix) funs.h doc.c makedoc$(binsuffix) $(OBJS) $(MAKEDOC_OBJECTS) distclean: clean texclean @@ -169,5 +170,5 @@ # listing the functions found. `doc.c' is a structure containing pointers # to those functions along with completable names and documentation strings. -funs.h: makedoc $(CMDFILES) +funs.h: makedoc$(binsuffix) $(CMDFILES) -@if test -f funs.h; then mv -f funs.h old-funs.h; fi; : -@if test -f doc.c; then mv -f doc.c old-doc.c; fi; : diff -u2rN texinfo-3.9/info/dribble.c texinfo-3.9x03/info/dribble.c --- texinfo-3.9/info/dribble.c Sat Jun 17 02:59:30 1995 +++ texinfo-3.9x03/info/dribble.c Sat Aug 30 21:56:00 1997 @@ -38,5 +38,9 @@ close_dribble_file (); +#ifdef __human68k__ + info_dribble_file = fopen (name, "wb"); +#else info_dribble_file = fopen (name, "w"); +#endif #if defined (HAVE_SETVBUF) diff -u2rN texinfo-3.9/info/filesys.c texinfo-3.9x03/info/filesys.c --- texinfo-3.9/info/filesys.c Sat Jun 17 02:59:40 1995 +++ texinfo-3.9x03/info/filesys.c Sun Aug 31 00:33:54 1997 @@ -41,4 +41,9 @@ #endif /* !O_RDONLY */ +#ifdef __human68k__ +#include +#include +#endif /* __human68k__ */ + #if !defined (errno) extern int errno; @@ -101,4 +106,7 @@ char *partial; { +#ifdef __human68k__ + static char tmpdrv[4] = "a:/"; +#endif /* __human68k__ */ int initial_character; char *temp; @@ -122,4 +130,11 @@ if (initial_character == '/') temp = info_file_in_path (partial + 1, "/"); +#ifdef __human68k__ + else if (isalpha(initial_character) && partial[1] == ':' && partial[2] == '/') + { + tmpdrv[0] = initial_character; + temp = info_file_in_path (partial + 3, tmpdrv); + } +#endif /* __human68k__ */ else if (initial_character == '~') { @@ -130,4 +145,11 @@ free (expansion); } +#ifdef __human68k__ + else if (isalpha(expansion[0]) && expansion[1] == ':' && expansion[2] == '/') + { + tmpdrv[0] = expansion[0]; + temp = info_file_in_path (expansion + 3, tmpdrv); + } +#endif /* __human68k__ */ else temp = expansion; @@ -277,6 +299,13 @@ return ((char *) NULL); +#ifdef __human68k__ + if (isalpha (string[i]) && string[i + 1] == ':' && string[i + 2] == '/') + i += 2; + while (string[i] && string[i] != ':' && string[i] != ';') + i++; +#else /* !__human68k__ */ while (string[i] && string[i] != ':') i++; +#endif /* !__human68k__ */ if (i == start) { @@ -371,4 +400,9 @@ int where; { +#ifdef __human68k__ +#define PATH_SEP ";" +#else /* !__human68k__ */ +#define PATH_SEP ":" +#endif /* !__human68k__ */ int len; @@ -388,5 +422,5 @@ else if (where == INFOPATH_APPEND) { - strcat (infopath, ":"); + strcat (infopath, PATH_SEP); strcat (infopath, path); } @@ -395,8 +429,11 @@ char *temp = strdup (infopath); strcpy (infopath, path); - strcat (infopath, ":"); + strcat (infopath, PATH_SEP); strcat (infopath, temp); free (temp); } +#ifdef __human68k__ + _toslash (infopath); +#endif /* __human68k__ */ } @@ -445,5 +482,9 @@ st_size = (long) finfo->st_size; contents = (char *)xmalloc (1 + st_size); +#ifdef __human68k__ + if ((st_size = read (descriptor, contents, st_size)) == -1) +#else /* !__human68k__ */ if ((read (descriptor, contents, st_size)) != st_size) +#endif /* !__human68k__ */ { filesys_error_number = errno; diff -u2rN texinfo-3.9/info/info.c texinfo-3.9x03/info/info.c --- texinfo-3.9/info/info.c Sat Oct 05 03:19:54 1996 +++ texinfo-3.9x03/info/info.c Sun Aug 31 00:39:26 1997 @@ -28,4 +28,7 @@ # include "man.h" #endif /* HANDLE_MAN_PAGES */ +#ifdef __human68k__ +#include +#endif /* __human68k__ */ /* The version numbers of this version of Info. */ @@ -149,4 +152,7 @@ user_filename = strdup (optarg); +#ifdef __human68k__ + _toslash (user_filename); +#endif /* __human68k__ */ break; @@ -156,4 +162,7 @@ free (user_output_filename); user_output_filename = strdup (optarg); +#ifdef __human68k__ + _toslash (user_output_filename); +#endif /* __human68k__ */ break; @@ -174,4 +183,7 @@ case DRIBBLE_OPTION: close_dribble_file (); +#ifdef __human68k__ + _toslash (optarg); +#endif /* __human68k__ */ open_dribble_file (optarg); break; @@ -179,4 +191,7 @@ /* User has specified an alternate input stream. */ case RESTORE_OPTION: +#ifdef __human68k__ + _toslash (optarg); +#endif /* __human68k__ */ info_set_input_from_file (optarg); break; @@ -456,4 +471,7 @@ if (info_patch_level) sprintf (vstring + strlen (vstring), "-p%d", info_patch_level); +#ifdef __human68k__ + strcat (vstring, " (X6_03)"); +#endif /* __human68k__ */ } return (vstring); @@ -474,4 +492,13 @@ char *filename; +#ifdef __human68k__ + { + char *ext; + _toslash (fullpath); + ext = strrchr (fullpath, '.'); + if (ext && strcasecmp (ext, ".x") == 0) + *ext = '\0'; + } +#endif /* __human68k__ */ filename = filename_non_directory (fullpath); program_name = strdup (filename); diff -u2rN texinfo-3.9/info/man.c texinfo-3.9x03/info/man.c --- texinfo-3.9/info/man.c Sun Dec 24 06:23:40 1995 +++ texinfo-3.9x03/info/man.c Sun Aug 31 18:00:52 1997 @@ -23,5 +23,7 @@ #include "info.h" +#ifndef __human68k__ #include +#endif #include #include "signals.h" @@ -167,4 +169,14 @@ (access (temp, X_OK) == 0)) return (temp); +#ifdef __human68k__ + strcat (temp, ".x"); + + statable = (stat (temp, &finfo) == 0); + + /* If we have found a regular executable file, then use it. */ + if ((statable) && (S_ISREG (finfo.st_mode)) && + (access (temp, X_OK) == 0)) + return (temp); +#endif /* __human68k__ */ else free (temp); @@ -177,5 +189,9 @@ find_man_formatter () { +#ifdef __human68k__ + return (executable_file_in_path ("man", (char *)getenv ("path"))); +#else /* !__human68k__ */ return (executable_file_in_path ("man", (char *)getenv ("PATH"))); +#endif /* !__human68k__ */ } @@ -230,7 +246,14 @@ char *pagename; { +#ifdef __human68k__ + static char *formatter_args[5] = { (char *)NULL }; + char *pipefile; + int old_fd[2]; + int fd; +#else /* !__human68k__ */ static char *formatter_args[4] = { (char *)NULL }; int pipes[2]; pid_t child; +#endif /* !__human68k__ */ char *formatted_page = (char *)NULL; char *section = (char *)NULL; @@ -243,4 +266,8 @@ return ((char *)NULL); +#ifdef __human68k__ + formatter_args[arg_index++] = "-"; +#endif /* __human68k__ */ + get_page_and_section (pagename); @@ -254,4 +281,31 @@ in FORMATTED_PAGE. The reader end of the pipe is pipes[0]; the writer end is pipes[1]. */ +#ifdef __human68k__ + pipefile = tmpnam (0); + + old_fd[0] = dup (fileno (stdout)); + old_fd[1] = dup (fileno (stderr)); + + fd = open (pipefile, O_WRONLY|O_CREAT|O_TRUNC, 0666); + dup2 (fd, fileno (stdout)); + close (fd); + + fd = open ("nul", O_WRONLY, 0666); + dup2 (fd, fileno (stderr)); + close (fd); + + spawnv (P_WAIT, formatter_args[0], formatter_args); + + dup2 (old_fd[0], fileno (stdout)); + dup2 (old_fd[1], fileno (stderr)); + close (old_fd[0]); + close (old_fd[1]); + + fd = open (pipefile, O_RDONLY, 0666); + formatted_page = read_from_fd (fd); + close (fd); + + unlink (pipefile); +#else /* !__human68k__ */ pipe (pipes); @@ -287,4 +341,5 @@ exit (0); } +#endif /* !__human68k__ */ /* If we have the page, then clean it up. */ diff -u2rN texinfo-3.9/info/session.c texinfo-3.9x03/info/session.c --- texinfo-3.9/info/session.c Fri Jul 19 23:56:00 1996 +++ texinfo-3.9x03/info/session.c Sun Aug 31 18:14:38 1997 @@ -26,5 +26,7 @@ #include #endif /* HAVE_SYS_FILE_H */ +#ifndef __human68k__ #include +#endif /* !__human68k__ */ #include @@ -34,4 +36,9 @@ #endif /* HAVE_SYS_TIME_H */ +#ifdef __human68k__ +#define __DOS_INLINE__ +#include +#endif /* __human68k__ */ + #if defined (HANDLE_MAN_PAGES) # include "man.h" @@ -305,5 +312,9 @@ FILE *stream; +#ifdef __human68k__ + stream = fopen (filename, "rb"); +#else /* !__human68k__ */ stream = fopen (filename, "r"); +#endif /* !__human68k__ */ if (!stream) @@ -4192,4 +4203,20 @@ } #else /* !FIONREAD */ +#if defined(__human68k__) + if (isatty (tty)) + { + while (_dos_k_keysns () && chars_avail < space_avail) + { + input[chars_avail] = _dos_k_keyinp () & 0377; + chars_avail++; + } + } + else + { + chars_avail = read (tty, &input[0], space_avail); + if (chars_avail == -1) + chars_avail = 0; + } +#else /* !__human68k__ */ # if defined (O_NDELAY) { @@ -4205,4 +4232,5 @@ chars_avail = 0; } +#endif /* !__human68k__ */ # endif /* O_NDELAY */ #endif /* !FIONREAD */ @@ -4232,4 +4260,9 @@ int rawkey; +#ifdef __human68k__ + if (isatty (fileno (info_input_stream))) + rawkey = _dos_k_keyinp () & 0377; + else +#endif /* __human68k__ */ rawkey = getc (info_input_stream); keystroke = rawkey; diff -u2rN texinfo-3.9/info/termdep.h texinfo-3.9x03/info/termdep.h --- texinfo-3.9/info/termdep.h Thu Oct 03 07:23:52 1996 +++ texinfo-3.9x03/info/termdep.h Sun Aug 31 18:16:08 1997 @@ -44,4 +44,5 @@ #endif +#if !defined (__human68k__) #if defined (HAVE_TERMIOS_H) # include @@ -62,4 +63,5 @@ # endif /* !HAVE_TERMIO_H */ #endif /* !HAVE_TERMIOS_H */ +#endif /* !__human68k__ */ #if defined (HAVE_SYS_TTOLD_H) diff -u2rN texinfo-3.9/info/terminal.c texinfo-3.9x03/info/terminal.c --- texinfo-3.9/info/terminal.c Mon Sep 30 06:04:56 1996 +++ texinfo-3.9x03/info/terminal.c Sun Aug 31 18:22:34 1997 @@ -27,4 +27,8 @@ #include #include +#ifdef __human68k__ +#define __DOS_INLINE__ +#include +#endif /* __human68k__ */ #include "terminal.h" #include "termdep.h" @@ -507,4 +511,5 @@ PC = BC ? *BC : 0; +#if !defined(__human68k__) #if defined (TIOCGETP) { @@ -519,4 +524,5 @@ ospeed = B9600; #endif /* !TIOCGETP */ +#endif /* !__human68k__ */ term_cr = tgetstr ("cr", &buffer); @@ -598,4 +604,8 @@ #endif +#ifdef __human68k__ +static char old_del[6]; +static int old_breakck; +#else /* !__human68k__ */ #if defined (HAVE_TERMIOS_H) struct termios original_termios, ttybuff; @@ -611,4 +621,5 @@ # endif /* !HAVE_TERMIO_H */ #endif /* !HAVE_TERMIOS_H */ +#endif /* !__human68k__ */ /* Prepare to start using the terminal to read characters singly. */ @@ -626,4 +637,13 @@ tty = fileno (stdin); +#if defined (__human68k__) + old_breakck = _dos_breakck (-1); + _dos_breakck (2); + _dos_ioctrlst (0, 0x20); + fputs ("\x1b" "0", stdout); + fflush (stdout); + _dos_fnckeygt (24 /* DEL */, old_del); + _dos_fnckeyst (24 /* DEL */, "\x7f"); +#else /* !__human68k__ */ #if defined (HAVE_TERMIOS_H) tcgetattr (tty, &original_termios); @@ -724,4 +744,5 @@ ioctl (tty, TIOCSETN, &ttybuff); #endif /* !HAVE_TERMIOS_H && !HAVE_TERMIO_H */ +#endif /* !__human68k__ */ } @@ -741,4 +762,11 @@ tty = fileno (stdin); +#if defined (__human68k__) + _dos_fnckeyst (24 /* DEL */, old_del); + fputs ("\x1b" "1", stdout); + fflush (stdout); + _dos_ioctrlst (0, 0x00); + _dos_breakck (old_breakck); +#else /* !__human68k__ */ #if defined (HAVE_TERMIOS_H) tcsetattr (tty, TCSANOW, &original_termios); @@ -765,4 +793,5 @@ # endif /* !HAVE_TERMIO_H */ #endif /* !HAVE_TERMIOS_H */ +#endif /* !__human68k__ */ terminal_end_using_terminal (); } diff -u2rN texinfo-3.9/libtxi/select.c texinfo-3.9x03/libtxi/select.c --- texinfo-3.9/libtxi/select.c Thu Jan 01 09:00:00 1970 +++ texinfo-3.9x03/libtxi/select.c Tue Aug 26 23:52:02 1997 @@ -0,0 +1,167 @@ +/* + * PROJECT C Library, X68000 PROGRAMMING INTERFACE DEFINITION + * -------------------------------------------------------------------- + * This file is written by the Project C Library Group, and completely + * in public domain. You can freely use, copy, modify, and redistribute + * the whole contents, without this notice. + * -------------------------------------------------------------------- + * $Id$ + */ + +#ifndef __IOCS_INLINE__ +#define __IOCS_INLINE__ +#define __DOS_INLINE__ +#define __DOS_DOSCALL__ +#endif + +/* System headers */ +#include +#include +#include +#include +#include +#include +#include +#if 0 +#include +#include +#endif +#include + +/* Macros */ +#define XFD_ISSET(fd,fds) ((fds) && FD_ISSET ((fd), (fds))) +#define isreadable(mode) ((mode) == O_RDONLY || (mode) == O_RDWR) +#define iswritable(mode) ((mode) == O_WRONLY || (mode) == O_RDWR) +#ifndef _POSIX_FD_SETSIZE +#define _POSIX_FD_SETSIZE OPEN_MAX +#endif + +/* Functions */ +int +select (int fds, fd_set *rfds, fd_set *wfds, fd_set *efds, struct timeval *timeout) +{ + fd_set oread, owrite, oexcept; + int ticks, start; + int nfds; + + if (fds > _POSIX_FD_SETSIZE) + { + errno = EINVAL; + return -1; + } + + FD_ZERO (&oread); + FD_ZERO (&owrite); + FD_ZERO (&oexcept); + + nfds = 0; + ticks = -1; + + if (timeout) + { + ticks = timeout->tv_sec * 100 + timeout->tv_usec / 10000; + if (ticks < 0) + { + errno = EINVAL; + return -1; + } + } + + start = _iocs_ontime (); + for (;;) + { + { + int fd; + + for (fd = 0; fd < fds; fd++) + { + int accmode; + + if (_fddb[fd].inuse == _FD_NOTUSED) + continue; + + accmode = _fddb[fd].oflag & O_ACCMODE; + + if (isatty (fd)) + { + if (XFD_ISSET (fd, rfds) && isreadable (accmode) && _dos_k_keysns ()) + { + FD_SET (fd, &oread); + nfds++; + } + + if (XFD_ISSET (fd, wfds) && iswritable (accmode)) + { + FD_SET (fd, &owrite); + nfds++; + } + } +#if 0 + else if (_fddb[fd].sockno >= 0) + { + if (XFD_ISSET (fd, rfds) && _socklen (_fddb[fd].sockno, 0)) + { + FD_SET (fd, &oread); + nfds++; + } + + if (XFD_ISSET (fd, wfds) /* && _socklen (_fddb[fd].sockno, 1) == 0 */) + { + FD_SET (fd, &owrite); + nfds++; + } + } +#endif + else + { + if (XFD_ISSET (fd, rfds) && isreadable (accmode) && _dos_ioctrlis (fd)) + { + FD_SET (fd, &oread); + nfds++; + } + + if (XFD_ISSET (fd, wfds) && iswritable (accmode) && _dos_ioctrlos (fd)) + { + FD_SET (fd, &owrite); + nfds++; + } + } + } + } + + { + int rest; + + if ((rest = (_iocs_ontime () - start) % 8640000) < 0) + rest += 8640000; + + if (nfds != 0) + { + if (ticks >= 0) + { + int left; + + if ((left = ticks - rest) < 0) + left = 0; + + timeout->tv_sec = left / 100; + timeout->tv_usec = (left % 100) * 10000; + } + + if (rfds) + *rfds = oread; + if (wfds) + *wfds = owrite; + if (efds) + *efds = oexcept; + + return nfds; + } + + if (ticks >= 0 && rest > ticks) + return 0; + } + + _dos_change_pr (); + } +} diff -u2rN texinfo-3.9/makeinfo/Makefile.in texinfo-3.9x03/makeinfo/Makefile.in --- texinfo-3.9/makeinfo/Makefile.in Wed Oct 02 06:45:00 1996 +++ texinfo-3.9x03/makeinfo/Makefile.in Mon Sep 01 22:04:02 1997 @@ -48,4 +48,5 @@ # Prefix for each installed program, normally empty or `g'. binprefix = +binsuffix = @binsuffix@ infodir = $(prefix)/info @@ -55,5 +56,5 @@ OBJS = makeinfo.o multi.o -PROGS = makeinfo +PROGS = makeinfo$(binsuffix) all: $(PROGS) makeinfo.info @@ -63,5 +64,5 @@ $(CC) -c $(CPPFLAGS) -I. -I$(srcdir) -I$(common) $(DEFS) $(CFLAGS) $< -makeinfo: $(OBJS) ../libtxi/libtxi.a +makeinfo$(binsuffix): $(OBJS) ../libtxi/libtxi.a $(CC) $(LDFLAGS) -o makeinfo $(OBJS) $(LOADLIBES) @@ -73,5 +74,5 @@ $(OBJS): makeinfo.h -info makeinfo.info: ./makeinfo makeinfo.texi #macro.texi +info makeinfo.info: ./makeinfo$(binsuffix) makeinfo.texi #macro.texi ./makeinfo --no-split -I$(srcdir) makeinfo.texi @@ -79,9 +80,9 @@ # ./makeinfo -E makeinfo.texi -I$(srcdir) makeinfo.mki -dvi makeinfo.dvi: ./makeinfo makeinfo.texi #macro.texi +dvi makeinfo.dvi: ./makeinfo$(binsuffix) makeinfo.texi #macro.texi $(srcdir)/../util/texi2dvi makeinfo.txi install: all - $(INSTALL_PROGRAM) makeinfo $(bindir)/$(binprefix)makeinfo + $(INSTALL_PROGRAM) makeinfo$(binsuffix) $(bindir)/$(binprefix)makeinfo$(binsuffix) -d=$(srcdir); test -f ./makeinfo.info && d=.; $(INSTALL_DATA) $$d/makeinfo.info $(infodir)/makeinfo.info $(POST_INSTALL) diff -u2rN texinfo-3.9/makeinfo/makeinfo.c texinfo-3.9x03/makeinfo/makeinfo.c --- texinfo-3.9/makeinfo/makeinfo.c Sat Oct 05 03:20:54 1996 +++ texinfo-3.9x03/makeinfo/makeinfo.c Sun Aug 31 18:41:02 1997 @@ -102,4 +102,8 @@ #endif /* HAVE_SYS_FILE_H */ +#ifdef __human68k__ +#include +#endif /* __human68k__ */ + #if defined (__GNUC__) #define alloca __builtin_alloca @@ -127,4 +131,10 @@ #include "makeinfo.h" +#if defined (__human68k__) +#define WRITE_MODE "wb" +#else /* !__human68k__ */ +#define WRITE_MODE "w" +#endif /* !__human68k__ */ + /* Non-zero means that we are currently hacking the insides of an insertion which would use a fixed width font. */ @@ -828,4 +838,12 @@ /* The name of this program is the last filename in argv[0]. */ +#if defined (__human68k__) + _toslash (argv[0]); + { + char *ext = strrchr (argv[0], '.'); + if (ext && strcasecmp (ext, ".x") == 0) + *ext = '\0'; + } +#endif /* __human68k__ */ progname = filename_part (argv[0]); @@ -857,5 +875,5 @@ if (!macro_expansion_output_stream) { - macro_expansion_output_stream = fopen (optarg, "w"); + macro_expansion_output_stream = fopen (optarg, WRITE_MODE); if (!macro_expansion_output_stream) error ("Couldn't open macro expansion output \"%s\"", optarg); @@ -874,6 +892,12 @@ xrealloc (include_files_path, 2 + strlen (include_files_path) + strlen (optarg)); +#if defined(__human68k__) + strcat (include_files_path, ";"); + strcat (include_files_path, optarg); + _toslash (include_files_path); +#else /* !__human68k__ */ strcat (include_files_path, ":"); strcat (include_files_path, optarg); +#endif /* !__human68k__ */ break; @@ -892,4 +916,7 @@ case 'o': command_output_filename = strdup (optarg); +#ifdef __human68k__ + _toslash (command_output_filename); +#endif /* __human68k__ */ break; @@ -993,5 +1020,9 @@ { while (optind != argc) +#if defined (__human68k__) + convert_from_file (_toslash (argv[optind++])); +#else /* !__human68k__ */ convert_from_file (argv[optind++]); +#endif /* !__human68k__ */ } else @@ -1008,5 +1039,9 @@ print_version_info () { +#if defined (__human68k__) + printf ("GNU Makeinfo (Texinfo 3.9 X6_03) %d.%d\n", major_version, minor_version); +#else /* !__human68k__ */ printf ("GNU Makeinfo (Texinfo 3.9) %d.%d\n", major_version, minor_version); +#endif } @@ -1173,6 +1208,10 @@ if (n == -1) #else /* !VMS */ +#if defined (__human68k__) + if ((count = read (file, result, file_size)) == -1) +#else /* !__human68k__ */ count = file_size; if (read (file, result, file_size) != file_size) +#endif /* !__human68k__ */ #endif /* !VMS */ error_exit: @@ -1396,5 +1435,10 @@ } +#if defined (__human68k__) + if (filename[0] == '.' || filename[0] == '/' || + (isalpha (filename[0]) && filename[1] == ':')) +#else /* !__human68k__ */ if (filename[0] == '.' || filename[0] == '/') +#endif /* !__human68k__ */ return (filename); @@ -1436,4 +1480,7 @@ /* Already absolute? */ if ((initial_character == '/') || +#if defined (__human68k__) + (isalpha (initial_character) && filename[1] == ':') || +#endif /* __human68k__ */ ((strncmp (filename, "./", 2) == 0) || (strncmp (filename, "../", 3) == 0))) @@ -2118,5 +2165,5 @@ real_output_filename = strdup (real_output_filename); - output_stream = fopen (real_output_filename, "w"); + output_stream = fopen (real_output_filename, WRITE_MODE); } @@ -5367,5 +5414,9 @@ fd = open +#if defined (__human68k__) + (split_filename, O_WRONLY | O_TRUNC | O_CREAT | O_BINARY, 0666); +#else /* !__human68k__ */ (split_filename, O_WRONLY | O_TRUNC | O_CREAT, 0666); +#endif /* !__human68k__ */ if ((fd < 0) || @@ -5403,5 +5454,5 @@ original again. We must use `output_stream', or write_tag_table_indirect () won't know where to place the output. */ - output_stream = fopen (filename, "w"); + output_stream = fopen (filename, WRITE_MODE); if (!output_stream) { @@ -9269,10 +9320,20 @@ are handled OK by the `else' part of the if statement; an empty string is returned in that case. */ +#if defined (__human68k__) + if (i && (string[i] == ':' || string[i] == ';')) +#else /* !__human68k__ */ if (i && string[i] == ':') +#endif /* !__human68k__ */ i++; start = i; +#if defined (__human68k__) + if (isalpha (string[i]) && string[i + 1] == ':' && string[i + 2] == '/') + i += 2; + while (string[i] && string[i] != ':' && string[i] != ';') i++; +#else /* !__human68k__ */ while (string[i] && string[i] != ':') i++; +#endif /* !__human68k__ */ *index = i; @@ -9315,4 +9376,7 @@ /* Handle absolute pathnames. "./foo", "/foo", "../foo". */ if (*filename == '/' || +#if defined (__human68k__) + (isalpha (filename[0]) && filename[1] == ':') || +#endif /* __human68k__ */ (*filename == '.' && (filename[1] == '/' || diff -u2rN texinfo-3.9/util/Makefile.in texinfo-3.9x03/util/Makefile.in --- texinfo-3.9/util/Makefile.in Mon Sep 30 05:07:06 1996 +++ texinfo-3.9x03/util/Makefile.in Sun Aug 31 18:43:52 1997 @@ -48,4 +48,5 @@ # Prefix for each installed program, normally empty or `g'. binprefix = +binsuffix = @binsuffix@ # Prefix for each installed man page, normally empty or `g'. manprefix = @@ -56,5 +57,5 @@ #### End of system configuration section. #### -all: texindex install-info +all: texindex$(binsuffix) install-info$(binsuffix) sub-all: all @@ -64,10 +65,10 @@ install: all - $(INSTALL_PROGRAM) texindex $(bindir)/texindex + $(INSTALL_PROGRAM) texindex$(binsuffix) $(bindir)/texindex$(binsuffix) $(INSTALL_PROGRAM) $(srcdir)/texi2dvi $(bindir)/texi2dvi - $(INSTALL_PROGRAM) install-info $(bindir)/install-info + $(INSTALL_PROGRAM) install-info$(binsuffix) $(bindir)/install-info$(binsuffix) uninstall: - rm -f $(bindir)/texindex $(bindir)/texi2dvi $(bindir)/install-info + rm -f $(bindir)/texindex$(binsuffix) $(bindir)/texi2dvi $(bindir)/install-info$(binsuffix) Makefile: Makefile.in ../config.status @@ -78,5 +79,5 @@ clean: - rm -f *.o a.out core core.* texindex install-info + rm -f *.o a.out core core.* texindex$(binsuffix) install-info$(binsuffix) mostlyclean: clean @@ -88,10 +89,10 @@ rm -f TAGS -texindex: texindex.o ../libtxi/libtxi.a +texindex$(binsuffix): texindex.o ../libtxi/libtxi.a $(CC) $(LDFLAGS) -o texindex texindex.o $(LOADLIBES) texindex.o: texindex.c $(common)/getopt.h -install-info: install-info.o +install-info$(binsuffix): install-info.o $(CC) $(LDFLAGS) -o install-info install-info.o $(LOADLIBES) diff -u2rN texinfo-3.9/util/deref.c texinfo-3.9x03/util/deref.c --- texinfo-3.9/util/deref.c Thu Nov 19 11:15:06 1992 +++ texinfo-3.9x03/util/deref.c Sun Aug 31 18:44:48 1997 @@ -224,4 +224,5 @@ /* strerror --- return error string, delete if in your library */ +#if !defined (__human68k__) char * strerror (int errno) @@ -237,2 +238,3 @@ return buf; } +#endif /* !__human68k__ */ diff -u2rN texinfo-3.9/util/install-info.c texinfo-3.9x03/util/install-info.c --- texinfo-3.9/util/install-info.c Fri Oct 04 08:13:36 1996 +++ texinfo-3.9x03/util/install-info.c Sun Aug 31 19:00:08 1997 @@ -347,5 +347,9 @@ if (errnum >= 0 && errnum < sys_nerr) +#if defined (__human68k__) + return strerror (errnum); +#else /* !__human68k__ */ return sys_errlist[errnum]; +#endif /* !__human68k__ */ return (char *) "Unknown error"; } diff -u2rN texinfo-3.9/util/texi2dvi texinfo-3.9x03/util/texi2dvi --- texinfo-3.9/util/texi2dvi Sat Oct 05 03:21:56 1996 +++ texinfo-3.9x03/util/texi2dvi Sun Aug 31 18:46:00 1997 @@ -179,5 +179,12 @@ # else. `.' goes first to ensure that any old .aux, .cps, etc. files in # ${directory} don't get used in preference to fresher files in `.'. + case "$KSH_VERSION" in + *X6*) + TEXINPUTS=".;${directory};${TEXINPUTS_orig}" + ;; + *) TEXINPUTS=".:${directory}:${TEXINPUTS_orig}" + ;; + esac # Expand macro commands in the original source file using Makeinfo;