diff -urNh ../autoconf2.13-2.13/config.guess ./config.guess
--- ../autoconf2.13-2.13/config.guess	Thu May 30 20:25:21 2002
+++ ./config.guess	Thu May 30 20:20:42 2002
@@ -121,6 +121,22 @@
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:Debian*)
+       # Debian GNU/NetBSD system. These have a different userland to
+       # standard NetBSD systems and so require a different target.
+        sysctl="sysctl -n hw.machine_arch"
+        UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+            /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+        case "${UNAME_MACHINE_ARCH}" in
+            arm*) machine=arm-unknown ;;
+            sh3el) machine=shl-unknown ;;
+            sh3eb) machine=sh-unknown ;;
+            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+        esac
+        os=netbsd
+        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+        echo "${machine}-${os}-debian"
+        exit 0 ;;
     *:NetBSD:*:*)
 	# Netbsd (nbsd) targets should (where applicable) match one or
 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
diff -urNh ../autoconf2.13-2.13/config.sub ./config.sub
--- ../autoconf2.13-2.13/config.sub	Thu May 30 20:25:21 2002
+++ ./config.sub	Thu May 30 20:21:02 2002
@@ -108,7 +108,7 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | storm-chaos*)
+  nto-qnx* | linux-gnu* | storm-chaos* | netbsd-debian*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
diff -urNh ../autoconf2.13-2.13/standards.info ./standards.info
--- ../autoconf2.13-2.13/standards.info	Tue Jan  5 13:43:40 1999
+++ ./standards.info	Thu May 30 20:21:32 2002
@@ -1,5 +1,5 @@
-This is Info file standards.info, produced by Makeinfo version 1.67
-from the input file /home/bje/autoconf-2.13/standards.texi.
+This is standards.info, produced by makeinfo version 4.0b from
+./standards.texi.
 
 START-INFO-DIR-ENTRY
 * Standards: (standards).        GNU coding standards.
@@ -122,7 +122,7 @@
 
    If someone else sends you a piece of code to add to the program you
 are working on, we need legal papers to use it--the same sort of legal
-papers we will need to get from you.  *Each* significant contributor to
+papers we will need to get from you.  _Each_ significant contributor to
 a program must sign some sort of legal papers in order for us to have
 clear title to the program.  The main author alone is not enough.
 
@@ -344,21 +344,21 @@
 Writing Robust Programs
 =======================
 
-   Avoid arbitrary limits on the length or number of *any* data
+   Avoid arbitrary limits on the length or number of _any_ data
 structure, including file names, lines, files, and symbols, by
 allocating all data structures dynamically.  In most Unix utilities,
 "long lines are silently truncated".  This is not acceptable in a GNU
 utility.
 
    Utilities reading files should not drop NUL characters, or any other
-nonprinting characters *including those with codes above 0177*.  The
+nonprinting characters _including those with codes above 0177_.  The
 only sensible exceptions would be utilities specifically intended for
 interface to certain types of printers that can't handle those
 characters.
 
    Check every system call for an error return, unless you know you
 wish to ignore errors.  Include the system error text (from `perror' or
-equivalent) in *every* error message resulting from a failing system
+equivalent) in _every_ error message resulting from a failing system
 call, as well as the name of the file if any and the name of the
 utility.  Just "cannot open foo.c" or "stat failed" is not sufficient.
 
@@ -416,7 +416,7 @@
 elsewhere.
 
    Do not use a count of errors as the exit status for a program.
-*That does not work*, because exit status values are limited to 8 bits
+_That does not work_, because exit status values are limited to 8 bits
 (0 through 255).  A single run of the program might have 256 errors; if
 you try to return 256 as the exit status, the parent process will see 0
 as the status, and it will appear that the program succeeded.
@@ -543,7 +543,7 @@
 to expect the "verbose" option of any GNU program which has one, to be
 spelled precisely `--verbose'.  To achieve this uniformity, look at the
 table of common long-option names when you choose the option names for
-your program (*note Option Table::.).
+your program (*note Option Table::).
 
    It is usually a good idea for file names given as ordinary arguments
 to be input files only; any output files would be specified using
@@ -568,7 +568,7 @@
 
           GNU Emacs 19.30
 
-     The program's name should be a constant string; *don't* compute it
+     The program's name should be a constant string; _don't_ compute it
      from `argv[0]'.  The idea is to state the standard or canonical
      name for the program, not its file name.  There are other ways to
      find out the precise file name where a command is found in `PATH'.
@@ -1746,7 +1746,7 @@
 * Names::                       Naming Variables and Functions
 * System Portability::          Portability between different operating systems
 * CPU Portability::             Supporting the range of CPU types
-* System Functions::            Portability and "standard" library functions
+* System Functions::            Portability and ``standard'' library functions
 * Internationalization::        Techniques for internationalization
 * Mmap::                        How you can safely use `mmap'.
 
@@ -1908,9 +1908,9 @@
 
    Every `#endif' should have a comment, except in the case of short
 conditionals (just a few lines) that are not nested.  The comment should
-state the condition of the conditional that is ending, *including its
-sense*.  `#else' should have a comment describing the condition *and
-sense* of the code that follows.  For example:
+state the condition of the conditional that is ending, _including its
+sense_.  `#else' should have a comment describing the condition _and
+sense_ of the code that follows.  For example:
 
      #ifdef foo
        ...
@@ -2160,7 +2160,7 @@
      }
 
 In practice, this works on all machines, and it is much simpler than any
