diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-06-16 04:24:38 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 1998-06-16 04:24:38 +0000 |
commit | 16487ee284f17cfbf6fad9f6b2fedc57f0f37e0a (patch) | |
tree | 0c0aab325ab782ff559d1cfa5df269e786219ee3 | |
parent | 83687c4eb47e2bcbe463d097317d068d1dd0b734 (diff) |
baseline
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | MANIFEST | 4 | ||||
-rw-r--r-- | bignum.c | 6 | ||||
-rw-r--r-- | config.guess | 6 | ||||
-rw-r--r-- | config.sub | 2 | ||||
-rw-r--r-- | configure | 442 | ||||
-rw-r--r-- | configure.in | 48 | ||||
-rw-r--r-- | defines.h | 2 | ||||
-rw-r--r-- | eval.c | 19 | ||||
-rw-r--r-- | ext/extmk.rb.in | 12 | ||||
-rw-r--r-- | ext/socket/socket.c | 2 | ||||
-rw-r--r-- | ext/tcltklib/tcltklib.c | 2 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | gc.c | 2 | ||||
-rw-r--r-- | hash.c | 2 | ||||
-rw-r--r-- | io.c | 6 | ||||
-rw-r--r-- | lib/cgi-lib.rb | 6 | ||||
-rw-r--r-- | lib/tk.rb | 10 | ||||
-rw-r--r-- | marshal.c | 2 | ||||
-rw-r--r-- | object.c | 10 | ||||
-rw-r--r-- | parse.y | 6 | ||||
-rw-r--r-- | process.c | 2 | ||||
-rw-r--r-- | rubyio.h (renamed from io.h) | 4 | ||||
-rw-r--r-- | rubysig.h (renamed from sig.h) | 2 | ||||
-rw-r--r-- | signal.c | 2 | ||||
-rw-r--r-- | struct.c | 15 | ||||
-rw-r--r-- | util.c | 3 | ||||
-rw-r--r-- | variable.c | 4 |
28 files changed, 381 insertions, 258 deletions
@@ -1,3 +1,19 @@ +Tue Jun 16 12:30:46 1998 Yukihiro Matsumoto <matz@netlab.co.jp> + + * bignum.c (str2inum): handles `+ddd'. + + * struct.c (make_struct): name parameter can be nil for unnamed + structures. + +pMon Jun 15 16:30:10 1998 Yukihiro Matsumoto <matz@netlab.co.jp> + + * object.c (class_s_inherited): prohibiting to make subclass of + class Class. + + * object.c (module_s_new): support for making subclass of Module. + + * parse.y (yycompile): clear eval_tree before compiling. + Fri Jun 12 17:58:18 1998 Yukihiro Matsumoto <matz@netlab.co.jp> * eval.c (eval): write back the_dyna_var into the block. @@ -37,7 +37,6 @@ install-sh instruby.rb intern.h io.c -io.h keywords lex.c main.c @@ -59,8 +58,9 @@ regex.h ruby.1 ruby.c ruby.h +rubyio.h +rubysig.h rubytest.rb -sig.h signal.c sprintf.c st.c @@ -175,7 +175,11 @@ str2inum(str, base) USHORT *zds; while (ISSPACE(*str)) str++; - if (*str == '-') { + + if (*str == '|') { + str++; + } + else if (*str == '-') { str++; sign = 0; } diff --git a/config.guess b/config.guess index bc489a68bc..d62857905a 100644 --- a/config.guess +++ b/config.guess @@ -783,7 +783,11 @@ main () #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); #endif diff --git a/config.sub b/config.sub index 86328ef24a..438abc8152 100644 --- a/config.sub +++ b/config.sub @@ -723,7 +723,7 @@ case $os in | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin32* | -pe* | -psos* | -moss* | -proelf* \ - | -linux* | -bow*) + | -linux* | -bow* | -rhapsody* | -openstep* ) # Remember, each alternative MUST END IN *, to match a version number. ;; -sunos5*) @@ -16,7 +16,7 @@ ac_help="$ac_help ac_help="$ac_help --disable-thread never use user-level thread" ac_help="$ac_help ---enable-fat-binary build a NeXT Multi Architecture Binary. " +--enable-fat-binary build a NeXT/Apple Multi Architecture Binary. " ac_help="$ac_help --with-dln-a-out use dln_a_out if possible" ac_help="$ac_help @@ -627,11 +627,19 @@ if test "$fat_binary" = yes ; then echo $ac_n "checking target architecture ""... $ac_c" 1>&6 echo "configure:629: checking target architecture " >&5 - if test "$TARGET_ARCHS" = "" ; then - if test `/usr/bin/arch` = "m68k" ; then - TARGET_ARCHS="m68k i486" - else - TARGET_ARCHS="m68k `/usr/bin/arch`" + if "$host_os" = "rhapsody" ; then + echo -n "Rhapsody: " + if test "$TARGET_ARCHS" = "" ; then + TARGET_ARCHS="ppc i486" + fi + else + echo -n "NeXTSTEP/OPENSTEP: " + if test "$TARGET_ARCHS" = "" ; then + if test `/usr/bin/arch` = "m68k" ; then + TARGET_ARCHS="m68k i486" + else + TARGET_ARCHS="m68k `/usr/bin/arch`" + fi fi fi # /usr/lib/arch_tool -archify_list $TARGET_ARCHS @@ -670,7 +678,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:674: checking for $ac_word" >&5 +echo "configure:682: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -699,7 +707,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:703: checking for $ac_word" >&5 +echo "configure:711: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -747,7 +755,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:751: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:759: 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. @@ -757,11 +765,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 761 "configure" +#line 769 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s 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>/dev/null; then @@ -781,12 +789,12 @@ 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:785: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:793: 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:790: checking whether we are using GNU C" >&5 +echo "configure:798: 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 else @@ -795,7 +803,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -810,7 +818,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:814: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:822: checking whether ${CC-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 @@ -838,7 +846,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:842: checking how to run the C preprocessor" >&5 +echo "configure:850: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -853,13 +861,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 857 "configure" +#line 865 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -870,13 +878,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 874 "configure" +#line 882 "configure" #include "confdefs.h" #include <assert.h> Syntax Error 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; } +{ (eval echo configure:888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -900,13 +908,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:904: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:912: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 910 "configure" +#line 918 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -924,7 +932,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 928 "configure" +#line 936 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -950,7 +958,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:954: checking for $ac_word" >&5 +echo "configure:962: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -982,7 +990,7 @@ test -n "$YACC" || YACC="yacc" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:986: checking for $ac_word" >&5 +echo "configure:994: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1014,7 +1022,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1018: checking for $ac_word" >&5 +echo "configure:1026: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1054,7 +1062,7 @@ test -n "$AR" || AR="ar" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./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:1058: checking for a BSD compatible install" >&5 +echo "configure:1066: 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 @@ -1104,7 +1112,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1108: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1116: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1134,17 +1142,17 @@ fi # checks for UNIX variants that set C preprocessor variables ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:1138: checking for minix/config.h" >&5 +echo "configure:1146: 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 -#line 1143 "configure" +#line 1151 "configure" #include "confdefs.h" #include <minix/config.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1183,7 +1191,7 @@ fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1187: checking size of int" >&5 +echo "configure:1195: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1191,7 +1199,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1195 "configure" +#line 1203 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1202,7 +1210,7 @@ main() exit(0); } EOF -if { (eval echo configure:1206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -1222,7 +1230,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1226: checking size of long" >&5 +echo "configure:1234: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1230,7 +1238,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1234 "configure" +#line 1242 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1241,7 +1249,7 @@ main() exit(0); } EOF -if { (eval echo configure:1245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1261,7 +1269,7 @@ EOF echo $ac_n "checking size of void*""... $ac_c" 1>&6 -echo "configure:1265: checking size of void*" >&5 +echo "configure:1273: checking size of void*" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1269,7 +1277,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 1273 "configure" +#line 1281 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -1280,7 +1288,7 @@ main() exit(0); } EOF -if { (eval echo configure:1284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_voidp=`cat conftestval` else @@ -1301,19 +1309,19 @@ EOF echo $ac_n "checking for prototypes""... $ac_c" 1>&6 -echo "configure:1305: checking for prototypes" >&5 +echo "configure:1313: checking for prototypes" >&5 if eval "test \"`echo '$''{'rb_cv_have_prototypes'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1310 "configure" +#line 1318 "configure" #include "confdefs.h" int foo(int x) { return 0; } int main() { return foo(10); ; return 0; } EOF -if { (eval echo configure:1317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_have_prototypes=yes else @@ -1334,12 +1342,12 @@ EOF fi echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -echo "configure:1338: checking for variable length prototypes and stdarg.h" >&5 +echo "configure:1346: checking for variable length prototypes and stdarg.h" >&5 if eval "test \"`echo '$''{'rb_cv_stdarg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1343 "configure" +#line 1351 "configure" #include "confdefs.h" #include <stdarg.h> @@ -1356,7 +1364,7 @@ int main() { return foo(10, "", 3.14); ; return 0; } EOF -if { (eval echo configure:1360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_stdarg=yes else @@ -1377,19 +1385,19 @@ EOF fi echo $ac_n "checking for gcc attribute noreturn""... $ac_c" 1>&6 -echo "configure:1381: checking for gcc attribute noreturn" >&5 +echo "configure:1389: checking for gcc attribute noreturn" >&5 if eval "test \"`echo '$''{'rb_cv_have_attr_noreturn'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1386 "configure" +#line 1394 "configure" #include "confdefs.h" void exit(int x) __attribute__ ((noreturn)); int main() { ; return 0; } EOF -if { (eval echo configure:1393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_have_attr_noreturn=yes else @@ -1411,12 +1419,14 @@ fi case "$host_os" in nextstep*) ;; +openstep*) ;; +rhapsody*) ;; human*) ;; beos*) ;; *) LIBS="-lm $LIBS";; esac echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:1420: checking for crypt in -lcrypt" >&5 +echo "configure:1430: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1424,7 +1434,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <<EOF -#line 1428 "configure" +#line 1438 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1435,7 +1445,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:1439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1463,7 +1473,7 @@ else fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:1467: checking for dlopen in -ldl" >&5 +echo "configure:1477: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1471,7 +1481,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 1475 "configure" +#line 1485 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1482,7 +1492,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:1486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1510,7 +1520,7 @@ else fi # Dynamic linking for SunOS/Solaris and SYSV echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:1514: checking for shl_load in -ldld" >&5 +echo "configure:1524: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1518,7 +1528,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 1522 "configure" +#line 1532 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1529,7 +1539,7 @@ int main() { shl_load() ; return 0; } EOF -if { (eval echo configure:1533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1562,12 +1572,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1566: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1576: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1571 "configure" +#line 1581 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -1575,7 +1585,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1600,7 +1610,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1604: checking for opendir in -ldir" >&5 +echo "configure:1614: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1608,7 +1618,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 1612 "configure" +#line 1622 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1619,7 +1629,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1641,7 +1651,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1645: checking for opendir in -lx" >&5 +echo "configure:1655: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1649,7 +1659,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 1653 "configure" +#line 1663 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1660,7 +1670,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:1664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1683,12 +1693,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1687: checking for ANSI C header files" >&5 +echo "configure:1697: 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 <<EOF -#line 1692 "configure" +#line 1702 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1696,7 +1706,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1713,7 +1723,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1717 "configure" +#line 1727 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1731,7 +1741,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1735 "configure" +#line 1745 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1752,7 +1762,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1756 "configure" +#line 1766 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1763,7 +1773,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1792,17 +1802,17 @@ for ac_hdr in stdlib.h unistd.h limits.h sys/file.h sys/ioctl.h pwd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1796: checking for $ac_hdr" >&5 +echo "configure:1806: 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 -#line 1801 "configure" +#line 1811 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1830,12 +1840,12 @@ done echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:1834: checking for uid_t in sys/types.h" >&5 +echo "configure:1844: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1839 "configure" +#line 1849 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -1864,12 +1874,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1868: checking for size_t" >&5 +echo "configure:1878: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1873 "configure" +#line 1883 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1897,12 +1907,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:1901: checking for st_blksize in struct stat" >&5 +echo "configure:1911: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1906 "configure" +#line 1916 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -1910,7 +1920,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:1914: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -1932,12 +1942,12 @@ fi save_LIBOJBS="$LIBOBJS" echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:1936: checking for st_blocks in struct stat" >&5 +echo "configure:1946: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1941 "configure" +#line 1951 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -1945,7 +1955,7 @@ int main() { struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:1949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -1969,12 +1979,12 @@ fi LIBOBJS="$save_LIBOBJS" echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:1973: checking for st_rdev in struct stat" >&5 +echo "configure:1983: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1978 "configure" +#line 1988 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/stat.h> @@ -1982,7 +1992,7 @@ int main() { struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:1986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2004,7 +2014,7 @@ fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:2008: checking type of array argument to getgroups" >&5 +echo "configure:2018: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2012,7 +2022,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 2016 "configure" +#line 2026 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -2037,7 +2047,7 @@ main() } EOF -if { (eval echo configure:2041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -2051,7 +2061,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 2055 "configure" +#line 2065 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -2075,12 +2085,12 @@ EOF echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2079: checking return type of signal handlers" >&5 +echo "configure:2089: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2084 "configure" +#line 2094 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2097,7 +2107,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:2101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2118,19 +2128,19 @@ EOF # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2122: checking for working alloca.h" >&5 +echo "configure:2132: 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 <<EOF -#line 2127 "configure" +#line 2137 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2151,12 +2161,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2155: checking for alloca" >&5 +echo "configure:2165: 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 <<EOF -#line 2160 "configure" +#line 2170 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -2179,7 +2189,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:2183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2211,12 +2221,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2215: checking whether alloca needs Cray hooks" >&5 +echo "configure:2225: 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 <<EOF -#line 2220 "configure" +#line 2230 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -2241,12 +2251,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2245: checking for $ac_func" >&5 +echo "configure:2255: 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 <<EOF -#line 2250 "configure" +#line 2260 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2269,7 +2279,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2296,7 +2306,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2300: checking stack direction for C alloca" >&5 +echo "configure:2310: 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 else @@ -2304,7 +2314,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 2308 "configure" +#line 2318 "configure" #include "confdefs.h" find_stack_direction () { @@ -2323,7 +2333,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2345,12 +2355,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2349: checking for pid_t" >&5 +echo "configure:2359: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2354 "configure" +#line 2364 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2379,17 +2389,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:2383: checking for vfork.h" >&5 +echo "configure:2393: checking for vfork.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 -#line 2388 "configure" +#line 2398 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2393: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2414,18 +2424,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:2418: checking for working vfork" >&5 +echo "configure:2428: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:2424: checking for vfork" >&5 +echo "configure:2434: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2429 "configure" +#line 2439 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -2448,7 +2458,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:2452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -2469,7 +2479,7 @@ fi else cat > conftest.$ac_ext <<EOF -#line 2473 "configure" +#line 2483 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -2564,7 +2574,7 @@ main() { } } EOF -if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -2587,7 +2597,7 @@ EOF fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:2591: checking for 8-bit clean memcmp" >&5 +echo "configure:2601: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2595,7 +2605,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 2599 "configure" +#line 2609 "configure" #include "confdefs.h" main() @@ -2605,7 +2615,7 @@ main() } EOF -if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -2626,12 +2636,12 @@ for ac_func in dup2 setenv memmove mkdir strcasecmp strerror strftime\ strchr strstr strtoul strdup crypt flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2630: checking for $ac_func" >&5 +echo "configure:2640: 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 <<EOF -#line 2635 "configure" +#line 2645 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2654,7 +2664,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2687,12 +2697,12 @@ for ac_func in fmod killpg drand48 random wait4 waitpid syscall getcwd\ dlopen sigprocmask sigaction _setjmp setpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2691: checking for $ac_func" >&5 +echo "configure:2701: 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 <<EOF -#line 2696 "configure" +#line 2706 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2715,7 +2725,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2741,12 +2751,12 @@ done if test "$ac_cv_func_strftime" = no; then echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2745: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2755: 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 <<EOF -#line 2750 "configure" +#line 2760 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -2754,7 +2764,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2775,12 +2785,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:2779: checking for tm_zone in struct tm" >&5 +echo "configure:2789: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2784 "configure" +#line 2794 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -2788,7 +2798,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:2792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -2808,12 +2818,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:2812: checking for tzname" >&5 +echo "configure:2822: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2817 "configure" +#line 2827 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -2823,7 +2833,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:2827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -2845,14 +2855,14 @@ EOF fi cat > conftest.$ac_ext <<EOF -#line 2849 "configure" +#line 2859 "configure" #include "confdefs.h" int main() { extern int daylight; int i = daylight; ; return 0; } EOF -if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_DAYLIGHT 1 @@ -2872,7 +2882,7 @@ EOF else echo $ac_n "checking for BSD signal semantics""... $ac_c" 1>&6 -echo "configure:2876: checking for BSD signal semantics" >&5 +echo "configure:2886: checking for BSD signal semantics" >&5 if eval "test \"`echo '$''{'rb_cv_bsd_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2880,7 +2890,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2884 "configure" +#line 2894 "configure" #include "confdefs.h" #include <stdio.h> @@ -2902,7 +2912,7 @@ main() } EOF -if { (eval echo configure:2906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then rb_cv_bsd_signal=yes else @@ -2936,19 +2946,19 @@ EOF else echo $ac_n "checking whether getpgrp() has arg""... $ac_c" 1>&6 -echo "configure:2940: checking whether getpgrp() has arg" >&5 +echo "configure:2950: checking whether getpgrp() has arg" >&5 if eval "test \"`echo '$''{'rb_cv_bsdgetpgrp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2945 "configure" +#line 2955 "configure" #include "confdefs.h" #include <unistd.h> int main() { getpgrp(0); ; return 0; } EOF -if { (eval echo configure:2952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_bsdgetpgrp=yes else @@ -2969,19 +2979,19 @@ EOF fi echo $ac_n "checking whether setpgrp() has args""... $ac_c" 1>&6 -echo "configure:2973: checking whether setpgrp() has args" >&5 +echo "configure:2983: checking whether setpgrp() has args" >&5 if eval "test \"`echo '$''{'rb_cv_bsdsetpgrp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2978 "configure" +#line 2988 "configure" #include "confdefs.h" #include <unistd.h> int main() { setpgrp(1, 1); ; return 0; } EOF -if { (eval echo configure:2985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_bsdsetpgrp=yes else @@ -3003,14 +3013,14 @@ EOF fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3007: checking whether byte ordering is bigendian" >&5 +echo "configure:3017: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 3014 "configure" +#line 3024 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3021,11 +3031,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 3029 "configure" +#line 3039 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3036,7 +3046,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3056,7 +3066,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3060 "configure" +#line 3070 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -3069,7 +3079,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:3073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3093,14 +3103,14 @@ EOF fi echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6 -echo "configure:3097: checking whether char is unsigned" >&5 +echo "configure:3107: checking whether char is unsigned" >&5 if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$GCC" = yes; then # GCC predefines this symbol on systems where it applies. cat > conftest.$ac_ext <<EOF -#line 3104 "configure" +#line 3114 "configure" #include "confdefs.h" #ifdef __CHAR_UNSIGNED__ yes @@ -3122,7 +3132,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3126 "configure" +#line 3136 "configure" #include "confdefs.h" /* volatile prevents gcc2 from optimizing the test away on sparcs. */ #if !defined(__STDC__) || __STDC__ != 1 @@ -3132,7 +3142,7 @@ main() { volatile char c = 255; exit(c < 0); } EOF -if { (eval echo configure:3136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_char_unsigned=yes else @@ -3157,19 +3167,19 @@ fi echo $ac_n "checking count field in FILE structures""... $ac_c" 1>&6 -echo "configure:3161: checking count field in FILE structures" >&5 +echo "configure:3171: checking count field in FILE structures" >&5 if eval "test \"`echo '$''{'rb_cv_fcnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3166 "configure" +#line 3176 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->_cnt = 0; ; return 0; } EOF -if { (eval echo configure:3173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="_cnt" else @@ -3179,14 +3189,14 @@ fi rm -f conftest* if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext <<EOF -#line 3183 "configure" +#line 3193 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->__cnt = 0; ; return 0; } EOF -if { (eval echo configure:3190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="__cnt" else @@ -3197,14 +3207,14 @@ rm -f conftest* fi if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext <<EOF -#line 3201 "configure" +#line 3211 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->_r = 0; ; return 0; } EOF -if { (eval echo configure:3208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="_r" else @@ -3215,14 +3225,14 @@ rm -f conftest* fi if test "$rb_cv_fcnt" = ""; then cat > conftest.$ac_ext <<EOF -#line 3219 "configure" +#line 3229 "configure" #include "confdefs.h" #include <stdio.h> int main() { FILE *f = stdin; f->readCount = 0; ; return 0; } EOF -if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_fcnt="readCount" else @@ -3247,9 +3257,9 @@ fi if test "$ac_cv_func_getpwent" = yes; then echo $ac_n "checking struct passwd""... $ac_c" 1>&6 -echo "configure:3251: checking struct passwd" >&5 +echo "configure:3261: checking struct passwd" >&5 cat > conftest.$ac_ext <<EOF -#line 3253 "configure" +#line 3263 "configure" #include "confdefs.h" #include <pwd.h> EOF @@ -3264,7 +3274,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3268 "configure" +#line 3278 "configure" #include "confdefs.h" #include <pwd.h> EOF @@ -3279,7 +3289,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3283 "configure" +#line 3293 "configure" #include "confdefs.h" #include <pwd.h> EOF @@ -3294,7 +3304,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3298 "configure" +#line 3308 "configure" #include "confdefs.h" #include <pwd.h> EOF @@ -3309,7 +3319,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3313 "configure" +#line 3323 "configure" #include "confdefs.h" #include <pwd.h> EOF @@ -3324,7 +3334,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3328 "configure" +#line 3338 "configure" #include "confdefs.h" #include <pwd.h> EOF @@ -3339,7 +3349,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3343 "configure" +#line 3353 "configure" #include "confdefs.h" #include <pwd.h> EOF @@ -3372,7 +3382,7 @@ fi case "$host_os" in linux*) echo $ac_n "checking whether ELF binaries are produced""... $ac_c" 1>&6 -echo "configure:3376: checking whether ELF binaries are produced" >&5 +echo "configure:3386: checking whether ELF binaries are produced" >&5 if eval "test \"`echo '$''{'rb_cv_linux_elf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3380,7 +3390,7 @@ else : else cat > conftest.$ac_ext <<EOF -#line 3384 "configure" +#line 3394 "configure" #include "confdefs.h" /* Test for whether ELF binaries are produced */ @@ -3400,7 +3410,7 @@ main() { } EOF -if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then rb_cv_linux_elf=yes else @@ -3430,10 +3440,12 @@ STATIC= if test "$with_dln_a_out" != yes; then rb_cv_dlopen=unknown echo $ac_n "checking whether OS depend dynamic link works""... $ac_c" 1>&6 -echo "configure:3434: checking whether OS depend dynamic link works" >&5 +echo "configure:3444: checking whether OS depend dynamic link works" >&5 if test "$GCC" = yes; then case "$host_os" in nextstep*) ;; + openstep*) ;; + rhapsody*) ;; human*) ;; *) CCDLFLAGS=-fpic;; esac @@ -3474,6 +3486,14 @@ echo "configure:3434: checking whether OS depend dynamic link works" >&5 LDFLAGS="-u libsys_s" DLDFLAGS="$ARCH_FLAG" rb_cv_dlopen=yes ;; + openstep*) LDSHARED='cc -dynamic -bundle -undefined suppress' + LDFLAGS="" + DLDFLAGS="$ARCH_FLAG" + rb_cv_dlopen=yes ;; + rhapsody*) LDSHARED='cc -dynamic -bundle -undefined suppress' + LDFLAGS="" + DLDFLAGS="$ARCH_FLAG" + rb_cv_dlopen=yes ;; aix*) LDSHARED='../../miniruby ../aix_ld.rb $(TARGET)' rb_cv_dlopen=yes ;; human*) DLDFLAGS='' @@ -3498,13 +3518,13 @@ dln_a_out_works=no if test "$ac_cv_header_a_out_h" = yes; then if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then echo $ac_n "checking whether matz's dln works""... $ac_c" 1>&6 -echo "configure:3502: checking whether matz's dln works" >&5 +echo "configure:3522: checking whether matz's dln works" >&5 cat confdefs.h > config.h if eval "test \"`echo '$''{'rb_cv_dln_a_out'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3508 "configure" +#line 3528 "configure" #include "confdefs.h" #define USE_DLN_A_OUT @@ -3514,7 +3534,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rb_cv_dln_a_out=yes else @@ -3561,6 +3581,16 @@ EOF #define DLEXT ".o" EOF ;; + openstep*) DLEXT=bundle + cat >> confdefs.h <<\EOF +#define DLEXT ".bundle" +EOF +;; + rhapsody*) DLEXT=bundle + cat >> confdefs.h <<\EOF +#define DLEXT ".bundle" +EOF +;; *) DLEXT=so cat >> confdefs.h <<\EOF #define DLEXT ".so" @@ -3580,6 +3610,10 @@ case "$host_os" in STRIP='strip -S -x';; nextstep*) STRIP='strip -A -n';; + openstep*) + STRIP='strip -A -n';; + rhapsody*) + STRIP='strip -A -n';; esac EXTSTATIC= @@ -3597,7 +3631,7 @@ fi case "$host_os" in human*) echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6 -echo "configure:3601: checking for _harderr in -lsignal" >&5 +echo "configure:3635: 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 @@ -3605,7 +3639,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsignal $LIBS" cat > conftest.$ac_ext <<EOF -#line 3609 "configure" +#line 3643 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3616,7 +3650,7 @@ int main() { _harderr() ; return 0; } EOF -if { (eval echo configure:3620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3644,7 +3678,7 @@ else fi echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6 -echo "configure:3648: checking for hmemset in -lhmem" >&5 +echo "configure:3682: 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 @@ -3652,7 +3686,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lhmem $LIBS" cat > conftest.$ac_ext <<EOF -#line 3656 "configure" +#line 3690 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3663,7 +3697,7 @@ int main() { hmemset() ; return 0; } EOF -if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3693,12 +3727,12 @@ fi for ac_func in select do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3697: checking for $ac_func" >&5 +echo "configure:3731: 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 <<EOF -#line 3702 "configure" +#line 3736 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3721,7 +3755,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3746,7 +3780,7 @@ fi done echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6 -echo "configure:3750: checking whether PD libc _dtos18 fail to convert big number" >&5 +echo "configure:3784: checking whether PD libc _dtos18 fail to convert big number" >&5 if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3754,7 +3788,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3758 "configure" +#line 3792 "configure" #include "confdefs.h" #include <stdio.h> @@ -3766,7 +3800,7 @@ main () } EOF -if { (eval echo configure:3770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then rb_cv_missing__dtos18=yes else @@ -3788,7 +3822,7 @@ EOF fi echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6 -echo "configure:3792: checking whether PD libc fconvert fail to round" >&5 +echo "configure:3826: checking whether PD libc fconvert fail to round" >&5 if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3796,7 +3830,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 3800 "configure" +#line 3834 "configure" #include "confdefs.h" #include <stdio.h> @@ -3809,7 +3843,7 @@ main () } EOF -if { (eval echo configure:3813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then rb_cv_missing_fconvert=yes else @@ -3871,6 +3905,12 @@ if test "$host_os" = "beos"; then esac fi +if "$host_os" = "rhapsody" ; then + CFLAGS="$CFLAGS -no-precomp" +fi + + + diff --git a/configure.in b/configure.in index 946f4b876a..c8f534d556 100644 --- a/configure.in +++ b/configure.in @@ -33,17 +33,25 @@ AC_CANONICAL_HOST dnl checks for fat-binary fat_binary=no AC_ARG_ENABLE( fat-binary, - [--enable-fat-binary build a NeXT Multi Architecture Binary. ], + [--enable-fat-binary build a NeXT/Apple Multi Architecture Binary. ], [ fat_binary=$enableval ] ) -if test "$fat_binary" = yes ; then + if test "$fat_binary" = yes ; then AC_MSG_CHECKING( target architecture ) - if test "$TARGET_ARCHS" = "" ; then - if test `/usr/bin/arch` = "m68k" ; then - TARGET_ARCHS="m68k i486" - else - TARGET_ARCHS="m68k `/usr/bin/arch`" + if test "$host_os" = "rhapsody" ; then + echo -n "Rhapsody: " + if test "$TARGET_ARCHS" = "" ; then + TARGET_ARCHS="ppc i486" + fi + else + echo -n "NeXTSTEP/OPENSTEP: " + if test "$TARGET_ARCHS" = "" ; then + if test `/usr/bin/arch` = "m68k" ; then + TARGET_ARCHS="m68k i486" + else + TARGET_ARCHS="m68k `/usr/bin/arch`" + fi fi fi # /usr/lib/arch_tool -archify_list $TARGET_ARCHS @@ -118,6 +126,8 @@ fi dnl Checks for libraries. case "$host_os" in nextstep*) ;; +openstep*) ;; +rhapsody*) ;; human*) ;; beos*) ;; *) LIBS="-lm $LIBS";; @@ -312,6 +322,8 @@ if test "$with_dln_a_out" != yes; then if test "$GCC" = yes; then case "$host_os" in nextstep*) ;; + openstep*) ;; + rhapsody*) ;; human*) ;; *) CCDLFLAGS=-fpic;; esac @@ -352,6 +364,14 @@ if test "$with_dln_a_out" != yes; then LDFLAGS="-u libsys_s" DLDFLAGS="$ARCH_FLAG" rb_cv_dlopen=yes ;; + openstep*) LDSHARED='cc -dynamic -bundle -undefined suppress' + LDFLAGS="" + DLDFLAGS="$ARCH_FLAG" + rb_cv_dlopen=yes ;; + rhapsody*) LDSHARED='cc -dynamic -bundle -undefined suppress' + LDFLAGS="" + DLDFLAGS="$ARCH_FLAG" + rb_cv_dlopen=yes ;; aix*) LDSHARED='../../miniruby ../aix_ld.rb $(TARGET)' rb_cv_dlopen=yes ;; human*) DLDFLAGS='' @@ -408,6 +428,10 @@ else AC_DEFINE(DLEXT, ".sl");; nextstep*) DLEXT=o AC_DEFINE(DLEXT, ".o");; + openstep*) DLEXT=bundle + AC_DEFINE(DLEXT, ".bundle");; + rhapsody*) DLEXT=bundle + AC_DEFINE(DLEXT, ".bundle");; *) DLEXT=so AC_DEFINE(DLEXT, ".so");; esac @@ -425,6 +449,10 @@ case "$host_os" in STRIP='strip -S -x';; nextstep*) STRIP='strip -A -n';; + openstep*) + STRIP='strip -A -n';; + rhapsody*) + STRIP='strip -A -n';; esac EXTSTATIC= @@ -521,6 +549,12 @@ if test "$host_os" = "beos"; then ;; esac fi + +if test "$host_os" = "rhapsody" ; then + CFLAGS="$CFLAGS -no-precomp" +fi + + AC_SUBST(LIBRUBY) AC_SUBST(LIBRUBYARG) AC_SUBST(SOLIBS) @@ -23,7 +23,9 @@ #ifdef NeXT #define DYNAMIC_ENDIAN /* determine endian at runtime */ +#ifndef __Apple__ #define S_IXUSR _S_IXUSR /* execute/search permission, owner */ +#endif #define S_IXGRP 0000010 /* execute/search permission, group */ #define S_IXOTH 0000001 /* execute/search permission, other */ #endif /* NeXT */ @@ -13,7 +13,7 @@ #include "ruby.h" #include "node.h" #include "env.h" -#include "sig.h" +#include "rubysig.h" #include <stdio.h> #include <setjmp.h> @@ -360,7 +360,7 @@ rb_attr(klass, id, read, write, ex) static ID init, eqq, each, aref, aset, match; VALUE errinfo = Qnil; -extern NODE *eval_tree0; +extern NODE *eval_tree_begin; extern NODE *eval_tree; extern int nerrs; @@ -883,7 +883,6 @@ ruby_options(argc, argv) ruby_process_options(argc, argv); ext_init = 1; /* Init_ext() called in ruby_process_options */ save = eval_tree; - eval_tree = 0; ruby_require_modules(); eval_tree = save; } @@ -901,9 +900,9 @@ eval_node(self) VALUE result = Qnil; NODE *tree; - if (eval_tree0) { - tree = eval_tree0; - eval_tree0 = 0; + if (eval_tree_begin) { + tree = eval_tree_begin; + eval_tree_begin = 0; rb_eval(self, tree); } @@ -2251,8 +2250,8 @@ rb_eval(self, node) else { if (nd_type(list->nd_head) == NODE_EVSTR) { rb_in_eval++; - eval_tree = 0; list->nd_head = compile(list->nd_head->nd_lit,0); + eval_tree = 0; rb_in_eval--; if (nerrs > 0) { compile_error("string expansion"); @@ -3818,7 +3817,6 @@ eval(self, src, scope, file, line) } PUSH_TAG(PROT_NONE); if ((state = EXEC_TAG()) == 0) { - eval_tree = 0; sourcefile = file; sourceline = line; compile(src, file); @@ -4640,7 +4638,8 @@ Init_eval() match = rb_intern("=~"); rb_global_variable((VALUE*)&top_scope); - rb_global_variable((VALUE*)&eval_tree0); + rb_global_variable((VALUE*)&eval_tree_begin); + rb_global_variable((VALUE*)&eval_tree); rb_global_variable((VALUE*)&the_dyna_vars); @@ -6173,7 +6172,7 @@ thread_create(fn, arg) posix_signal(SIGALRM, catch_timer); #else signal(SIGVTALRM, catch_timer); - posix_signal(SIGALRM, catch_timer); + signal(SIGALRM, catch_timer); #endif tval.it_interval.tv_sec = 0; diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index e4823edb85..0c32954577 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -332,6 +332,16 @@ $(TARGET): $(OBJS) $(TARGET): $(OBJS) cc -r $(CFLAGS) -o $(TARGET) $(OBJS) " + elsif PLATFORM =~ "-openstep" + mfile.printf "\ +$(TARGET): $(OBJS) + cc -r $(CFLAGS) -o $(TARGET) $(OBJS) +" + elsif PLATFORM =~ "-rhapsody" + mfile.printf "\ +$(TARGET): $(OBJS) + cc -r $(CFLAGS) -o $(TARGET) $(OBJS) +" elsif $static mfile.printf "\ $(TARGET): $(OBJS) @@ -379,7 +389,7 @@ def extmake(target) return if $nodynamic and not $static $objs = nil - $libs = PLATFORM =~ /cygwin32|beos/ ? nil : "-lc" + $libs = PLATFORM =~ /cygwin32|beos|openstep|nextstep|rhapsody/ ? nil : "-lc" $local_libs = nil # to be assigned in extconf.rb $CFLAGS = nil $LDFLAGS = nil diff --git a/ext/socket/socket.c b/ext/socket/socket.c index f9903654b6..d527e308e8 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -9,7 +9,7 @@ ************************************************/ #include "ruby.h" -#include "io.h" +#include "rubyio.h" #include <stdio.h> #include <sys/types.h> #ifndef NT diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c index 952a9f73c2..e144c5f082 100644 --- a/ext/tcltklib/tcltklib.c +++ b/ext/tcltklib/tcltklib.c @@ -5,7 +5,7 @@ */ #include "ruby.h" -#include "sig.h" +#include "rubysig.h" #include <stdio.h> #include <string.h> #include <tcl.h> @@ -11,7 +11,7 @@ ************************************************/ #include "ruby.h" -#include "io.h" +#include "rubyio.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -11,7 +11,7 @@ ************************************************/ #include "ruby.h" -#include "sig.h" +#include "rubysig.h" #include "st.h" #include "node.h" #include "env.h" @@ -12,7 +12,7 @@ #include "ruby.h" #include "st.h" -#include "sig.h" +#include "rubysig.h" #include <sys/types.h> #include <sys/stat.h> @@ -11,7 +11,7 @@ ************************************************/ #include "ruby.h" -#include "io.h" +#include "rubyio.h" #include <ctype.h> #include <errno.h> @@ -39,10 +39,6 @@ struct timeval { #include <sys/stat.h> -#if defined(DJGPP) || defined(__CYGWIN32__) || defined(NT) || defined(__human68k__) -#include <fcntl.h> -#endif - #ifdef HAVE_SYS_PARAM_H # include <sys/param.h> #else diff --git a/lib/cgi-lib.rb b/lib/cgi-lib.rb index 2407c6b388..362d13f8d0 100644 --- a/lib/cgi-lib.rb +++ b/lib/cgi-lib.rb @@ -60,7 +60,11 @@ class CGI < SimpleDelegator read_from_cmdline end.split(/&/).each do |x| key, val = x.split(/=/,2).collect{|x|unescape(x)} - @inputs[key] += ("\0" if @inputs[key]) + (val or "") + if @inputs.include?('key') + @inputs[key] += "\0" + (val or "") + else + @inputs[key] = (val or "") + end end super(@inputs) @@ -812,11 +812,11 @@ module TkGrid end def columnconfigure(master, index, *args) - tk_call "grid", 'columnconfigure', master, index, *hash_kv(keys) + tk_call "grid", 'columnconfigure', master, index, *hash_kv(args) end def rowconfigure(master, index, *args) - tk_call "grid", 'rowconfigure', master, index, *hash_kv(keys) + tk_call "grid", 'rowconfigure', master, index, *hash_kv(args) end def add(widget, *args) @@ -1301,10 +1301,10 @@ class TkMenu<TkWindow def index(index) tk_send 'index', index end - def invoke - tk_send 'invoke' + def invoke(index) + tk_send 'invoke', index end - def insert(index, type, *keys) + def insert(index, type, keys=nil) tk_send 'add', index, type, *hash_kv(keys) end def post(x, y) @@ -10,7 +10,7 @@ ************************************************/ #include "ruby.h" -#include "io.h" +#include "rubyio.h" #include "st.h" #define MARSHAL_MAJOR 4 @@ -529,10 +529,11 @@ mod_cmp(mod, arg) } VALUE -module_s_new() +module_s_new(klass) { VALUE mod = module_new(); + RBASIC(mod)->klass = klass; obj_call_init(mod); return mod; } @@ -561,6 +562,12 @@ class_s_new(argc, argv) return klass; } +static VALUE +class_s_inherited() +{ + TypeError("can't make subclass of Class"); +} + VALUE mod_name(); VALUE mod_included_modules(); VALUE mod_ancestors(); @@ -1039,6 +1046,7 @@ Init_Object() rb_define_singleton_method(cClass, "new", class_s_new, -1); rb_undef_method(cClass, "extend_object"); rb_undef_method(cClass, "append_features"); + rb_define_singleton_method(cClass, "inherited", class_s_inherited, 1); cData = rb_define_class("Data", cObject); rb_undef_method(CLASS_OF(cData), "new"); @@ -44,7 +44,7 @@ struct op_tbl { char *name; }; -NODE *eval_tree0 = 0; +NODE *eval_tree_begin = 0; NODE *eval_tree = 0; char *sourcefile; /* current source file */ @@ -354,7 +354,8 @@ stmt : iterator iter_do_block } '{' compstmt '}' { - eval_tree0 = block_append(eval_tree0,NEW_PREEXE($4)); + eval_tree_begin = block_append(eval_tree_begin, + NEW_PREEXE($4)); local_pop(); $$ = 0; } @@ -1596,6 +1597,7 @@ yycompile(f) { int n; + eval_tree = 0; newline_seen = 0; sourcefile = strdup(f); rb_in_compile = 1; @@ -11,7 +11,7 @@ ************************************************/ #include "ruby.h" -#include "sig.h" +#include "rubysig.h" #include <stdio.h> #include <errno.h> #include <signal.h> @@ -1,6 +1,6 @@ /************************************************ - io.h - + rubyio.h - $Author$ $Revision$ @@ -14,7 +14,7 @@ #ifndef IO_H #define IO_H -#include "sig.h" +#include "rubysig.h" #include <stdio.h> #include <errno.h> @@ -1,6 +1,6 @@ /************************************************ - sig.h - + rubysig.h - $Author$ $Date$ @@ -9,7 +9,7 @@ ************************************************/ #include "ruby.h" -#include "sig.h" +#include "rubysig.h" #include <signal.h> #include <stdio.h> @@ -136,11 +136,17 @@ make_struct(name, member, klass) ID id; int i; - id = rb_intern(RSTRING(name)->ptr); - if (!rb_is_const_id(id)) { - NameError("identifier %s needs to be constant", RSTRING(name)->ptr); + if (NIL_P(name)) { + nstr = class_new(klass); + } + else { + char *cname = STR2CSTR(name); + id = rb_intern(cname); + if (!rb_is_const_id(id)) { + NameError("identifier %s needs to be constant", cname); + } + nstr = rb_define_class_under(klass, cname, klass); } - nstr = rb_define_class_under(klass, RSTRING(name)->ptr, klass); rb_iv_set(nstr, "__size__", INT2FIX(RARRAY(member)->len)); rb_iv_set(nstr, "__member__", member); @@ -206,7 +212,6 @@ struct_s_def(argc, argv, klass) VALUE st; rb_scan_args(argc, argv, "1*", &name, &rest); - Check_Type(name, T_STRING); for (i=0; i<rest->len; i++) { ID id = rb_to_id(rest->ptr[i]); rest->ptr[i] = INT2FIX(id); @@ -93,6 +93,9 @@ int *retlen; #ifdef HAVE_UNISTD_H #include <unistd.h> #endif +#if defined(HAVE_FCNTL) +#include <fcntl.h> +#endif #ifndef S_ISDIR # define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR) diff --git a/variable.c b/variable.c index 7269ee1d87..7a827ed88b 100644 --- a/variable.c +++ b/variable.c @@ -211,8 +211,6 @@ rb_name_class(klass, id) VALUE klass; ID id; { - extern VALUE cString; - if (cString) { rb_iv_set(klass, "__classpath__", str_new2(rb_id2name(id))); } @@ -619,7 +617,6 @@ rb_gvar_set(entry, val) struct trace_data trace; if (rb_safe_level() >= 4) { - extern VALUE eSecurityError; Raise(eSecurityError, "cannot change global variable value"); } (*entry->setter)(val, entry->id, entry->data, entry); @@ -725,7 +722,6 @@ rb_ivar_set(obj, id, val) VALUE val; { if (rb_safe_level() >= 5) { - extern VALUE eSecurityError; Raise(eSecurityError, "cannot change object status"); } switch (TYPE(obj)) { |