====================================================================== GNU autoconf-2.12 for HUMAN68K X6_18 ====================================================================== Free Software FoundationのGNU autoconf-2.12をHUMAN68Kに移植しました。 o 保証 正しく動作するよう意識して移植していますが動作保証はいたしません。 o 著作権 差分ファイルについての著作権は私(WILLs)が有します。 o 再配布 GPLにしたがいます。 o 問い合わせ GNU autoconf-2.12 for HUMAN68Kについての問い合わせはWILLs宛てにお願 いします。決してFree Software Foundationに問い合わせるような事はし ないで下さい。 ういるす / WILLs / 岡部 勝幸 hgc02147@niftyserve.or.jp RMN00081@うさぎ倶楽部 WILLS@めんたいネット SUME0008@すめネット WILLs@Network-SCoT WILLs@YASTY-Serve ---------------------------------------------------------------------- diff -u2rN autoconf-2.12/ChangeLog.X68 autoconf-2.12x18/ChangeLog.X68 --- autoconf-2.12/ChangeLog.X68 Thu Jan 01 09:00:00 1970 +++ autoconf-2.12x18/ChangeLog.X68 Sat Jul 12 19:52:00 1997 @@ -0,0 +1,64 @@ +Sat Jul 12 19:44:33 1997 Katsuyuki Okabe (wills at x68k) + + * version X6_18 + * acgeneral.m4 (AC_INIT_NOTICE): LIBS に -lsignal を設定しないよう + にした. + * acgeneral.m4, acspecific.m4: autoconf により生成される configure + を改行コードを変換だけでオリジナルと同様に unix でも動作するように + してみた. ただし未確認. + +Thu Jan 16 21:30:27 1997 Katsuyuki Okabe (WILLs at x68k) + + * version X6_17 + * base version を 2.12 へ + +Fri Dec 13 18:37:52 1996 Katsuyuki Okabe (WILLs at x68k) + + * base version を 2.11 へ + +Wed Sep 25 22:17:39 1996 Katsuyuki Okabe (WILLs at x68k) + + * version X6_16 + * acgeneral.m4 (AC_TRY_RUN): volatile, __volatile, __volatile__ を + 空に define するようにした. + +Mon Jun 10 17:11:22 1996 Katsuyuki Okabe (WILLs at X68K) + + * version X6_15 + * acgeneral.m4 (AC_TRY_COMPILE, AC_TRY_LINK): AC_TRY_COMPILE と + AC_TRY_LINK の修正が逆になっていたのを直した. + +Sun Jun 09 16:16:41 1996 Katsuyuki Okabe (WILLs at X68K) + + * version X6_14 + * base version を 2.10 へ + +Tue Apr 16 19:50:07 1996 Katsuyuki Okabe (WILLs at X68K) + + * version X6_13 + * base version を 2.9 へ + +Sat Dec 02 23:49:30 1995 Katsuyuki Okabe (WILLs at X68K) + + * version X6_12 + * base version を 2.7 へ + +Fri Nov 24 17:00:20 1995 Katsuyuki Okabe (WILLs at X68K) + + * version X6_11 + * base version を 2.5 へ + +Thu Jun 22 15:38:00 1995 Katsuyuki Okabe (WILLs at X68K) + + * version X6_10 + * base version を 2.4 へ + * config.guess: 返す値をm68k-sharp-msdos から m68k-sharp-human へ + 変更 + * config.sub: m68k-sharp-human を通すようにした + +Tue May 16 21:05:10 1995 Katsuyuki Okabe (WILLs at X68K) + + * version X6_09 + * acspecific.m4 (AC_PROG_INSTALL): 拡張子 .x のものを調べ忘れてい + たのを直した. + diff -u2rN autoconf-2.12/acgeneral.m4 autoconf-2.12x18/acgeneral.m4 --- autoconf-2.12/acgeneral.m4 Wed Nov 27 03:09:42 1996 +++ autoconf-2.12x18/acgeneral.m4 Fri Jul 11 02:32:40 1997 @@ -50,4 +50,7 @@ dnl Roland McGrath, Noah Friedman, david d zuhn, and many others. dnl +dnl Modified for Human68k by K.Okabe 1995.04.04 +dnl Last change; 1997.07.09 +dnl divert(-1)dnl Throw away output until AC_INIT is called. changequote([, ]) @@ -156,4 +159,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:]) @@ -605,5 +623,5 @@ [#] AC_FD_CC compiler messages saved in config.log if test "$silent" = yes; then - exec AC_FD_MSG>/dev/null + exec AC_FD_MSG>$ac_dev_null else exec AC_FD_MSG>&1 @@ -690,4 +708,10 @@ AC_PROG_ECHO_N dnl Substitute for predefined variables. +#case "$KSH_VERSION" in +#*X6*) +# : ${LIBS=-lsignal} ;; +#*) +# ;; +#esac AC_SUBST(CFLAGS)dnl AC_SUBST(CPPFLAGS)dnl @@ -910,5 +934,5 @@ # Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : +if $ac_config_sub sun4 >$ac_dev_null 2>&1; then : else AC_MSG_ERROR(can not run $ac_config_sub) fi @@ -1196,6 +1220,14 @@ # 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>&AC_FD_CC' +ac_link='( ${CC-gcc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>conftest.msg 2>&1; ac_state=$?; cat conftest.msg 1>&AC_FD_CC; exit $ac_state )' +;; +*) ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&AC_FD_CC' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' +;; +esac cross_compiling=$ac_cv_prog_cc_cross ]) @@ -1204,9 +1236,17 @@ AC_DEFUN(AC_LANG_CPLUSPLUS, [define([AC_LANG], [CPLUSPLUS])dnl -ac_ext=C +ac_ext=cc # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' +case "$KSH_VERSION" in +*X6*) +ac_compile='${CXX-gcc2} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&AC_FD_CC' +ac_link='( ${CXX-gcc2} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>conftest.msg 2>&1; ac_state=$?; cat conftest.msg 1>&AC_FD_CC; exit $ac_state )' +;; +*) ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&AC_FD_CC' ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' +;; +esac cross_compiling=$ac_cv_prog_cxx_cross ]) @@ -1277,5 +1317,5 @@ ac_cv_prog_$1="[$]$1" # 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" ifelse([$6], , , [ ac_prog_rejected=no ])dnl @@ -1283,4 +1323,21 @@ dnl bash word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. + case "$KSH_VERSION" in + *X6*) + for ac_dir in ifelse([$5], , $PATH, [`echo "$5$ac_dummy" | tr : ';'`]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word -o -f $ac_dir/${ac_word}.x; then +ifelse([$6], , , dnl +[ if test "[$ac_dir/$ac_word]" = "$6"; then + ac_prog_rejected=yes + continue + fi +])dnl + ac_cv_prog_$1="$3" + break + fi + done + ;; + *) for ac_dir in ifelse([$5], , $PATH, [$5$ac_dummy]); do test -z "$ac_dir" && ac_dir=. @@ -1296,4 +1353,6 @@ fi done + ;; + esac IFS="$ac_save_ifs" ifelse([$6], , , [if test $ac_prog_rejected = yes; then @@ -1342,9 +1401,25 @@ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; +changequote(, )dnl + [A-Za-z]:/*) +changequote([, ])dnl + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}$ac_path_sep" dnl $ac_dummy forces splitting on constant user-supplied paths. dnl bash word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. + case "$KSH_VERSION" in + *X6*) + for ac_dir in ifelse([$4], , $PATH, [`echo "$4$ac_dummy" | tr : ';'`]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word -o -f $ac_dir/${ac_word}.x; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + done + ;; + *) for ac_dir in ifelse([$4], , $PATH, [$4$ac_dummy]); do test -z "$ac_dir" && ac_dir=. @@ -1354,4 +1429,6 @@ fi done + ;; + esac IFS="$ac_save_ifs" dnl If no 3rd arg is given, leave the cache variable unset, @@ -1452,8 +1529,8 @@ [$1] EOF -if AC_TRY_EVAL(ac_link) && test -s conftest; then +if AC_TRY_EVAL(ac_link) && test -x conftest; then [$2]=yes # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then + if (./conftest; exit) 2>$ac_dev_null; then [$3]=no else @@ -1562,5 +1639,5 @@ dnl that breaks under sh -x, which writes compile commands starting dnl with ` +' to stderr in eval and subshells. -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +ac_try="$ac_cpp conftest.$ac_ext >$ac_dev_null 2>conftest.out" AC_TRY_EVAL(ac_try) ac_err=`grep -v '^ *+' conftest.out` @@ -1599,5 +1676,5 @@ dnl Prevent m4 from eating character classes: changequote(, )dnl - egrep "$1" >/dev/null 2>&1; then + egrep "$1" >$ac_dev_null 2>&1; then changequote([, ])dnl ifelse([$3], , :, [rm -rf conftest* @@ -1666,5 +1743,9 @@ ; return 0; } EOF -if AC_TRY_EVAL(ac_link) && test -s conftest; 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 AC_TRY_EVAL(ac_link) && eval $ac_test; then ifelse([$3], , :, [rm -rf conftest* $3]) @@ -1702,4 +1783,9 @@ [#]line __oline__ "configure" #include "confdefs.h" +#ifdef __human68k__ +#define volatile +#define __volatile +#define __volatile__ +#endif ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus extern "C" void exit(int); @@ -1708,5 +1794,5 @@ [$1] EOF -if AC_TRY_EVAL(ac_link) && test -s conftest && (./conftest; exit) 2>/dev/null +if AC_TRY_EVAL(ac_link) && test -x conftest && (./conftest; exit) 2>$ac_dev_null then dnl Don't remove the temporary files here, so they can be examined. @@ -1940,5 +2026,5 @@ dnl hostname on some systems (SVR3.2, Linux) returns a bogus exit status, dnl so uname gets run too. -# 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 @@ -1968,4 +2054,5 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL" ])dnl +ac_dev_null=$ac_dev_null changequote(<<, >>)dnl @@ -1992,5 +2079,15 @@ 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 AC_FD_MSG>&- + exec AC_FD_CC>&- + ;; +*) + ;; +esac +exit $ac_states dnl config.status should not do recursion. ifdef([AC_LIST_SUBDIRS], [AC_OUTPUT_SUBDIRS(AC_LIST_SUBDIRS)])dnl @@ -2111,4 +2208,7 @@ else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; +changequote(, )dnl + [A-Za-z]:/*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; +changequote([, ])dnl *) # Relative path. srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" @@ -2264,5 +2364,5 @@ cat conftest.in >> conftest.h rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then + if cmp -s $ac_file conftest.h 2>$ac_dev_null; then echo "$ac_file is unchanged" rm -f conftest.h @@ -2332,5 +2432,5 @@ # Make a symlink if possible; otherwise try a hard link. - if ln -s $ac_rel_source $ac_dest 2>/dev/null || + if ln -s $ac_rel_source $ac_dest 2>$ac_dev_null || ln $srcdir/$ac_source $ac_dest; then : else @@ -2403,4 +2503,8 @@ /*) # Absolute path. ac_sub_srcdir=$srcdir/$ac_config_dir ;; +changequote(, )dnl + [A-Za-z]:/*) + ac_sub_srcdir=$srcdir/$ac_config_dir ;; +changequote([, ])dnl *) # Relative path. ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; @@ -2423,4 +2527,7 @@ case "$cache_file" in /*) ac_sub_cache_file=$cache_file ;; +changequote(, )dnl + [A-Za-z]:/*) ac_sub_cache_file=$cache_file ;; +changequote([, ])dnl *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; diff -u2rN autoconf-2.12/acspecific.m4 autoconf-2.12x18/acspecific.m4 --- autoconf-2.12/acspecific.m4 Wed Nov 20 14:10:48 1996 +++ autoconf-2.12x18/acspecific.m4 Wed Jul 09 21:27:12 1997 @@ -48,5 +48,7 @@ dnl Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, dnl Roland McGrath, Noah Friedman, david d zuhn, and many others. - +dnl +dnl Modified for Human68k by K.Okabe 1995.04.04 +dnl Last change: 1997.07.09 dnl ### Checks for programs @@ -58,7 +60,7 @@ dnl Internal use only. AC_DEFUN(AC_PROG_ECHO_N, -[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=' ' @@ -106,5 +108,15 @@ AC_DEFUN(AC_PROG_CXX, [AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl -AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc) +case "$KSH_VERSION" in +*X6*) + ac_check_CXXS="$CCC gcc2 gpp g++" + ac_check_default_CXX=gcc2 + ;; +*) + ac_check_CXXS="$CCC c++ g++ gcc CC cxx c++" + ac_check_default_CXX=gcc + ;; +esac +AC_CHECK_PROGS(CXX, $ac_check_CXXS, $ac_check_default_CXX) AC_PROG_CXX_WORKS @@ -171,5 +183,5 @@ #endif EOF -if AC_TRY_COMMAND(${CC-cc} -E conftest.c) | egrep yes >/dev/null 2>&1; then +if AC_TRY_COMMAND(${CC-$ac_default_CC} -E conftest.c) | egrep yes >$ac_dev_null 2>&1; then ac_cv_prog_gcc=yes else @@ -180,10 +192,10 @@ [AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx, [dnl The semicolon is to pacify NeXT's syntax-checking cpp. -cat > conftest.C < conftest.cc </dev/null 2>&1; then +if AC_TRY_COMMAND(${CXX-$ac_default_CXX} -E conftest.cc) | egrep yes >$ac_dev_null 2>&1; then ac_cv_prog_gxx=yes else @@ -192,7 +204,7 @@ AC_DEFUN(AC_PROG_CC_G, -[AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g, +[AC_CACHE_CHECK(whether ${CC-$ac_default_CC} accepts -g, ac_cv_prog_cc_g, [echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then +if test -z "`${CC-$ac_default_CC} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else @@ -203,7 +215,7 @@ AC_DEFUN(AC_PROG_CXX_G, -[AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g, +[AC_CACHE_CHECK(whether ${CXX-$ac_default_CXX} accepts -g, ac_cv_prog_cxx_g, [echo 'void f(){}' > conftest.cc -if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then +if test -z "`${CXX-$ac_default_CXX} -g -c conftest.cc 2>&1`"; then ac_cv_prog_cxx_g=yes else @@ -217,5 +229,5 @@ AC_REQUIRE([AC_PROG_CPP])dnl if test $ac_cv_prog_gcc = yes; then - AC_CACHE_CHECK(whether ${CC-cc} needs -traditional, + AC_CACHE_CHECK(whether ${CC-$ac_default_CC} needs -traditional, ac_cv_prog_gcc_traditional, [ ac_pattern="Autoconf.*'x'" @@ -250,5 +262,5 @@ # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. -ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&AC_FD_CC' +ac_try='${CC-$ac_default_CC} -c conftest.c -o conftest.o 1>&AC_FD_CC' if AC_TRY_EVAL(ac_try) && test -f conftest.o && AC_TRY_EVAL(ac_try); @@ -294,5 +306,5 @@ changequote(, )dnl # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +eval `${MAKE-make} -f conftestmake 2>$ac_dev_null | grep temp=` changequote([, ])dnl if test -n "$ac_maketemp"; then @@ -332,5 +344,5 @@ [ # 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. @@ -339,5 +351,5 @@ AC_TRY_CPP([#include Syntax Error], , - CPP="${CC-cc} -E -traditional-cpp" + CPP="${CC-$ac_default_CC} -E -traditional-cpp" AC_TRY_CPP([#include Syntax Error], , CPP=/lib/cpp)) @@ -357,5 +369,5 @@ [AC_LANG_SAVE[]dnl AC_LANG_CPLUSPLUS[]dnl - CXXCPP="${CXX-g++} -E" + CXXCPP="${CXX-$ac_default_CXX} -E" AC_TRY_CPP([#include ], , CXXCPP=/lib/cpp) ac_cv_prog_CXXCPP="$CXXCPP" @@ -437,5 +449,22 @@ if test -z "$INSTALL"; then AC_CACHE_VAL(ac_cv_path_install, -[ 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. @@ -460,4 +489,6 @@ esac done + ;; + esac IFS="$ac_save_IFS" ])dnl @@ -489,5 +520,5 @@ AC_CACHE_VAL(ac_cv_prog_LN_S, [rm -f conftestdata -if ln -s X conftestdata 2>/dev/null +if ln -s X conftestdata 2>$ac_dev_null then rm -f conftestdata @@ -1380,5 +1411,5 @@ [changequote(, )dnl # On Solaris, /dev/kmem is a symlink. Get info on the real file. - ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null` + ac_ls_output=`ls -lgL /dev/kmem 2>$ac_dev_null` # If we got an error (system does not support symlinks), try without -L. test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem` @@ -1745,5 +1776,5 @@ ' > conftest chmod u+x conftest -(SHELL=/bin/sh; export SHELL; ./conftest >/dev/null) +(SHELL=/bin/sh; export SHELL; ./conftest >$ac_dev_null) if test $? -ne 69; then ac_cv_sys_interpreter=yes @@ -1773,4 +1804,8 @@ if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then ac_tmpdirs="$TMPDIR" +elif test -n "$temp" && test -d "$temp" && test -w "$temp"; then + ac_tmpdirs="$temp" +elif test -n "$TMP" && test -d "$TMP" && test -w "$TMP"; then + ac_tmpdirs="$TMP" else ac_tmpdirs='/tmp /var/tmp /usr/tmp' @@ -1779,13 +1814,13 @@ test -d $ac_dir || continue test -w $ac_dir || continue # It is less confusing to not echo anything here. - (echo 1 > $ac_dir/conftest9012345) 2>/dev/null - (echo 2 > $ac_dir/conftest9012346) 2>/dev/null - val=`cat $ac_dir/conftest9012345 2>/dev/null` + (echo 1 > $ac_dir/conftest9012345) 2>$ac_dev_null + (echo 2 > $ac_dir/conftest9012346) 2>$ac_dev_null + val=`cat $ac_dir/conftest9012345 2>$ac_dev_null` if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then ac_cv_sys_long_file_names=no - rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null + rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>$ac_dev_null break fi - rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null + rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>$ac_dev_null done]) if test $ac_cv_sys_long_file_names = yes; then @@ -1877,7 +1912,7 @@ @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' EOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + if (xmkmf) >$ac_dev_null 2>$ac_dev_null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + eval `${MAKE-make} acfindx 2>$ac_dev_null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do @@ -2043,5 +2078,5 @@ # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - case "`(uname -sr) 2>/dev/null`" in + case "`(uname -sr) 2>$ac_dev_null`" in "SunOS 5"*) AC_MSG_CHECKING(whether -R must be followed by a space) @@ -2172,5 +2207,5 @@ AC_MSG_CHECKING(for POSIXized ISC) 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 AC_MSG_RESULT(yes) diff -u2rN autoconf-2.12/autoconf.sh autoconf-2.12x18/autoconf.sh --- autoconf-2.12/autoconf.sh Thu Nov 21 06:28:42 1996 +++ autoconf-2.12x18/autoconf.sh Sun Aug 03 19:24:22 1997 @@ -22,4 +22,7 @@ # the given template file. +# Modified for Human68k by K.Okabe 1995.04.04 +# Last change: 1997.08.03 + usage="\ Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir] @@ -43,7 +46,20 @@ # It may have been found originally in a build directory. test -f "${M4}" || M4=m4 ;; +[A-Za-z]:/*) + test -f "${M4}" || M4=m4 ;; esac : ${TMPDIR=/tmp} +case "$KSH_VERSION" in +*X6*) +test -d "$TMPDIR" || TMPDIR=`test -n "$temp" -a -d "$temp" && echo "$temp" || + test -n "$TMP" -a -d "$TMP" && echo "$TMP" || + echo '.'` +dev_null=nul +;; +*) +dev_null=/dev/null +;; +esac tmpout=${TMPDIR}/acout.$$ localdir= @@ -116,5 +132,5 @@ r= f= # Some non-GNU m4's don't reject the --help option, so give them /dev/null. -case `$M4 --help < /dev/null 2>&1` in +case `$M4 --help < $dev_null 2>&1` in *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; *traditional*) ;; @@ -131,9 +147,9 @@ status=0 -if grep "^[^#]*${pattern}" $tmpout > /dev/null 2>&1; then +if grep "^[^#]*${pattern}" $tmpout > $dev_null 2>&1; then echo "autoconf: Undefined macros:" >&2 sed -n "s/^[^#]*\\(${pattern}[_A-Za-z0-9]*\\).*/\\1/p" $tmpout | while read macro; do - grep -n "^[^#]*$macro" $infile /dev/null + grep -n "^[^#]*$macro" $infile $dev_null test $? -eq 1 && echo >&2 "***BUG in Autoconf--please report*** $macro" done | sort -u >&2 @@ -142,5 +158,7 @@ if test $# -eq 0; then - exec 4> configure; chmod +x configure + touch configure + chmod +x configure + exec 4> configure else exec 4>&1 @@ -155,4 +173,5 @@ ' >&4 +exec 4>&- rm -f $tmpout diff -u2rN autoconf-2.12/autoheader.sh autoconf-2.12x18/autoheader.sh --- autoconf-2.12/autoheader.sh Thu Nov 21 06:28:46 1996 +++ autoconf-2.12x18/autoheader.sh Sun Aug 03 19:57:30 1997 @@ -24,4 +24,7 @@ # the given template file. +# Modified for Human68k by K.Okabe 1995.04.04 +# Last change: 1997.08.03 + usage="\ Usage: autoheader [-h] [--help] [-m dir] [--macrodir=dir] @@ -44,6 +47,20 @@ # It may have been found originally in a build directory. test -f "${M4}" || M4=m4 ;; +[A-Za-z]:/*) + test -f "${M4}" || M4=m4 ;; esac +: ${TMPDIR=/tmp} +case "$KSH_VERSION" in +*X6*) +test -d "$TMPDIR" || TMPDIR=`test -n "$temp" -a -d "$temp" && echo "$temp" || + test -n "$TMP" -a -d "$TMP" && echo "$TMP" || + echo '.'` +dev_null=nul +;; +*) +dev_null=/dev/null +;; +esac localdir=. show_version=no @@ -114,5 +131,5 @@ r= f= # Some non-GNU m4's don't reject the --help option, so give them /dev/null. -case `$M4 --help < /dev/null 2>&1` in +case `$M4 --help < $dev_null 2>&1` in *reload-state*) test -r $AC_MACRODIR/autoheader.m4f && { r=--reload f=f; } ;; *traditional*) ;; @@ -140,9 +157,12 @@ syms="`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`" -if test $# -eq 0; then +if test $# -ne 0; then + exec 5>&1 +fi +# if test $# -eq 0; then tmpout=autoh$$ trap "rm -f $tmpout; exit 1" 1 2 15 exec > $tmpout -fi +# fi # Support "outfile[:infile]", defaulting infile="outfile.in". @@ -161,5 +181,5 @@ test -r ${config_h}.top && cat ${config_h}.top test -r $localdir/acconfig.h && - grep @TOP@ $localdir/acconfig.h >/dev/null && + grep @TOP@ $localdir/acconfig.h >$dev_null && sed '/@TOP@/,$d' $localdir/acconfig.h @@ -173,6 +193,6 @@ for t in $TEMPLATES; do sedscript="" - grep @TOP@ $t >/dev/null && sedscript="1,/@TOP@/d;" - grep @BOTTOM@ $t >/dev/null && sedscript="$sedscript /@BOTTOM@/,\$d;" + grep @TOP@ $t >$dev_null && sedscript="1,/@TOP@/d;" + grep @BOTTOM@ $t >$dev_null && sedscript="$sedscript /@BOTTOM@/,\$d;" # This substitution makes "#undefFOO" in acconfig.h work. sed -n -e "$sedscript s/ / /g; p" $t @@ -244,5 +264,5 @@ # Handle the case where @BOTTOM@ is the first line of acconfig.h. test -r $localdir/acconfig.h && - grep @BOTTOM@ $localdir/acconfig.h >/dev/null && + grep @BOTTOM@ $localdir/acconfig.h >$dev_null && sed -n '/@BOTTOM@/,${/@BOTTOM@/!p;}' $localdir/acconfig.h test -f ${config_h}.bot && cat ${config_h}.bot @@ -252,5 +272,5 @@ if test -n "$syms"; then for sym in $syms; do - if fgrep $sym $TEMPLATES >/dev/null; then + if fgrep $sym $TEMPLATES >$dev_null; then : # All is well. else @@ -261,4 +281,6 @@ fi +exec >&- + if test $# -eq 0; then if test $status -eq 0; then @@ -271,4 +293,8 @@ rm -f $tmpout fi +else + cat -q $tmpout >&5 + exec 5>&- + rm -f $tmpout fi diff -u2rN autoconf-2.12/autoreconf.sh autoconf-2.12x18/autoreconf.sh --- autoconf-2.12/autoreconf.sh Thu Nov 21 06:28:48 1996 +++ autoconf-2.12x18/autoreconf.sh Sun Aug 03 19:59:52 1997 @@ -18,4 +18,7 @@ # 02111-1307, USA. +# Modified for Human68k by K.Okabe 1995.04.04 +# Last change: 1997.08.03 + usage="\ Usage: autoreconf [-f] [-h] [--help] [-m dir] [--macrodir=dir] @@ -27,4 +30,9 @@ force=no +case "$KSH_VERSION" in +*X6*) dev_null=nul ;; +*) dev_null=/dev/null ;; +esac + test -z "$AC_MACRODIR" && AC_MACRODIR=@datadir@ @@ -94,4 +102,5 @@ case "$0" in /*) autoconf=$top_autoconf; autoheader=$top_autoheader ;; + [A-Za-z]:/*) autoconf=$top_autoconf; autoheader=$top_autoheader ;; */*) autoconf=$dots$top_autoconf; autoheader=$dots$top_autoheader ;; *) autoconf=$top_autoconf; autoheader=$top_autoheader ;; @@ -100,4 +109,5 @@ case "$AC_MACRODIR" in /*) macrodir_opt="--macrodir=$AC_MACRODIR" ;; + [A-Za-z]:/*) macrodir_opt="--macrodir=$AC_MACRODIR" ;; *) macrodir_opt="--macrodir=$dots$AC_MACRODIR" ;; esac @@ -108,4 +118,6 @@ /*) localdir_opt="--localdir=$localdir" aclocal=$localdir/aclocal.m4 ;; + [A-Za-z]:/*) localdir_opt="--localdir=$localdir" + aclocal=$localdir/aclocal.m4 ;; *) localdir_opt="--localdir=$dots$localdir" aclocal=$dots$localdir/aclocal.m4 ;; @@ -124,5 +136,5 @@ fi - if grep AC_CONFIG_HEADER configure.in >/dev/null; then + if grep AC_CONFIG_HEADER configure.in >$dev_null; then template=`sed -n '/AC_CONFIG_HEADER/{ s%[^#]*AC_CONFIG_HEADER(\([^)]*\).*%\1% @@ -136,8 +148,8 @@ q }' configure.in` - if test ! -f $template || grep autoheader $template >/dev/null; then + if test ! -f $template || grep autoheader $template >$dev_null; then if test $force = no && test -f $template && ls -lt $template configure.in $aclocal | sed 1q | - grep "$template$" > /dev/null + grep "$template$" > $dev_null then : diff -u2rN autoconf-2.12/autoupdate.sh autoconf-2.12x18/autoupdate.sh --- autoconf-2.12/autoupdate.sh Mon Jul 15 01:37:22 1996 +++ autoconf-2.12x18/autoupdate.sh Sun Aug 03 20:02:20 1997 @@ -23,11 +23,24 @@ # Written by David MacKenzie +# Modified for Human68k by K.Okabe 1995.04.04 +# Last change: 1997.08.03 + usage="\ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] [--version] [template-file]" +case "$KSH_VERSION" in +*X6*) +ac_temp=`test -n "$temp" -a -d "$temp" && echo "$temp" || + test -n "$TMP" -a -d "$TMP" && echo "$TMP" || + echo '.'` +sedtmp=$ac_temp/acups.$$ +;; +*) sedtmp=/tmp/acups.$$ # For debugging. #sedtmp=/tmp/acups +;; +esac show_version=no test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@ diff -u2rN autoconf-2.12/config.guess autoconf-2.12x18/config.guess --- autoconf-2.12/config.guess Wed Nov 27 03:09:48 1996 +++ autoconf-2.12x18/config.guess Wed Jul 09 21:09:20 1997 @@ -36,4 +36,15 @@ # +# Modified for Human68k by K.Okabe 1996.04.16 +# Last change: 1997.07.09 + +case "$KSH_VERSION" in +*X6*) + echo m68k-sharp-human + exit 0 ;; +*) + ;; +esac + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 8/24/94.) @@ -553,4 +564,7 @@ echo i586-unisys-sysv4 exit 0 ;; + X680[02346]0:Human68k:*:*) + echo m68k-sharp-human + exit 0 ;; esac @@ -652,10 +666,14 @@ #endif +#if defined(__human68k__) || defined(HUMAN68K) + printf ("m68k-sharp-human\n"); exit (0); +#endif + exit (1); } EOF -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 -rm -f dummy.c dummy +${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm -f dummy.c dummy.x dummy && exit 0 +rm -f dummy.c dummy.x dummy # Apollos put the system type in the environment. diff -u2rN autoconf-2.12/config.sub autoconf-2.12x18/config.sub --- autoconf-2.12/config.sub Sat Nov 23 01:45:56 1996 +++ autoconf-2.12x18/config.sub Wed Jul 09 01:17:46 1997 @@ -46,4 +46,6 @@ # It is wrong to echo any other type of specification. +# Modified for Human68k by K.Okabe 1996.04.16 + if [ x$1 = x ] then @@ -637,4 +639,8 @@ basic_machine=clipper-highlevel ;; + human) + basic_machine=m68k-sharp + os=-human + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 @@ -750,4 +756,6 @@ -xenix) os=-xenix + ;; + -human) ;; -none) diff -u2rN autoconf-2.12/configure autoconf-2.12x18/configure --- autoconf-2.12/configure Wed Nov 27 03:09:50 1996 +++ autoconf-2.12x18/configure Sun Aug 03 20:04:30 1997 @@ -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: @@ -407,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 @@ -502,11 +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=' ' @@ -518,4 +541,10 @@ fi +#case "$KSH_VERSION" in +#*X6*) +# : ${LIBS=-lsignal} ;; +#*) +# ;; +#esac @@ -545,5 +574,5 @@ set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:__oline__: checking for $ac_word" >&5 +echo "configure:577: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -553,6 +582,20 @@ ac_cv_path_M4="$M4" # Let the user override the test with a path. ;; + [A-Za-z]:/*) + ac_cv_path_M4="$M4" # Let the user override the test with a path. + ;; + *) + 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_path_M4="$ac_dir/$ac_word" + break + fi + done + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -562,4 +605,6 @@ fi done + ;; + esac IFS="$ac_save_ifs" ;; @@ -582,5 +627,5 @@ set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:__oline__: checking for $ac_word" >&5 +echo "configure:630: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -589,5 +634,16 @@ ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog" + break + fi + done + ;; + *) for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -597,4 +653,6 @@ fi done + ;; + esac IFS="$ac_save_ifs" fi @@ -614,5 +672,5 @@ set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:__oline__: checking for $ac_word" >&5 +echo "configure:675: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -622,6 +680,20 @@ ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; + [A-Za-z]:/*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + *) + 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_path_PERL="$ac_dir/$ac_word" + break + fi + done + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -631,4 +703,6 @@ fi done + ;; + esac IFS="$ac_save_ifs" test -z "$ac_cv_path_PERL" && ac_cv_path_PERL="no" @@ -679,10 +753,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:__oline__: checking for a BSD compatible install" >&5 +echo "configure:756: 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. @@ -707,4 +798,6 @@ esac done + ;; + esac IFS="$ac_save_IFS" @@ -821,5 +914,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 @@ -846,4 +939,5 @@ ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" +ac_dev_null=$ac_dev_null trap 'rm -fr `echo "Makefile testsuite/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 @@ -956,4 +1050,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" @@ -995,4 +1090,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