-"correct" alternative.  Be sure *not* to use a prototype for such
+"correct" alternative.  Be sure _not_ to use a prototype for such
 functions.
 
    However, avoid casting pointers to integers unless you really need
@@ -2429,7 +2429,7 @@
 implementation, rather than the structure that helps the user
 understand.
 
-   Instead, each manual should cover a coherent *topic*.  For example,
+   Instead, each manual should cover a coherent _topic_.  For example,
 instead of a manual for `diff' and a manual for `diff3', we have one
 manual for "comparison of files" which covers both of those programs,
 as well as `cmp'.  By documenting these programs together, we can make
@@ -2452,8 +2452,8 @@
 logical breakdown of its topic, but order the sections, and write their
 text, so that reading the chapter straight through makes sense.  Do
 likewise when structuring the book into chapters, and when structuring a
-section into paragraphs.  The watchword is, *at each point, address the
-most fundamental and important issue raised by the preceding text.*
+section into paragraphs.  The watchword is, _at each point, address the
+most fundamental and important issue raised by the preceding text._
 
    If necessary, add extra chapters at the beginning of the manual which
 are purely tutorial and cover the basics of the subject.  These provide
@@ -2676,7 +2676,7 @@
      * dispnew.c (init_display) [HAVE_LIBNCURSES]: If X, call tgetent.
 
    Here is an entry for a change that takes affect only when a certain
-macro is *not* defined:
+macro is _not_ defined:
 
      (gethostname) [!HAVE_SOCKETS]: Replace with winsock version.
 
@@ -2767,12 +2767,12 @@
 
    One way to do this is to make a link from a standard name such as
 `config.h' to the proper configuration file for the chosen system.  If
-you use this technique, the distribution should *not* contain a file
+you use this technique, the distribution should _not_ contain a file
 named `config.h'.  This is so that people won't be able to build the
 program without configuring it first.
 
    Another thing that `configure' can do is to edit the Makefile.  If
-you do this, the distribution should *not* contain a file named
+you do this, the distribution should _not_ contain a file named
 `Makefile'.  Instead, it should include a file `Makefile.in' which
 contains the input used for editing.  Once again, this is so that people
 won't be able to build the program without configuring it first.
@@ -3080,14 +3080,13 @@
    Each program-name variable should come with an options variable that
 is used to supply options to the program.  Append `FLAGS' to the
 program-name variable name to get the options variable name--for
-example, `BISONFLAGS'.  (The names `CFLAGS' for the C compiler,
-`YFLAGS' for yacc, and `LFLAGS' for lex, are exceptions to this rule,
-but we keep them because they are standard.) Use `CPPFLAGS' in any
+example, `BISONFLAGS'.  (The name `CFLAGS' is an exception to this
+rule, but we keep it because it is standard.)  Use `CPPFLAGS' in any
 compilation command that runs the preprocessor, and use `LDFLAGS' in
 any compilation command that does linking as well as in any direct use
 of `ld'.
 
-   If there are C compiler options that *must* be used for proper
+   If there are C compiler options that _must_ be used for proper
 compilation of certain files, do not include them in `CFLAGS'.  Users
 expect to be able to specify `CFLAGS' freely themselves.  Instead,
 arrange to pass the necessary options to the C compiler independently
@@ -3100,7 +3099,7 @@
              $(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $<
 
    Do include the `-g' option in `CFLAGS', because that is not
-*required* for proper compilation.  You can consider it a default that
+_required_ for proper compilation.  You can consider it a default that
 is only recommended.  If the package is set up so that it is compiled
 with GCC by default, then you might as well include `-O' in the default
 value of `CFLAGS' as well.
@@ -3207,7 +3206,7 @@
      The directory for installing read-only architecture independent
      data files.  This should normally be `/usr/local/share', but write
      it as `$(prefix)/share'.  (If you are using Autoconf, write it as
-     `@datadir@'.) As a special exception, see `$(infodir)' and
+     `@datadir@'.)  As a special exception, see `$(infodir)' and
      `$(includedir)' below.
 
 `sysconfdir'
