home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
ed-0.2-diffs.gz
/
ed-0.2-diffs
Wrap
Text File
|
1996-10-13
|
145KB
|
4,762 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/ed/BeOS.diffs amiga/fsf/ed/BeOS.diffs
--- baseline/fsf/ed/BeOS.diffs Wed Dec 31 17:00:00 1969
+++ amiga/fsf/ed/BeOS.diffs Sat Sep 28 00:00:00 1996
@@ -0,0 +1,469 @@
+This patch works around current bugs in the BeOS shell that affect
+configure, and also patch up some Makefile targets that are not
+yet fully supported.
+
+============================================================================
+
+diff -rc ed-ref/Makefile.in ed/Makefile.in
+*** ed-ref/Makefile.in Sat Sep 28 07:50:41 1996
+--- ed/Makefile.in Fri Sep 20 00:00:00 1996
+***************
+*** 31,38 ****
+ #LN_S = @LN_S@
+ LN_S = cp
+ CC = @CC@
+! AR = @AR@
+! AR_FLAGS = cru
+ RANLIB = @RANLIB@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- 31,38 ----
+ #LN_S = @LN_S@
+ LN_S = cp
+ CC = @CC@
+! AR = mwcc
+! AR_FLAGS = -xml -o
+ RANLIB = @RANLIB@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+diff -rc ed-ref/configure ed/configure
+*** ed-ref/configure Sat Sep 28 07:54:18 1996
+--- ed/configure Fri Sep 20 00:00:00 1996
+***************
+*** 861,867 ****
+ yes;
+ #endif
+ EOF
+! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:865: \"$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
+--- 861,867 ----
+ yes;
+ #endif
+ EOF
+! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:865: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; } | egrep yes >/dev/null 2>&1; then
+ ac_cv_prog_gcc=yes
+ else
+ ac_cv_prog_gcc=no
+***************
+*** 953,959 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_c_const=yes
+ else
+--- 953,959 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:957: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ ac_cv_c_const=yes
+ else
+***************
+*** 993,999 ****
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+--- 993,999 ----
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:997: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+***************
+*** 1008,1014 ****
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+--- 1008,1014 ----
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1012: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ :
+***************
+*** 1041,1047 ****
+ #include "confdefs.h"
+ main(){return(0);}
+ EOF
+! { (eval echo configure:1045: \"$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
+--- 1041,1047 ----
+ #include "confdefs.h"
+ main(){return(0);}
+ EOF
+! { (eval echo configure:1045: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ ac_cv_c_cross=no
+ else
+***************
+*** 1067,1073 ****
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 1067,1073 ----
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1071: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 1086,1093 ****
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+! egrep "memchr" >/dev/null 2>&1; then
+ :
+ else
+ rm -rf conftest*
+--- 1086,1093 ----
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+! eval "$ac_cpp conftest.$ac_ext" 2>&5 >conftest.tmp
+! if egrep "memchr" <conftest.tmp >/dev/null 2>&1; then
+ :
+ else
+ rm -rf conftest*
+***************
+*** 1104,1111 ****
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+! egrep "free" >/dev/null 2>&1; then
+ :
+ else
+ rm -rf conftest*
+--- 1104,1111 ----
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+! eval "$ac_cpp conftest.$ac_ext" 2>&5 >conftest.tmp
+! if egrep "free" <conftest.tmp >/dev/null 2>&1; then
+ :
+ else
+ rm -rf conftest*
+***************
+*** 1132,1138 ****
+ exit (0); }
+
+ EOF
+! { (eval echo configure:1136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ :
+ else
+--- 1132,1138 ----
+ exit (0); }
+
+ EOF
+! { (eval echo configure:1136: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ :
+ else
+***************
+*** 1164,1170 ****
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+--- 1164,1170 ----
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+! { (eval echo configure:1168: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ ac_err=`grep -v '^ *+' conftest.out`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+***************
+*** 1205,1211 ****
+ builtin and then its argument prototype would still apply. */
+ char $ac_func();
+
+! int main() { return 0; }
+ int t() {
+
+ /* The GNU C library defines this for functions which it implements
+--- 1205,1211 ----
+ builtin and then its argument prototype would still apply. */
+ char $ac_func();
+
+! int main() { t(); return 0; }
+ int t() {
+
+ /* The GNU C library defines this for functions which it implements
+***************
+*** 1219,1225 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+--- 1219,1225 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1223: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+***************
+*** 1256,1262 ****
+ builtin and then its argument prototype would still apply. */
+ char vprintf();
+
+! int main() { return 0; }
+ int t() {
+
+ /* The GNU C library defines this for functions which it implements
+--- 1256,1262 ----
+ builtin and then its argument prototype would still apply. */
+ char vprintf();
+
+! int main() { t(); return 0; }
+ int t() {
+
+ /* The GNU C library defines this for functions which it implements
+***************
+*** 1270,1276 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_vprintf=yes"
+ else
+--- 1270,1276 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1274: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_vprintf=yes"
+ else
+***************
+*** 1306,1312 ****
+ builtin and then its argument prototype would still apply. */
+ char _doprnt();
+
+! int main() { return 0; }
+ int t() {
+
+ /* The GNU C library defines this for functions which it implements
+--- 1306,1312 ----
+ builtin and then its argument prototype would still apply. */
+ char _doprnt();
+
+! int main() { t(); return 0; }
+ int t() {
+
+ /* The GNU C library defines this for functions which it implements
+***************
+*** 1320,1326 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func__doprnt=yes"
+ else
+--- 1320,1326 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1324: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_func__doprnt=yes"
+ else
+***************
+*** 1352,1363 ****
+ #line 1353 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+! int main() { return 0; }
+ int t() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_header_alloca_h=yes
+ else
+--- 1352,1363 ----
+ #line 1353 "configure"
+ #include "confdefs.h"
+ #include <alloca.h>
+! int main() { t(); return 0; }
+ int t() {
+ char *p = alloca(2 * sizeof(int));
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1361: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ ac_cv_header_alloca_h=yes
+ else
+***************
+*** 1400,1411 ****
+ # endif
+ #endif
+
+! int main() { return 0; }
+ int t() {
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ ac_cv_func_alloca=yes
+ else
+--- 1400,1411 ----
+ # endif
+ #endif
+
+! int main() { t(); return 0; }
+ int t() {
+ char *p = (char *) alloca(1);
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1409: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ ac_cv_func_alloca=yes
+ else
+***************
+*** 1449,1456 ****
+ #endif
+
+ EOF
+! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+! egrep "webecray" >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_os_cray=yes
+ else
+--- 1449,1456 ----
+ #endif
+
+ EOF
+! eval "$ac_cpp conftest.$ac_ext" 2>&5 >conftest.tmp
+! if egrep "webecray" <conftest.tmp >/dev/null 2>&1; then
+ rm -rf conftest*
+ ac_cv_os_cray=yes
+ else
+***************
+*** 1479,1485 ****
+ builtin and then its argument prototype would still apply. */
+ char $ac_func();
+
+! int main() { return 0; }
+ int t() {
+
+ /* The GNU C library defines this for functions which it implements
+--- 1479,1485 ----
+ builtin and then its argument prototype would still apply. */
+ char $ac_func();
+
+! int main() { t(); return 0; }
+ int t() {
+
+ /* The GNU C library defines this for functions which it implements
+***************
+*** 1493,1499 ****
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+--- 1493,1499 ----
+
+ ; return 0; }
+ EOF
+! if { (eval echo configure:1497: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
+ rm -rf conftest*
+ eval "ac_cv_func_$ac_func=yes"
+ else
+***************
+*** 1544,1550 ****
+ exit (find_stack_direction() < 0);
+ }
+ EOF
+! { (eval echo configure:1548: \"$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
+--- 1544,1550 ----
+ exit (find_stack_direction() < 0);
+ }
+ EOF
+! { (eval echo configure:1548: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
+ if test -s conftest && (./conftest; exit) 2>/dev/null; then
+ ac_cv_c_stack_direction=1
+ else
+***************
+*** 1584,1592 ****
+ EOF
+ # 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=\${\1='\2'}/p" \
+! >> confcache
+ if cmp -s $cache_file confcache; then
+ :
+ else
+--- 1584,1592 ----
+ EOF
+ # 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) >cache.tmp 2>&1
+ sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
+! <cache.tmp >> confcache
+ if cmp -s $cache_file confcache; then
+ :
+ else
+***************
+*** 1597,1603 ****
+ echo "not updating unwritable cache $cache_file"
+ fi
+ fi
+! rm -f confcache
+
+ trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
+--- 1597,1603 ----
+ echo "not updating unwritable cache $cache_file"
+ fi
+ fi
+! rm -f confcache cache.tmp
+
+ trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
+
diff -rup --new-file baseline/fsf/ed/Makefile.in amiga/fsf/ed/Makefile.in
--- baseline/fsf/ed/Makefile.in Sat Nov 19 05:45:32 1994
+++ amiga/fsf/ed/Makefile.in Sat Sep 28 00:00:00 1996
@@ -23,9 +23,16 @@ srcdir = @srcdir@
testdir = $(srcdir)/testsuite
VPATH = @srcdir@
-LN_S = @LN_S@
+# For the Amiga, force LN_S to be just "cp" rather than "ln -s", so that a
+# copy is made rather than a symbolic link. We support symbolic links, but
+# we don't want to use them in the installation because the "mkisofs" CD-ROM
+# mastering software doesn't know what to do with them yet (convert to a
+# copy on the fly).
+#LN_S = @LN_S@
+LN_S = cp
CC = @CC@
-AR = ar
+AR = @AR@
+AR_FLAGS = cru
RANLIB = @RANLIB@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -42,6 +49,7 @@ prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = $(exec_prefix)/bin
infodir = $(prefix)/info
+guidedir = $(prefix)/guide
mandir = $(prefix)/man/man1
manext = .1
@@ -61,9 +69,9 @@ LIBOBJS = @ALLOCA@ getopt.o getopt1.o re
DISTFILES = $(HEADERS) $(LIBHDRS) $(LIBSRCS) $(SOURCES) ChangeLog COPYING \
INSTALL Makefile.in NEWS POSIX README TODO THANKS \
configure configure.in stamp-h.in config.h.in mkinstalldirs install.sh \
-ed.1 ed.info ed.texinfo texinfo.tex
+ed.1 ed.info ed.texinfo texinfo.tex ed.guide
-all: ed
+all: ed info guide
ed: $(OBJECTS) libed.a
$(CC) $(LDFLAGS) -o ed $(OBJECTS) libed.a $(LIBS)
@@ -76,7 +84,7 @@ signal.o: ed.h config.h regex.h
libed.a: $(LIBOBJS)
rm -f libed.a
- $(AR) cru libed.a $(LIBOBJS)
+ $(AR) $(AR_FLAGS) libed.a $(LIBOBJS)
$(RANLIB) libed.a
getopt.o getopt1.o: getopt.h
@@ -93,17 +101,23 @@ info: ed.info
ed.info: ed.texinfo
$(MAKEINFO) -I$(srcdir) --no-split ed.texinfo
+guide: ed.guide
+
+ed.guide: ed.texinfo
+ $(MAKEINFO) -I$(srcdir) --no-split ed.texinfo --amiga -o $@
+
dvi: ed.dvi
ed.dvi: ed.texinfo
$(TEXI2DVI) $(srcdir)/ed.texinfo
-install: ed ed.info installdirs
+install: ed ed.info ed.guide installdirs
$(INSTALL_PROGRAM) ed $(bindir)/$(binprefix)ed
rm -f $(bindir)/$(binprefix)red
cd $(bindir); \
$(LN_S) $(binprefix)ed $(binprefix)red
- $(INSTALL_DATA) $(srcdir)/ed.info $(infodir)/$(binprefix)ed.info
+ $(INSTALL_DATA) ed.info $(infodir)/$(binprefix)ed.info
+ $(INSTALL_DATA) ed.guide $(guidedir)/$(binprefix)ed.guide
$(INSTALL_DATA) $(srcdir)/ed.1 $(mandir)/$(binprefix)ed$(manext)
rm -f $(mandir)/$(binprefix)red$(manext)
cd $(mandir); \
@@ -112,11 +126,12 @@ install: ed ed.info installdirs
# Make sure all installation directories, e.g. $(bindir) actually exist by
# making them if necessary.
installdirs:
- $(srcdir)/mkinstalldirs $(bindir) $(infodir) $(mandir)
+ $(srcdir)/mkinstalldirs $(bindir) $(infodir) $(mandir) $(guidedir)
uninstall: all
rm -f $(bindir)/$(binprefix)ed $(bindir)/$(binprefix)red
rm -f $(infodir)/$(binprefix)ed.info
+ rm -f $(guidedir)/$(binprefix)ed.guide
rm -f $(mandir)/$(binprefix)ed.1 $(mandir)/$(binprefix)red.1
tags: $(HEADERS) $(SOURCES)
@@ -141,7 +156,7 @@ distclean: clean
rm -f tags TAGS Makefile config.h config.status config.log config.cache
realclean: distclean
- rm -f ed.info
+ rm -f ed.info ed.guide
dist: $(DISTFILES)
echo > .fname \
diff -rup --new-file baseline/fsf/ed/Product-Info amiga/fsf/ed/Product-Info
--- baseline/fsf/ed/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/ed/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,23 @@
+.name
+ed
+.fullname
+GNU line editor
+.type
+Miscellaneous
+.short
+8-bit-clean POSIX compliant line editor.
+.description
+"Ed" is a line-oriented text editor. It is used to create, display,
+modify and otherwise manipulate text files. "Red" is a restricted ed:
+it can only edit files in the current directory and cannot execute
+shell commands.
+.version
+0.2
+.author
+Andrew Moore
+.requirements
+Amiga binary requires ixemul.library.
+.distribution
+GNU Public License
+.described-by
+Fred Fish (fnf@amigalib.com)
diff -rup --new-file baseline/fsf/ed/config.guess amiga/fsf/ed/config.guess
--- baseline/fsf/ed/config.guess Wed Dec 31 17:00:00 1969
+++ amiga/fsf/ed/config.guess Sat Sep 28 00:00:00 1996
@@ -0,0 +1,600 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+# Copyright (C) 1992, 93, 94, 95, 1996 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Written by Per Bothner <bothner@cygnus.com>.
+# The master version of this file is at the FSF in /home/gd/gnu/lib.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub. If it succeeds, it prints the system name on stdout, and
+# exits with 0. Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit system type (host/target name).
+#
+# Only a few systems have been added to this list; please add others
+# (but try to keep the structure clean).
+#
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 8/24/94.)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ alpha:OSF1:*:*)
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
+ exit 0 ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+ exit 0 ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-cbm-sysv4
+ exit 0;;
+ amiga:NetBSD:*:*)
+ echo m68k-cbm-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit 0;;
+ Pyramid*:OSx*:*:*)
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+ fi
+ exit 0 ;;
+ sun4*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ exit 0 ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:NetBSD:*:*)
+ echo m68k-atari-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3*:NetBSD:*:*)
+ echo m68k-sun-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:NetBSD:*:*)
+ echo m68k-apple-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ mips:*:4*:UMIPS)
+ echo mips-mips-riscos4sysv
+ exit 0 ;;
+ mips:*:5*:RISCos)
+ echo mips-mips-riscos${UNAME_RELEASE}
+ exit 0 ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+ exit 0 ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+ exit 0 ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+ exit 0 ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88100 ] ; then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+ -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+ echo m88k-dg-dgux${UNAME_RELEASE}
+ else
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit 0 ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+ exit 0 ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+ exit 0 ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ exit 0 ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i[34]86:AIX:*:*)
+ echo i386-ibm-aix
+ exit 0 ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ sed 's/^ //' << EOF >dummy.c
+ #include <sys/systemcfg.h>
+
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
+EOF
+ ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+ rm -f dummy.c dummy
+ echo rs6000-ibm-aix3.2.5
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit 0 ;;
+ *:AIX:*:4)
+ if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=4.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+ exit 0 ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+ exit 0 ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ exit 0 ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+ exit 0 ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+ exit 0 ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+ exit 0 ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+ exit 0 ;;
+ 9000/[3478]??:HP-UX:*:*)
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/7?? | 9000/8?[679] ) HP_ARCH=hppa1.1 ;;
+ 9000/8?? ) HP_ARCH=hppa1.0 ;;
+ esac
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ 3050*:HI-UX:*:*)
+ sed 's/^ //' << EOF >dummy.c
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
+EOF
+ ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+ rm -f dummy.c dummy
+ echo unknown-hitachi-hiuxwe2
+ exit 0 ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+ exit 0 ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+ exit 0 ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+ exit 0 ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+ exit 0 ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+ exit 0 ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ CRAY*X-MP:*:*:*)
+ echo xmp-cray-unicos
+ exit 0 ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE}
+ exit 0 ;;
+ CRAY*C90:*:*:*)
+ echo c90-cray-unicos${UNAME_RELEASE}
+ exit 0 ;;
+ CRAY-2:*:*:*)
+ echo cray2-cray-unicos
+ exit 0 ;;
+ hp3[0-9][05]:NetBSD:*:*)
+ echo m68k-hp-netbsd${UNAME_RELEASE}
+ exit 0 ;;
+ i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:FreeBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+ *:NetBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ exit 0 ;;
+ i*:CYGWIN*:*)
+ echo i386-unknown-cygwin32
+ exit 0 ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin32
+ exit 0 ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ *:GNU:*:*)
+ echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit 0 ;;
+ *:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us.
+ ld_help_string=`ld --help 2>&1`
+ if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
+ echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
+ echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
+ echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
+ echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
+ echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
+ elif test "${UNAME_MACHINE}" = "alpha" ; then
+ echo alpha-unknown-linux ; exit 0
+ else
+ # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
+ # useful --help. Gcc wants to distinguish between linuxoldld and linuxaout.
+ test ! -d /usr/lib/ldscripts/. \
+ && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
+ # Determine whether the default compiler is a.out or elf
+ cat >dummy.c <<EOF
+main(argc, argv)
+int argc;
+char *argv[];
+{
+#ifdef __ELF__
+ printf ("%s-unknown-linux\n", argv[1]);
+#else
+ printf ("%s-unknown-linuxaout\n", argv[1]);
+#endif
+ return 0;
+}
+EOF
+ ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+ rm -f dummy.c dummy
+ fi ;;
+# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
+# are messed up and put the nodename in both sysname and nodename.
+ i[34]86:DYNIX/ptx:4*:*)
+ echo i386-sequent-sysv4
+ exit 0 ;;
+ i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+ else
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ i[34]86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
+ else
+ echo ${UNAME_MACHINE}-unknown-sysv32
+ fi
+ exit 0 ;;
+ Intel:Mach:3*:*)
+ echo i386-unknown-mach3
+ exit 0 ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+ exit 0 ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit 0 ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ echo m68010-convergent-sysv
+ exit 0 ;;
+ M680[234]0:*:R3V[567]*:*)
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
+ uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4.3 && exit 0 ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4 && exit 0 ;;
+ m680[234]0:LynxOS:2.[23]*:*)
+ echo m68k-lynx-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit 0 ;;
+ i[34]86:LynxOS:2.[23]*:*)
+ echo i386-lynx-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ TSUNAMI:LynxOS:2.[23]*:*)
+ echo sparc-lynx-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ rs6000:LynxOS:2.[23]*:*)
+ echo rs6000-lynx-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ RM*:SINIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ echo ${UNAME_MACHINE}-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+ fi
+ exit 0 ;;
+ mc68*:A/UX:*:*)
+ echo m68k-apple-aux${UNAME_RELEASE}
+ exit 0 ;;
+ R3000:*System_V*:*:*)
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+cat >dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+ printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+ printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ printf ("%s-next-nextstep%s\n", __ARCHITECTURE__, version==2 ? "2" : "3");
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-unknown-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+ printf ("vax-dec-bsd\n"); exit (0);
+#else
+ printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
+rm -f dummy.c dummy
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ c34*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ c38*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ c4*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ esac
+fi
+
+#echo '(Unable to guess system type)' 1>&2
+
+exit 1
diff -rup --new-file baseline/fsf/ed/config.h.in amiga/fsf/ed/config.h.in
--- baseline/fsf/ed/config.h.in Sat Nov 19 05:37:59 1994
+++ amiga/fsf/ed/config.h.in Sat Sep 28 00:00:00 1996
@@ -40,6 +40,9 @@
/* Define if you have the setbuffer function. */
#undef HAVE_SETBUFFER
+/* Define if you have the setlocale function. */
+#undef HAVE_SETLOCALE
+
/* Define if you have the sigaction function. */
#undef HAVE_SIGACTION
diff -rup --new-file baseline/fsf/ed/config.sub amiga/fsf/ed/config.sub
--- baseline/fsf/ed/config.sub Wed Dec 31 17:00:00 1969
+++ amiga/fsf/ed/config.sub Sat Sep 28 00:00:00 1996
@@ -0,0 +1,867 @@
+#! /bin/sh
+# Configuration validation subroutine script, version 1.1.
+# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+if [ x$1 = x ]
+then
+ echo Configuration name missing. 1>&2
+ echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+ echo "or $0 ALIAS" 1>&2
+ echo where ALIAS is a recognized configuration type. 1>&2
+ exit 1
+fi
+
+# First pass through any local machine types.
+case $1 in
+ *local*)
+ echo $1
+ exit 0
+ ;;
+ *)
+ ;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS (if any).
+basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+if [ $basic_machine != $1 ]
+then os=`echo $1 | sed 's/.*-/-/'`
+else os=; fi
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
+ os=
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
+ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+ -ptx*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+ # Recognize the basic CPU types without company name.
+ # Some are omitted here because they have special meanings below.
+ tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm \
+ | arme[lb] | pyramid \
+ | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
+ | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
+ | powerpc | powerpcle | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
+ | pdp11 | mips64el | mips64orion | mips64orionel \
+ | sparc)
+ basic_machine=$basic_machine-unknown
+ ;;
+ # Object if more than one company name word.
+ *-*-*)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+ # Recognize the basic CPU types with company name.
+ vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \
+ | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
+ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
+ | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
+ | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
+ | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
+ | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
+ | mips64el-* | mips64orion-* | mips64orionel-*)
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ basic_machine=m68000-att
+ ;;
+ 3b*)
+ basic_machine=we32k-att
+ ;;
+ alliant | fx80)
+ basic_machine=fx80-alliant
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=-bsd
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+ ;;
+ amiga | amiga-*)
+ basic_machine=m68k-unknown
+ ;;
+ amigaos)
+ basic_machine=m68k-unknown
+ os=-amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-cbm
+ os=-sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=-sysv
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=-bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=-bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=-bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=-bsd
+ ;;
+ cray | ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
+ cray2)
+ basic_machine=cray2-cray
+ os=-unicos
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ basic_machine=m68k-motorola
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+ ;;
+ dpx2* | dpx2*-bull)
+ basic_machine=m68k-bull
+ os=-sysv3
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=-ebmon
+ ;;
+ elxsi)
+ basic_machine=elxsi-elxsi
+ os=-bsd
+ ;;
+ encore | umax | mmax)
+ basic_machine=ns32k-encore
+ ;;
+ fx2800)
+ basic_machine=i860-alliant
+ ;;
+ genix)
+ basic_machine=ns32k-ns
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=-sysv
+ ;;
+ h3050r* | hiux*)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=-hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=-sysv3
+ ;;
+ hp300-*)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=-bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=-hpux
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ basic_machine=m68000-hp
+ ;;
+ hp9k3[2-9][0-9])
+ basic_machine=m68k-hp
+ ;;
+ hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i[345]86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+ os=-sysv32
+ ;;
+ i[345]86v4*)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+ os=-sysv4
+ ;;
+ i[345]86v)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+ os=-sysv
+ ;;
+ i[345]86sol2)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
+ os=-solaris2
+ ;;
+ iris | iris4d)
+ basic_machine=mips-sgi
+ case $os in
+ -irix*)
+ ;;
+ *)
+ os=-irix4
+ ;;
+ esac
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=-sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=-newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=-newsos
+ ;;
+ news-3600 | risc-news)
+ basic_machine=mips-sony
+ os=-newsos
+ ;;
+ next | m*-next )
+ basic_machine=m68k-next
+ case $os in
+ -nextstep* )
+ ;;
+ -ns2*)
+ os=-nextstep2
+ ;;
+ *)
+ os=-nextstep3
+ ;;
+ esac
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=-cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=-cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=-nindy
+ ;;
+ np1)
+ basic_machine=np1-gould
+ ;;
+ pa-hitachi)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=-osf
+ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+ pbb)
+ basic_machine=m68k-tti
+ ;;
+ pc532 | pc532-*)
+ basic_machine=ns32k-pc532
+ ;;
+ pentium | p5 | p6)
+ # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
+ basic_machine=i586-intel
+ ;;
+ pentium-* | p5-* | p6-*)
+ # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ k5)
+ # We don't have specific support for AMD's K5 yet, so just call it a Pentium
+ basic_machine=i586-amd
+ ;;
+ nexen)
+ # We don't have specific support for Nexgen yet, so just call it a Pentium
+ basic_machine=i586-nexgen
+ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+ power) basic_machine=rs6000-ibm
+ ;;
+ ppc) basic_machine=powerpc-unknown
+ ;;
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ps2)
+ basic_machine=i386-ibm
+ ;;
+ rm[46]00)
+ basic_machine=mips-siemens
+ ;;
+ rtpc | rtpc-*)
+ basic_machine=romp-ibm
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ ;;
+ sh)
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=-sysv2
+ ;;
+ spur)
+ basic_machine=spur-unknown
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=-sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=-sunos4
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=-sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=-sunos4
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=-sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=-sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=-solaris2
+ ;;
+ sun3 | sun3-*)
+ basic_machine=m68k-sun
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=-dynix
+ ;;
+ tower | tower-32)
+ basic_machine=m68k-ncr
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=-sym1
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=-sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=-vms
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=-vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=-vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=-vxworks
+ ;;
+ xmp)
+ basic_machine=xmp-cray
+ os=-unicos
+ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+ ;;
+
+# Here we handle the default manufacturer of certain CPU types. It is in
+# some cases the only manufacturer, in others, it is the most popular.
+ mips)
+ basic_machine=mips-mips
+ ;;
+ romp)
+ basic_machine=romp-ibm
+ ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+ vax)
+ basic_machine=vax-dec
+ ;;
+ pdp11)
+ basic_machine=pdp11-dec
+ ;;
+ we32k)
+ basic_machine=we32k-att
+ ;;
+ sparc)
+ basic_machine=sparc-sun
+ ;;
+ cydra)
+ basic_machine=cydra-cydrome
+ ;;
+ orion)
+ basic_machine=orion-highlevel
+ ;;
+ orion105)
+ basic_machine=clipper-highlevel
+ ;;
+ *)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+ *-digital*)
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ ;;
+ *-commodore*)
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ ;;
+ *)
+ ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+ # -solaris* is a basic system type, with this one exception.
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+ -solaris)
+ os=-solaris2
+ ;;
+ -unixware* | svr4*)
+ os=-sysv4
+ ;;
+ -gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux|'`
+ ;;
+ # First accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -amigaos* | -msdos* | -newsos* | -unicos* | -aos* \
+ | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
+ | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
+ | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* )
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -sunos5*)
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ ;;
+ -sunos6*)
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ ;;
+ -osfrose*)
+ os=-osfrose
+ ;;
+ -osf*)
+ os=-osf
+ ;;
+ -utek*)
+ os=-bsd
+ ;;
+ -dynix*)
+ os=-bsd
+ ;;
+ -acis*)
+ os=-aos
+ ;;
+ -ctix* | -uts*)
+ os=-sysv
+ ;;
+ # Preserve the version number of sinix5.
+ -sinix5.*)
+ os=`echo $os | sed -e 's|sinix|sysv|'`
+ ;;
+ -sinix*)
+ os=-sysv4
+ ;;
+ -triton*)
+ os=-sysv3
+ ;;
+ -oss*)
+ os=-sysv3
+ ;;
+ -svr4)
+ os=-sysv4
+ ;;
+ -svr3)
+ os=-sysv3
+ ;;
+ -sysvr4)
+ os=-sysv4
+ ;;
+ # This must come after -sysvr4.
+ -sysv*)
+ ;;
+ -xenix)
+ os=-xenix
+ ;;
+ -none)
+ ;;
+ *)
+ # Get rid of the `-' at the beginning of $os.
+ os=`echo $os | sed 's/[^-]*-//'`
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system. Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+ *-acorn)
+ os=-riscix1.2
+ ;;
+ arm*-semi)
+ os=-aout
+ ;;
+ pdp11-*)
+ os=-none
+ ;;
+ *-dec | vax-*)
+ os=-ultrix4.2
+ ;;
+ m68*-apollo)
+ os=-domain
+ ;;
+ i386-sun)
+ os=-sunos4.0.2
+ ;;
+ m68000-sun)
+ os=-sunos3
+ # This also exists in the configure program, but was not the
+ # default.
+ # os=-sunos4
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=-sysv3
+ ;;
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+ *-ibm)
+ os=-aix
+ ;;
+ *-hp)
+ os=-hpux
+ ;;
+ *-hitachi)
+ os=-hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=-sysv
+ ;;
+ *-cbm)
+ os=-amigaos
+ ;;
+ *-dg)
+ os=-dgux
+ ;;
+ *-dolphin)
+ os=-sysv3
+ ;;
+ m68k-ccur)
+ os=-rtu
+ ;;
+ m88k-omron*)
+ os=-luna
+ ;;
+ *-sequent)
+ os=-ptx
+ ;;
+ *-crds)
+ os=-unos
+ ;;
+ *-ns)
+ os=-genix
+ ;;
+ i370-*)
+ os=-mvs
+ ;;
+ *-next)
+ os=-nextstep3
+ ;;
+ *-gould)
+ os=-sysv
+ ;;
+ *-highlevel)
+ os=-bsd
+ ;;
+ *-encore)
+ os=-bsd
+ ;;
+ *-sgi)
+ os=-irix
+ ;;
+ *-siemens)
+ os=-sysv4
+ ;;
+ *-masscomp)
+ os=-rtu
+ ;;
+ *)
+ os=-none
+ ;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer. We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+ *-unknown)
+ case $os in
+ -riscix*)
+ vendor=acorn
+ ;;
+ -sunos*)
+ vendor=sun
+ ;;
+ -lynxos*)
+ vendor=lynx
+ ;;
+ -aix*)
+ vendor=ibm
+ ;;
+ -hpux*)
+ vendor=hp
+ ;;
+ -hiux*)
+ vendor=hitachi
+ ;;
+ -unos*)
+ vendor=crds
+ ;;
+ -dgux*)
+ vendor=dg
+ ;;
+ -luna*)
+ vendor=omron
+ ;;
+ -genix*)
+ vendor=ns
+ ;;
+ -mvs*)
+ vendor=ibm
+ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
+ -vxworks*)
+ vendor=wrs
+ ;;
+ esac
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
+esac
+
+echo $basic_machine$os
diff -rup --new-file baseline/fsf/ed/configure amiga/fsf/ed/configure
--- baseline/fsf/ed/configure Sat Nov 19 05:56:24 1994
+++ amiga/fsf/ed/configure Mon Sep 30 22:39:46 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.
@@ -33,9 +33,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
@@ -57,9 +73,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 \
@@ -69,6 +90,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.
@@ -119,12 +146,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]
@@ -136,8 +183,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)
@@ -145,6 +194,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 ;;
@@ -157,6 +256,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=*)
@@ -197,6 +305,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=*)
@@ -207,6 +332,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=*)
@@ -216,7 +348,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-*)
@@ -262,7 +394,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
@@ -279,19 +411,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
@@ -381,8 +514,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.
@@ -399,9 +532,9 @@ fi
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_prog_LN_S'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftestdata
if ln -s X conftestdata 2>/dev/null
@@ -414,16 +547,114 @@ fi
fi
LN_S="$ac_cv_prog_LN_S"
if test "$ac_cv_prog_LN_S" = "ln -s"; then
- echo "$ac_t""yes" 1>&4
+ echo "$ac_t""yes" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+ if test -f $ac_dir/install-sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f $ac_dir/install.sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+ac_config_sub=$ac_aux_dir/config.sub
+ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+
+
+# Make sure we can run config.sub.
+if $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+ case $nonopt in
+ NONE)
+ if host_alias=`$ac_config_guess`; then :
+ else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+ fi ;;
+ *) host_alias=$nonopt ;;
+ esac ;;
+esac
+
+host=`$ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+ case $nonopt in
+ NONE) build_alias=$host_alias ;;
+ *) build_alias=$nonopt ;;
+ esac ;;
+esac
+
+build=`$ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+if test $host != $build; then
+ ac_tool_prefix=${host_alias}-
+else
+ ac_tool_prefix=
+fi
+
+# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$RANLIB"; then
+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+ echo "$ac_t""$RANLIB" 1>&6
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
-# Extract the first word of "ranlib", so it can be a program name with args.
+
+if test -z "$ac_cv_prog_RANLIB"; then
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&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.
@@ -442,29 +673,45 @@ 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
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+else
+ RANLIB=":"
fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+fi
+
+# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_prog_AR="${ac_tool_prefix}ar"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
+fi
+fi
+AR="$ac_cv_prog_AR"
+if test -n "$AR"; then
+ echo "$ac_t""$AR" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
@@ -473,18 +720,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
@@ -504,12 +753,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.
@@ -517,11 +773,11 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PR
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-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
@@ -533,15 +789,15 @@ EOF
CC="$CC -Xp"
fi
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
ISC=
fi
# 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.
@@ -555,39 +811,88 @@ else
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
fi
fi
CC="$ac_cv_prog_CC"
if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&4
+ echo "$ac_t""$CC" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ ac_prog_rejected=no
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# -gt 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ set dummy "$ac_dir/$ac_word" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&4
-if eval "test \"`echo '${'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&4
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:883: \"$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
@@ -598,11 +903,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
@@ -610,12 +916,12 @@ else
test "${CFLAGS+set}" = set || CFLAGS="-g"
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 619 "configure"
+#line 925 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -628,7 +934,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 */
@@ -665,7 +971,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if eval $ac_compile; then
+if { (eval echo configure:975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -675,7 +981,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
@@ -683,14 +990,14 @@ EOF
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.
@@ -698,12 +1005,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 702 "configure"
+#line 1009 "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:1015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -712,12 +1020,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 716 "configure"
+#line 1024 "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:1030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -731,24 +1040,26 @@ 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
# 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 748 "configure"
+#line 1059 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-eval $ac_link
+{ (eval echo configure:1063: \"$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
@@ -757,22 +1068,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 769 "configure"
+#line 1081 "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:1089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -787,7 +1100,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 791 "configure"
+#line 1104 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -805,7 +1118,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 809 "configure"
+#line 1122 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -823,10 +1136,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 830 "configure"
+#line 1143 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -837,7 +1150,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-eval $ac_link
+{ (eval echo configure:1154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
@@ -847,7 +1160,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
@@ -858,16 +1172,17 @@ fi
for ac_hdr in limits.h memory.h string.h unistd.h locale.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 867 "configure"
+#line 1181 "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:1186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -880,31 +1195,35 @@ 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
-for ac_func in setbuffer sigsetjmp sigaction strerror
+for ac_func in setbuffer sigsetjmp sigaction strerror setlocale
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 902 "configure"
+#line 1217 "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
@@ -918,7 +1237,7 @@ $ac_func();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -929,29 +1248,33 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&4
- ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
+ echo "$ac_t""yes" 1>&6
+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
else
- echo "$ac_t""no" 1>&4
+ echo "$ac_t""no" 1>&6
fi
done
-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 949 "configure"
+#line 1268 "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
@@ -965,7 +1288,7 @@ vprintf();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_vprintf=yes"
else
@@ -976,28 +1299,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 995 "configure"
+#line 1318 "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
@@ -1011,7 +1338,7 @@ _doprnt();
; return 0; }
EOF
-if eval $ac_link; then
+if { (eval echo configure:1342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func__doprnt=yes"
else
@@ -1022,33 +1349,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 1044 "configure"
+#line 1371 "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:1379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -1058,7 +1385,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
@@ -1066,12 +1394,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 1075 "configure"
+#line 1403 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -1090,12 +1418,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:1427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_func_alloca=yes
else
@@ -1105,7 +1433,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
@@ -1124,12 +1453,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 1133 "configure"
+#line 1462 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1149,154 +1478,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 1160 "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 1203 "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 1246 "configure"
+#line 1491 "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:1515: \"$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 1300 "configure"
+#line 1547 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -1315,7 +1562,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-eval $ac_link
+{ (eval echo configure:1566: \"$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
@@ -1324,7 +1571,8 @@ 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
@@ -1336,9 +1584,7 @@ if test "$ALLOCA" = alloca.o; then
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.
@@ -1354,15 +1600,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.
@@ -1383,9 +1638,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,
@@ -1404,7 +1661,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 ;;
@@ -1415,11 +1672,13 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr Makefile config.h conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "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
@@ -1431,8 +1690,34 @@ 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%@LN_S@%$LN_S%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
s%@RANLIB@%$RANLIB%g
+s%@AR@%$AR%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
s%@CC@%$CC%g
@@ -1462,7 +1747,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
@@ -1537,13 +1822,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
@@ -1591,6 +1876,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
@@ -1601,8 +1892,9 @@ fi; done
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/ed/configure.in amiga/fsf/ed/configure.in
--- baseline/fsf/ed/configure.in Sat Nov 19 05:38:00 1994
+++ amiga/fsf/ed/configure.in Sat Sep 28 00:00:00 1996
@@ -4,14 +4,15 @@ AC_INIT(ed.h)
AC_CONFIG_HEADER(config.h)
AC_PROG_LN_S
-AC_PROG_RANLIB
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(AR, ar)
AC_PROG_INSTALL
AC_ISC_POSIX
AC_PROG_CC
AC_C_CONST
AC_HEADER_STDC
AC_CHECK_HEADERS(limits.h memory.h string.h unistd.h locale.h)
-AC_CHECK_FUNCS(setbuffer sigsetjmp sigaction strerror)
+AC_CHECK_FUNCS(setbuffer sigsetjmp sigaction strerror setlocale)
AC_FUNC_VPRINTF
AC_FUNC_ALLOCA
if test "$ALLOCA" = alloca.o; then
diff -rup --new-file baseline/fsf/ed/ed.info amiga/fsf/ed/ed.info
--- baseline/fsf/ed/ed.info Sat Nov 19 05:50:17 1994
+++ amiga/fsf/ed/ed.info Wed Dec 31 17:00:00 1969
@@ -1,769 +0,0 @@
-This is Info file ed.info, produced by Makeinfo-1.55 from the input
-file ed.texinfo.
-
- This file documents the `ed' command, which has the purpose of
-editing text files.
-
- Copyright (C) 1993 by the Free Software Foundation, Inc.
-
- Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notice and this permission notice are
-preserved on all copies.
-
- Permission is granted to copy and distribute modified versions of
-this manual under the conditions for verbatim copying, provided that
-the entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
- Permission is granted to copy and distribute translations of this
-manual into another language, under the above conditions for modified
-versions, except that this permission notice may be stated in a
-translation approved by the Foundation.
-
-
-File: ed.info, Node: Top, Next: Intro, Prev: (dir), Up: (dir)
-
-
-
- This info file documents the `ed' text editor, as of release 0.2.
-You may find in this document:
-
-* Menu:
-
-* Intro:: An introduction to line editing with `ed'
-* Invoking ed:: GNU `ed' command-line options
-* Line addressing:: Specifying lines/ranges in the buffer
-* Regular expressions:: Patterns for selecting text
-* Commands:: Commands recognized by GNU `ed'
-* Limitations:: Intrinsic limits of GNU `ed'
-* Diagnostics:: GNU `ed' error handling
-
-
-File: ed.info, Node: Intro, Next: Invoking ed, Prev: Top, Up: Top
-
-Intro
-*****
-
- `ed' is a line-oriented text editor. It is used to create, display,
-modify and otherwise manipulate text files, both interactively and via
-shell scripts. A restricted version of `ed', `red', can only edit
-files in the current directory and cannot execute shell commands. `ed'
-is the "standard" text editor in the sense that it is the original
-editor for Unix, and thus widely available. For most purposes,
-however, it is superceded by full-screen editors such as Emacs and Vi.
-
- The sample sessions below illustrate some basic concepts of line
-editing with `ed'. We begin by creating a file, `sonnet', with some
-help from Shakespeare. As with the shell, all input to `ed' must be
-followed by a newline character. Comments begin with a `#'.
-
- $ ed
- # The `a' command is for appending text to the editor buffer.
- a
- No more be grieved at that which thou hast done.
- Roses have thorns, and filvers foutians mud.
- Clouds and eclipses stain both moon and sun,
- And loathsome canker lives in sweetest bud.
- .
- # Entering a single period on a line returns `ed' to command mode.
- # Now write the buffer to the file `sonnet' and quit:
- w sonnet
- 183
- # `ed' reports the number of characters written.
- q
- $ ls -l
- total 2
- -rw-rw-r-- 1 alm 183 Nov 10 01:16 sonnet
- $
-
- Editing with `ed' is done in two distinct modes: "command" and
-"input". When first invoked, `ed' is in command mode. In this mode
-commands are read from the standard input and executed to manipulate
-the contents of the editor buffer. When an input command, such as `a'
-(append), `i' (insert) or `c' (change), is given, `ed' enters input
-mode. This is the primary means of adding text to a file. In this
-mode, no commands are available; instead, the standard input is written
-directly to the editor buffer. A "line" consists of the text up to and
-including a newline character. Input mode is terminated by entering a
-single period (`.') on a line.
-
- In the next example, some typos are corrected in the file `sonnet'.
-
- $ ed sonnet
- 183
- # Begin by printing the buffer to the terminal with the `p' command.
- # The `,' means ``all lines.''
- ,p
- No more be grieved at that which thou hast done.
- Roses have thorns, and filvers foutians mud.
- Clouds and eclipses stain both moon and sun,
- And loathsome canker lives in sweetest bud.
- # Select line 2 for editing.
- 2
- Roses have thorns, and filvers foutians mud.
- # Use the substitute command, `s', to replace `filvers' with `silver',
- # and print the result.
- s/filvers/silver/p
- Roses have thorns, and silver foutians mud.
- # And correct the spelling of `fountains'.
- s/utia/untai/p
- Roses have thorns, and silver fountains mud.
- w sonnet
- 183
- q
- $
-
- `ed' may be invoked with or without arguments *Note Invoking ed::.
-When invoked with a FILE argument, a copy of FILE is read into the
-editor's buffer. Changes are made to this copy and not directly to
-FILE itself. Upon quitting `ed', any changes not explicitly saved with
-a `w' command *Note Commands:: are lost.
-
- Since `ed' is line-oriented, we have to tell it which line, or range
-of lines we want to edit. In the above example, we do this by
-specifying the line's number, or sequence in the buffer. Alternatively,
-we could have specified a unique string in the line, e.g., `/filvers/',
-where the `/'s delimit the string in question. Subsequent commands
-affect only the selected line, a.k.a. the "current" line. Portions of
-that line are then replaced with the substitute command, whose syntax is
-`s/OLD/NEW/'.
-
- Although `ed' accepts only one command per line, the print command
-`p' is an exception, and may be appended to the end of most commands.
-
- In the next example, a title is added to our sonnet.
-
- $ ed sonnet
- 183
- a
- Sonnet #50
- .
- ,p
- No more be grieved at that which thou hast done.
- Roses have thorns, and silver fountains mud.
- Clouds and eclipses stain both moon and sun,
- And loathsome canker lives in sweetest bud.
- Sonnet #50
- # The title got appended to the end; we should have used `0a'
- # to append ``before the first line.''
- # Move the title to its proper place.
- 5m0p
- Sonnet #50
- # The title is now the first line, and the current line has been
- # set to this line as well.
- ,p
- Sonnet #50
- No more be grieved at that which thou hast done.
- Roses have thorns, and silver fountains mud.
- Clouds and eclipses stain both moon and sun,
- And loathsome canker lives in sweetest bud.
- wq sonnet
- 195
- $
-
- When `ed' opens a file, the current line is initially set to the last
-line of that file. Similarly, the move command `m' sets the current
-line to the last line moved.
-
- In summary: All `ed' commands operate on whole lines or ranges of
-lines; e.g., the `d' command deletes lines; the `m' command moves
-lines, and so on. It is possible to modify only a portion of a line by
-means of replacement, as in the second example above. However even
-there, the `s' command is applied to whole lines at a time.
-
- Structurally, `ed' commands consist of zero or more line addresses,
-followed by a single character command and possibly additional
-parameters; i.e., commands have the structure:
-
- [ADDRESS [,ADDRESS]]COMMAND[PARAMETERS]
-
- The ADDRESS(es) indicate the line or range of lines to be affected
-by the command. If fewer addresses are given than the command accepts,
-then default addresses are supplied.
-
- Related programs or routines are `vi (1)', `sed (1)', `regex (3)',
-`sh (1)'. Relevant documents are:
-
- Unix User's Manual Supplementary Documents: 12 -- 13
-
- B. W. Kernighan and P. J. Plauger: "Software Tools in Pascal",
- Addison-Wesley, 1981.
-
-
-File: ed.info, Node: Invoking ed, Next: Line addressing, Prev: Intro, Up: Top
-
-Invoking GNU `ed'
-*****************
-
- ed [-] [-Gs] [-p STRING] [FILE]
- red [-] [-Gs] [-p STRING] [FILE]
-
-`-G'
- Forces backwards compatibility. This affects the behavior of the
- `ed' commands `G', `V', `f', `l', `m', `t' and `!!'. If the
- default behavior of these commands does not seem familiar, then
- try invoking `ed' with this switch.
-
-`-s'
-`-'
- Suppresses diagnostics. This should be used if `ed''s standard
- input is from a script.
-
-`-p STRING'
- Specifies a command prompt. This may be toggled on and off with
- the `P' command.
-
- FILE specifies the name of a file to read. If FILE is prefixed with
-a bang (!), then it is interpreted as a shell command. In this case,
-what is read is the standard output of FILE executed via `sh (1)'. To
-read a file whose name begins with a bang, prefix the name with a
-backslash (`\'). The default filename is set to FILE only if it is not
-prefixed with a bang.
-
-
-File: ed.info, Node: Line addressing, Next: Regular expressions, Prev: Invoking ed, Up: Top
-
-Line addressing
-***************
-
- An address represents the number of a line in the buffer. `ed'
-maintains a "current address" which is typically supplied to commands
-as the default address when none is specified. When a file is first
-read, the current address is set to the last line of the file. In
-general, the current address is set to the last line affected by a
-command.
-
- A line address is constructed from one of the bases in the list
-below, optionally followed by a numeric offset. The offset may include
-any combination of digits, operators (i.e., `+', `-' and `^') and
-whitespace. Addresses are read from left to right, and their values
-are computed relative to the current address.
-
- One exception to the rule that addresses represent line numbers is
-the address `0' (zero). This means "before the first line," and is
-legal wherever it makes sense.
-
- An address range is two addresses separated either by a comma or
-semicolon. The value of the first address in a range cannot exceed the
-value of the the second. If only one address is given in a range, then
-the second address is set to the given address. If an N-tuple of
-addresses is given where N > 2, then the corresponding range is
-determined by the last two addresses in the N-tuple. If only one
-address is expected, then the last address is used.
-
- Each address in a comma-delimited range is interpreted relative to
-the current address. In a semicolon-delimited range, the first address
-is used to set the current address, and the second address is
-interpreted relative to the first.
-
- The following address symbols are recognized.
-
-`.'
- The current line (address) in the buffer.
-
-`$'
- The last line in the buffer.
-
-`N'
- The Nth, line in the buffer where N is a number in the range `0,$'.
-
-`-'
-`^'
- The previous line. This is equivalent to `-1' and may be repeated
- with cumulative effect.
-
-`-N'
-`^N'
- The Nth previous line, where N is a non-negative number.
-
-`+'
- The next line. This is equivalent to `+1' and may be repeated with
- cumulative effect.
-
-`+N'
-`WHITESPACE N'
- The Nth next line, where N is a non-negative number. Whitespace
- followed by a number N is interpreted as `+N'.
-
-`,'
-`%'
- The first through last lines in the buffer. This is equivalent to
- the address range `1,$'.
-
-`;'
- The current through last lines in the buffer. This is equivalent
- to the address range `.,$'.
-
-`/RE/'
- The next line containing the regular expression RE. The search
- wraps to the beginning of the buffer and continues down to the
- current line, if necessary. `//' repeats the last search.
-
-`?RE?'
- The previous line containing the regular expression RE. The
- search wraps to the end of the buffer and continues up to the
- current line, if necessary. `??' repeats the last search.
-
-`'LC'
- The line previously marked by a `k' (mark) command, where LC is a
- lower case letter.
-
-
-File: ed.info, Node: Regular expressions, Next: Commands, Prev: Line addressing, Up: Top
-
-Regular expressions
-*******************
-
- Regular expressions are patterns used in selecting text. For
-example, the `ed' command
-
- g/STRING/
-
-prints all lines containing STRING. Regular expressions are also used
-by the `s' command for selecting old text to be replaced with new.
-
- In addition to a specifying string literals, regular expressions can
-represent classes of strings. Strings thus represented are said to be
-matched by the corresponding regular expression. If it is possible for
-a regular expression to match several strings in a line, then the
-left-most longest match is the one selected.
-
- The following symbols are used in constructing regular expressions:
-
-`C'
- Any character C not listed below, including `{', `}', `(', `)',
- `<' and `>', matches itself.
-
-`\C'
- Any backslash-escaped character C, other than `{', ``}', `(', `)',
- `<', `>', `b', `B', `w', `W', `+' and `?', matches itself.
-
-`.'
- Matches any single character.
-
-`[CHAR-CLASS]'
- Matches any single character in CHAR-CLASS. To include a `]' in
- CHAR-CLASS, it must be the first character. A range of characters
- may be specified by separating the end characters of the range
- with a `-', e.g., `a-z' specifies the lower case characters. The
- following literal expressions can also be used in CHAR-CLASS to
- specify sets of characters:
-
- [:alnum:] [:cntrl:] [:lower:] [:space:]
- [:alpha:] [:digit:] [:print:] [:upper:]
- [:blank:] [:graph:] [:punct:] [:xdigit:]
-
- If `-' appears as the first or last character of CHAR-CLASS, then
- it matches itself. All other characters in CHAR-CLASS match
- themselves.
-
- Patterns in CHAR-CLASS of the form:
- [.COL-ELM.]
- [=COL-ELM=]
-
- where COL-ELM is a "collating element" are interpreted according
- to `locale (5)' (not currently supported). See `regex (3)' for an
- explanation of these constructs.
-
-`[^CHAR-CLASS]'
- Matches any single character, other than newline, not in
- CHAR-CLASS. CHAR-CLASS is defined as above.
-
-`^'
- If `^' is the first character of a regular expression, then it
- anchors the regular expression to the beginning of a line.
- Otherwise, it matches itself.
-
-`$'
- If `$' is the last character of a regular expression, it anchors
- the regular expression to the end of a line. Otherwise, it matches
- itself.
-
-`\(RE\)'
- Defines a (possibly null) subexpression RE. Subexpressions may be
- nested. A subsequent backreference of the form `\N', where N is a
- number in the range [1,9], expands to the text matched by the Nth
- subexpression. For example, the regular expression `\(a.c\)\1'
- matches the string `abcabc', but not `abcadc'. Subexpressions are
- ordered relative to their left delimiter.
-
-`*'
- Matches the single character regular expression or subexpression
- immediately preceding it zero or more times. If `*' is the first
- character of a regular expression or subexpression, then it matches
- itself. The `*' operator sometimes yields unexpected results. For
- example, the regular expression `b*' matches the beginning of the
- string `abbb', as opposed to the substring `bbb', since a null
- match is the only left-most match.
-
-`\{N,M\}'
-`\{N,\}'
-`\{N\}'
- Matches the single character regular expression or subexpression
- immediately preceding it at least N and at most M times. If M is
- omitted, then it matches at least N times. If the comma is also
- omitted, then it matches exactly N times. If any of these forms
- occurs first in a regular expression or subexpression, then it is
- interpreted literally (i.e., the regular expression `\{2\}'
- matches the string `{2}', and so on).
-
-`\<'
-`\>'
- Anchors the single character regular expression or subexpression
- immediately following it to the beginning (in the case of `\<') or
- ending (in the case of `\>') of a "word", i.e., in ASCII, a
- maximal string of alphanumeric characters, including the
- underscore (_).
-
- The following extended operators are preceded by a backslash `\' to
-distinguish them from traditional `ed' syntax.
-
-`\`'
-`\''
- Unconditionally matches the beginning `\`' or ending `\'' of a
- line.
-
-`\?'
- Optionally matches the single character regular expression or
- subexpression immediately preceding it. For example, the regular
- expression `a[bd]\?c' matches the strings `abc', `adc' and `ac'.
- If `\?' occurs at the beginning of a regular expressions or
- subexpression, then it matches a literal `?'.
-
-`\+'
- Matches the single character regular expression or subexpression
- immediately preceding it one or more times. So the regular
- expression `a+' is shorthand for `aa*'. If `\+' occurs at the
- beginning of a regular expression or subexpression, then it
- matches a literal `+'.
-
-`\b'
- Matches the beginning or ending (null string) of a word. Thus the
- regular expression `\bhello\b' is equivalent to `\<hello\>'.
- However, `\b\b' is a valid regular expression whereas `\<\>' is
- not.
-
-`\B'
- Matches (a null string) inside a word.
-
-`\w'
- Matches any character in a word.
-
-`\W'
- Matches any character not in a word.
-
-
-File: ed.info, Node: Commands, Next: Limitations, Prev: Regular expressions, Up: Top
-
-Commands
-********
-
- All `ed' commands are single characters, though some require
-additonal parameters. If a command's parameters extend over several
-lines, then each line except for the last must be terminated with a
-backslash (`\').
-
- In general, at most one command is allowed per line. However, most
-commands accept a print suffix, which is any of `p' (print), `l'
-(list), or `n' (enumerate), to print the last line affected by the
-command.
-
- An interrupt (typically ^C) has the effect of aborting the current
-command and returning the editor to command mode.
-
- `ed' recognizes the following commands. The commands are shown
-together with the default address or address range supplied if none is
-specified (in parenthesis).
-
-`(.)a'
- Appends text to the buffer after the addressed line, which may be
- the address `0' (zero). Text is entered in input mode. The
- current address is set to last line entered.
-
-`(.,.)c'
- Changes lines in the buffer. The addressed lines are deleted from
- the buffer, and text is appended in their place. Text is entered
- in input mode. The current address is set to last line entered.
-
-`(.,.)d'
- Deletes the addressed lines from the buffer. If there is a line
- after the deleted range, then the current address is set to this
- line. Otherwise the current address is set to the line before the
- deleted range.
-
-`e FILE'
- Edits FILE, and sets the default filename. If FILE is not
- specified, then the default filename is used. Any lines in the
- buffer are deleted before the new file is read. The current
- address is set to the last line read.
-
-`e !COMMAND'
- Edits the standard output of `!COMMAND', (see the `!' command
- below). The default filename is unchanged. Any lines in the
- buffer are deleted before the output of COMMAND is read. The
- current address is set to the last line read.
-
-`E FILE'
- Edits FILE unconditionally. This is similar to the `e' command,
- except that unwritten changes are discarded without warning. The
- current address is set to the last line read.
-
-`f FILE'
- Sets the default filename to FILE. If FILE is not specified, then
- the default unescaped filename is printed.
-
-`(1,$)g /RE/COMMAND-LIST'
- Applies COMMAND-LIST to each of the addressed lines matching a
- regular expression RE. The current address is set to the line
- currently matched before COMMAND-LIST is executed. At the end of
- the `g' command, the current address is set to the last line
- affected by COMMAND-LIST.
-
- Each command in COMMAND-LIST must be on a separate line, and every
- line except for the last must be terminated by a backslash (`\').
- Any commands are allowed, except for `g', `G', `v', and `V'. By
- default, a newline alone in COMMAND-LIST is equivalent to a `p'
- command. If `ed' is invoked with the command-line option `-G',
- then a newline in COMMAND-LIST is equivalent to a `.+1p' command.
-
-`(1,$)G /RE/'
- Interactively edits the addressed lines matching a regular
- expression RE. For each matching line, the line is printed, the
- current address is set, and the user is prompted to enter a
- COMMAND-LIST. At the end of the `G' command, the current address
- is set to the last line affected by (the last) COMMAND-LIST.
-
- The format of COMMAND-LIST is the same as that of the `g' command.
- A newline alone acts as a null command list. A single `&'
- repeats the last non-null command list.
-
-`H'
- Toggles the printing of error explanations. By default,
- explanations are not printed. It is recommended that ed scripts
- begin with this command to aid in debugging.
-
-`h'
- Prints an explanation of the last error.
-
-`(.)i'
- Inserts text in the buffer before the current line. Text is
- entered in input mode. The current address is set to the last
- line entered.
-
-`(.,.+1)j'
- Joins the addressed lines. The addressed lines are deleted from
- the buffer and replaced by a single line containing their joined
- text. The current address is set to the resultant line.
-
-`(.)k LC'
- Marks a line with a lower case letter LC. The line can then be
- addressed as `'LC' (i.e., a single quote followed by LC) in
- subsequent commands. The mark is not cleared until the line is
- deleted or otherwise modified.
-
-`(.,.)l'
- Prints the addressed lines unambiguously. If invoked from a
- terminal, `ed' pauses at the end of each page until a newline is
- entered. The current address is set to the last line printed.
-
-`(.,.)m(.)'
- Moves lines in the buffer. The addressed lines are moved to after
- the right-hand destination address, which may be the address `0'
- (zero). The current address is set to the last line moved.
-
-`(.,.)n'
- Prints the addressed lines along with their line numbers. The
- current address is set to the last line printed.
-
-`(.,.)p'
- Prints the addressed lines. If invoked from a terminal, `ed'
- pauses at the end of each page until a newline is entered. The
- current address is set to the last line printed.
-
-`P'
- Toggles the command prompt on and off. Unless a prompt is
- specified with command-line option `-p STRING', the command prompt
- is by default turned off.
-
-`q'
- Quits `ed'.
-
-`Q'
- Quits `ed' unconditionally. This is similar to the `q' command,
- except that unwritten changes are discarded without warning.
-
-`($)r FILE'
- Reads FILE to after the addressed line. If FILE is not specified,
- then the default filename is used. If there is no default
- filename prior to the command, then the default filename is set to
- FILE. Otherwise, the default filename is unchanged. The current
- address is set to the last line read.
-
-`($)r !COMMAND'
- Reads to after the addressed line the standard output of
- `!command', (see the `!' command below). The default filename is
- unchanged. The current address is set to the last line read.
-
-`(.,.)s /RE/REPLACEMENT/'
-`(.,.)s /RE/REPLACEMENT/g'
-`(.,.)s /RE/REPLACEMENT/n'
- Replaces text in the addressed lines matching a regular expression
- RE with REPLACEMENT. By default, only the first match in each
- line is replaced. If the `g' (global) suffix is given, then every
- match to be replaced. The `n' suffix, where N is a postive
- number, causes only the Nth match to be replaced. It is an error
- if no substitutions are performed on any of the addressed lines.
- The current address is set the last line affected.
-
- RE and REPLACEMENT may be delimited by any character other than
- space and newline (see the `s' command below). If one or two of
- the last delimiters is omitted, then the last line affected is
- printed as though the print suffix `p' were specified.
-
- An unescaped `&' in REPLACEMENT is replaced by the currently
- matched text. The character sequence `\M' where M is a number in
- the range [1,9], is replaced by the Mth backreference expression
- of the matched text. If REPLACEMENT consists of a single `%',
- then REPLACEMENT from the last substitution is used. Newlines may
- be embedded in REPLACEMENT if they are escaped with a backslash
- (`\').
-
-`(.,.)s'
- Repeats the last substitution. This form of the `s' command
- accepts a count suffix N, or any combination of the characters
- `r', `g', and `p'. If a count suffix N is given, then only the
- Nth match is replaced. The `r' suffix causes the regular
- expression of the last search to be used instead of the that of
- the last substitution. The `g' suffix toggles the global suffix
- of the last substitution. The `p' suffix toggles the print suffix
- of the last substitution The current address is set to the last
- line affected.
-
-`(.,.)t(.)'
- Copies (i.e., transfers) the addressed lines to after the
- right-hand destination address, which may be the address `0'
- (zero). The current address is set to the last line copied.
-
-`u'
- Undoes the last command and restores the current address to what
- it was before the command. The global commands `g', `G', `v', and
- `V' are treated as a single command by undo. `u' is its own
- inverse.
-
-`(1,$)v /RE/COMMAND-LIST'
- Applies COMMAND-LIST to each of the addressed lines not matching a
- regular expression RE. This is similar to the `g' command.
-
-`(1,$)V /RE/'
- Interactively edits the addressed lines not matching a regular
- expression RE. This is similar to the `G' command.
-
-`(1,$)w FILE'
- Writes the addressed lines to FILE. Any previous contents of FILE
- is lost without warning. If there is no default filename, then
- the default filename is set to FILE, otherwise it is unchanged.
- If no filename is specified, then the default filename is used.
- The current address is unchanged.
-
-`(1,$)wq FILE'
- Writes the addressed lines to FILE, and then executes a `q'
- command.
-
-`(1,$)w !COMMAND'
- Writes the addressed lines to the standard input of `!COMMAND',
- (see the `!' command below). The default filename and current
- address are unchanged.
-
-`(1,$)W FILE'
- Appends the addressed lines to the end of FILE. This is similar
- to the `w' command, expect that the previous contents of file is
- not clobbered. The current address is unchanged.
-
-`(.)x'
- Copies (puts) the contents of the cut buffer to after the
- addressed line. The current address is set to the last line
- copied.
-
-`(.,.)y'
- Copies (yanks) the addressed lines to the cut buffer. The cut
- buffer is overwritten by subsequent `y', `s', `j', `d', or `c'
- commands. The current address is unchanged.
-
-`(.+1)z N'
- Scrolls N lines at a time starting at addressed line. If N is not
- specified, then the current window size is used. The current
- address is set to the last line printed.
-
-`! COMMAND'
- Executes COMMAND via `sh (1)'. If the first character of COMMAND
- is `!', then it is replaced by text of the previous `!COMMAND'.
- `ed' does not process COMMAND for backslash (`\') escapes.
- However, an unescaped `%' is replaced by the default filename.
- When the shell returns from execution, a `!' is printed to the
- standard output. The current line is unchanged.
-
-`(.,.)#'
- Begins a comment; the rest of the line, up to a newline, is
- ignored. If a line address followed by a semicolon is given, then
- the current address is set to that address. Otherwise, the
- current address is unchanged.
-
-`($)='
- Prints the line number of the addressed line.
-
-`(.+1)newline'
- Prints the addressed line, and sets the current address to that
- line.
-
-
-File: ed.info, Node: Limitations, Next: Diagnostics, Prev: Commands, Up: Top
-
-Limitations
-***********
-
- The buffer files are kept in `/tmp/ed.*'. If the terminal hangs up,
-`ed' attempts to write the buffer to file `ed.hup'.
-
- `ed' processes FILE arguments for backslash escapes, i.e., in a
-filename, any characters preceded by a backslash (`\') are interpreted
-literally.
-
- If a text (non-binary) file is not terminated by a newline character,
-then `ed' appends one on reading/writing it. In the case of a binary
-file, `ed' does not append a newline on reading/writing.
-
- Per line overhead: 4 `int's.
-
-
-File: ed.info, Node: Diagnostics, Prev: Limitations, Up: Top
-
-Diagnostics
-***********
-
- When an error occurs, if `ed''s input is from a regular file or here
-document, then it exits, otherwise it prints a `?' and returns to
-command mode. An explanation of the last error can be printed with the
-`h' (help) command.
-
-If the `u' (undo) command occurs in a global command list, then the
-command list is executed only once.
-
- Attempting to quit `ed' or edit another file before writing a
-modified buffer results in an error. If the command is entered a
-second time, it succeeds, but any changes to the buffer are lost.
-
- `ed' exits with 0 if no errors occurred; otherwise >0.
-
-
-
-Tag Table:
-Node: Top894
-Node: Intro1524
-Node: Invoking ed7497
-Node: Line addressing8534
-Node: Regular expressions11590
-Node: Commands16976
-Node: Limitations27862
-Node: Diagnostics28480
-
-End Tag Table
diff -rup --new-file baseline/fsf/ed/ed.texinfo amiga/fsf/ed/ed.texinfo
--- baseline/fsf/ed/ed.texinfo Sat Nov 19 05:38:01 1994
+++ amiga/fsf/ed/ed.texinfo Sat Sep 28 00:00:00 1996
@@ -160,7 +160,7 @@ $
invoked with a @var{file} argument, a copy of @var{file} is read into
the editor's buffer. Changes are made to this copy and not directly to
@var{file} itself. Upon quitting @code{ed}, any changes not explicitly
-saved with a @samp{w} command @xref{Commands} are lost.
+saved with a @samp{w} command @xref{Commands}, are lost.
Since @code{ed} is line-oriented, we have to tell it which line, or
range of lines we want to edit. In the above example, we do this by
diff -rup --new-file baseline/fsf/ed/main.c amiga/fsf/ed/main.c
--- baseline/fsf/ed/main.c Sat Nov 19 05:38:02 1994
+++ amiga/fsf/ed/main.c Sat Sep 28 00:00:00 1996
@@ -54,11 +54,11 @@ static char *rcsid = "@(#)$Id: main.c,v
#include <ctype.h>
#include <setjmp.h>
+#include <sys/types.h> /* Some systems need it before <pwd.h> */
#include <pwd.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include <sys/types.h>
#include <sys/stat.h>
#ifdef HAVE_LOCALE_H
#include <locale.h>
@@ -205,7 +205,7 @@ top:
argv++;
argc--;
}
-#if HAVE_LOCALE_H
+#if defined (HAVE_LOCALE_H) && defined (HAVE_SETLOCALE)
setlocale(LC_CTYPE, "");
#endif
init_buffers ();
diff -rup --new-file baseline/fsf/ed/manifests/bin amiga/fsf/ed/manifests/bin
--- baseline/fsf/ed/manifests/bin Wed Dec 31 17:00:00 1969
+++ amiga/fsf/ed/manifests/bin Sat Sep 28 00:00:00 1996
@@ -0,0 +1,8 @@
+COPYING
+COPYING.info
+bin/ed
+bin/red
+guide/ed.guide
+info/ed.info
+man/man1/ed.1
+man/man1/red.1
diff -rup --new-file baseline/fsf/ed/manifests/src amiga/fsf/ed/manifests/src
--- baseline/fsf/ed/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/ed/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,257 @@
+fsf/ed/BeOS.diffs
+fsf/ed/COPYING
+fsf/ed/ChangeLog
+fsf/ed/INSTALL
+fsf/ed/Makefile.in
+fsf/ed/NEWS
+fsf/ed/POSIX
+fsf/ed/Product-Info
+fsf/ed/README
+fsf/ed/THANKS
+fsf/ed/TODO
+fsf/ed/alloca.c
+fsf/ed/buf.c
+fsf/ed/config.h.in
+fsf/ed/config.guess
+fsf/ed/config.sub
+fsf/ed/configure
+fsf/ed/configure.in
+fsf/ed/ed.1
+fsf/ed/ed.h
+fsf/ed/ed.texinfo
+fsf/ed/error.c
+fsf/ed/getopt.c
+fsf/ed/getopt.h
+fsf/ed/getopt1.c
+fsf/ed/glbl.c
+fsf/ed/install.sh
+fsf/ed/io.c
+fsf/ed/main.c
+fsf/ed/manifests/bin
+fsf/ed/manifests/src
+fsf/ed/mkinstalldirs
+fsf/ed/pathmax.h
+fsf/ed/re.c
+fsf/ed/regex.c
+fsf/ed/regex.h
+fsf/ed/signal.c
+fsf/ed/stamp-h.in
+fsf/ed/sub.c
+fsf/ed/testsuite/=.err.posix
+fsf/ed/testsuite/Makefile
+fsf/ed/testsuite/README
+fsf/ed/testsuite/TODO
+fsf/ed/testsuite/a.d
+fsf/ed/testsuite/a.r
+fsf/ed/testsuite/a.t
+fsf/ed/testsuite/a1.err.posix
+fsf/ed/testsuite/a2.err
+fsf/ed/testsuite/a2.rr
+fsf/ed/testsuite/addr.d
+fsf/ed/testsuite/addr.r
+fsf/ed/testsuite/addr.t
+fsf/ed/testsuite/addr1.err
+fsf/ed/testsuite/addr1.rr
+fsf/ed/testsuite/addr2.err
+fsf/ed/testsuite/addr2.rr
+fsf/ed/testsuite/ascii.d
+fsf/ed/testsuite/ascii.r
+fsf/ed/testsuite/ascii.t
+fsf/ed/testsuite/bang1.d
+fsf/ed/testsuite/bang1.err
+fsf/ed/testsuite/bang1.r
+fsf/ed/testsuite/bang1.rr
+fsf/ed/testsuite/bang1.t
+fsf/ed/testsuite/bang2.err
+fsf/ed/testsuite/bang2.rr
+fsf/ed/testsuite/c.d
+fsf/ed/testsuite/c.r
+fsf/ed/testsuite/c.t
+fsf/ed/testsuite/c1.err
+fsf/ed/testsuite/c1.rr
+fsf/ed/testsuite/c2.err
+fsf/ed/testsuite/c2.rr
+fsf/ed/testsuite/ckscripts.sh
+fsf/ed/testsuite/comment.d
+fsf/ed/testsuite/comment.r
+fsf/ed/testsuite/comment.t
+fsf/ed/testsuite/d.d
+fsf/ed/testsuite/d.err
+fsf/ed/testsuite/d.r
+fsf/ed/testsuite/d.rr
+fsf/ed/testsuite/d.t
+fsf/ed/testsuite/e1.d
+fsf/ed/testsuite/e1.err
+fsf/ed/testsuite/e1.r
+fsf/ed/testsuite/e1.rr
+fsf/ed/testsuite/e1.t
+fsf/ed/testsuite/e2.d
+fsf/ed/testsuite/e2.err
+fsf/ed/testsuite/e2.r
+fsf/ed/testsuite/e2.rr
+fsf/ed/testsuite/e2.t
+fsf/ed/testsuite/e3.d
+fsf/ed/testsuite/e3.err
+fsf/ed/testsuite/e3.r
+fsf/ed/testsuite/e3.rr
+fsf/ed/testsuite/e3.t
+fsf/ed/testsuite/e4.d
+fsf/ed/testsuite/e4.r
+fsf/ed/testsuite/e4.t
+fsf/ed/testsuite/f1.err
+fsf/ed/testsuite/f1.rr
+fsf/ed/testsuite/f2.err
+fsf/ed/testsuite/f2.rr
+fsf/ed/testsuite/g1.d
+fsf/ed/testsuite/g1.err
+fsf/ed/testsuite/g1.r
+fsf/ed/testsuite/g1.rr
+fsf/ed/testsuite/g1.t
+fsf/ed/testsuite/g2.d
+fsf/ed/testsuite/g2.err
+fsf/ed/testsuite/g2.r
+fsf/ed/testsuite/g2.rr
+fsf/ed/testsuite/g2.t
+fsf/ed/testsuite/g3.d
+fsf/ed/testsuite/g3.err
+fsf/ed/testsuite/g3.r
+fsf/ed/testsuite/g3.rr
+fsf/ed/testsuite/g3.t
+fsf/ed/testsuite/g4.d
+fsf/ed/testsuite/g4.r
+fsf/ed/testsuite/g4.t
+fsf/ed/testsuite/g5.d
+fsf/ed/testsuite/g5.r
+fsf/ed/testsuite/g5.t
+fsf/ed/testsuite/h.err
+fsf/ed/testsuite/h.rr
+fsf/ed/testsuite/i.d
+fsf/ed/testsuite/i.r
+fsf/ed/testsuite/i.t
+fsf/ed/testsuite/i1.err.posix
+fsf/ed/testsuite/i2.err
+fsf/ed/testsuite/i2.rr
+fsf/ed/testsuite/i3.err
+fsf/ed/testsuite/i3.rr
+fsf/ed/testsuite/j.d
+fsf/ed/testsuite/j.r
+fsf/ed/testsuite/j.t
+fsf/ed/testsuite/k.d
+fsf/ed/testsuite/k.r
+fsf/ed/testsuite/k.t
+fsf/ed/testsuite/k1.err.posix
+fsf/ed/testsuite/k2.err
+fsf/ed/testsuite/k2.rr
+fsf/ed/testsuite/k3.err
+fsf/ed/testsuite/k3.rr
+fsf/ed/testsuite/k4.err
+fsf/ed/testsuite/k4.rr
+fsf/ed/testsuite/l.d
+fsf/ed/testsuite/l.r
+fsf/ed/testsuite/l.t
+fsf/ed/testsuite/m.d
+fsf/ed/testsuite/m.err
+fsf/ed/testsuite/m.r
+fsf/ed/testsuite/m.rr
+fsf/ed/testsuite/m.t
+fsf/ed/testsuite/mkscripts.sh
+fsf/ed/testsuite/n.d
+fsf/ed/testsuite/n.r
+fsf/ed/testsuite/n.t
+fsf/ed/testsuite/nl.err
+fsf/ed/testsuite/nl.rr
+fsf/ed/testsuite/nl1.d
+fsf/ed/testsuite/nl1.r
+fsf/ed/testsuite/nl1.t
+fsf/ed/testsuite/nl2.d
+fsf/ed/testsuite/nl2.r
+fsf/ed/testsuite/nl2.t
+fsf/ed/testsuite/p.d
+fsf/ed/testsuite/p.r
+fsf/ed/testsuite/p.t
+fsf/ed/testsuite/q.d
+fsf/ed/testsuite/q.r
+fsf/ed/testsuite/q.t
+fsf/ed/testsuite/q1.err
+fsf/ed/testsuite/q1.rr
+fsf/ed/testsuite/r1.d
+fsf/ed/testsuite/r1.err.posix
+fsf/ed/testsuite/r1.r
+fsf/ed/testsuite/r1.t
+fsf/ed/testsuite/r2.d
+fsf/ed/testsuite/r2.err
+fsf/ed/testsuite/r2.r
+fsf/ed/testsuite/r2.rr
+fsf/ed/testsuite/r2.t
+fsf/ed/testsuite/r3.d
+fsf/ed/testsuite/r3.r
+fsf/ed/testsuite/r3.t
+fsf/ed/testsuite/s1.d
+fsf/ed/testsuite/s1.err
+fsf/ed/testsuite/s1.r
+fsf/ed/testsuite/s1.rr
+fsf/ed/testsuite/s1.t
+fsf/ed/testsuite/s10.err
+fsf/ed/testsuite/s10.rr
+fsf/ed/testsuite/s2.d
+fsf/ed/testsuite/s2.err
+fsf/ed/testsuite/s2.r
+fsf/ed/testsuite/s2.rr
+fsf/ed/testsuite/s2.t
+fsf/ed/testsuite/s3.d
+fsf/ed/testsuite/s3.err
+fsf/ed/testsuite/s3.r
+fsf/ed/testsuite/s3.rr
+fsf/ed/testsuite/s3.t
+fsf/ed/testsuite/s4.err
+fsf/ed/testsuite/s4.rr
+fsf/ed/testsuite/s5.err
+fsf/ed/testsuite/s5.rr
+fsf/ed/testsuite/s6.err
+fsf/ed/testsuite/s6.rr
+fsf/ed/testsuite/s7.err
+fsf/ed/testsuite/s7.rr
+fsf/ed/testsuite/s8.err
+fsf/ed/testsuite/s8.rr
+fsf/ed/testsuite/s9.err
+fsf/ed/testsuite/s9.rr
+fsf/ed/testsuite/t.d
+fsf/ed/testsuite/t.r
+fsf/ed/testsuite/t1.d
+fsf/ed/testsuite/t1.err
+fsf/ed/testsuite/t1.r
+fsf/ed/testsuite/t1.rr
+fsf/ed/testsuite/t1.t
+fsf/ed/testsuite/t2.d
+fsf/ed/testsuite/t2.err
+fsf/ed/testsuite/t2.r
+fsf/ed/testsuite/t2.rr
+fsf/ed/testsuite/t2.t
+fsf/ed/testsuite/u.d
+fsf/ed/testsuite/u.err
+fsf/ed/testsuite/u.r
+fsf/ed/testsuite/u.rr
+fsf/ed/testsuite/u.t
+fsf/ed/testsuite/v.d
+fsf/ed/testsuite/v.r
+fsf/ed/testsuite/v.t
+fsf/ed/testsuite/w.d
+fsf/ed/testsuite/w.r
+fsf/ed/testsuite/w.t
+fsf/ed/testsuite/w1.err
+fsf/ed/testsuite/w1.rr
+fsf/ed/testsuite/w2.err
+fsf/ed/testsuite/w2.rr
+fsf/ed/testsuite/w3.err
+fsf/ed/testsuite/w3.rr
+fsf/ed/testsuite/x.d
+fsf/ed/testsuite/x.err
+fsf/ed/testsuite/x.r
+fsf/ed/testsuite/x.rr
+fsf/ed/testsuite/x.t
+fsf/ed/testsuite/z.err
+fsf/ed/testsuite/z.rr
+fsf/ed/texinfo.tex
+fsf/ed/undo.c
+fsf/ed/version.c
+fsf/ed/xmalloc.c