home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
m4-1.4-diffs.gz
/
m4-1.4-diffs
Wrap
Text File
|
1996-10-13
|
73KB
|
2,290 lines
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 <diff-file
where 'diff-file' is this patch file. After running patch you should
remove all the generated *.pbak files, and look for any *.rej files
that indicate a problem patching the baseline source.
diff -rup --new-file baseline/fsf/m4/INSTALL amiga/fsf/m4/INSTALL
--- baseline/fsf/m4/INSTALL Tue Oct 18 13:30:28 1994
+++ amiga/fsf/m4/INSTALL Sat Sep 28 00:00:00 1996
@@ -76,8 +76,8 @@ Installation Names
==================
By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
+`/gnu/bin', `/gnu/man', etc. You can specify an
+installation prefix other than `/gnu' by giving `configure' the
option `--prefix=PATH'.
You can specify separate installation prefixes for
diff -rup --new-file baseline/fsf/m4/Makefile.in amiga/fsf/m4/Makefile.in
--- baseline/fsf/m4/Makefile.in Sat Nov 5 16:19:53 1994
+++ amiga/fsf/m4/Makefile.in Sat Sep 28 00:00:00 1996
@@ -42,10 +42,11 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
infodir = $(prefix)/info
+guidedir = @guidedir@
MDEFINES = CC='$(CC)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' LIBS='$(LIBS)' \
prefix='$(prefix)' exec_prefix='$(exec_prefix)' \
-bindir='$(bindir)' infodir='$(infodir)'
+bindir='$(bindir)' infodir='$(infodir)' guidedir='$(guidedir)'
SUBDIRS = doc lib src checks examples
@@ -61,7 +62,7 @@ all install uninstall: config.h
(cd $$subdir && $(MAKE) $(MDEFINES) $@) || exit 1; \
done
-info dvi:
+info guide dvi:
cd doc && $(MAKE) $@
check: all
diff -rup --new-file baseline/fsf/m4/Product-Info amiga/fsf/m4/Product-Info
--- baseline/fsf/m4/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/m4/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,22 @@
+.name
+m4
+.fullname
+GNU macro processor
+.type
+Programmer Tool
+.short
+GNU macro processor
+.description
+This is GNU m4, a program which copies its input to the output,
+expanding macros as it goes. m4 has built-in functions for including
+named files, running Unix commands, doing integer arithmetic,
+manipulating text in various ways, recursion, etc... Macros can also
+be user-defined, and can take any number of arguments.
+.version
+1.4
+.author
+Rene' Seindal
+.distribution
+GNU Public License
+.described-by
+Fred Fish (fnf@amigalib.com)
diff -rup --new-file baseline/fsf/m4/configure amiga/fsf/m4/configure
--- baseline/fsf/m4/configure Sat Nov 5 20:44:17 1994
+++ amiga/fsf/m4/configure Mon Sep 30 22:47:20 1996
@@ -1,8 +1,8 @@
-#!/bin/sh
+#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.1
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+# Generated automatically using autoconf version 2.10
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -38,9 +38,25 @@ target=NONE
verbose=
x_includes=NONE
x_libraries=NONE
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+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.
subdirs=
+MFLAGS= MAKEFLAGS=
ac_prev=
for ac_option
@@ -62,9 +78,14 @@ do
case "$ac_option" in
- -build | --build | --buil | --bui | --bu | --b)
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir="$ac_optarg" ;;
+
+ -build | --build | --buil | --bui | --bu)
ac_prev=build ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
build="$ac_optarg" ;;
-cache-file | --cache-file | --cache-fil | --cache-fi \
@@ -74,6 +95,12 @@ do
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
cache_file="$ac_optarg" ;;
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
+ datadir="$ac_optarg" ;;
+
-disable-* | --disable-*)
ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
# Reject names that are not valid shell variable names.
@@ -124,12 +151,32 @@ Configuration:
Directory and file names:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
- --exec-prefix=PREFIX install architecture-dependent files in PREFIX
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[same as prefix]
+ --bindir=DIR user executables in DIR [EPREFIX/bin]
+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data in DIR
+ [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data in DIR
+ [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
+ --libdir=DIR object code libraries in DIR [EPREFIX/lib]
+ --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
--program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+ --program-transform-name=PROGRAM
+ run sed PROGRAM on installed program names
+EOF
+ cat << EOF
Host type:
--build=BUILD configure for building on BUILD [BUILD=HOST]
--host=HOST configure for HOST [guessed]
@@ -141,8 +188,10 @@ Features and packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--x-includes=DIR X include files are in DIR
--x-libraries=DIR X library files are in DIR
---enable and --with options recognized:$ac_help
EOF
+ if test -n "$ac_help"; then
+ echo "--enable and --with options recognized:$ac_help"
+ fi
exit 0 ;;
-host | --host | --hos | --ho)
@@ -150,6 +199,56 @@ EOF
-host=* | --host=* | --hos=* | --ho=*)
host="$ac_optarg" ;;
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir="$ac_optarg" ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -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=*)
+ libdir="$ac_optarg" ;;
+
+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+ | --libexe | --libex | --libe)
+ ac_prev=libexecdir ;;
+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir="$ac_optarg" ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ localstatedir="$ac_optarg" ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir="$ac_optarg" ;;
+
-nfp | --nfp | --nf)
# Obsolete; use --without-fp.
with_fp=no ;;
@@ -162,6 +261,15 @@ EOF
| --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
no_recursion=yes ;;
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir="$ac_optarg" ;;
+
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
@@ -202,6 +310,23 @@ EOF
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir="$ac_optarg" ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir="$ac_optarg" ;;
+
-site | --site | --sit)
ac_prev=site ;;
-site=* | --site=* | --sit=*)
@@ -212,6 +337,13 @@ EOF
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
srcdir="$ac_optarg" ;;
+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+ | --syscon | --sysco | --sysc | --sys | --sy)
+ ac_prev=sysconfdir ;;
+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+ sysconfdir="$ac_optarg" ;;
+
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
@@ -221,7 +353,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.1"
+ echo "configure generated by autoconf version 2.10"
exit 0 ;;
-with-* | --with-*)
@@ -267,7 +399,7 @@ EOF
-*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
;;
- *)
+ *)
if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
echo "configure: warning: $ac_option: invalid host type" 1>&2
fi
@@ -284,19 +416,20 @@ if test -n "$ac_prev"; then
{ echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
fi
-trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
# File descriptor usage:
-# 0 unused; standard input
+# 0 standard input
# 1 file creation
# 2 errors and warnings
-# 3 unused; some systems may open it to /dev/tty
-# 4 checking for... messages and results
+# 3 some systems may open it to /dev/tty
+# 4 used on the Kubota Titan
+# 6 checking for... messages and results
# 5 compiler messages saved in config.log
if test "$silent" = yes; then
- exec 4>/dev/null
+ exec 6>/dev/null
else
- exec 4>&1
+ exec 6>&1
fi
exec 5>./config.log
@@ -386,8 +519,8 @@ fi
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&5 2>&5'
-ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&5 2>&5'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
@@ -406,8 +539,10 @@ fi
if test "$program_transform_name" = s,x,x,; then
program_transform_name=
else
- # Double any \ or $.
- echo 's,\\,\\\\,g; s,\$,$$,g' > conftestsed
+ # Double any \ or $. echo might interpret backslashes.
+ cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
rm -f conftestsed
fi
@@ -438,9 +573,9 @@ for ac_prog in mawk gawk nawk awk
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>&4
-if eval "test \"`echo '${'ac_cv_prog_AWK'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$AWK"; then
ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -458,9 +593,9 @@ fi
fi
AWK="$ac_cv_prog_AWK"
if test -n "$AWK"; then
- echo "$ac_t""$AWK" 1>&4
+ echo "$ac_t""$AWK" 1>&6
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
test -n "$AWK" && break
@@ -468,9 +603,9 @@ done
# 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>&4
-if eval "test \"`echo '${'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -484,39 +619,88 @@ else
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
fi
fi
CC="$ac_cv_prog_CC"
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&4
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+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
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ ac_prog_rejected=no
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# -gt 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ set dummy "$ac_dir/$ac_word" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:691: \"$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
fi
fi
-echo "$ac_t""$ac_cv_prog_gcc" 1>&4
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
if test $ac_cv_prog_gcc = yes; then
GCC=yes
if test "${CFLAGS+set}" != set; then
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_prog_gcc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -527,11 +711,12 @@ fi
rm -f conftest*
fi
- echo "$ac_t""$ac_cv_prog_gcc_g" 1>&4
+
+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
@@ -565,18 +750,20 @@ ac_configure=$ac_aux_dir/configure # Thi
# 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.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&4
+echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
if test -z "$INSTALL"; then
-if eval "test \"`echo '${'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
- case "$ac_dir" in
- ''|.|/etc|/usr/sbin|/usr/etc|/sbin|/usr/afsws/bin|/usr/ucb) ;;
+ # Account for people who put trailing slashes in PATH elements.
+ case "$ac_dir/" in
+ /|./|.//|/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
@@ -596,12 +783,19 @@ else
esac
done
IFS="$ac_save_ifs"
- # As a last resort, use the slow shell script.
- test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"
+
fi
- INSTALL="$ac_cv_path_install"
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL="$ac_cv_path_install"
+ else
+ # As a last resort, use the slow shell script. We don't cache a
+ # path for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the path is relative.
+ INSTALL="$ac_install_sh"
+ fi
fi
-echo "$ac_t""$INSTALL" 1>&4
+echo "$ac_t""$INSTALL" 1>&6
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
@@ -609,10 +803,10 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-echo $ac_n "checking whether ${MAKE-make} sets \$MAKE""... $ac_c" 1>&4
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
set dummy ${MAKE-make}; ac_make=$2
-if eval "test \"`echo '${'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftestmake <<\EOF
all:
@@ -628,18 +822,18 @@ fi
rm -f conftestmake
fi
if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
SET_MAKE=
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
SET_MAKE="MAKE=${MAKE-make}"
fi
# 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>&4
-if eval "test \"`echo '${'ac_cv_prog_RANLIB'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+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.
@@ -658,20 +852,20 @@ fi
fi
RANLIB="$ac_cv_prog_RANLIB"
if test -n "$RANLIB"; then
- echo "$ac_t""$RANLIB" 1>&4
+ echo "$ac_t""$RANLIB" 1>&6
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&4
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
-if eval "test \"`echo '${'ac_cv_prog_CPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
# This must be in double quotes, not single quotes, because CPP may get
# substituted into the Makefile and "${CC-cc}" will confuse make.
@@ -679,12 +873,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 683 "configure"
+#line 877 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -693,12 +888,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 697 "configure"
+#line 892 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -712,13 +908,15 @@ fi
rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
+ CPP="$ac_cv_prog_CPP"
+else
+ ac_cv_prog_CPP="$CPP"
fi
-CPP="$ac_cv_prog_CPP"
-echo "$ac_t""$CPP" 1>&4
+echo "$ac_t""$CPP" 1>&6
-echo $ac_n "checking for AIX""... $ac_c" 1>&4
+echo $ac_n "checking for AIX""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 722 "configure"
+#line 920 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -728,22 +926,22 @@ EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
- echo "$ac_t""yes" 1>&4; cat >> confdefs.h <<\EOF
+ echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define _ALL_SOURCE 1
EOF
else
rm -rf conftest*
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
rm -f conftest*
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&4
+echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
if test -d /etc/conf/kconfig.d &&
grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
ISC=yes # If later tests want to check for ISC.
cat >> confdefs.h <<\EOF
#define _POSIX_SOURCE 1
@@ -755,21 +953,22 @@ EOF
CC="$CC -Xp"
fi
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
ISC=
fi
ac_safe=`echo "minix/config.h" | tr './\055' '___'`
-echo $ac_n "checking for minix/config.h""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
+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 769 "configure"
+#line 967 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -782,10 +981,10 @@ fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
MINIX=yes
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
MINIX=
fi
@@ -804,9 +1003,9 @@ EOF
fi
-echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_prog_cc_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_prog_cc_stdc=no
ac_save_CFLAGS="$CFLAGS"
@@ -820,7 +1019,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-
do
CFLAGS="$ac_save_CFLAGS $ac_arg"
cat > conftest.$ac_ext <<EOF
-#line 824 "configure"
+#line 1023 "configure"
#include "confdefs.h"
#if !defined(__STDC__) || __STDC__ != 1
choke me
@@ -833,7 +1032,7 @@ struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_prog_cc_stdc="$ac_arg"; break
fi
@@ -844,32 +1043,32 @@ CFLAGS="$ac_save_CFLAGS"
fi
-echo "$ac_t""$ac_cv_prog_cc_stdc" 1>&4
+echo "$ac_t""$ac_cv_prog_cc_stdc" 1>&6
case "x$ac_cv_prog_cc_stdc" in
x|xno) ;;
*) CC="$CC $ac_cv_prog_cc_stdc" ;;
esac
-echo $ac_n "checking for function prototypes""... $ac_c" 1>&4
+echo $ac_n "checking for function prototypes""... $ac_c" 1>&6
if test "$ac_cv_prog_cc_stdc" != no; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define PROTOTYPES 1
EOF
U= ANSI2KNR=
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
U=_ ANSI2KNR=ansi2knr
fi
-echo $ac_n "checking for working const""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_c_const'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 873 "configure"
+#line 1072 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -882,7 +1081,7 @@ char const *const *ccp;
char **p;
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
-static struct point const zero;
+static struct point const zero = {0,0};
/* AIX XL C 1.02.0.0 rejects this.
It does not let you subtract one const X* pointer from another in an arm
of an if-expression whose if-part is not a constant expression */
@@ -919,7 +1118,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -929,7 +1128,8 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_c_const" 1>&4
+
+echo "$ac_t""$ac_cv_c_const" 1>&6
if test $ac_cv_c_const = no; then
cat >> confdefs.h <<\EOF
#define const
@@ -941,16 +1141,17 @@ fi
for ac_hdr in limits.h memory.h siginfo.h string.h unistd.h
do
ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+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 950 "configure"
+#line 1150 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -963,31 +1164,31 @@ fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
+ echo "$ac_t""yes" 1>&6
+ ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
done
# If we cannot run a trivial program, we must be cross compiling.
-echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_c_cross'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
- ac_cv_cross=yes
+ ac_cv_c_cross=yes
else
cat > conftest.$ac_ext <<EOF
-#line 987 "configure"
+#line 1188 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-eval $ac_link
+{ (eval echo configure:1192: \"$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
@@ -996,22 +1197,24 @@ fi
fi
rm -fr conftest*
fi
+
+echo "$ac_t""$ac_cv_c_cross" 1>&6
cross_compiling=$ac_cv_c_cross
-echo "$ac_t""$ac_cv_c_cross" 1>&4
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+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 1008 "configure"
+#line 1210 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <float.h>
EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1026,7 +1229,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 1030 "configure"
+#line 1233 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1044,7 +1247,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 1048 "configure"
+#line 1251 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1062,10 +1265,10 @@ fi
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
if test "$cross_compiling" = yes; then
- ac_cv_header_stdc=no
+ :
else
cat > conftest.$ac_ext <<EOF
-#line 1069 "configure"
+#line 1272 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1076,7 +1279,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-eval $ac_link
+{ (eval echo configure:1283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
@@ -1086,7 +1289,8 @@ fi
rm -fr conftest*
fi
fi
-echo "$ac_t""$ac_cv_header_stdc" 1>&4
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
if test $ac_cv_header_stdc = yes; then
cat >> confdefs.h <<\EOF
#define STDC_HEADERS 1
@@ -1094,25 +1298,30 @@ EOF
fi
-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_type_signal'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+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 1103 "configure"
+#line 1307 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
#ifdef signal
#undef signal
#endif
-extern void (*signal ()) ();
+#ifdef __cplusplus
+extern "C" void (*signal (int, void (*)(int)))(int);
+#else
+void (*signal ()) ();
+#endif
+
int main() { return 0; }
int t() {
int i;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -1122,18 +1331,19 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_type_signal" 1>&4
+
+echo "$ac_t""$ac_cv_type_signal" 1>&6
cat >> confdefs.h <<EOF
#define RETSIGTYPE $ac_cv_type_signal
EOF
-echo $ac_n "checking for size_t""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+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 1137 "configure"
+#line 1347 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1151,7 +1361,7 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&4
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
if test $ac_cv_type_size_t = no; then
cat >> confdefs.h <<\EOF
#define size_t unsigned
@@ -1162,18 +1372,22 @@ fi
for ac_func in mkstemp sigaction sigaltstack sigstack sigvec strerror tmpfile
do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+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 1171 "configure"
+#line 1381 "configure"
#include "confdefs.h"
-#include <ctype.h> /* Arbitrary system header to define __stub macros. */
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1187,7 +1401,7 @@ $ac_func();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1198,33 +1412,33 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
done
# 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>&4
-if eval "test \"`echo '${'ac_cv_header_alloca_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
+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 1220 "configure"
+#line 1434 "configure"
#include "confdefs.h"
#include <alloca.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -1234,7 +1448,8 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&4
+
+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
if test $ac_cv_header_alloca_h = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_ALLOCA_H 1
@@ -1242,12 +1457,12 @@ EOF
fi
-echo $ac_n "checking for alloca""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_alloca'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for alloca""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1251 "configure"
+#line 1466 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -1266,12 +1481,12 @@ char *alloca ();
# endif
#endif
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_func_alloca=yes
else
@@ -1281,7 +1496,8 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_func_alloca" 1>&4
+
+echo "$ac_t""$ac_cv_func_alloca" 1>&6
if test $ac_cv_func_alloca = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_ALLOCA 1
@@ -1300,12 +1516,12 @@ if test $ac_cv_func_alloca = no; then
EOF
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_os_cray'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
+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 1309 "configure"
+#line 1525 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1325,154 +1541,72 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_os_cray" 1>&4
-if test $ac_cv_os_cray = yes; then
-echo $ac_n "checking for _getb67""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func__getb67'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
-else
- cat > conftest.$ac_ext <<EOF
-#line 1336 "configure"
-#include "confdefs.h"
-#include <ctype.h> /* Arbitrary system header to define __stub macros. */
-/* Override any gcc2 internal prototype to avoid an error. */
-char _getb67();
-
-int main() { return 0; }
-int t() {
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub__getb67) || defined (__stub____getb67)
-choke me
-#else
-_getb67();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func__getb67=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func__getb67=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'_getb67`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- cat >> confdefs.h <<\EOF
-#define CRAY_STACKSEG_END _getb67
-EOF
-
-else
- echo "$ac_t""no" 1>&4
-echo $ac_n "checking for GETB67""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_GETB67'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
-else
- cat > conftest.$ac_ext <<EOF
-#line 1379 "configure"
-#include "confdefs.h"
-#include <ctype.h> /* Arbitrary system header to define __stub macros. */
-/* Override any gcc2 internal prototype to avoid an error. */
-char GETB67();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_GETB67) || defined (__stub___GETB67)
-choke me
-#else
-GETB67();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_GETB67=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_GETB67=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'GETB67`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- cat >> confdefs.h <<\EOF
-#define CRAY_STACKSEG_END GETB67
-EOF
-
-else
- echo "$ac_t""no" 1>&4
-echo $ac_n "checking for getb67""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_getb67'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+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
+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 1422 "configure"
+#line 1554 "configure"
#include "confdefs.h"
-#include <ctype.h> /* Arbitrary system header to define __stub macros. */
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
-char getb67();
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
-#if defined (__stub_getb67) || defined (__stub___getb67)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
-getb67();
+$ac_func();
#endif
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_func_getb67=yes"
+ eval "ac_cv_func_$ac_func=yes"
else
rm -rf conftest*
- eval "ac_cv_func_getb67=no"
+ eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
-if eval "test \"`echo '$ac_cv_func_'getb67`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- cat >> confdefs.h <<\EOF
-#define CRAY_STACKSEG_END getb67
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ cat >> confdefs.h <<EOF
+#define CRAY_STACKSEG_END $ac_func
EOF
+ break
else
- echo "$ac_t""no" 1>&4
-fi
-
-fi
-
+ echo "$ac_t""no" 1>&6
fi
+done
fi
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_c_stack_direction'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 1476 "configure"
+#line 1610 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -1491,7 +1625,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-eval $ac_link
+{ (eval echo configure:1629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_c_stack_direction=1
else
@@ -1500,25 +1634,30 @@ fi
fi
rm -fr conftest*
fi
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&4
+
+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
cat >> confdefs.h <<EOF
#define STACK_DIRECTION $ac_cv_c_stack_direction
EOF
fi
-echo $ac_n "checking for vprintf""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_vprintf'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1516 "configure"
+#line 1651 "configure"
#include "confdefs.h"
-#include <ctype.h> /* Arbitrary system header to define __stub macros. */
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char vprintf(); below. */
+#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
-char vprintf();
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char vprintf();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1532,7 +1671,7 @@ vprintf();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -1543,28 +1682,32 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_VPRINTF 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func__doprnt'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1562 "configure"
+#line 1701 "configure"
#include "confdefs.h"
-#include <ctype.h> /* Arbitrary system header to define __stub macros. */
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char _doprnt(); below. */
+#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
-char _doprnt();
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char _doprnt();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1578,7 +1721,7 @@ _doprnt();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -1589,31 +1732,35 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_DOPRNT 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
fi
for ac_func in strtol
do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+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 1611 "configure"
+#line 1754 "configure"
#include "confdefs.h"
-#include <ctype.h> /* Arbitrary system header to define __stub macros. */
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1627,7 +1774,7 @@ $ac_func();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1638,44 +1785,48 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
:
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
LIBOBJS="$LIBOBJS ${ac_func}.o"
fi
done
-echo $ac_n "checking ecvt declaration""... $ac_c" 1>&4
+echo $ac_n "checking ecvt declaration""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 1653 "configure"
+#line 1800 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "ecvt" >/dev/null 2>&1; then
rm -rf conftest*
- echo "$ac_t""yes" 1>&4; cat >> confdefs.h <<\EOF
+ echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
#define HAVE_EFGCVT 2
EOF
else
rm -rf conftest*
- echo "$ac_t""no" 1>&4; for ac_func in ecvt
+ echo "$ac_t""no" 1>&6; for ac_func in ecvt
do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+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 1673 "configure"
+#line 1820 "configure"
#include "confdefs.h"
-#include <ctype.h> /* Arbitrary system header to define __stub macros. */
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func(); below. */
+#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1689,7 +1840,7 @@ $ac_func();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1700,14 +1851,14 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
done
@@ -1715,7 +1866,7 @@ fi
rm -f conftest*
-echo $ac_n "checking if stack overflow is detectable""... $ac_c" 1>&4
+echo $ac_n "checking if stack overflow is detectable""... $ac_c" 1>&6
# Code from Jim Avera <jima@netcom.com>.
# stackovf.c requires:
# 1. Either sigaction with SA_ONSTACK, or sigvec with SV_ONSTACK
@@ -1725,12 +1876,12 @@ use_stackovf=no
if test "$ac_cv_func_sigaction" = yes || test "$ac_cv_func_sigvec" = yes; then
if test "$ac_cv_func_sigaltstack" = yes || test "$ac_cv_func_sigstack" = yes; then
cat > conftest.$ac_ext <<EOF
-#line 1729 "configure"
+#line 1880 "configure"
#include "confdefs.h"
#include <sys/time.h>
#include <sys/resource.h>
#include <signal.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
struct rlimit r; int i; getrlimit (RLIMIT_STACK, &r)
#if (!defined(HAVE_SIGACTION) || !defined(SA_ONSTACK)) \
@@ -1739,7 +1890,7 @@ choke me /* SA_ONSTACK and/or SV_ONSTAC
#endif
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
use_stackovf=yes
fi
@@ -1747,7 +1898,8 @@ rm -f conftest*
fi
fi
-echo "$ac_t""$use_stackovf" 1>&4
+echo "$ac_t""$use_stackovf" 1>&6
+use_stackovf=no # Amiga hack - suppress use; we can't do it right yet.
if test "$use_stackovf" = yes; then
cat >> confdefs.h <<\EOF
#define USE_STACKOVF 1
@@ -1756,7 +1908,7 @@ EOF
STACKOVF=stackovf.${U}o
cat > conftest.$ac_ext <<EOF
-#line 1760 "configure"
+#line 1912 "configure"
#include "confdefs.h"
#include <sys/resource.h>
EOF
@@ -1773,7 +1925,7 @@ fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 1777 "configure"
+#line 1929 "configure"
#include "confdefs.h"
#include <signal.h>
EOF
@@ -1790,7 +1942,7 @@ fi
rm -f conftest*
cat > conftest.$ac_ext <<EOF
-#line 1794 "configure"
+#line 1946 "configure"
#include "confdefs.h"
#include <signal.h>
EOF
@@ -1806,30 +1958,30 @@ rm -f conftest*
fi
-echo $ac_n "checking if changeword is wanted""... $ac_c" 1>&4
+echo $ac_n "checking if changeword is wanted""... $ac_c" 1>&6
# Check whether --enable-changeword or --disable-changeword was given.
-enableval="$enable_changeword"
-if test -n "$enableval"; then
+if test "${enable_changeword+set}" = set; then
+ enableval="$enable_changeword"
if test "$enableval" = yes; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define ENABLE_CHANGEWORD 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&4
+echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6
# Check whether --with-dmalloc or --without-dmalloc was given.
-withval="$with_dmalloc"
-if test -n "$withval"; then
+if test "${with_dmalloc+set}" = set; then
+ withval="$with_dmalloc"
if test "$withval" = yes; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define WITH_DMALLOC 1
EOF
@@ -1837,17 +1989,15 @@ EOF
LIBS="$LIBS -ldmalloc"
LDFLAGS="$LDFLAGS -g"
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
trap '' 1 2 15
-if test -w $cache_file; then
-echo "updating cache $cache_file"
-cat > $cache_file <<\EOF
+cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
# scripts and configure runs. It is not useful on other systems.
@@ -1863,15 +2013,24 @@ cat > $cache_file <<\EOF
# --recheck option to rerun configure.
#
EOF
-# Ultrix sh set writes to stderr and can't be redirected directly.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
(set) 2>&1 |
- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/: \${\1='\2'}/p" \
- >> $cache_file
+ sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+ >> confcache
+if cmp -s $cache_file confcache; then
+ :
else
-echo "not updating unwritable cache $cache_file"
+ if test -w $cache_file; then
+ echo "updating cache $cache_file"
+ cat confcache > $cache_file
+ else
+ echo "not updating unwritable cache $cache_file"
+ fi
fi
+rm -f confcache
-trap 'rm -fr conftest* confdefs* core $ac_clean_files; exit 1' 1 2 15
+trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
test "x$prefix" = xNONE && prefix=$ac_default_prefix
# Let make expand exec_prefix.
@@ -1892,9 +2051,11 @@ 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 <<EOF
-#!/bin/sh
+#! /bin/sh
# Generated automatically by configure.
# Run this file to recreate the current configuration.
# This directory was configured as follows,
@@ -1913,7 +2074,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.1"
+ echo "$CONFIG_STATUS generated by autoconf version 2.10"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -1924,12 +2085,14 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr Makefile doc/Makefile lib/Makefile src/Makefile \
-checks/Makefile examples/Makefile config.h conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile doc/Makefile lib/Makefile src/Makefile \
+checks/Makefile examples/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+EOF
+cat >> $CONFIG_STATUS <<EOF
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
+# Protect against being on the right side of a sed subst in config.status.
+sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
$ac_vpsub
$extrasub
s%@CFLAGS@%$CFLAGS%g
@@ -1941,6 +2104,21 @@ s%@LIBS@%$LIBS%g
s%@exec_prefix@%$exec_prefix%g
s%@prefix@%$prefix%g
s%@program_transform_name@%$program_transform_name%g
+s%@bindir@%$bindir%g
+s%@sbindir@%$sbindir%g
+s%@libexecdir@%$libexecdir%g
+s%@datadir@%$datadir%g
+s%@sysconfdir@%$sysconfdir%g
+s%@sharedstatedir@%$sharedstatedir%g
+s%@localstatedir@%$localstatedir%g
+s%@libdir@%$libdir%g
+s%@includedir@%$includedir%g
+s%@oldincludedir@%$oldincludedir%g
+s%@infodir@%$infodir%g
+s%@guidedir@%$guidedir%g
+s%@psdir@%$psdir%g
+s%@dvidir@%$dvidir%g
+s%@mandir@%$mandir%g
s%@PRODUCT@%$PRODUCT%g
s%@VERSION@%$VERSION%g
s%@AWK@%$AWK%g
@@ -1979,7 +2157,7 @@ for ac_file in .. $CONFIG_FILES; do if t
if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
# The file is in a subdirectory.
test ! -d "$ac_dir" && mkdir "$ac_dir"
- ac_dir_suffix="/$ac_dir"
+ ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
# A "../" for each directory in $ac_dir_suffix.
ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
else
@@ -2054,13 +2232,13 @@ EOF
# Transform confdefs.h into a sed script conftest.vals that substitutes
# the proper values into config.h.in to produce config.h. And first:
-# Protect against being on the right side of a sed subst in config.status.
+# Protect against being on the right side of a sed subst in config.status.
# Protect against being in an unquoted here document in config.status.
rm -f conftest.vals
cat > conftest.hdr <<\EOF
s/[\\&%]/\\&/g
s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
+s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
s%ac_d%ac_u%gp
s%ac_u%ac_e%gp
EOF
@@ -2108,6 +2286,12 @@ cat >> $CONFIG_STATUS <<\EOF
echo "$ac_file is unchanged"
rm -f conftest.h
else
+ # Remove last slash and all that follows it. Not all systems have dirname.
+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+ # The file is in a subdirectory.
+ test ! -d "$ac_dir" && mkdir "$ac_dir"
+ fi
rm -f $ac_file
mv conftest.h $ac_file
fi
@@ -2118,6 +2302,7 @@ test -z "$CONFIG_HEADERS" || date > stam
exit 0
EOF
chmod +x $CONFIG_STATUS
+rm -f CONFIG.STATUS.old
rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS
+test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff -rup --new-file baseline/fsf/m4/configure.in amiga/fsf/m4/configure.in
--- baseline/fsf/m4/configure.in Sat Nov 5 20:40:38 1994
+++ amiga/fsf/m4/configure.in Sat Sep 28 00:00:00 1996
@@ -62,6 +62,7 @@ choke me /* SA_ONSTACK and/or SV_ONSTAC
fi
fi
AC_MSG_RESULT($use_stackovf)
+use_stackovf=no # Amiga hack - suppress use; we can't do it right yet.
if test "$use_stackovf" = yes; then
AC_DEFINE(USE_STACKOVF)
STACKOVF=stackovf.${U}o
diff -rup --new-file baseline/fsf/m4/doc/Makefile.in amiga/fsf/m4/doc/Makefile.in
--- baseline/fsf/m4/doc/Makefile.in Sat Nov 5 13:52:26 1994
+++ amiga/fsf/m4/doc/Makefile.in Sat Sep 28 00:00:00 1996
@@ -29,19 +29,25 @@ TEXI2DVI = texi2dvi
prefix = @prefix@
infodir = $(prefix)/info
+guidedir = @guidedir@
.SUFFIXES:
DISTFILES = Makefile.in m4.texinfo texinfo.tex \
stamp-vti version.texi m4.info m4.info-1 m4.info-2 m4.info-3
-all: m4.info
+all: m4.info m4.guide
info: m4.info
+guide: m4.guide
+
m4.info: m4.texinfo version.texi
cd $(srcdir) && $(MAKEINFO) m4.texinfo
+m4.guide: m4.texinfo version.texi
+ $(MAKEINFO) -I$(srcdir) --amiga-39 $(srcdir)/m4.texinfo -o m4.guide
+
dvi: m4.dvi
m4.dvi: m4.texinfo version.texi
@@ -57,13 +63,16 @@ stamp-vti: m4.texinfo ../configure.in
date > $(srcdir)/stamp-vti
install: all
- $(srcdir)/../mkinstalldirs $(infodir)
+ $(srcdir)/../mkinstalldirs $(infodir) $(guidedir)
cd $(srcdir) && for file in m4.info*; do \
$(INSTALL_DATA) $$file $(infodir)/$$file; \
done
+ for file in m4.guide ; do \
+ $(INSTALL_DATA) $$file $(guidedir)/$$file; \
+ done
uninstall:
- rm -f $(infodir)/m4.info*
+ rm -f $(infodir)/m4.info* $(guidedir)/m4.guide
mostlyclean:
rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr
@@ -75,7 +84,7 @@ distclean: clean
rm -f Makefile
realclean: distclean
- rm -f stamp-vti version.texi m4.info*
+ rm -f stamp-vti version.texi m4.info* m4.guide
dist: $(DISTFILES)
@echo "Copying distribution files"
diff -rup --new-file baseline/fsf/m4/doc/m4.info amiga/fsf/m4/doc/m4.info
--- baseline/fsf/m4/doc/m4.info Sat Nov 5 21:13:42 1994
+++ amiga/fsf/m4/doc/m4.info Sat Sep 28 00:00:00 1996
@@ -1,4 +1,4 @@
-This is Info file m4.info, produced by Makeinfo-1.55 from the input
+This is Info file m4.info, produced by Makeinfo-1.63 from the input
file m4.texinfo.
START-INFO-DIR-ENTRY
diff -rup --new-file baseline/fsf/m4/doc/m4.info-1 amiga/fsf/m4/doc/m4.info-1
--- baseline/fsf/m4/doc/m4.info-1 Sat Nov 5 21:13:42 1994
+++ amiga/fsf/m4/doc/m4.info-1 Sat Sep 28 00:00:00 1996
@@ -1,4 +1,4 @@
-This is Info file m4.info, produced by Makeinfo-1.55 from the input
+This is Info file m4.info, produced by Makeinfo-1.63 from the input
file m4.texinfo.
START-INFO-DIR-ENTRY
diff -rup --new-file baseline/fsf/m4/doc/m4.info-2 amiga/fsf/m4/doc/m4.info-2
--- baseline/fsf/m4/doc/m4.info-2 Sat Nov 5 21:13:42 1994
+++ amiga/fsf/m4/doc/m4.info-2 Sat Sep 28 00:00:00 1996
@@ -1,4 +1,4 @@
-This is Info file m4.info, produced by Makeinfo-1.55 from the input
+This is Info file m4.info, produced by Makeinfo-1.63 from the input
file m4.texinfo.
START-INFO-DIR-ENTRY
diff -rup --new-file baseline/fsf/m4/doc/m4.info-3 amiga/fsf/m4/doc/m4.info-3
--- baseline/fsf/m4/doc/m4.info-3 Sat Nov 5 21:13:42 1994
+++ amiga/fsf/m4/doc/m4.info-3 Sat Sep 28 00:00:00 1996
@@ -1,4 +1,4 @@
-This is Info file m4.info, produced by Makeinfo-1.55 from the input
+This is Info file m4.info, produced by Makeinfo-1.63 from the input
file m4.texinfo.
START-INFO-DIR-ENTRY
@@ -79,7 +79,7 @@ Concept index
* expressions, evaluation of integer: Eval.
* extracting substrings: Substr.
* fast loading of frozen files: Frozen files.
-* file inclusion: Undivert.
+* file inclusion <1>: Undivert.
* file inclusion: File Inclusion.
* filenames, on the command line: Invoking m4.
* files, diverting output to: Divert.
@@ -87,22 +87,22 @@ Concept index
* forloops: Loops.
* formatted output: Format.
* frozen files for fast loading: Frozen files.
-* GNU extensions: Extensions.
-* GNU extensions: Frozen files.
-* GNU extensions: Esyscmd.
-* GNU extensions: Format.
-* GNU extensions: Patsubst.
-* GNU extensions: Regexp.
-* GNU extensions: Undivert.
-* GNU extensions: Search Path.
-* GNU extensions: Debug Output.
+* GNU extensions <1>: Indir.
+* GNU extensions <1>: Search Path.
+* GNU extensions <1>: Undivert.
+* GNU extensions <1>: Esyscmd.
+* GNU extensions <1>: Regexp.
+* GNU extensions <1>: Builtin.
+* GNU extensions <1>: Arguments.
+* GNU extensions <1>: Extensions.
+* GNU extensions <1>: Patsubst.
+* GNU extensions <1>: Frozen files.
+* GNU extensions <1>: Format.
+* GNU extensions <1>: Debug Output.
* GNU extensions: Debug Levels.
-* GNU extensions: Builtin.
-* GNU extensions: Indir.
-* GNU extensions: Arguments.
* included files, search path for: Search Path.
+* inclusion, of files <1>: File Inclusion.
* inclusion, of files: Undivert.
-* inclusion, of files: File Inclusion.
* increment operator: Incr.
* indirect call of builtins: Builtin.
* indirect call of macros: Indir.
@@ -118,7 +118,7 @@ Concept index
* macro definitions, on the command line: Invoking m4.
* macro expansion, tracing: Trace.
* macro invocation: Invocation.
-* macros, arguments to: Arguments.
+* macros, arguments to <1>: Arguments.
* macros, arguments to: Macro Arguments.
* macros, displaying definitions: Dumpdef.
* macros, expansion of: Macro expansion.
@@ -144,7 +144,7 @@ Concept index
* quoted string: Quoted strings.
* recursive macros: Loops.
* redefinition of macros, temporary: Pushdef.
-* regular expressions: Patsubst.
+* regular expressions <1>: Patsubst.
* regular expressions: Regexp.
* reloading a frozen file: Frozen files.
* renaming macros: Defn.
diff -rup --new-file baseline/fsf/m4/doc/stamp-vti amiga/fsf/m4/doc/stamp-vti
--- baseline/fsf/m4/doc/stamp-vti Sat Nov 5 20:46:26 1994
+++ amiga/fsf/m4/doc/stamp-vti Sat Sep 28 00:00:00 1996
@@ -1 +1 @@
-Sat Nov 5 22:46:26 EST 1994
+Sat Nov 12 15:26:39 1994
diff -rup --new-file baseline/fsf/m4/manifests/bin amiga/fsf/m4/manifests/bin
--- baseline/fsf/m4/manifests/bin Wed Dec 31 17:00:00 1969
+++ amiga/fsf/m4/manifests/bin Wed Oct 9 23:32:11 1996
@@ -0,0 +1,8 @@
+COPYING
+COPYING.info
+bin/m4
+guide/m4.guide
+info/m4.info
+info/m4.info-1
+info/m4.info-2
+info/m4.info-3
diff -rup --new-file baseline/fsf/m4/manifests/src amiga/fsf/m4/manifests/src
--- baseline/fsf/m4/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/m4/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,154 @@
+fsf/m4/BACKLOG
+fsf/m4/COPYING
+fsf/m4/ChangeLog
+fsf/m4/INSTALL
+fsf/m4/Makefile.in
+fsf/m4/NEWS
+fsf/m4/Product-Info
+fsf/m4/README
+fsf/m4/THANKS
+fsf/m4/TODO
+fsf/m4/acconfig.h
+fsf/m4/aclocal.m4
+fsf/m4/c-boxes.el
+fsf/m4/checks/01.define
+fsf/m4/checks/02.arguments
+fsf/m4/checks/03.arguments
+fsf/m4/checks/04.arguments
+fsf/m4/checks/05.arguments
+fsf/m4/checks/06.pseudo_argu
+fsf/m4/checks/07.pseudo_argu
+fsf/m4/checks/08.pseudo_argu
+fsf/m4/checks/09.pseudo_argu
+fsf/m4/checks/10.pseudo_argu
+fsf/m4/checks/11.undefine
+fsf/m4/checks/12.defn
+fsf/m4/checks/13.pushdef
+fsf/m4/checks/14.pushdef
+fsf/m4/checks/15.indir
+fsf/m4/checks/16.ifdef
+fsf/m4/checks/17.ifelse
+fsf/m4/checks/18.ifelse
+fsf/m4/checks/19.loops
+fsf/m4/checks/20.loops
+fsf/m4/checks/21.dumpdef
+fsf/m4/checks/22.trace
+fsf/m4/checks/23.dnl
+fsf/m4/checks/24.changequote
+fsf/m4/checks/25.changequote
+fsf/m4/checks/26.changequote
+fsf/m4/checks/27.changecom
+fsf/m4/checks/28.changecom
+fsf/m4/checks/29.m4wrap
+fsf/m4/checks/30.include
+fsf/m4/checks/31.include
+fsf/m4/checks/32.include
+fsf/m4/checks/33.divert
+fsf/m4/checks/34.divert
+fsf/m4/checks/35.undivert
+fsf/m4/checks/36.undivert
+fsf/m4/checks/37.undivert
+fsf/m4/checks/38.divnum
+fsf/m4/checks/39.cleardiv
+fsf/m4/checks/40.cleardiv
+fsf/m4/checks/41.len
+fsf/m4/checks/42.index
+fsf/m4/checks/43.regexp
+fsf/m4/checks/44.regexp
+fsf/m4/checks/45.substr
+fsf/m4/checks/46.translit
+fsf/m4/checks/47.patsubst
+fsf/m4/checks/48.patsubst
+fsf/m4/checks/49.format
+fsf/m4/checks/50.incr
+fsf/m4/checks/51.eval
+fsf/m4/checks/52.eval
+fsf/m4/checks/53.esyscmd
+fsf/m4/checks/54.sysval
+fsf/m4/checks/55.errprint
+fsf/m4/checks/56.errprint
+fsf/m4/checks/57.m4exit
+fsf/m4/checks/Makefile.in
+fsf/m4/checks/check-them
+fsf/m4/checks/foo
+fsf/m4/checks/get-them
+fsf/m4/checks/incl.m4
+fsf/m4/checks/stamp-checks
+fsf/m4/config.h.in
+fsf/m4/configure
+fsf/m4/configure.in
+fsf/m4/doc/Makefile.in
+fsf/m4/doc/m4.info
+fsf/m4/doc/m4.info-1
+fsf/m4/doc/m4.info-2
+fsf/m4/doc/m4.info-3
+fsf/m4/doc/m4.texinfo
+fsf/m4/doc/stamp-vti
+fsf/m4/doc/texinfo.tex
+fsf/m4/doc/version.texi
+fsf/m4/examples/Makefile.in
+fsf/m4/examples/capitalize.m4
+fsf/m4/examples/comments.m4
+fsf/m4/examples/ddivert.m4
+fsf/m4/examples/debug.m4
+fsf/m4/examples/esyscmd.m4
+fsf/m4/examples/exp.m4
+fsf/m4/examples/file.m4
+fsf/m4/examples/foreach.m4
+fsf/m4/examples/forloop.m4
+fsf/m4/examples/fstab.m4
+fsf/m4/examples/hanoi.m4
+fsf/m4/examples/incl-test.m4
+fsf/m4/examples/include.m4
+fsf/m4/examples/indir.m4
+fsf/m4/examples/misc.m4
+fsf/m4/examples/multiquotes.m4
+fsf/m4/examples/patsubst.m4
+fsf/m4/examples/pushpop.m4
+fsf/m4/examples/regexp.m4
+fsf/m4/examples/reverse.m4
+fsf/m4/examples/stackovf.sh
+fsf/m4/examples/sync-lines.m4
+fsf/m4/examples/sysv-args.m4
+fsf/m4/examples/trace.m4
+fsf/m4/examples/translit.m4
+fsf/m4/examples/undivert.incl
+fsf/m4/examples/undivert.m4
+fsf/m4/examples/wrap.m4
+fsf/m4/install-sh
+fsf/m4/lib/COPYING.LIB
+fsf/m4/lib/Makefile.in
+fsf/m4/lib/TAGS
+fsf/m4/lib/alloca.c
+fsf/m4/lib/error.c
+fsf/m4/lib/getopt.c
+fsf/m4/lib/getopt.h
+fsf/m4/lib/getopt1.c
+fsf/m4/lib/obstack.c
+fsf/m4/lib/obstack.h
+fsf/m4/lib/regex.c
+fsf/m4/lib/regex.h
+fsf/m4/lib/strtol.c
+fsf/m4/lib/xmalloc.c
+fsf/m4/lib/xstrdup.c
+fsf/m4/manifests/bin
+fsf/m4/manifests/src
+fsf/m4/mkinstalldirs
+fsf/m4/src/Makefile.in
+fsf/m4/src/TAGS
+fsf/m4/src/ansi2knr.1
+fsf/m4/src/ansi2knr.c
+fsf/m4/src/builtin.c
+fsf/m4/src/debug.c
+fsf/m4/src/eval.c
+fsf/m4/src/format.c
+fsf/m4/src/freeze.c
+fsf/m4/src/input.c
+fsf/m4/src/m4.c
+fsf/m4/src/m4.h
+fsf/m4/src/macro.c
+fsf/m4/src/output.c
+fsf/m4/src/path.c
+fsf/m4/src/stackovf.c
+fsf/m4/src/symtab.c
+fsf/m4/stamp-h.in
diff -rup --new-file baseline/fsf/m4/stamp-h.in amiga/fsf/m4/stamp-h.in
--- baseline/fsf/m4/stamp-h.in Sat Nov 5 20:45:51 1994
+++ amiga/fsf/m4/stamp-h.in Sat Sep 28 00:00:00 1996
@@ -1 +1 @@
-Sat Nov 5 22:45:51 EST 1994
+Mon Sep 16 14:07:09 GMT+0100 1996