@@ -3415,7 +3414,7 @@
      that don't have the Unix man page documentation system installed.
 
      The way to install Info files is to copy them into `$(infodir)'
-     with `$(INSTALL_DATA)' (*note Command Variables::.), and then run
+     with `$(INSTALL_DATA)' (*note Command Variables::), and then run
      the `install-info' program if it is present.  `install-info' is a
      program that edits the Info `dir' file to add or update the menu
      entry for the given Info file; it is part of the Texinfo package.
@@ -3606,7 +3605,7 @@
 
    ---------- Footnotes ----------
 
-   (1)  `texi2dvi' uses TeX to do the real work of formatting. TeX is
+   (1) `texi2dvi' uses TeX to do the real work of formatting. TeX is
 not distributed with Texinfo.
 
 
@@ -3650,7 +3649,7 @@
 variables you can use, one for each category; the variable name
 specifies the category.  Category lines are no-ops in ordinary execution
 because these three Make variables are normally undefined (and you
-*should not* define them in the makefile).
+_should not_ define them in the makefile).
 
    Here are the three possible category lines, each with a comment that
 explains what it means:
@@ -3674,7 +3673,7 @@
 from the Info directory.
 
    If the `install' or `uninstall' target has any dependencies which
-act as subroutines of installation, then you should start *each*
+act as subroutines of installation, then you should start _each_
 dependency's commands with a category line, and start the main target's
 commands with a category line also.  This way, you can ensure that each
 command is placed in the right category regardless of which of the
@@ -3785,53 +3784,54 @@
 
 
 Tag Table:
-Node: Top1010
-Node: Preface1554
-Node: Intellectual Property2582
-Node: Reading Non-Free Code2957
-Node: Contributions4689
-Node: Design Advice6683
-Node: Compatibility7200
-Node: Using Extensions8711
-Node: ANSI C10213
-Node: Source Language11449
-Node: Program Behavior12942
-Node: Semantics13651
-Node: Libraries17801
-Node: Errors19036
-Node: User Interfaces20259
-Node: Option Table27131
-Node: Memory Usage41686
-Node: Writing C42680
-Node: Formatting43519
-Node: Comments46791
-Node: Syntactic Conventions50089
-Node: Names53027
-Node: System Portability54763
-Node: CPU Portability56539
-Node: System Functions58700
-Node: Internationalization63804
-Node: Mmap66952
-Node: Documentation67657
-Node: GNU Manuals68215
-Node: Manual Structure Details72102
-Node: NEWS File73432
-Node: Change Logs74113
-Node: Change Log Concepts74830
-Node: Style of Change Logs76598
-Node: Simple Changes78152
-Node: Conditional Changes79343
-Node: Man Pages80720
-Node: Reading other Manuals82339
-Node: Managing Releases83123
-Node: Configuration83859
-Node: Makefile Conventions90799
-Node: Makefile Basics91479
-Node: Utilities in Makefiles94648
-Node: Command Variables96784
-Node: Directory Variables99812
-Node: Standard Targets110394
-Node: Install Command Categories120895
-Node: Releases125468
+Node: Top963
+Node: Preface1507
+Node: Intellectual Property2535
+Node: Reading Non-Free Code2910
+Node: Contributions4642
+Node: Design Advice6636
+Node: Compatibility7153
+Node: Using Extensions8664
+Node: ANSI C10166
+Node: Source Language11402
+Node: Program Behavior12895
+Node: Semantics13604
+Node: Libraries17754
+Node: Errors18989
+Node: User Interfaces20212
+Node: Option Table27083
+Node: Memory Usage41638
+Node: Writing C42632
+Node: Formatting43473
+Node: Comments46745
+Node: Syntactic Conventions50043
+Node: Names52981
+Node: System Portability54717
+Node: CPU Portability56493
+Node: System Functions58654
+Node: Internationalization63758
+Node: Mmap66906
+Node: Documentation67611
+Node: GNU Manuals68169
+Node: Manual Structure Details72056
+Node: NEWS File73386
+Node: Change Logs74067
+Node: Change Log Concepts74784
+Node: Style of Change Logs76552
+Node: Simple Changes78106
+Node: Conditional Changes79297
+Node: Man Pages80674
+Node: Reading other Manuals82293
+Node: Managing Releases83077
+Node: Configuration83813
+Node: Makefile Conventions90753
+Node: Makefile Basics91433
+Node: Utilities in Makefiles94602
+Node: Command Variables96738
+Node: Directory Variables99701
+Node: Standard Targets110284
+Ref: Standard Targets-Footnote-1120683
+Node: Install Command Categories120783
+Node: Releases125356
 
 End Tag Table
