This file contains patches that transform the baseline version into the amiga version. Assuming that you have unarchived the baseline version in the current directory, just run the command: patch -p1 -E -b .pbak * config/..., kaffevm/... - Merged in diffs for Amiga DOS. + Merged in diffs for AmigaOS. Thanks to Matthias Hopf * kaffevm/thread.c diff -rup --new-file baseline/contrib/kaffe/NOTES/POST amiga/contrib/kaffe/NOTES/POST --- baseline/contrib/kaffe/NOTES/POST Fri Aug 30 16:02:40 1996 +++ amiga/contrib/kaffe/NOTES/POST Sat Sep 28 00:00:00 1996 @@ -25,7 +25,7 @@ This version of Kaffe will run on the fo " NetBSD 1.x (interp) " NeXTStep 3 (interp) PowerPC MkLinux (interp) - M68k Amiga DOS (interp) + M68k AmigaOS (interp) I encourage people to make ports to other platforms and to feed them back to me. I would recommend that initial ports concentrate on the interpreter. diff -rup --new-file baseline/contrib/kaffe/NOTES/PUBLICITY amiga/contrib/kaffe/NOTES/PUBLICITY --- baseline/contrib/kaffe/NOTES/PUBLICITY Fri Aug 16 02:44:46 1996 +++ amiga/contrib/kaffe/NOTES/PUBLICITY Sat Sep 28 00:00:00 1996 @@ -21,7 +21,7 @@ Pentium processors (and similar), Sun's 68K. At the time of writing, only the Intel systems supports just-in-time compilation. There are also plans to produce MIPS. Various operating sytems are supported on the current systems, including Solaris, Linux -Window '95 and Amiga DOS. +Window '95 and AmigaOS. Kaffe and the Jolt Project ========================== diff -rup --new-file baseline/contrib/kaffe/Product-Info amiga/contrib/kaffe/Product-Info --- baseline/contrib/kaffe/Product-Info Wed Dec 31 17:00:00 1969 +++ amiga/contrib/kaffe/Product-Info Sat Sep 28 00:00:00 1996 @@ -0,0 +1,29 @@ +.name +kaffe +.fullname +Java bytecode virtual machine +.type +Programmer Tool +.short +Virtual machine to execute java bytecode +.description +This is Kaffe, a virtual machine design to execute Java bytecode. +This machine can be configured in two modes. In one mode it operates as +a pure bytecode interpreter (not unlike Javasoft's machine); in the second +mode if performs "just-in-time" code conversion from the abstract code to +the host machine's native code. This will ultimately allow execution of +Java code at the same speed as standard compiled code but while maintaining +the advantages and flexibility of code independence. +.version +0.5p4 +.author +Tim Wilkinson +.distribution +Freely Distributable +.email + +.described-by +Fred Fish (fnf@ninemoons.com) +.submittal +Submitted by Matthias Hopf +Primary ftp site is ftp://ftp.sarc.city.ac.uk/pub/kaffe diff -rup --new-file baseline/contrib/kaffe/README amiga/contrib/kaffe/README --- baseline/contrib/kaffe/README Thu Sep 5 00:53:02 1996 +++ amiga/contrib/kaffe/README Sat Sep 28 00:00:00 1996 @@ -12,7 +12,7 @@ the advantages and flexibility of code i What's new ========== - * Added port for m68k Amiga DOS. + * Added port for m68k AmigaOS. * Improved (hopefully) Windows'95 port. @@ -37,7 +37,7 @@ This version of Kaffe will run on the fo " NetBSD 1.x (interp) " NeXTStep 3 (interp) PowerPC MkLinux (interp) - M68k Amiga DOS (interp) + M68k AmigaOS (interp) Although the system is relatively portable, some machine and processor specific code is necessary. If operating in an interpreting mode, it diff -rup --new-file baseline/contrib/kaffe/README.amiga amiga/contrib/kaffe/README.amiga --- baseline/contrib/kaffe/README.amiga Wed Dec 31 17:00:00 1969 +++ amiga/contrib/kaffe/README.amiga Sat Sep 28 00:00:00 1996 @@ -0,0 +1,58 @@ +KAFFE v0.5p4 - A JIT and interpreting virtual machine to run Java(tm)* code +=========================================================================== +Written by Tim Wilkinson . +Ported to AmigaOS by Matthias Hopf + + + Notes about the AmigaOS port + ============================ + +The Amiga port has been done in a relatively straightforward way using the +ADE (Amiga Developer Environment). Thus to work properly it needs at least +version 44.0 of ixemul.library, available from any Aminet or ADE mirror. + +The needed Sun java classes are not included due to legal reasons. They are +available as a seperate archive, e.g. kaffe-0.5p4-sun.tgz. If you get an +'Exception thrown on null object' you probably do not have the Sun classes +included in your CLASSPATH (see below). + + +To set up kaffe, either do 'make install' in an ADE environment and set up +the environment variables as stated in the file ENVIRONMENT, or perform the +following steps: + +1) +2) assign Kaffe: +3) makedir Kaffe:bin Kaffe:lib +3) copy kaffe/kaffe kaffeh/kaffeh kaffe:bin/ +4) copy sun/classes.zip Kaffe: (available from the sun archive) +5) copy sun/javac.properties Kaffe:lib/ (-''-) +4) path kaffe:bin add (add this to s:User-Startup, too) +5) setenv CLASSPATH ".;Kaffe:.;Kaffe:classes.zip" (the same in envarc:) +6) setenv KAFFEHOME "Kaffe:." (-''-) +7) alias java kaffe (add this to s:Shell-Startup, too) +8) alias javac kaffe sun.tools.javac.Main (-''-) + + +Try 'kaffe HelloWorldApp' in the test/ directory. Guess what it does :-) + +Try 'javac HelloWorldApp.java' in the test/ directory. But be prepared +- the javac compiler class is relatively slow... + + +Some more notes: + +- The CLASSPATH specification is affected by your ixprefs settings. Do not + forget the trailing dot when specifying volumes (e.g. 'kaffe:.') or the + current directory! + +- java.net is not much tested, but it *should* work... + + +Enjoy + +Matthias Hopf + + +---- +* Java and Javasoft are registered trademark of Sun Microsystems, Inc. diff -rup --new-file baseline/contrib/kaffe/config/config-hacks.h amiga/contrib/kaffe/config/config-hacks.h --- baseline/contrib/kaffe/config/config-hacks.h Fri Aug 23 12:26:49 1996 +++ amiga/contrib/kaffe/config/config-hacks.h Sat Sep 28 00:00:00 1996 @@ -5,7 +5,7 @@ #endif /* Hack to configure AmigaOS */ -#if defined(__AMIGA__) +#if defined(__amigaos__) #define HAVE_DYN_UNDERSTORE 1 #endif diff -rup --new-file baseline/contrib/kaffe/config/m68k/amigados/md.c amiga/contrib/kaffe/config/m68k/amigados/md.c --- baseline/contrib/kaffe/config/m68k/amigados/md.c Wed Aug 14 15:13:51 1996 +++ amiga/contrib/kaffe/config/m68k/amigados/md.c Wed Dec 31 17:00:00 1969 @@ -1,16 +0,0 @@ -/* - * m68k/amigados/md.c - * AmigaOS specific functions. - * - * Copyright (c) 1996 Matthias Hopf - * - * Permission granted for Tim Wilkinson to include this source in his - * Kaffe system, Copyright (c) 1996 Systems Architecture Research Centre, - * City University, London, UK. - * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - */ - -/* #include "m68k/amigados/threads.c" */ - diff -rup --new-file baseline/contrib/kaffe/config/m68k/amigados/md.h amiga/contrib/kaffe/config/m68k/amigados/md.h --- baseline/contrib/kaffe/config/m68k/amigados/md.h Thu Aug 15 18:35:37 1996 +++ amiga/contrib/kaffe/config/m68k/amigados/md.h Wed Dec 31 17:00:00 1969 @@ -1,74 +0,0 @@ -/* - * m68k/amigados/md.h - * AmigaOS specific functions. - * - * Copyright (c) 1996 Matthias Hopf - * - * Permission granted for Tim Wilkinson to include this source in his - * Kaffe system, Copyright (c) 1996 Systems Architecture Research Centre, - * City University, London, UK. - * - * See the file "license.terms" for information on usage and redistribution - * of this file, and for a DISCLAIMER OF ALL WARRANTIES. - */ - -#ifndef __m68k_amigados_md_h -#define __m68k_amigados_md_h - - -#include /* don't change! */ -struct timerequest; /* Hack!! needed to get files including md.h *and* sys/time.h before working. */ -#define DEVICES_TIMER_H 1 /* devices/timer.h (included from exec/exec.h) is broken due to an other struct timeval definition. */ - -#ifdef IMPORT /* Hack!! needed to get rid of IMPORT redefined warnings */ -# define _AMIGA_IMPORT IMPORT -# undef IMPORT -#endif - -#include - -#include -#include - -/* #include "m68k/amigados/threads.h" */ - -#include "m68k/threads.h" - -#undef THREADINFO -/* we should use StackSwap instead of native code, but that would be too complicated and extra overhead... */ -#define THREADINFO(ee) \ - do { \ - int stacksize; \ - M68K_THREADINFO (ee); \ - (ee)->stackBase = FindTask(NULL)->tc_SPLower; /* not NULL on Amiga!!! This is the absolute minimum stack base of this task! */ \ - stacksize = (ee)->stackEnd - (ee)->stackBase; \ - if (stacksize < threadStackSize) \ - { \ - fprintf (stderr, "stack size too low - stack left (%d) < stack needed (%d)\n", stacksize, threadStackSize); \ - exit (20); \ - } \ - } while (0) - -#undef THREADSWITCH -/* we *should* surround this with Forbid()/Permit() (Task struct stack consistency), but overhead is too high. */ -#define THREADSWITCH(to, from) \ - do { \ - struct Task *task; /* perhaps this should be saved in ctx */ \ - task = FindTask (NULL); /* write stack information into system structures */ \ - task->tc_SPLower = (to)->stackBase; \ - task->tc_SPUpper = (to)->stackEnd; \ -DBG( printf ("setting task stack info from %x to %x\n", (to)->stackBase, (to)->stackEnd); ) \ - M68K_THREADSWITCH(to, from); \ - } while (0) - -#if defined(TRANSLATOR) -#include "m68k/jit-md.h" -#endif - -#undef IMPORT -#ifdef _AMIGA_IMPORT -# define IMPORT _AMIGA_IMPORT -# undef _AMIGA_IMPORT -#endif - -#endif diff -rup --new-file baseline/contrib/kaffe/config/m68k/amigaos/md.c amiga/contrib/kaffe/config/m68k/amigaos/md.c --- baseline/contrib/kaffe/config/m68k/amigaos/md.c Wed Dec 31 17:00:00 1969 +++ amiga/contrib/kaffe/config/m68k/amigaos/md.c Sat Sep 28 00:00:00 1996 @@ -0,0 +1,21 @@ +/* + * m68k/amigaos/md.c + * AmigaOS specific functions. + * + * Copyright (c) 1996 Matthias Hopf + * + * Permission granted for Tim Wilkinson to include this source in his + * Kaffe system, Copyright (c) 1996 Systems Architecture Research Centre, + * City University, London, UK. + * + * See the file "license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + */ + +/* #include "m68k/amigaos/threads.c" */ + + +#include + +struct Task *AmigaThisTask = NULL; + diff -rup --new-file baseline/contrib/kaffe/config/m68k/amigaos/md.h amiga/contrib/kaffe/config/m68k/amigaos/md.h --- baseline/contrib/kaffe/config/m68k/amigaos/md.h Wed Dec 31 17:00:00 1969 +++ amiga/contrib/kaffe/config/m68k/amigaos/md.h Sat Sep 28 00:00:00 1996 @@ -0,0 +1,77 @@ +/* + * m68k/amigaos/md.h + * AmigaOS specific functions. + * + * Copyright (c) 1996 Matthias Hopf + * + * Permission granted for Tim Wilkinson to include this source in his + * Kaffe system, Copyright (c) 1996 Systems Architecture Research Centre, + * City University, London, UK. + * + * See the file "license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. + */ + +#ifndef __m68k_amigaos_md_h +#define __m68k_amigaos_md_h + + +#include /* don't change! */ +struct timerequest; /* Hack!! needed to get files including md.h *and* sys/time.h before working. */ +#define DEVICES_TIMER_H 1 /* devices/timer.h (included from exec/exec.h) is broken due to an other struct timeval definition. */ + +#ifdef IMPORT /* Hack!! needed to get rid of IMPORT redefined warnings */ +# define _AMIGA_IMPORT IMPORT +# undef IMPORT +#endif + +#include + +#include +#include + +/* #include "m68k/amigaos/threads.h" */ + +#include "m68k/threads.h" + + +extern struct Task *AmigaThisTask; + + +#undef THREADINFO +#define THREADINFO(ee) \ + do { \ + AmigaThisTask = FindTask (NULL); \ + M68K_THREADINFO (ee); \ + if ((uint8 *) AmigaThisTask->tc_SPLower > (ee)->stackBase) \ + { \ + fprintf (stderr, "stack size too low - stack left: %ld, stack needed: %ld\n", \ + (ee)->stackEnd - (uint8 *) AmigaThisTask->tc_SPLower, threadStackSize); \ + exit (20); \ + } \ + } while (0) + +#undef THREADSWITCH +/* we should use StackSwap instead of native code, but that would be too + * complicated and extra overhead... + * we *should* surround this with Forbid()/Permit() (Task struct stack + * consistency), but overhead is too high. */ +#define THREADSWITCH(to, from) \ + do { \ + AmigaThisTask->tc_SPLower = (to)->stackBase; \ + AmigaThisTask->tc_SPUpper = (to)->stackEnd; \ +DBG( printf ("setting task stack info from %x to %x\n", (to)->stackBase, (to)->stackEnd); ) \ + M68K_THREADSWITCH(to, from); \ + } while (0) + +#if defined(TRANSLATOR) +#include "m68k/jit-md.h" +#endif + +#undef IMPORT +#ifdef _AMIGA_IMPORT +# define IMPORT _AMIGA_IMPORT +# undef _AMIGA_IMPORT +#endif + +#endif diff -rup --new-file baseline/contrib/kaffe/config/m68k/threads.h amiga/contrib/kaffe/config/m68k/threads.h --- baseline/contrib/kaffe/config/m68k/threads.h Thu Aug 15 09:47:33 1996 +++ amiga/contrib/kaffe/config/m68k/threads.h Sat Sep 28 00:00:00 1996 @@ -23,15 +23,11 @@ /* * Stack of waiting thread: - * + 64... Thread stack - * + 60 pc (return address) - * + 56 a6 - * + 52 a5 (frame pointer) (52=13*4) - * ... - * + 32 a0 - * ... - * + 4 d0 - * SPReg + 0 d0 + * + 12 pc (return address) + * + 8 a4 () + * + 4 a5 (frame pointer) + * + 0 a6 + * remaining registers are scratched. */ #define USE_INTERNAL_THREADS @@ -41,22 +37,27 @@ #define M68K_THREADSWITCH(to, from) \ asm(" \ pea 1f \n\ - movem.l d0-d7/a0-a6, -(a7) \n\ + move.l a4, -(a7) \n\ + move.l a5, -(a7) \n\ + move.l a6, -(a7) \n\ move.l a7, (%0) \n\ move.l %1, a7 \n\ - movem.l (a7)+,d0-d7/a0-a6 \n\ + move.l (a7)+,a6 \n\ + move.l (a7)+,a5 \n\ + move.l (a7)+,a4 \n\ rts \n\ 1: nop " \ - : : "a" (& from->restorePoint), "a" (to->restorePoint)) + : : "a" (& from->restorePoint), "a" (to->restorePoint) : "cc","memory", \ + "d0","d1","d2","d3","d4","d5","d6","d7","a0","a1","a2","a3") #define M68K_THREADINIT(to, func) \ asm(" \ moveq #0, d0 \n\ - moveq #14, d1 \n\ move.l %2, -(%0) \n\ - 1: move.l d0, -(%0) \n\ - dbf d1, 1b " \ - : "=a" (to->restorePoint) : "0" (to->stackEnd), "g" (func) : "d0", "d1") + move.l d0, -(%0) \n\ + move.l d0, -(%0) \n\ + move.l d0, -(%0) " \ + : "=a" (to->restorePoint) : "0" (to->stackEnd), "g" (func) : "d0", "cc") #define M68K_THREADINFO(ee) \ do { \ @@ -67,8 +68,9 @@ ptr = (void**)*ptr; \ } \ (ee)->restorePoint = 0; \ - (ee)->stackBase = NULL; \ (ee)->stackEnd = (void*)ptr; \ + (ee)->stackBase = (ee)->stackEnd - threadStackSize;\ + (ee)->flags = THREAD_FLAGS_NOSTACKALLOC;\ } while(0) #define M68K_THREADFRAMES(tid, cnt) \ @@ -79,7 +81,7 @@ asm("move.l a5,%0" : "=r" (ptr));\ } \ else { \ - ptr = ((void***)tid->PrivateInfo->restorePoint)[13];\ + ptr = ((void***)tid->PrivateInfo->restorePoint)[1];\ } \ while (*ptr != 0) { \ cnt++; \ diff -rup --new-file baseline/contrib/kaffe/config.sub amiga/contrib/kaffe/config.sub --- baseline/contrib/kaffe/config.sub Tue Jun 18 08:28:36 1996 +++ amiga/contrib/kaffe/config.sub Sat Sep 28 00:00:00 1996 @@ -176,11 +176,11 @@ case $basic_machine in os=-sysv ;; amiga | amiga-*) - basic_machine=m68k-cbm + basic_machine=m68k-unknown ;; - amigados) - basic_machine=m68k-cbm - os=-amigados + amigaos) + basic_machine=m68k-unknown + os=-amigaos ;; amigaunix | amix) basic_machine=m68k-cbm @@ -635,7 +635,7 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \ + | -amigaos* | -msdos* | -newsos* | -unicos* | -aos* \ | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \ | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \ @@ -761,7 +761,7 @@ case $basic_machine in os=-sysv ;; *-cbm) - os=-amigados + os=-sysv4 ;; *-dg) os=-dgux diff -rup --new-file baseline/contrib/kaffe/configure amiga/contrib/kaffe/configure --- baseline/contrib/kaffe/configure Thu Sep 5 00:59:55 1996 +++ amiga/contrib/kaffe/configure Thu Oct 3 11:31:35 1996 @@ -48,6 +48,9 @@ libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' infodir='${prefix}/info' +guidedir='${prefix}/guide' +psdir='${prefix}/ps' +dvidir='${prefix}/dvi' mandir='${prefix}/man' # Initialize some other variables. @@ -162,6 +165,9 @@ Directory and file names: --includedir=DIR C header files in DIR [PREFIX/include] --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] --infodir=DIR info documentation in DIR [PREFIX/info] + --guidedir=DIR Amigaguide documentation in DIR [PREFIX/guide] + --psdir=DIR postscript documentation in DIR [PREFIX/ps] + --dvidir=DIR TeX dvi documentation in DIR [PREFIX/dvi] --mandir=DIR man documentation in DIR [PREFIX/man] --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names @@ -204,6 +210,18 @@ EOF -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) infodir="$ac_optarg" ;; + -guidedir | --guidedir | --guidedi | --guided | --guide | --gui) + ac_prev=guidedir ;; + -guidedir=* | --guidedir=* | --guidedi=* | --guided=* | --guide=* |--gui=*)+ guidedir="$ac_optarg" ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)+ psdir="$ac_optarg" ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* |--dv=*)+ dvidir="$ac_optarg" ;; + -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) @@ -697,9 +715,10 @@ powerpc-linux*) NOSHAREDLIBS="-L../lib/native -L../lib/net -lkaffe_native -lkaffe_net" ;; -m68k-amigados*) +m68k-amigaos*) host_cpu=m68k - host_os=amigados + host_os=amigaos + CFLAGS="-g -O2 -fno-omit-frame-pointer" KAFFEVMFLAGS=-DNO_SHARED_LIBRARIES NOSHAREDLIBS="-L../lib/native -L../lib/net -lkaffe_native -lkaffe_net" VPATHSEP=" " @@ -873,7 +892,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:877: \"$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:896: \"$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 @@ -900,9 +919,9 @@ fi echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 if test $ac_cv_prog_gcc_g = yes; then - CFLAGS="-g -O" + CFLAGS="-g -O2" else - CFLAGS="-O" + CFLAGS="-O2" fi fi else @@ -937,6 +956,7 @@ fi # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /c/install # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. @@ -949,7 +969,7 @@ else for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; + /|./|.//|/etc/*|/c/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. for ac_prog in ginstall installbsd scoinst install; do @@ -1015,7 +1035,60 @@ else SET_MAKE="MAKE=${MAKE-make}" fi -# Extract the first word of "ranlib", so it can be a program name with args. +echo $ac_n "checking build system type""... $ac_c" 1>&6 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +build=`$ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + +if test $host != $build; then + ac_tool_prefix=${host_alias}- +else + ac_tool_prefix= +fi + +# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +if test -z "$ac_cv_prog_RANLIB"; then +if test -n "$ac_tool_prefix"; then + # 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 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then @@ -1043,8 +1116,13 @@ else echo "$ac_t""no" 1>&6 fi -# Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 +else + RANLIB=":" +fi +fi + +# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. +set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1056,11 +1134,12 @@ else for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="ar cr" + ac_cv_prog_AR="${ac_tool_prefix}ar" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" fi fi AR="$ac_cv_prog_AR" @@ -1072,6 +1151,8 @@ fi + + # If we cannot run a trivial program, we must be cross compiling. echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then @@ -1081,11 +1162,11 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_cross=no else @@ -1106,7 +1187,7 @@ else ac_cv_sizeof_short=0 else cat > conftest.$ac_ext < main() @@ -1117,7 +1198,7 @@ main() exit(0); } EOF -{ (eval echo configure:1121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_short=`cat conftestval` else @@ -1140,7 +1221,7 @@ else ac_cv_sizeof_int=0 else cat > conftest.$ac_ext < main() @@ -1151,7 +1232,7 @@ main() exit(0); } EOF -{ (eval echo configure:1155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_int=`cat conftestval` else @@ -1174,7 +1255,7 @@ else ac_cv_sizeof_long=0 else cat > conftest.$ac_ext < main() @@ -1185,7 +1266,7 @@ main() exit(0); } EOF -{ (eval echo configure:1189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_long=`cat conftestval` else @@ -1208,7 +1289,7 @@ else ac_cv_sizeof_long_long=0 else cat > conftest.$ac_ext < main() @@ -1219,7 +1300,7 @@ main() exit(0); } EOF -{ (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_long_long=`cat conftestval` else @@ -1242,7 +1323,7 @@ else ac_cv_sizeof___int64=0 else cat > conftest.$ac_ext < main() @@ -1253,7 +1334,7 @@ main() exit(0); } EOF -{ (eval echo configure:1257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof___int64=`cat conftestval` else @@ -1276,7 +1357,7 @@ else ac_cv_sizeof_voidp=0 else cat > conftest.$ac_ext < main() @@ -1287,7 +1368,7 @@ main() exit(0); } EOF -{ (eval echo configure:1291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_sizeof_voidp=`cat conftestval` else @@ -1311,19 +1392,19 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1336,7 +1417,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` cat >> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1380,7 +1461,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo dl | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` cat >> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1424,7 +1505,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo dld | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo dld | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` cat >> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1468,7 +1549,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo socket | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo socket | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` cat >> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1512,7 +1593,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo nsl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo nsl | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` cat >> confdefs.h < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1556,7 +1637,7 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo m | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + ac_tr_lib=HAVE_LIB`echo m | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` cat >> confdefs.h < conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1598,13 +1679,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1629,7 +1710,7 @@ if eval "test \"`echo '$''{'ac_cv_header echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1637,7 +1718,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1652,7 +1733,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 @@ -1670,7 +1751,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 @@ -1691,7 +1772,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1702,7 +1783,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -{ (eval echo configure:1706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:1787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then : else @@ -1729,12 +1810,12 @@ if eval "test \"`echo '$''{'ac_cv_header echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1767,7 +1848,7 @@ if eval "test \"`echo '$''{'ac_cv_header echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -1776,7 +1857,7 @@ int t() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1807,19 +1888,19 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1846,19 +1927,19 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:1943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1884,7 +1965,7 @@ if eval "test \"`echo '$''{'ac_cv_header echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1894,7 +1975,7 @@ int t() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1979: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1918,7 +1999,7 @@ if eval "test \"`echo '$''{'ac_cv_struct echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1927,7 +2008,7 @@ int t() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:1931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -1951,7 +2032,7 @@ if eval "test \"`echo '$''{'ac_cv_struct echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -1960,7 +2041,7 @@ int t() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:1964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -1983,18 +2064,18 @@ if eval "test \"`echo '$''{'ac_cv_var_tz echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ extern char *tzname[]; /* RS6000 and others reject char **tzname. */ #endif -int main() { return 0; } +int main() { t(); return 0; } int t() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:1998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -2021,7 +2102,7 @@ else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -2033,11 +2114,11 @@ int t() { #endif ; return 0; } EOF -if { (eval echo configure:2037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2118: \"$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 < #include @@ -2049,7 +2130,7 @@ int t() { #endif ; return 0; } EOF -if { (eval echo configure:2053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2066,7 +2147,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 <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_c_bigendian=no else @@ -2104,7 +2185,7 @@ if eval "test \"`echo '$''{'ac_cv_type_s echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2122,7 +2203,7 @@ int t() { int i; ; return 0; } EOF -if { (eval echo configure:2126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2148,19 +2229,19 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2183,7 +2264,7 @@ if eval "test \"`echo '$''{'ac_cv_func_s echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -2234,7 +2315,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2287,7 +2368,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2340,7 +2421,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2393,7 +2474,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2446,7 +2527,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2499,7 +2580,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2552,7 +2633,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; }; then +if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2608,13 +2689,13 @@ if test "$cross_compiling" = yes; then ac_cv_underscore=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } +{ (eval echo configure:2699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } if test -s conftest && (./conftest; exit) 2>/dev/null; then ac_cv_underscore=yes else @@ -2699,7 +2780,9 @@ DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS +# Some systems, like AmigaOS, won't allow you to remove a script that is +# being executed, so just move it out of the way instead. +if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi cat > $CONFIG_STATUS <