home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
findutils-4.1-diffs.gz
/
findutils-4.1-diffs
Wrap
Text File
|
1996-10-13
|
120KB
|
3,764 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/findutils/ChangeLog amiga/fsf/findutils/ChangeLog
--- baseline/fsf/findutils/ChangeLog Sat Nov 5 07:52:35 1994
+++ amiga/fsf/findutils/ChangeLog Sat Sep 28 00:00:00 1996
@@ -1,3 +1,16 @@
+Mon Sep 16 11:59:59 1996 Kristof Depraetere <Kristof.Depraetere@rug.ac.be>
+
+ * Makefile.in, doc/Makefile.in, find/Makefile.in, lib/Makefile.in
+ locate/Makefile.in, testsuite/Makefile.in, xargs/Makefile.in: added
+ a guide entry.
+
+Tue Aug 20 14:09:40 1996 Fred Fish <fnf@ninemoons.com>
+
+ * find/find.c (main): For __amigaos__ set no_leaf_check to default
+ to true (essentially force --noleaf option) because ixemul.library
+ always sets st_nlink to 2 instead of 2 plus the number of files in
+ the directory.
+
Thu Nov 3 09:23:33 1994 David J. MacKenzie <djm@duality.gnu.ai.mit.edu>
* Version 4.1.
diff -rup --new-file baseline/fsf/findutils/INSTALL amiga/fsf/findutils/INSTALL
--- baseline/fsf/findutils/INSTALL Tue Oct 18 13:30:28 1994
+++ amiga/fsf/findutils/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/findutils/Makefile.in amiga/fsf/findutils/Makefile.in
--- baseline/fsf/findutils/Makefile.in Sat Nov 5 07:45:56 1994
+++ amiga/fsf/findutils/Makefile.in Sat Sep 28 00:00:00 1996
@@ -25,13 +25,17 @@ exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
sbindir = $(exec_prefix)/sbin
-libexecdir = $(exec_prefix)/libexec
datadir = $(prefix)/share
sysconfdir = $(prefix)/etc
sharedstatedir = $(prefix)/com
-localstatedir = $(prefix)/var
+# Put this in /local, since $(prefix) might be on read-only media. -fnf
+localstatedir = /local/var
libdir = $(exec_prefix)/lib
+# It seems hokey to me to have the libexec dir visible at what is the
+# equivalent of the root directory, so put it under libdir instead. -fnf
+libexecdir = $(libdir)/libexec
infodir = $(prefix)/info
+guidedir = $(prefix)/guide
mandir = $(prefix)/man
includedir = $(prefix)/include
oldincludedir = /usr/include
@@ -47,7 +51,7 @@ SOURCES =
DIST_CONF = Makefile.am Makefile.in README INSTALL NEWS \
configure configure.in ${ACLOCAL} ${ACCONFIG} ${CONFIG_TOP} \
${CONFIG_BOT} mkinstalldirs
-DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
+DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(GUIDES) $(MANS) $(DIST_OTHER)
DIST_OTHER = COPYING ChangeLog TODO install-sh config.h.in stamp-h.in
SUBDIRS = lib find xargs locate doc testsuite
@@ -64,7 +68,7 @@ all:: ${ALL}
@SET_MAKE@
-all install install-info uninstall check tags TAGS info dvi::
+all install install-info install-guide uninstall check tags TAGS info guide dvi::
for subdir in $(SUBDIRS); do \
echo making $@ in $$subdir ; \
(cd $$subdir; $(MAKE) $@); \
@@ -125,7 +129,7 @@ dist: $(DIST_FILES) $(DIST_DIRS) distnam
tar -chozf `cat distname`.tar.gz `cat distname`
rm -rf `cat distname` distname
-check dvi info install uninstall::
+check dvi info guide install uninstall::
tags:: TAGS
diff -rup --new-file baseline/fsf/findutils/Product-Info amiga/fsf/findutils/Product-Info
--- baseline/fsf/findutils/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/findutils/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,40 @@
+.name
+findutils
+.fullname
+GNU find, xargs, and locate
+.type
+Programmer Tool
+.short
+GNU find, xargs, and locate
+.description
+This package contains the GNU find, xargs, and locate programs. This
+version of find and xargs comply with POSIX 1003.2, and also support
+some additional options, some borrowed from Unix and some unique to
+GNU.
+
+To gain speed, GNU find now avoids statting files whenever possible.
+It does this by: (1) Checking the number of links to directories and
+not statting files that it knows aren't directories until it
+encounters a test or action that needs the stat info. (2) Rearranging
+the command line, where possible, so that it can do tests that don't
+require a stat before tests that do, in hopes that the latter will be
+skipped because of an OR or AND. (But it only does this where it will
+leave the output unchanged.)
+
+The locate utility is based on James Woods' public domain fast-find
+code, which is also distributed with the 4.3BSD find. Because POSIX
+requires `find foo' to have the same effect as `find foo -print', the
+fast-find searching has been moved to a separate program, `locate';
+the same thing has been done in 4.3BSD-reno/4.4BSD. If you use
+locate, you should run the included `updatedb' script from cron
+periodically (typically nightly).
+.version
+4.1
+.author
+Free Software Foundation
+.requirements
+Amiga binaries require ixemul.library.
+.distribution
+GNU Public License
+.described-by
+Fred Fish (fnf@amigalib.com)
diff -rup --new-file baseline/fsf/findutils/configure amiga/fsf/findutils/configure
--- baseline/fsf/findutils/configure Fri Nov 4 07:47:50 1994
+++ amiga/fsf/findutils/configure Mon Sep 30 22:40:39 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.
@@ -37,9 +37,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
@@ -61,9 +77,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 \
@@ -73,6 +94,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.
@@ -123,12 +150,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]
@@ -140,8 +187,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)
@@ -149,6 +198,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 ;;
@@ -161,6 +260,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=*)
@@ -201,6 +309,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=*)
@@ -211,6 +336,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=*)
@@ -220,7 +352,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-*)
@@ -266,7 +398,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
@@ -283,19 +415,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
@@ -385,8 +518,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.
@@ -404,8 +537,8 @@ fi
# Check whether --enable-id-cache or --disable-id-cache was given.
-enableval="$enable_id_cache"
-if test -n "$enableval"; then
+if test "${enable_id_cache+set}" = set; then
+ enableval="$enable_id_cache"
cat >> confdefs.h <<\EOF
#define CACHE_IDS 1
EOF
@@ -413,8 +546,8 @@ EOF
fi
# Check whether --with-afs or --without-afs was given.
-withval="$with_afs"
-if test -n "$withval"; then
+if test "${with_afs+set}" = set; then
+ withval="$with_afs"
cat >> confdefs.h <<\EOF
#define AFS 1
EOF
@@ -426,8 +559,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
@@ -443,9 +578,9 @@ test "$program_transform_name" = "" && p
# 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.
@@ -459,39 +594,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>&4
+ 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>&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:666: \"$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
@@ -502,11 +686,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
@@ -514,14 +699,14 @@ else
test "${CFLAGS+set}" = set || CFLAGS="-g"
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.
@@ -529,12 +714,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 533 "configure"
+#line 718 "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:724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -543,12 +729,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 547 "configure"
+#line 733 "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:739: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -562,9 +749,11 @@ 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
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -592,18 +781,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
@@ -623,12 +814,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.
@@ -638,9 +836,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA=
# 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.
@@ -659,15 +857,15 @@ 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 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:
@@ -683,17 +881,17 @@ 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
-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 697 "configure"
+#line 895 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -703,28 +901,29 @@ 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*
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 724 "configure"
+#line 922 "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:927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -737,10 +936,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
@@ -759,11 +958,11 @@ EOF
fi
-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
@@ -775,64 +974,70 @@ EOF
CC="$CC -Xp"
fi
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
ISC=
fi
-echo $ac_n "checking for -lsun""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_lib_sun'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for -lsun""... $ac_c" 1>&6
+ac_lib_var=`echo sun'_'getpwnam | tr './+\055' '__p_'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="$LIBS -lsun "
+LIBS="-lsun $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 791 "configure"
+#line 991 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char getpwnam();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
getpwnam()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_sun=yes"
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
- eval "ac_cv_lib_sun=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'sun`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- ac_tr_lib=HAVE_LIB`echo sun | tr '[a-z]' '[A-Z]'`
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ ac_tr_lib=HAVE_LIB`echo sun | tr 'abcdefghijklmnopqrstuvwxyz+' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
cat >> confdefs.h <<EOF
#define $ac_tr_lib 1
EOF
- LIBS="$LIBS -lsun"
+ LIBS="-lsun $LIBS"
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
for ac_hdr in fcntl.h string.h limits.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 832 "configure"
+#line 1036 "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:1041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -845,31 +1050,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 869 "configure"
+#line 1074 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-eval $ac_link
+{ (eval echo configure:1078: \"$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
@@ -878,22 +1083,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 890 "configure"
+#line 1096 "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:1104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -908,7 +1115,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 912 "configure"
+#line 1119 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -926,7 +1133,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 930 "configure"
+#line 1137 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -944,10 +1151,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 951 "configure"
+#line 1158 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -958,7 +1165,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-eval $ac_link
+{ (eval echo configure:1169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
@@ -968,7 +1175,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
@@ -976,20 +1184,20 @@ EOF
fi
-echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 985 "configure"
+#line 1193 "configure"
#include "confdefs.h"
#include <sys/types.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
return makedev(0, 0);
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_types_h_makedev=yes
else
@@ -1000,20 +1208,22 @@ rm -f conftest*
fi
-echo "$ac_t""$ac_cv_header_sys_types_h_makedev" 1>&4
+
+echo "$ac_t""$ac_cv_header_sys_types_h_makedev" 1>&6
if test $ac_cv_header_sys_types_h_makedev = no; then
ac_safe=`echo "sys/mkdev.h" | tr './\055' '___'`
-echo $ac_n "checking for sys/mkdev.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 sys/mkdev.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 1013 "configure"
+#line 1222 "configure"
#include "confdefs.h"
#include <sys/mkdev.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:1227: \"$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,28 +1236,29 @@ 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
cat >> confdefs.h <<\EOF
#define MAJOR_IN_MKDEV 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
if test $ac_cv_header_sys_mkdev_h = no; then
ac_safe=`echo "sys/sysmacros.h" | tr './\055' '___'`
-echo $ac_n "checking for sys/sysmacros.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 sys/sysmacros.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 1047 "configure"
+#line 1257 "configure"
#include "confdefs.h"
#include <sys/sysmacros.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:1262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1060,13 +1271,13 @@ 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
cat >> confdefs.h <<\EOF
#define MAJOR_IN_SYSMACROS 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
fi
@@ -1076,12 +1287,12 @@ ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
do
ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
-echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1085 "configure"
+#line 1296 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1090,7 +1301,7 @@ int t() {
DIR *dirp = 0;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1101,114 +1312,126 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_dirent_'$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 'abcdedfghijklmnopqrstuvwxyz./\055' 'ABCDEDFGHIJKLMNOPQRSTUVWXYZ___'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
ac_header_dirent=$ac_hdr; break
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
-echo $ac_n "checking for -ldir""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_lib_dir'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for -ldir""... $ac_c" 1>&6
+ac_lib_var=`echo dir'_'opendir | tr './+\055' '__p_'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="$LIBS -ldir "
+LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1124 "configure"
+#line 1336 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char opendir();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
opendir()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_dir=yes"
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
- eval "ac_cv_lib_dir=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'dir`\" = yes"; then
- echo "$ac_t""yes" 1>&4
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
LIBS="$LIBS -ldir"
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
else
-echo $ac_n "checking for -lx""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_lib_x'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for -lx""... $ac_c" 1>&6
+ac_lib_var=`echo x'_'opendir | tr './+\055' '__p_'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="$LIBS -lx "
+LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1158 "configure"
+#line 1375 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char opendir();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
opendir()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_x=yes"
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
- eval "ac_cv_lib_x=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'x`\" = yes"; then
- echo "$ac_t""yes" 1>&4
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lx"
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
fi
-echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_header_stat_broken'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1191 "configure"
+#line 1412 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef S_ISBLK
+
+#if defined(S_ISBLK) && defined(S_IFDIR)
# if S_ISBLK (S_IFDIR)
You lose.
# endif
-# ifdef S_IFCHR
-# if S_ISBLK (S_IFCHR)
+#endif
+
+#if defined(S_ISBLK) && defined(S_IFCHR)
+# if S_ISBLK (S_IFCHR)
You lose.
-# endif
# endif
#endif
-#ifdef S_ISLNK
+#if defined(S_ISLNK) && defined(S_IFREG)
# if S_ISLNK (S_IFREG)
You lose.
# endif
#endif
-#ifdef S_ISSOCK
+#if defined(S_ISSOCK) && defined(S_IFREG)
# if S_ISSOCK (S_IFREG)
You lose.
# endif
@@ -1226,7 +1449,8 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_header_stat_broken" 1>&4
+
+echo "$ac_t""$ac_cv_header_stat_broken" 1>&6
if test $ac_cv_header_stat_broken = yes; then
cat >> confdefs.h <<\EOF
#define STAT_MACROS_BROKEN 1
@@ -1234,12 +1458,12 @@ EOF
fi
-echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1243 "configure"
+#line 1467 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
@@ -1256,7 +1480,7 @@ wait (&s);
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
@@ -1266,7 +1490,8 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&4
+
+echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
if test $ac_cv_header_sys_wait_h = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_SYS_WAIT_H 1
@@ -1275,16 +1500,17 @@ EOF
fi
-echo $ac_n "checking how to get filesystem type""... $ac_c" 1>&4
+echo $ac_n "checking how to get filesystem type""... $ac_c" 1>&6
fstype=no
# The order of these tests is important.
cat > conftest.$ac_ext <<EOF
-#line 1283 "configure"
+#line 1508 "configure"
#include "confdefs.h"
#include <sys/statvfs.h>
#include <sys/fstyp.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:1514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1298,12 +1524,13 @@ fi
rm -f conftest*
if test $fstype = no; then
cat > conftest.$ac_ext <<EOF
-#line 1302 "configure"
+#line 1528 "configure"
#include "confdefs.h"
#include <sys/statfs.h>
#include <sys/fstyp.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:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1318,12 +1545,13 @@ rm -f conftest*
fi
if test $fstype = no; then
cat > conftest.$ac_ext <<EOF
-#line 1322 "configure"
+#line 1549 "configure"
#include "confdefs.h"
#include <sys/statfs.h>
#include <sys/vmount.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:1555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1338,11 +1566,12 @@ rm -f conftest*
fi
if test $fstype = no; then
cat > conftest.$ac_ext <<EOF
-#line 1342 "configure"
+#line 1570 "configure"
#include "confdefs.h"
#include <mntent.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:1575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1357,7 +1586,7 @@ rm -f conftest*
fi
if test $fstype = no; then
cat > conftest.$ac_ext <<EOF
-#line 1361 "configure"
+#line 1590 "configure"
#include "confdefs.h"
#include <sys/mount.h>
EOF
@@ -1374,12 +1603,13 @@ rm -f conftest*
fi
if test $fstype = no; then
cat > conftest.$ac_ext <<EOF
-#line 1378 "configure"
+#line 1607 "configure"
#include "confdefs.h"
#include <sys/mount.h>
#include <sys/fs_types.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:1613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1392,15 +1622,15 @@ else
fi
rm -f conftest*
fi
-echo "$ac_t""$fstype" 1>&4
+echo "$ac_t""$fstype" 1>&6
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_type_uid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1404 "configure"
+#line 1634 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
@@ -1415,7 +1645,8 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_type_uid_t" 1>&4
+
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
if test $ac_cv_type_uid_t = no; then
cat >> confdefs.h <<\EOF
#define uid_t int
@@ -1427,12 +1658,12 @@ EOF
fi
-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 1436 "configure"
+#line 1667 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1450,7 +1681,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
@@ -1458,12 +1689,12 @@ EOF
fi
-echo $ac_n "checking for pid_t""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_type_pid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1467 "configure"
+#line 1698 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1481,7 +1712,7 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_type_pid_t" 1>&4
+echo "$ac_t""$ac_cv_type_pid_t" 1>&6
if test $ac_cv_type_pid_t = no; then
cat >> confdefs.h <<\EOF
#define pid_t int
@@ -1489,12 +1720,12 @@ EOF
fi
-echo $ac_n "checking for ino_t""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_type_ino_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for ino_t""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1498 "configure"
+#line 1729 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1512,7 +1743,7 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_type_ino_t" 1>&4
+echo "$ac_t""$ac_cv_type_ino_t" 1>&6
if test $ac_cv_type_ino_t = no; then
cat >> confdefs.h <<\EOF
#define ino_t unsigned long
@@ -1520,12 +1751,12 @@ EOF
fi
-echo $ac_n "checking for dev_t""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_type_dev_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for dev_t""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1529 "configure"
+#line 1760 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
@@ -1543,7 +1774,7 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_type_dev_t" 1>&4
+echo "$ac_t""$ac_cv_type_dev_t" 1>&6
if test $ac_cv_type_dev_t = no; then
cat >> confdefs.h <<\EOF
#define dev_t unsigned long
@@ -1551,12 +1782,12 @@ EOF
fi
-echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_struct_st_blocks'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1560 "configure"
+#line 1791 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -1565,7 +1796,7 @@ int t() {
struct stat s; s.st_blocks;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_blocks=yes
else
@@ -1575,7 +1806,8 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_struct_st_blocks" 1>&4
+
+echo "$ac_t""$ac_cv_struct_st_blocks" 1>&6
if test $ac_cv_struct_st_blocks = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_ST_BLOCKS 1
@@ -1585,12 +1817,12 @@ else
LIBOBJS="$LIBOBJS fileblocks.o"
fi
-echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_struct_st_rdev'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1594 "configure"
+#line 1826 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/stat.h>
@@ -1599,7 +1831,7 @@ int t() {
struct stat s; s.st_rdev;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_st_rdev=yes
else
@@ -1609,7 +1841,8 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_struct_st_rdev" 1>&4
+
+echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6
if test $ac_cv_struct_st_rdev = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_ST_RDEV 1
@@ -1617,12 +1850,12 @@ EOF
fi
-echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_struct_tm'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1626 "configure"
+#line 1859 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
@@ -1631,7 +1864,7 @@ int t() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
@@ -1641,7 +1874,8 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_struct_tm" 1>&4
+
+echo "$ac_t""$ac_cv_struct_tm" 1>&6
if test $ac_cv_struct_tm = sys/time.h; then
cat >> confdefs.h <<\EOF
#define TM_IN_SYS_TIME 1
@@ -1649,12 +1883,12 @@ EOF
fi
-echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_struct_tm_zone'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1658 "configure"
+#line 1892 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
@@ -1663,7 +1897,7 @@ int t() {
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:1901: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
@@ -1673,30 +1907,31 @@ fi
rm -f conftest*
fi
-echo "$ac_t""$ac_cv_struct_tm_zone" 1>&4
+
+echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6
if test "$ac_cv_struct_tm_zone" = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_TM_ZONE 1
EOF
else
- echo $ac_n "checking for tzname""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_var_tzname'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+ echo $ac_n "checking for tzname""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1689 "configure"
+#line 1924 "configure"
#include "confdefs.h"
#include <time.h>
#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 $ac_link; then
+if { (eval echo configure:1935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
@@ -1706,7 +1941,8 @@ fi
rm -f conftest*
fi
- echo "$ac_t""$ac_cv_var_tzname" 1>&4
+
+echo "$ac_t""$ac_cv_var_tzname" 1>&6
if test $ac_cv_var_tzname = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_TZNAME 1
@@ -1715,12 +1951,12 @@ EOF
fi
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 1724 "configure"
+#line 1960 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -1733,7 +1969,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 */
@@ -1770,7 +2006,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:2010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -1780,7 +2016,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
@@ -1792,18 +2029,22 @@ fi
for ac_func in memcmp memset mktime stpcpy strdup strftime strspn strstr 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 1801 "configure"
+#line 2038 "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
@@ -1817,7 +2058,7 @@ $ac_func();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1828,10 +2069,10 @@ 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
@@ -1839,18 +2080,22 @@ done
for ac_func in fchdir getcwd strerror
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 1848 "configure"
+#line 2089 "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
@@ -1864,7 +2109,7 @@ $ac_func();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1875,63 +2120,72 @@ 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
# strftime is in -lintl on SCO UNIX.
-echo $ac_n "checking for -lintl""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_lib_intl'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for -lintl""... $ac_c" 1>&6
+ac_lib_var=`echo intl'_'strftime | tr './+\055' '__p_'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="$LIBS -lintl "
+LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1898 "configure"
+#line 2144 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char strftime();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
strftime()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_intl=yes"
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
- eval "ac_cv_lib_intl=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'intl`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- LIBS="$LIBS -lintl"
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lintl $LIBS"
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking for strftime""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_strftime'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking for strftime""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_strftime'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1929 "configure"
+#line 2179 "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 strftime(); below. */
+#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
-char strftime();
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char strftime();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1945,7 +2199,7 @@ strftime();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_strftime=yes"
else
@@ -1956,27 +2210,31 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'strftime`\" = yes"; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_STRFTIME 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
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 1974 "configure"
+#line 2228 "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
@@ -1990,7 +2248,7 @@ vprintf();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -2001,28 +2259,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 2020 "configure"
+#line 2278 "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
@@ -2036,7 +2298,7 @@ _doprnt();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -2047,33 +2309,33 @@ 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
# 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 2069 "configure"
+#line 2331 "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:2339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -2083,7 +2345,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
@@ -2091,12 +2354,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 2100 "configure"
+#line 2363 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -2115,12 +2378,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:2387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_func_alloca=yes
else
@@ -2130,7 +2393,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
@@ -2149,12 +2413,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 2158 "configure"
+#line 2422 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -2174,154 +2438,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 2185 "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 2228 "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 2271 "configure"
+#line 2451 "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:2475: \"$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 2325 "configure"
+#line 2507 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -2340,7 +2522,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-eval $ac_link
+{ (eval echo configure:2526: \"$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
@@ -2349,92 +2531,145 @@ 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
-# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX.
-echo $ac_n "checking for -lsun""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_lib_sun'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
+echo $ac_n "checking for -lsun""... $ac_c" 1>&6
+ac_lib_var=`echo sun'_'getmntent | tr './+\055' '__p_'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="$LIBS -lsun "
+LIBS="-lsun $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2368 "configure"
+#line 2552 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char getmntent();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
getmntent()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_sun=yes"
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
- eval "ac_cv_lib_sun=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'sun`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- LIBS="$LIBS -lsun"
-else
- echo "$ac_t""no" 1>&4
-echo $ac_n "checking for -lseq""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_lib_seq'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lsun $LIBS"
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for -lseq""... $ac_c" 1>&6
+ac_lib_var=`echo seq'_'getmntent | tr './+\055' '__p_'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="$LIBS -lseq "
+LIBS="-lseq $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2399 "configure"
+#line 2588 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char getmntent();
-int main() { return 0; }
+int main() { t(); return 0; }
+int t() {
+getmntent()
+; return 0; }
+EOF
+if { (eval echo configure:2600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+else
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lseq $LIBS"
+else
+ echo "$ac_t""no" 1>&6
+echo $ac_n "checking for -lgen""... $ac_c" 1>&6
+ac_lib_var=`echo gen'_'getmntent | tr './+\055' '__p_'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ ac_save_LIBS="$LIBS"
+LIBS="-lgen $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 2624 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char getmntent();
+
+int main() { t(); return 0; }
int t() {
getmntent()
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
- eval "ac_cv_lib_seq=yes"
+ eval "ac_cv_lib_$ac_lib_var=yes"
else
rm -rf conftest*
- eval "ac_cv_lib_seq=no"
+ eval "ac_cv_lib_$ac_lib_var=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
-if eval "test \"`echo '$ac_cv_lib_'seq`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- LIBS="$LIBS -lseq"
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ LIBS="-lgen $LIBS"
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
fi
-echo $ac_n "checking for getmntent""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_getmntent'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+fi
+
+echo $ac_n "checking for getmntent""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_getmntent'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2432 "configure"
+#line 2663 "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 getmntent(); below. */
+#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
-char getmntent();
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char getmntent();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2448,7 +2683,7 @@ getmntent();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_getmntent=yes"
else
@@ -2459,30 +2694,30 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'getmntent`\" = yes"; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
#define HAVE_GETMNTENT 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
-echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_func_closedir_void'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ ac_cv_func_closedir_void=yes
else
cat > conftest.$ac_ext <<EOF
-#line 2480 "configure"
+#line 2715 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_header_dirent>
int closedir(); main() { exit(closedir(opendir(".")) != 0); }
EOF
-eval $ac_link
+{ (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_func_closedir_void=no
else
@@ -2491,7 +2726,8 @@ fi
fi
rm -fr conftest*
fi
-echo "$ac_t""$ac_cv_func_closedir_void" 1>&4
+
+echo "$ac_t""$ac_cv_func_closedir_void" 1>&6
if test $ac_cv_func_closedir_void = yes; then
cat >> confdefs.h <<\EOF
#define CLOSEDIR_VOID 1
@@ -2501,9 +2737,7 @@ 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.
@@ -2519,15 +2753,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.
@@ -2548,9 +2791,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,
@@ -2569,7 +2814,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 ;;
@@ -2580,12 +2825,14 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr Makefile lib/Makefile find/Makefile xargs/Makefile \
-locate/Makefile doc/Makefile testsuite/Makefile config.h conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile lib/Makefile find/Makefile xargs/Makefile \
+locate/Makefile doc/Makefile testsuite/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
@@ -2597,6 +2844,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%@INCLUDES@%$INCLUDES%g
s%@CC@%$CC%g
s%@CPP@%$CPP%g
@@ -2630,7 +2892,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
@@ -2705,13 +2967,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
@@ -2759,6 +3021,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
@@ -2769,6 +3037,7 @@ date > stamp-h
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/findutils/doc/Makefile.in amiga/fsf/findutils/doc/Makefile.in
--- baseline/fsf/findutils/doc/Makefile.in Sat Nov 5 07:44:12 1994
+++ amiga/fsf/findutils/doc/Makefile.in Sat Sep 28 00:00:00 1996
@@ -25,13 +25,17 @@ exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
sbindir = $(exec_prefix)/sbin
-libexecdir = $(exec_prefix)/libexec
datadir = $(prefix)/share
sysconfdir = $(prefix)/etc
sharedstatedir = $(prefix)/com
-localstatedir = $(prefix)/var
+# Put this in /local, since $(prefix) might be on read-only media. -fnf
+localstatedir = /local/var
libdir = $(exec_prefix)/lib
+# It seems hokey to me to have the libexec dir visible at what is the
+# equivalent of the root directory, so put it under libdir instead. -fnf
+libexecdir = $(libdir)/libexec
infodir = $(prefix)/info
+guidedir = $(prefix)/guide
mandir = $(prefix)/man
includedir = $(prefix)/include
oldincludedir = /usr/include
@@ -48,30 +52,37 @@ TEXI2DVI = texi2dvi
TEXFILES = *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.log *.pg *.toc *.tp *.vr
INFOS = find.info*
+GUIDES = find.guide
INFO_DEPS = find.info
+GUIDE_DEPS = find.guide
DVIS = find.dvi
SOURCES =
DIST_CONF = Makefile.am Makefile.in
-DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
+DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(GUIDES) $(MANS) $(DIST_OTHER)
TEXINFOS = find.texi
DIST_OTHER = perm.texi texinfo.tex
all:: ${ALL}
-.SUFFIXES: .texi .info .dvi
+.SUFFIXES: .texi .info .guide .dvi
.texi.info:
$(MAKEINFO) -I$(srcdir) $<
+.texi.guide:
+ $(MAKEINFO) --amiga-39 -I$(srcdir) $< -o find.guide
+
.texi.dvi:
TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
info:: $(INFO_DEPS)
+guide:: $(GUIDE_DEPS)
+
dvi:: $(DVIS)
-install:: install-info
+install:: install-info install-guide
install-info: $(INFO_DEPS)
$(top_srcdir)/mkinstalldirs $(infodir)
@@ -79,13 +90,24 @@ install-info: $(INFO_DEPS)
$(INSTALL_DATA) $$file $(infodir)/$$file; \
done
-uninstall:: uninstall-info
+install-guide: $(GUIDE_DEPS)
+ $(top_srcdir)/mkinstalldirs $(guidedir)
+ for file in *.guide; do \
+ $(INSTALL_DATA) $$file $(guidedir)/$$file; \
+ done
+
+uninstall:: uninstall-info uninstall-guide
uninstall-info:
cd $(srcdir); for file in *.info*; do \
rm -f $(infodir)/$$file; \
done
+uninstall-guide:
+ for file in *.guide; do \
+ rm -f $(guidedir)/$$file; \
+ done
+
mostlyclean:
rm -f *.o core
@@ -97,7 +119,7 @@ distclean: clean
rm -f config.cache config.log config.status ${CONFIG_HEADER} stamp-h
realclean: distclean
- rm -f TAGS $(INFOS)
+ rm -f TAGS $(INFOS) $(GUIDES)
dist: $(DIST_FILES) $(DIST_DIRS)
-mkdir ../`cat ../distname`/$(subdir)
@@ -107,7 +129,7 @@ dist: $(DIST_FILES) $(DIST_DIRS)
{ echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file;}; \
done
-check dvi info install uninstall::
+check dvi info guide install uninstall::
tags:: TAGS
@@ -118,4 +140,4 @@ TAGS::
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
-find.info find.dvi: perm.texi
+find.info find.guide find.dvi: perm.texi
diff -rup --new-file baseline/fsf/findutils/doc/find.info amiga/fsf/findutils/doc/find.info
--- baseline/fsf/findutils/doc/find.info Thu Nov 3 21:22:49 1994
+++ amiga/fsf/findutils/doc/find.info Sat Sep 28 00:00:00 1996
@@ -1,5 +1,5 @@
-This is Info file find.info, produced by Makeinfo-1.55 from the input
-file find.texi.
+This is Info file find.info, produced by Makeinfo-1.63 from the input
+file /ade-src/fsf/findutils/doc/find.texi.
START-INFO-DIR-ENTRY
* Finding Files: (find). Listing and operating on files
@@ -27,87 +27,87 @@ translation approved by the Foundation.
Indirect:
-find.info-1: 1097
-find.info-2: 50752
+find.info-1: 1124
+find.info-2: 50779
Tag Table:
(Indirect)
-Node: Top1097
-Node: Introduction1909
-Node: Scope3080
-Node: Overview5000
-Node: find Expressions6758
-Node: Finding Files8379
-Node: Name8845
-Node: Base Name Patterns9469
-Node: Full Name Patterns10008
-Node: Fast Full Name Search10993
-Node: Shell Pattern Matching13148
-Node: Links14989
-Node: Symbolic Links15419
-Node: Hard Links16367
-Node: Time17403
-Node: Age Ranges17918
-Node: Comparing Timestamps18851
-Node: Size20130
-Node: Type20945
-Node: Owner21757
-Node: Permissions22570
-Node: Contents23255
-Node: Directories24423
-Node: Filesystems26897
-Node: Combining Primaries With Operators28169
-Node: Actions29470
-Node: Print File Name30017
-Node: Print File Information30621
-Node: Escapes32856
-Node: Format Directives33516
-Node: Name Directives34214
-Node: Ownership Directives34745
-Node: Size Directives35170
-Node: Location Directives35466
-Node: Time Directives36018
-Node: Time Formats36886
-Node: Time Components37313
-Node: Date Components37806
-Node: Combined Time Formats38616
-Node: Run Commands39100
-Node: Single File39453
-Node: Multiple Files40303
-Node: Unsafe File Name Handling42106
-Node: Safe File Name Handling43656
-Node: Limiting Command Size44342
-Node: Interspersing File Names46097
-Node: Querying47158
-Node: Adding Tests48074
-Node: Common Tasks50336
-Node: Viewing And Editing50752
-Node: Archiving51263
-Node: Cleaning Up52895
-Node: Strange File Names54456
-Node: Fixing Permissions56086
-Node: Classifying Files56645
-Node: Databases57363
-Node: Database Locations57977
-Node: Database Formats59501
-Node: New Database Format60152
-Node: Sample Database61714
-Node: Old Database Format62353
-Node: File Permissions64083
-Node: Mode Structure64651
-Node: Symbolic Modes66779
-Node: Setting Permissions67777
-Node: Copying Permissions70314
-Node: Changing Special Permissions71115
-Node: Conditional Executability72951
-Node: Multiple Changes73568
-Node: Umask and Protection75216
-Node: Numeric Modes76305
-Node: Reference78135
-Node: Invoking find78433
-Node: Invoking locate79480
-Node: Invoking updatedb80163
-Node: Invoking xargs80932
-Node: Primary Index84002
+Node: Top1124
+Node: Introduction1936
+Node: Scope3107
+Node: Overview5027
+Node: find Expressions6785
+Node: Finding Files8406
+Node: Name8872
+Node: Base Name Patterns9496
+Node: Full Name Patterns10035
+Node: Fast Full Name Search11020
+Node: Shell Pattern Matching13175
+Node: Links15016
+Node: Symbolic Links15446
+Node: Hard Links16394
+Node: Time17430
+Node: Age Ranges17945
+Node: Comparing Timestamps18878
+Node: Size20157
+Node: Type20972
+Node: Owner21784
+Node: Permissions22597
+Node: Contents23282
+Node: Directories24450
+Node: Filesystems26924
+Node: Combining Primaries With Operators28196
+Node: Actions29497
+Node: Print File Name30044
+Node: Print File Information30648
+Node: Escapes32883
+Node: Format Directives33543
+Node: Name Directives34241
+Node: Ownership Directives34772
+Node: Size Directives35197
+Node: Location Directives35493
+Node: Time Directives36045
+Node: Time Formats36913
+Node: Time Components37340
+Node: Date Components37833
+Node: Combined Time Formats38643
+Node: Run Commands39127
+Node: Single File39480
+Node: Multiple Files40330
+Node: Unsafe File Name Handling42133
+Node: Safe File Name Handling43683
+Node: Limiting Command Size44369
+Node: Interspersing File Names46124
+Node: Querying47185
+Node: Adding Tests48101
+Node: Common Tasks50363
+Node: Viewing And Editing50779
+Node: Archiving51290
+Node: Cleaning Up52922
+Node: Strange File Names54483
+Node: Fixing Permissions56113
+Node: Classifying Files56672
+Node: Databases57390
+Node: Database Locations58004
+Node: Database Formats59528
+Node: New Database Format60179
+Node: Sample Database61741
+Node: Old Database Format62380
+Node: File Permissions64110
+Node: Mode Structure64678
+Node: Symbolic Modes66806
+Node: Setting Permissions67804
+Node: Copying Permissions70341
+Node: Changing Special Permissions71142
+Node: Conditional Executability72978
+Node: Multiple Changes73595
+Node: Umask and Protection75243
+Node: Numeric Modes76332
+Node: Reference78162
+Node: Invoking find78460
+Node: Invoking locate79507
+Node: Invoking updatedb80190
+Node: Invoking xargs80959
+Node: Primary Index84029
End Tag Table
diff -rup --new-file baseline/fsf/findutils/doc/find.info-1 amiga/fsf/findutils/doc/find.info-1
--- baseline/fsf/findutils/doc/find.info-1 Thu Nov 3 21:22:49 1994
+++ amiga/fsf/findutils/doc/find.info-1 Sat Sep 28 00:00:00 1996
@@ -1,5 +1,5 @@
-This is Info file find.info, produced by Makeinfo-1.55 from the input
-file find.texi.
+This is Info file find.info, produced by Makeinfo-1.63 from the input
+file /ade-src/fsf/findutils/doc/find.texi.
START-INFO-DIR-ENTRY
* Finding Files: (find). Listing and operating on files
diff -rup --new-file baseline/fsf/findutils/doc/find.info-2 amiga/fsf/findutils/doc/find.info-2
--- baseline/fsf/findutils/doc/find.info-2 Thu Nov 3 21:22:49 1994
+++ amiga/fsf/findutils/doc/find.info-2 Sat Sep 28 00:00:00 1996
@@ -1,5 +1,5 @@
-This is Info file find.info, produced by Makeinfo-1.55 from the input
-file find.texi.
+This is Info file find.info, produced by Makeinfo-1.63 from the input
+file /ade-src/fsf/findutils/doc/find.texi.
START-INFO-DIR-ENTRY
* Finding Files: (find). Listing and operating on files
diff -rup --new-file baseline/fsf/findutils/find/Makefile.in amiga/fsf/findutils/find/Makefile.in
--- baseline/fsf/findutils/find/Makefile.in Sat Nov 5 07:43:52 1994
+++ amiga/fsf/findutils/find/Makefile.in Sat Sep 28 00:00:00 1996
@@ -25,13 +25,17 @@ exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
sbindir = $(exec_prefix)/sbin
-libexecdir = $(exec_prefix)/libexec
datadir = $(prefix)/share
sysconfdir = $(prefix)/etc
sharedstatedir = $(prefix)/com
-localstatedir = $(prefix)/var
+# Put this in /local, since $(prefix) might be on read-only media. -fnf
+localstatedir = /local/var
libdir = $(exec_prefix)/lib
+# It seems hokey to me to have the libexec dir visible at what is the
+# equivalent of the root directory, so put it under libdir instead. -fnf
+libexecdir = $(libdir)/libexec
infodir = $(prefix)/info
+guidedir = $(prefix)/guide
mandir = $(prefix)/man
includedir = $(prefix)/include
oldincludedir = /usr/include
@@ -58,7 +62,7 @@ NROFF = nroff
SOURCES = ${find_SOURCES}
DIST_CONF = Makefile.am Makefile.in
-DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
+DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(GUIDES) $(MANS) $(DIST_OTHER)
PROGRAMS = find
find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c
@@ -131,7 +135,7 @@ distclean: clean
rm -f config.cache config.log config.status ${CONFIG_HEADER} stamp-h
realclean: distclean
- rm -f TAGS $(INFOS)
+ rm -f TAGS $(INFOS) $(GUIDES)
dist: $(DIST_FILES) $(DIST_DIRS)
-mkdir ../`cat ../distname`/$(subdir)
@@ -141,7 +145,7 @@ dist: $(DIST_FILES) $(DIST_DIRS)
{ echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file;}; \
done
-check dvi info install uninstall::
+check dvi info guide install uninstall::
tags:: TAGS
diff -rup --new-file baseline/fsf/findutils/find/find.c amiga/fsf/findutils/find/find.c
--- baseline/fsf/findutils/find/find.c Wed Oct 12 14:21:11 1994
+++ amiga/fsf/findutils/find/find.c Sat Sep 28 00:00:00 1996
@@ -131,7 +131,7 @@ debug_stat (file, bufp)
}
#endif /* DEBUG_STAT */
-void
+int
main (argc, argv)
int argc;
char *argv[];
@@ -149,7 +149,13 @@ main (argc, argv)
maxdepth = mindepth = -1;
cur_day_start = time ((time_t *) 0) - DAYSECS;
full_days = false;
+/* ixemul.library always sets st_nlink to 2 instead of 2 + number of
+ files in directory */
+#ifdef __amigaos__
+ no_leaf_check = true;
+#else
no_leaf_check = false;
+#endif
stay_on_filesystem = false;
exit_status = 0;
dereference = false;
diff -rup --new-file baseline/fsf/findutils/find/fstype.c amiga/fsf/findutils/find/fstype.c
--- baseline/fsf/findutils/find/fstype.c Thu Nov 3 09:33:48 1994
+++ amiga/fsf/findutils/find/fstype.c Sat Sep 28 00:00:00 1996
@@ -48,8 +48,19 @@ static int xatoi P_((char *cp));
#endif
#endif
+/* The above "defs.h" includes "regex.h", which defines RE_DUP_MAX. However
+ on some systems, <param.h> includes <sys/syslimits.h>, which wants to
+ unconditionally define RE_DUP_MAX. So to work around this problem, we
+ save the value set by regex.h and then restore it later after including
+ param.h. This is a hack, but the alternative is to reorder the includes,
+ which is more dangerous. */
+#define RE_DUP_MAX_SAVE RE_DUP_MAX
+#undef RE_DUP_MAX
+
#ifdef FSTYPE_GETMNT /* Ultrix. */
#include <sys/param.h>
+#undef RE_DUP_MAX /* See notes above */
+#define RE_DUP_MAX RE_DUP_MAX_SAVE
#include <sys/mount.h>
#include <sys/fs_types.h>
#endif
@@ -66,6 +77,8 @@ static int xatoi P_((char *cp));
#ifdef FSTYPE_STATFS /* 4.4BSD. */
#include <sys/param.h> /* NetBSD needs this. */
+#undef RE_DUP_MAX /* See notes above */
+#define RE_DUP_MAX RE_DUP_MAX_SAVE
#include <sys/mount.h>
#ifndef MFSNAMELEN /* NetBSD defines this. */
diff -rup --new-file baseline/fsf/findutils/find/pred.c amiga/fsf/findutils/find/pred.c
--- baseline/fsf/findutils/find/pred.c Wed Nov 2 13:59:23 1994
+++ amiga/fsf/findutils/find/pred.c Sat Sep 28 00:00:00 1996
@@ -19,11 +19,14 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <stdio.h>
-#include <fnmatch.h>
#include <signal.h>
#include <pwd.h>
#include <grp.h>
#include "defs.h"
+/* Put fnmatch.h after defs.h, since defs.h includes unistd.h, which on
+ some systems defines FNM_PATHNAME, which fnmatch.h then wants to undef
+ and do it's own way. */
+#include <fnmatch.h>
#include "modetype.h"
#include "wait.h"
@@ -1337,7 +1340,7 @@ launch (pred_ptr)
signal (SIGCHLD, SIG_DFL);
}
- child_pid = fork ();
+ child_pid = vfork ();
if (child_pid == -1)
error (1, errno, "cannot fork");
if (child_pid == 0)
diff -rup --new-file baseline/fsf/findutils/lib/Makefile.in amiga/fsf/findutils/lib/Makefile.in
--- baseline/fsf/findutils/lib/Makefile.in Sat Nov 5 07:43:58 1994
+++ amiga/fsf/findutils/lib/Makefile.in Sat Sep 28 00:00:00 1996
@@ -25,13 +25,17 @@ exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
sbindir = $(exec_prefix)/sbin
-libexecdir = $(exec_prefix)/libexec
datadir = $(prefix)/share
sysconfdir = $(prefix)/etc
sharedstatedir = $(prefix)/com
-localstatedir = $(prefix)/var
+# Put this in /local, since $(prefix) might be on read-only media. -fnf
+localstatedir = /local/var
libdir = $(exec_prefix)/lib
+# It seems hokey to me to have the libexec dir visible at what is the
+# equivalent of the root directory, so put it under libdir instead. -fnf
+libexecdir = $(libdir)/libexec
infodir = $(prefix)/info
+guidedir = $(prefix)/guide
mandir = $(prefix)/man
includedir = $(prefix)/include
oldincludedir = /usr/include
@@ -62,7 +66,7 @@ LIBOBJS = @LIBOBJS@
SOURCES = ${find_SOURCES}
DIST_CONF = Makefile.am Makefile.in
-DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
+DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(GUIDES) $(MANS) $(DIST_OTHER)
LIBRARIES = find
find_SOURCES = regex.c dirname.c error.c filemode.c getopt.c getopt1.c \
@@ -108,7 +112,7 @@ distclean: clean
rm -f config.cache config.log config.status ${CONFIG_HEADER} stamp-h
realclean: distclean
- rm -f TAGS $(INFOS)
+ rm -f TAGS $(INFOS) $(GUIDES)
dist: $(DIST_FILES) $(DIST_DIRS)
-mkdir ../`cat ../distname`/$(subdir)
@@ -118,7 +122,7 @@ dist: $(DIST_FILES) $(DIST_DIRS)
{ echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file;}; \
done
-check dvi info install uninstall::
+check dvi info guide install uninstall::
tags:: TAGS
diff -rup --new-file baseline/fsf/findutils/lib/fnmatch.h amiga/fsf/findutils/lib/fnmatch.h
--- baseline/fsf/findutils/lib/fnmatch.h Mon Sep 26 15:03:58 1994
+++ amiga/fsf/findutils/lib/fnmatch.h Sat Sep 28 00:00:00 1996
@@ -41,6 +41,10 @@ extern "C" {
#undef FNM_NOESCAPE
#undef FNM_PERIOD
+#ifdef FNM_PATHNAME
+#undef FNM_PATHNAME /* Defined in some <unistd.h> files? -fnf */
+#endif
+
/* Bits set in the FLAGS argument to `fnmatch'. */
#define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */
#define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */
diff -rup --new-file baseline/fsf/findutils/locate/Makefile.in amiga/fsf/findutils/locate/Makefile.in
--- baseline/fsf/findutils/locate/Makefile.in Sat Nov 5 07:44:08 1994
+++ amiga/fsf/findutils/locate/Makefile.in Sat Sep 28 00:00:00 1996
@@ -25,13 +25,17 @@ exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
sbindir = $(exec_prefix)/sbin
-libexecdir = $(exec_prefix)/libexec
datadir = $(prefix)/share
sysconfdir = $(prefix)/etc
sharedstatedir = $(prefix)/com
-localstatedir = $(prefix)/var
+# Put this in /local, since $(prefix) might be on read-only media. -fnf
+localstatedir = /local/var
libdir = $(exec_prefix)/lib
+# It seems hokey to me to have the libexec dir visible at what is the
+# equivalent of the root directory, so put it under libdir instead. -fnf
+libexecdir = $(libdir)/libexec
infodir = $(prefix)/info
+guidedir = $(prefix)/guide
mandir = $(prefix)/man
includedir = $(prefix)/include
oldincludedir = /usr/include
@@ -65,7 +69,7 @@ NROFF = nroff
SOURCES = locate.c frcode.c code.c bigram.c
DIST_CONF = Makefile.am Makefile.in
-DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
+DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(GUIDES) $(MANS) $(DIST_OTHER)
# The default database to build and search.
LOCATE_DB = $(localstatedir)/locatedb
@@ -173,7 +177,7 @@ distclean: clean
rm -f config.cache config.log config.status ${CONFIG_HEADER} stamp-h
realclean: distclean
- rm -f TAGS $(INFOS)
+ rm -f TAGS $(INFOS) $(GUIDES)
dist: $(DIST_FILES) $(DIST_DIRS)
-mkdir ../`cat ../distname`/$(subdir)
@@ -183,7 +187,7 @@ dist: $(DIST_FILES) $(DIST_DIRS)
{ echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file;}; \
done
-check dvi info install uninstall::
+check dvi info guide install uninstall::
tags:: TAGS
@@ -203,9 +207,10 @@ updatedb: updatedb.sh
frcode=`echo frcode|sed '$(transform)'`; \
bigram=`echo bigram|sed '$(transform)'`; \
code=`echo code|sed '$(transform)'`; \
+ # Amiga hack - avoid autoconf substitutions of @bindir@ & @libexecdir@
sed \
- -e "s,@bindir@,$(bindir)," \
- -e "s,@libexecdir@,$(libexecdir)," \
+ -e "s,@bin.*dir@,$(bindir)," \
+ -e "s,@lib.*execdir@,$(libexecdir)," \
-e "s,@LOCATE_DB@,$(LOCATE_DB)," \
-e "s,@version@,$$version," \
-e "s,@find@,$$find," \
diff -rup --new-file baseline/fsf/findutils/locate/bigram.c amiga/fsf/findutils/locate/bigram.c
--- baseline/fsf/findutils/locate/bigram.c Fri Oct 7 10:21:35 1994
+++ amiga/fsf/findutils/locate/bigram.c Sat Sep 28 00:00:00 1996
@@ -61,7 +61,7 @@ prefix_length (s1, s2)
return s1 - start;
}
-void
+int
main (argc, argv)
int argc;
char **argv;
diff -rup --new-file baseline/fsf/findutils/locate/code.c amiga/fsf/findutils/locate/code.c
--- baseline/fsf/findutils/locate/code.c Mon Sep 26 15:06:09 1994
+++ amiga/fsf/findutils/locate/code.c Sat Sep 28 00:00:00 1996
@@ -102,7 +102,7 @@ prefix_length (s1, s2)
return s1 - start;
}
-void
+int
main (argc, argv)
int argc;
char **argv;
diff -rup --new-file baseline/fsf/findutils/locate/frcode.c amiga/fsf/findutils/locate/frcode.c
--- baseline/fsf/findutils/locate/frcode.c Mon Sep 26 15:06:11 1994
+++ amiga/fsf/findutils/locate/frcode.c Sat Sep 28 00:00:00 1996
@@ -106,7 +106,6 @@ prefix_length (s1, s2)
return s1 - start;
}
-void
main (argc, argv)
int argc;
char **argv;
diff -rup --new-file baseline/fsf/findutils/locate/locate.c amiga/fsf/findutils/locate/locate.c
--- baseline/fsf/findutils/locate/locate.c Mon Sep 26 15:06:14 1994
+++ amiga/fsf/findutils/locate/locate.c Sat Sep 28 00:00:00 1996
@@ -355,7 +355,7 @@ static struct option const longopts[] =
{NULL, no_argument, NULL, 0}
};
-void
+int
main (argc, argv)
int argc;
char **argv;
diff -rup --new-file baseline/fsf/findutils/locate/updatedb.sh amiga/fsf/findutils/locate/updatedb.sh
--- baseline/fsf/findutils/locate/updatedb.sh Tue Oct 4 19:24:18 1994
+++ amiga/fsf/findutils/locate/updatedb.sh Sat Sep 28 00:00:00 1996
@@ -63,11 +63,7 @@ test -z "$PRUNEREGEX" &&
: ${LOCATE_DB=@LOCATE_DB@}
# Directory to hold intermediate files.
-if test -d /var/tmp; then
- : ${TMPDIR=/var/tmp}
-else
- : ${TMPDIR=/usr/tmp}
-fi
+: ${TMPDIR=/tmp}
# The user to search network directories as.
: ${NETUSER=daemon}
@@ -84,7 +80,7 @@ fi
: ${bigram=@bigram@}
: ${code=@code@}
-PATH=$LIBEXECDIR:$BINDIR:/usr/ucb:/bin:/usr/bin:$PATH export PATH
+PATH=$LIBEXECDIR:$BINDIR:/bin:$PATH export PATH
# Make and code the file list.
# Sort case insensitively for users' convenience.
diff -rup --new-file baseline/fsf/findutils/manifests/bin amiga/fsf/findutils/manifests/bin
--- baseline/fsf/findutils/manifests/bin Wed Dec 31 17:00:00 1969
+++ amiga/fsf/findutils/manifests/bin Wed Oct 9 23:24:11 1996
@@ -0,0 +1,23 @@
+COPYING
+COPYING.info
+bin/find
+bin/locate
+bin/updatedb
+bin/xargs
+guide/find.guide
+info/find.info
+info/find.info-1
+info/find.info-2
+lib/libexec/bigram
+lib/libexec/code
+lib/libexec/frcode
+man/cat1/find.1
+man/cat1/locate.1
+man/cat1/updatedb.1
+man/cat1/xargs.1
+man/cat5/locatedb.5
+man/man1/find.1
+man/man1/locate.1
+man/man1/updatedb.1
+man/man1/xargs.1
+man/man5/locatedb.5
diff -rup --new-file baseline/fsf/findutils/manifests/src amiga/fsf/findutils/manifests/src
--- baseline/fsf/findutils/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/findutils/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,126 @@
+fsf/findutils/COPYING
+fsf/findutils/ChangeLog
+fsf/findutils/INSTALL
+fsf/findutils/Makefile.am
+fsf/findutils/Makefile.in
+fsf/findutils/NEWS
+fsf/findutils/Product-Info
+fsf/findutils/README
+fsf/findutils/TODO
+fsf/findutils/acconfig.h
+fsf/findutils/config.h.in
+fsf/findutils/configure
+fsf/findutils/configure.in
+fsf/findutils/doc/Makefile.am
+fsf/findutils/doc/Makefile.in
+fsf/findutils/doc/find.info
+fsf/findutils/doc/find.info-1
+fsf/findutils/doc/find.info-2
+fsf/findutils/doc/find.texi
+fsf/findutils/doc/perm.texi
+fsf/findutils/doc/texinfo.tex
+fsf/findutils/find/Makefile.am
+fsf/findutils/find/Makefile.in
+fsf/findutils/find/defs.h
+fsf/findutils/find/find.1
+fsf/findutils/find/find.c
+fsf/findutils/find/fstype.c
+fsf/findutils/find/parser.c
+fsf/findutils/find/pred.c
+fsf/findutils/find/tree.c
+fsf/findutils/find/util.c
+fsf/findutils/find/version.c
+fsf/findutils/install-sh
+fsf/findutils/lib/Makefile.am
+fsf/findutils/lib/Makefile.in
+fsf/findutils/lib/alloca.c
+fsf/findutils/lib/dirname.c
+fsf/findutils/lib/error.c
+fsf/findutils/lib/fileblocks.c
+fsf/findutils/lib/filemode.c
+fsf/findutils/lib/fnmatch.c
+fsf/findutils/lib/fnmatch.h
+fsf/findutils/lib/getline.c
+fsf/findutils/lib/getopt.c
+fsf/findutils/lib/getopt.h
+fsf/findutils/lib/getopt1.c
+fsf/findutils/lib/idcache.c
+fsf/findutils/lib/listfile.c
+fsf/findutils/lib/memcmp.c
+fsf/findutils/lib/memset.c
+fsf/findutils/lib/mktime.c
+fsf/findutils/lib/modechange.c
+fsf/findutils/lib/modechange.h
+fsf/findutils/lib/modetype.h
+fsf/findutils/lib/nextelem.c
+fsf/findutils/lib/pathmax.h
+fsf/findutils/lib/regex.c
+fsf/findutils/lib/regex.h
+fsf/findutils/lib/savedir.c
+fsf/findutils/lib/stpcpy.c
+fsf/findutils/lib/strdup.c
+fsf/findutils/lib/strftime.c
+fsf/findutils/lib/strspn.c
+fsf/findutils/lib/strstr.c
+fsf/findutils/lib/strtol.c
+fsf/findutils/lib/wait.h
+fsf/findutils/lib/xgetcwd.c
+fsf/findutils/lib/xmalloc.c
+fsf/findutils/lib/xstrdup.c
+fsf/findutils/locate/Makefile.am
+fsf/findutils/locate/Makefile.in
+fsf/findutils/locate/bigram.c
+fsf/findutils/locate/code.c
+fsf/findutils/locate/frcode.c
+fsf/findutils/locate/locate.1
+fsf/findutils/locate/locate.c
+fsf/findutils/locate/locatedb.5
+fsf/findutils/locate/locatedb.h
+fsf/findutils/locate/updatedb.1
+fsf/findutils/locate/updatedb.sh
+fsf/findutils/manifests/bin
+fsf/findutils/manifests/src
+fsf/findutils/mkinstalldirs
+fsf/findutils/stamp-h.in
+fsf/findutils/testsuite/Makefile.am
+fsf/findutils/testsuite/Makefile.in
+fsf/findutils/testsuite/config/unix.exp
+fsf/findutils/testsuite/inputs/eof.xi
+fsf/findutils/testsuite/inputs/eofstr.xi
+fsf/findutils/testsuite/inputs/files.xi
+fsf/findutils/testsuite/inputs/files0.xi
+fsf/findutils/testsuite/inputs/quotes.xi
+fsf/findutils/testsuite/xargs.gnu/0n3.exp
+fsf/findutils/testsuite/xargs.gnu/0n3.xo
+fsf/findutils/testsuite/xargs.gnu/nothing.exp
+fsf/findutils/testsuite/xargs.gnu/nothing.xo
+fsf/findutils/testsuite/xargs.gnu/r.exp
+fsf/findutils/testsuite/xargs.posix/hithere.exp
+fsf/findutils/testsuite/xargs.posix/hithere.xo
+fsf/findutils/testsuite/xargs.posix/n3.exp
+fsf/findutils/testsuite/xargs.posix/n3.xo
+fsf/findutils/testsuite/xargs.posix/quotes.exp
+fsf/findutils/testsuite/xargs.posix/quotes.xo
+fsf/findutils/testsuite/xargs.posix/s47.exp
+fsf/findutils/testsuite/xargs.posix/s47.xo
+fsf/findutils/testsuite/xargs.posix/s470.exp
+fsf/findutils/testsuite/xargs.posix/s470.xo
+fsf/findutils/testsuite/xargs.posix/s48.exp
+fsf/findutils/testsuite/xargs.posix/s48.xo
+fsf/findutils/testsuite/xargs.posix/s6.exp
+fsf/findutils/testsuite/xargs.sysv/eEOF.exp
+fsf/findutils/testsuite/xargs.sysv/eEOF.xo
+fsf/findutils/testsuite/xargs.sysv/eof.exp
+fsf/findutils/testsuite/xargs.sysv/eof.xo
+fsf/findutils/testsuite/xargs.sysv/iARG.exp
+fsf/findutils/testsuite/xargs.sysv/iARG.xo
+fsf/findutils/testsuite/xargs.sysv/iquotes.exp
+fsf/findutils/testsuite/xargs.sysv/iquotes.xo
+fsf/findutils/testsuite/xargs.sysv/l1n4.exp
+fsf/findutils/testsuite/xargs.sysv/l1n4.xo
+fsf/findutils/testsuite/xargs.sysv/l2.exp
+fsf/findutils/testsuite/xargs.sysv/l2.xo
+fsf/findutils/xargs/Makefile.am
+fsf/findutils/xargs/Makefile.in
+fsf/findutils/xargs/xargs.1
+fsf/findutils/xargs/xargs.c
diff -rup --new-file baseline/fsf/findutils/testsuite/Makefile.in amiga/fsf/findutils/testsuite/Makefile.in
--- baseline/fsf/findutils/testsuite/Makefile.in Sat Nov 5 07:44:25 1994
+++ amiga/fsf/findutils/testsuite/Makefile.in Sat Sep 28 00:00:00 1996
@@ -25,13 +25,17 @@ exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
sbindir = $(exec_prefix)/sbin
-libexecdir = $(exec_prefix)/libexec
datadir = $(prefix)/share
sysconfdir = $(prefix)/etc
sharedstatedir = $(prefix)/com
-localstatedir = $(prefix)/var
+# Put this in /local, since $(prefix) might be on read-only media. -fnf
+localstatedir = /local/var
libdir = $(exec_prefix)/lib
+# It seems hokey to me to have the libexec dir visible at what is the
+# equivalent of the root directory, so put it under libdir instead. -fnf
+libexecdir = $(libdir)/libexec
infodir = $(prefix)/info
+guidedir = $(prefix)/guide
mandir = $(prefix)/man
includedir = $(prefix)/include
oldincludedir = /usr/include
@@ -44,7 +48,7 @@ transform = @program_transform_name@
ALL = ${PROGRAMS} ${LIBPROGRAMS} ${SCRIPTS} ${LIBSCRIPTS} ${LIBFILES}
SOURCES =
DIST_CONF = Makefile.am Makefile.in
-DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
+DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(GUIDES) $(MANS) $(DIST_OTHER)
XARGS = ../xargs/xargs
XARGSFLAGS =
@@ -70,7 +74,7 @@ distclean: clean
rm -f config.cache config.log config.status ${CONFIG_HEADER} stamp-h
realclean: distclean
- rm -f TAGS $(INFOS)
+ rm -f TAGS $(INFOS) $(GUIDES)
dist: $(DIST_FILES) $(DIST_DIRS)
-mkdir ../`cat ../distname`/$(subdir)
@@ -80,7 +84,7 @@ dist: $(DIST_FILES) $(DIST_DIRS)
{ echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file;}; \
done
-check dvi info install uninstall::
+check dvi info guide install uninstall::
tags:: TAGS
diff -rup --new-file baseline/fsf/findutils/xargs/Makefile.in amiga/fsf/findutils/xargs/Makefile.in
--- baseline/fsf/findutils/xargs/Makefile.in Sat Nov 5 07:44:18 1994
+++ amiga/fsf/findutils/xargs/Makefile.in Sat Sep 28 00:00:00 1996
@@ -25,13 +25,17 @@ exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
sbindir = $(exec_prefix)/sbin
-libexecdir = $(exec_prefix)/libexec
datadir = $(prefix)/share
sysconfdir = $(prefix)/etc
sharedstatedir = $(prefix)/com
-localstatedir = $(prefix)/var
+# Put this in /local, since $(prefix) might be on read-only media. -fnf
+localstatedir = /local/var
libdir = $(exec_prefix)/lib
+# It seems hokey to me to have the libexec dir visible at what is the
+# equivalent of the root directory, so put it under libdir instead. -fnf
+libexecdir = $(libdir)/libexec
infodir = $(prefix)/info
+guidedir = $(prefix)/guide
mandir = $(prefix)/man
includedir = $(prefix)/include
oldincludedir = /usr/include
@@ -59,7 +63,7 @@ NROFF = nroff
SOURCES = xargs.c
DIST_CONF = Makefile.am Makefile.in
-DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(MANS) $(DIST_OTHER)
+DIST_FILES = $(DIST_CONF) $(SOURCES) $(TEXINFOS) $(INFOS) $(GUIDES) $(MANS) $(DIST_OTHER)
PROGRAMS = xargs
MANS = xargs.1
@@ -130,7 +134,7 @@ distclean: clean
rm -f config.cache config.log config.status ${CONFIG_HEADER} stamp-h
realclean: distclean
- rm -f TAGS $(INFOS)
+ rm -f TAGS $(INFOS) $(GUIDES)
dist: $(DIST_FILES) $(DIST_DIRS)
-mkdir ../`cat ../distname`/$(subdir)
@@ -140,7 +144,7 @@ dist: $(DIST_FILES) $(DIST_DIRS)
{ echo copying $$file instead; cp -p $(srcdir)/$$file ../`cat ../distname`/$(subdir)/$$file;}; \
done
-check dvi info install uninstall::
+check dvi info guide install uninstall::
tags:: TAGS
diff -rup --new-file baseline/fsf/findutils/xargs/xargs.c amiga/fsf/findutils/xargs/xargs.c
--- baseline/fsf/findutils/xargs/xargs.c Fri Oct 7 10:21:39 1994
+++ amiga/fsf/findutils/xargs/xargs.c Sat Sep 28 00:00:00 1996
@@ -248,7 +248,7 @@ static long parse_num P_ ((char *str, in
static long env_size P_ ((char **envp));
static void usage P_ ((FILE * stream, int status));
-void
+int
main (argc, argv)
int argc;
char **argv;
@@ -752,12 +752,12 @@ do_exec ()
print_args (false);
/* If we run out of processes, wait for a child to return and
try again. */
- while ((child = fork ()) < 0 && errno == EAGAIN && procs_executing)
+ while ((child = vfork ()) < 0 && errno == EAGAIN && procs_executing)
wait_for_proc (false);
switch (child)
{
case -1:
- error (1, errno, "cannot fork");
+ error (1, errno, "cannot vfork");
case 0: /* Child. */
execvp (cmd_argv[0], cmd_argv);