this commit includes all the changes on the OV_9510_INTEGRATION and

OV_MERGE branches.  This includes, but is not limited to, the new openvision
admin system, and major changes to gssapi to add functionality, and bring
the implementation in line with rfc1964.  before committing, the
code was built and tested for netbsd and solaris.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8774 dc483132-0cff-0310-8789-dd5450dbe970

6 files changed, 193 insertions, 161 deletions

diff --git a/src/util/autoconf/ChangeLog b/src/util/autoconf/ChangeLog
index 67827c8e1..e317fe91e 100644
--- a/src/util/autoconf/ChangeLog
+++ b/src/util/autoconf/ChangeLog
@@ -1,3 +1,12 @@
+Tue Jul  9 18:24:12 1996  Marc Horowitz  <marc@mit.edu>
+
+	* autoheader.sh (TEMPLATES): add ./acconfig.h to the list of
+ 	header templates used.  This is necessary when a subpackage is
+ 	being autoreconf'd.
+
+	* acgeneral.m4 (AC_CACHE_CHECK): added, from autoconf 2.7.  db2
+ 	needs it.
+
 Wed Jun 12 18:17:17 1996  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
 
 	* autoconf.texi (Output): document changes to AC_OUTPUT
diff --git a/src/util/autoconf/README.krb5 b/src/util/autoconf/README.krb5
new file mode 100644
index 000000000..d4b734658
--- /dev/null
+++ b/src/util/autoconf/README.krb5
@@ -0,0 +1,2 @@
+There have been a few local changes and bug-fixes made to this tree.
+Check out the ChangeLog file for details.
diff --git a/src/util/autoconf/autoconf.info b/src/util/autoconf/autoconf.info
index 050a253b8..472783f0b 100644
--- a/src/util/autoconf/autoconf.info
+++ b/src/util/autoconf/autoconf.info
@@ -1,5 +1,5 @@
-This is Info file ../autoconf.info, produced by Makeinfo-1.63 from the
-input file ../autoconf.texi.
+This is Info file autoconf.info, produced by Makeinfo-1.55 from the
+input file ./autoconf.texi.
 
 START-INFO-DIR-ENTRY
 * Autoconf: (autoconf).         Create source code configuration scripts.
@@ -722,6 +722,10 @@ macro is `AC_INIT' (*note Input::.).
      separated by a colon.  For example,
           AC_OUTPUT(Makefile:templates/top.mk lib/Makefile:templates/lib.mk)
 
+     You can also generate an output file from multiple input files by
+     separating the input files by a plus sign.  For example,
+          AC_OUTPUT(Makefile:templates/pre.in+Makefile.in+templates/post.in)
+
      If you pass EXTRA-CMDS, those commands will be inserted into
      `config.status' to be run after all its other processing.  If
      INIT-CMDS are given, they are inserted just before EXTRA-CMDS,
@@ -3024,7 +3028,7 @@ automatically.
      Notify the user of an error that prevents `configure' from
      completing.  This macro prints an error message on the standard
      error output and exits `configure' with a nonzero status.
-     ERROR-DESCRIPTION should be something like `invalid value $HOME
+     eRROR-DESCRIPTION should be something like `invalid value $HOME
      for \$HOME'.
 
  - Macro: AC_MSG_WARN (PROBLEM-DESCRIPTION)
@@ -3261,7 +3265,7 @@ it is considered obsolete.
 
  - Macro: AC_PROVIDE (THIS-MACRO-NAME)
      Record the fact that THIS-MACRO-NAME has been called.
-     THIS-MACRO-NAME should be the name of the macro that is calling
+     tHIS-MACRO-NAME should be the name of the macro that is calling
      `AC_PROVIDE'.  An easy way to get it is from the `m4' builtin
      variable `$0', like this:
 
@@ -4953,11 +4957,11 @@ Autoconf checks.
 
 * Menu:
 
-* AC_MACRODIR <1>:                      Invoking autoupdate.
-* AC_MACRODIR <1>:                      Invoking autoheader.
-* AC_MACRODIR <1>:                      Invoking autoreconf.
-* AC_MACRODIR <1>:                      Invoking autoconf.
-* AC_MACRODIR <1>:                      Invoking ifnames.
+* AC_MACRODIR:                          Invoking autoupdate.
+* AC_MACRODIR:                          Invoking autoheader.
+* AC_MACRODIR:                          Invoking autoreconf.
+* AC_MACRODIR:                          Invoking autoconf.
+* AC_MACRODIR:                          Invoking ifnames.
 * AC_MACRODIR:                          Invoking autoscan.
 * CONFIG_FILES:                         Invoking config.status.
 * CONFIG_HEADERS:                       Invoking config.status.
@@ -4987,17 +4991,18 @@ how this is done.
 * build_cpu:                            System Type Variables.
 * build_os:                             System Type Variables.
 * build_vendor:                         System Type Variables.
-* CC <1>:                               UNIX Variants.
+* CC:                                   UNIX Variants.
+* CC:                                   Particular Programs.
 * CC:                                   Particular Programs.
-* CFLAGS <1>:                           Particular Programs.
 * CFLAGS:                               Preset Output Variables.
+* CFLAGS:                               Particular Programs.
 * configure_input:                      Preset Output Variables.
 * CPP:                                  Particular Programs.
 * CPPFLAGS:                             Preset Output Variables.
 * CXX:                                  Particular Programs.
 * CXXCPP:                               Particular Programs.
-* CXXFLAGS <1>:                         Particular Programs.
 * CXXFLAGS:                             Preset Output Variables.
+* CXXFLAGS:                             Particular Programs.
 * datadir:                              Preset Output Variables.
 * DEFS:                                 Preset Output Variables.
 * exec_prefix:                          Preset Output Variables.
@@ -5014,15 +5019,17 @@ how this is done.
 * KMEM_GROUP:                           Particular Functions.
 * LDFLAGS:                              Preset Output Variables.
 * LEX:                                  Particular Programs.
-* LEX_OUTPUT_ROOT:                      Particular Programs.
 * LEXLIB:                               Particular Programs.
+* LEX_OUTPUT_ROOT:                      Particular Programs.
 * libdir:                               Preset Output Variables.
 * libexecdir:                           Preset Output Variables.
-* LIBOBJS <1>:                          Structures.
-* LIBOBJS <1>:                          Generic Functions.
 * LIBOBJS:                              Particular Functions.
-* LIBS <1>:                             UNIX Variants.
+* LIBOBJS:                              Particular Functions.
+* LIBOBJS:                              Generic Functions.
+* LIBOBJS:                              Structures.
 * LIBS:                                 Preset Output Variables.
+* LIBS:                                 UNIX Variants.
+* LIBS:                                 UNIX Variants.
 * LN_S:                                 Particular Programs.
 * localstatedir:                        Preset Output Variables.
 * mandir:                               Preset Output Variables.
@@ -5061,15 +5068,9 @@ use these names in `#if' directives.
 
 * Menu:
 
-* __CHAR_UNSIGNED__:                    Compiler Characteristics.
-* _ALL_SOURCE:                          UNIX Variants.
-* _MINIX:                               UNIX Variants.
-* _POSIX_1_SOURCE:                      UNIX Variants.
-* _POSIX_SOURCE:                        UNIX Variants.
-* _POSIX_VERSION:                       Particular Headers.
-* C_ALLOCA:                             Particular Functions.
 * CLOSEDIR_VOID:                        Particular Functions.
 * const:                                Compiler Characteristics.
+* C_ALLOCA:                             Particular Functions.
 * DGUX:                                 Particular Functions.
 * DIRENT:                               Particular Headers.
 * GETGROUPS_T:                          Particular Typedefs.
@@ -5088,11 +5089,11 @@ use these names in `#if' directives.
 * HAVE_MMAP:                            Particular Functions.
 * HAVE_NDIR_H:                          Particular Headers.
 * HAVE_RESTARTABLE_SYSCALLS:            System Services.
+* HAVE_STRCOLL:                         Particular Functions.
+* HAVE_STRFTIME:                        Particular Functions.
 * HAVE_ST_BLKSIZE:                      Structures.
 * HAVE_ST_BLOCKS:                       Structures.
 * HAVE_ST_RDEV:                         Structures.
-* HAVE_STRCOLL:                         Particular Functions.
-* HAVE_STRFTIME:                        Particular Functions.
 * HAVE_SYS_DIR_H:                       Particular Headers.
 * HAVE_SYS_NDIR_H:                      Particular Headers.
 * HAVE_SYS_WAIT_H:                      Particular Headers.
@@ -5122,9 +5123,9 @@ use these names in `#if' directives.
 * size_t:                               Particular Typedefs.
 * STDC_HEADERS:                         Particular Headers.
 * SVR4:                                 Particular Functions.
-* SYS_SIGLIST_DECLARED:                 Particular Headers.
 * SYSDIR:                               Particular Headers.
 * SYSNDIR:                              Particular Headers.
+* SYS_SIGLIST_DECLARED:                 Particular Headers.
 * TIME_WITH_SYS_TIME:                   Structures.
 * TM_IN_SYS_TIME:                       Structures.
 * uid_t:                                Particular Typedefs.
@@ -5135,6 +5136,13 @@ use these names in `#if' directives.
 * VOID_CLOSEDIR:                        Particular Headers.
 * WORDS_BIGENDIAN:                      Compiler Characteristics.
 * YYTEXT_POINTER:                       Particular Programs.
+* _ALL_SOURCE:                          UNIX Variants.
+* _MINIX:                               UNIX Variants.
+* _POSIX_1_SOURCE:                      UNIX Variants.
+* _POSIX_SOURCE:                        UNIX Variants.
+* _POSIX_SOURCE:                        UNIX Variants.
+* _POSIX_VERSION:                       Particular Headers.
+* __CHAR_UNSIGNED__:                    Compiler Characteristics.
 
 
 File: autoconf.info,  Node: Macro Index,  Prev: Preprocessor Symbol Index,  Up: Top
@@ -5154,17 +5162,12 @@ list easier to use, the macros are listed without their preceding `AC_'.
 * ARG_PROGRAM:                          Transforming Names.
 * ARG_WITH:                             External Software.
 * BEFORE:                               Suggested Ordering.
-* C_BIGENDIAN:                          Compiler Characteristics.
-* C_CHAR_UNSIGNED:                      Compiler Characteristics.
-* C_CONST:                              Compiler Characteristics.
-* C_CROSS:                              Test Programs.
-* C_INLINE:                             Compiler Characteristics.
-* C_LONG_DOUBLE:                        Compiler Characteristics.
 * CACHE_CHECK:                          Caching Results.
 * CACHE_VAL:                            Caching Results.
 * CANONICAL_HOST:                       Canonicalizing.
 * CANONICAL_SYSTEM:                     Canonicalizing.
 * CHAR_UNSIGNED:                        Old Macro Names.
+* CHECKING:                             Printing Messages.
 * CHECK_FUNC:                           Generic Functions.
 * CHECK_FUNCS:                          Generic Functions.
 * CHECK_HEADER:                         Generic Headers.
@@ -5175,13 +5178,18 @@ list easier to use, the macros are listed without their preceding `AC_'.
 * CHECK_SIZEOF:                         Compiler Characteristics.
 * CHECK_TOOL:                           Generic Programs.
 * CHECK_TYPE:                           Generic Typedefs.
-* CHECKING:                             Printing Messages.
 * COMPILE_CHECK:                        Examining Libraries.
 * CONFIG_AUX_DIR:                       Input.
 * CONFIG_HEADER:                        Configuration Headers.
 * CONFIG_SUBDIRS:                       Subdirectories.
 * CONST:                                Old Macro Names.
 * CROSS_CHECK:                          Old Macro Names.
+* C_BIGENDIAN:                          Compiler Characteristics.
+* C_CHAR_UNSIGNED:                      Compiler Characteristics.
+* C_CONST:                              Compiler Characteristics.
+* C_CROSS:                              Test Programs.
+* C_INLINE:                             Compiler Characteristics.
+* C_LONG_DOUBLE:                        Compiler Characteristics.
 * DECL_SYS_SIGLIST:                     Particular Headers.
 * DECL_YYTEXT:                          Particular Programs.
 * DEFINE:                               Defining Symbols.
@@ -5260,6 +5268,11 @@ list easier to use, the macros are listed without their preceding `AC_'.
 * PREFIX:                               Old Macro Names.
 * PREFIX_PROGRAM:                       Default Prefix.
 * PREREQ:                               Versions.
+* PROGRAMS_CHECK:                       Old Macro Names.
+* PROGRAMS_PATH:                        Old Macro Names.
+* PROGRAM_CHECK:                        Old Macro Names.
+* PROGRAM_EGREP:                        Old Macro Names.
+* PROGRAM_PATH:                         Old Macro Names.
 * PROG_AWK:                             Particular Programs.
 * PROG_CC:                              Particular Programs.
 * PROG_CC_C_O:                          Particular Programs.
@@ -5273,11 +5286,6 @@ list easier to use, the macros are listed without their preceding `AC_'.
 * PROG_MAKE_SET:                        Output.
 * PROG_RANLIB:                          Particular Programs.
 * PROG_YACC:                            Particular Programs.
-* PROGRAM_CHECK:                        Old Macro Names.
-* PROGRAM_EGREP:                        Old Macro Names.
-* PROGRAM_PATH:                         Old Macro Names.
-* PROGRAMS_CHECK:                       Old Macro Names.
-* PROGRAMS_PATH:                        Old Macro Names.
 * PROVIDE:                              Prerequisite Macros.
 * REMOTE_TAPE:                          Old Macro Names.
 * REPLACE_FUNCS:                        Generic Functions.
@@ -5288,15 +5296,12 @@ list easier to use, the macros are listed without their preceding `AC_'.
 * REVISION:                             Versions.
 * RSH:                                  Old Macro Names.
 * SCO_INTL:                             UNIX Variants.
-* SET_MAKE:                             Old Macro Names.
 * SETVBUF_REVERSED:                     Old Macro Names.
-* SIZE_T:                               Old Macro Names.
+* SET_MAKE:                             Old Macro Names.
 * SIZEOF_TYPE:                          Old Macro Names.
-* ST_BLKSIZE:                           Old Macro Names.
-* ST_BLOCKS:                            Old Macro Names.
-* ST_RDEV:                              Old Macro Names.
-* STAT_MACROS_BROKEN <1>:               Old Macro Names.
+* SIZE_T:                               Old Macro Names.
 * STAT_MACROS_BROKEN:                   Structures.
+* STAT_MACROS_BROKEN:                   Old Macro Names.
 * STDC_HEADERS:                         Old Macro Names.
 * STRCOLL:                              Old Macro Names.
 * STRUCT_ST_BLKSIZE:                    Structures.
@@ -5304,6 +5309,9 @@ list easier to use, the macros are listed without their preceding `AC_'.
 * STRUCT_ST_RDEV:                       Structures.
 * STRUCT_TIMEZONE:                      Structures.
 * STRUCT_TM:                            Structures.
+* ST_BLKSIZE:                           Old Macro Names.
+* ST_BLOCKS:                            Old Macro Names.
+* ST_RDEV:                              Old Macro Names.
 * SUBST:                                Setting Output Variables.
 * SUBST_FILE:                           Setting Output Variables.
 * SYS_INTERPRETER:                      System Services.
@@ -5312,8 +5320,8 @@ list easier to use, the macros are listed without their preceding `AC_'.
 * SYS_SIGLIST_DECLARED:                 Old Macro Names.
 * TEST_CPP:                             Old Macro Names.
 * TEST_PROGRAM:                         Old Macro Names.
-* TIME_WITH_SYS_TIME:                   Old Macro Names.
 * TIMEZONE:                             Old Macro Names.
+* TIME_WITH_SYS_TIME:                   Old Macro Names.
 * TRY_COMPILE:                          Examining Syntax.
 * TRY_CPP:                              Examining Declarations.
 * TRY_LINK:                             Examining Libraries.
@@ -5342,118 +5350,118 @@ list easier to use, the macros are listed without their preceding `AC_'.
 
 
 Tag Table:
-Node: Top1177
-Node: Introduction9316
-Node: Making configure Scripts13156
-Node: Writing configure.in16221
-Node: Invoking autoscan19921
-Node: Invoking ifnames22226
-Node: Invoking autoconf23716
-Node: Invoking autoreconf25554
-Node: Setup27874
-Node: Input28760
-Node: Output30483
-Node: Makefile Substitutions33233
-Node: Preset Output Variables34817
-Node: Build Directories39319
-Node: Automatic Remaking40952
-Node: Configuration Headers43038
-Node: Header Templates45405
-Node: Invoking autoheader46584
-Node: Subdirectories49732
-Node: Default Prefix51075
-Node: Versions52479
-Node: Existing Tests54383
-Node: Alternative Programs55848
-Node: Particular Programs56512
-Node: Generic Programs62362
-Node: Libraries65188
-Node: Library Functions67017
-Node: Particular Functions67575
-Node: Generic Functions73878
-Node: Header Files75721
-Node: Particular Headers76280
-Node: Generic Headers83251
-Node: Structures84553
-Node: Typedefs86790
-Node: Particular Typedefs87294
-Node: Generic Typedefs88494
-Node: Compiler Characteristics88937
-Node: System Services91562
-Node: UNIX Variants93911
-Node: Writing Tests95930
-Node: Examining Declarations97896
-Node: Examining Syntax100366
-Node: Examining Libraries101423
-Node: Run Time103982
-Node: Test Programs104943
-Node: Guidelines107480
-Node: Test Functions108669
-Node: Portable Shell110212
-Node: Testing Values and Files112144
-Node: Multiple Cases113799
-Node: Language Choice114997
-Node: Results116555
-Node: Defining Symbols117314
-Node: Setting Output Variables120323
-Node: Caching Results122169
-Node: Cache Variable Names124450
-Node: Cache Files125999
-Node: Printing Messages128097
-Node: Writing Macros131384
-Node: Macro Definitions132003
-Node: Macro Names133108
-Node: Quoting135559
-Node: Dependencies Between Macros137461
-Node: Prerequisite Macros138093
-Node: Suggested Ordering139548
-Node: Obsolete Macros141078
-Node: Manual Configuration142302
-Node: Specifying Names143201
-Node: Canonicalizing145073
-Node: System Type Variables146387
-Node: Using System Type147134
-Node: Site Configuration148581
-Node: External Software149354
-Node: Package Options152052
-Node: Site Details154319
-Node: Transforming Names155542
-Node: Transformation Options156720
-Node: Transformation Examples157186
-Node: Transformation Rules158754
-Node: Site Defaults160163
-Node: Invoking configure163947
-Node: Basic Installation164896
-Node: Compilers and Options167476
-Node: Multiple Architectures168125
-Node: Installation Names169111
-Node: Optional Features170295
-Node: System Type171065
-Node: Sharing Defaults172087
-Node: Operation Controls172711
-Node: Invoking config.status173586
-Node: Questions176974
-Node: Distributing177506
-Node: Why GNU m4178632
-Node: Bootstrapping179445
-Node: Why Not Imake180061
-Node: Upgrading184470
-Node: Changed File Names185991
-Node: Changed Makefiles186727
-Node: Changed Macros187823
-Node: Invoking autoupdate189070
-Node: Changed Results190661
-Node: Changed Macro Writing192763
-Node: History194026
-Node: Genesis194733
-Node: Exodus195906
-Node: Leviticus198955
-Node: Numbers200478
-Node: Deuteronomy202394
-Node: Old Macro Names205058
-Node: Environment Variable Index208107
-Node: Output Variable Index209109
-Node: Preprocessor Symbol Index213792
-Node: Macro Index218607
+Node: Top1173
+Node: Introduction9312
+Node: Making configure Scripts13152
+Node: Writing configure.in16217
+Node: Invoking autoscan19917
+Node: Invoking ifnames22222
+Node: Invoking autoconf23712
+Node: Invoking autoreconf25550
+Node: Setup27870
+Node: Input28756
+Node: Output30479
+Node: Makefile Substitutions33440
+Node: Preset Output Variables35024
+Node: Build Directories39526
+Node: Automatic Remaking41159
+Node: Configuration Headers43245
+Node: Header Templates45612
+Node: Invoking autoheader46791
+Node: Subdirectories49939
+Node: Default Prefix51282
+Node: Versions52686
+Node: Existing Tests54590
+Node: Alternative Programs56055
+Node: Particular Programs56719
+Node: Generic Programs62569
+Node: Libraries65395
+Node: Library Functions67224
+Node: Particular Functions67782
+Node: Generic Functions74085
+Node: Header Files75928
+Node: Particular Headers76487
+Node: Generic Headers83458
+Node: Structures84760
+Node: Typedefs86997
+Node: Particular Typedefs87501
+Node: Generic Typedefs88701
+Node: Compiler Characteristics89144
+Node: System Services91769
+Node: UNIX Variants94118
+Node: Writing Tests96137
+Node: Examining Declarations98103
+Node: Examining Syntax100573
+Node: Examining Libraries101630
+Node: Run Time104189
+Node: Test Programs105150
+Node: Guidelines107687
+Node: Test Functions108876
+Node: Portable Shell110419
+Node: Testing Values and Files112351
+Node: Multiple Cases114006
+Node: Language Choice115204
+Node: Results116762
+Node: Defining Symbols117521
+Node: Setting Output Variables120530
+Node: Caching Results122376
+Node: Cache Variable Names124657
+Node: Cache Files126206
+Node: Printing Messages128304
+Node: Writing Macros131591
+Node: Macro Definitions132210
+Node: Macro Names133315
+Node: Quoting135766
+Node: Dependencies Between Macros137668
+Node: Prerequisite Macros138300
+Node: Suggested Ordering139755
+Node: Obsolete Macros141285
+Node: Manual Configuration142509
+Node: Specifying Names143408
+Node: Canonicalizing145280
+Node: System Type Variables146594
+Node: Using System Type147341
+Node: Site Configuration148788
+Node: External Software149561
+Node: Package Options152259
+Node: Site Details154526
+Node: Transforming Names155749
+Node: Transformation Options156927
+Node: Transformation Examples157393
+Node: Transformation Rules158961
+Node: Site Defaults160370
+Node: Invoking configure164154
+Node: Basic Installation165103
+Node: Compilers and Options167683
+Node: Multiple Architectures168332
+Node: Installation Names169318
+Node: Optional Features170502
+Node: System Type171272
+Node: Sharing Defaults172294
+Node: Operation Controls172918
+Node: Invoking config.status173793
+Node: Questions177181
+Node: Distributing177713
+Node: Why GNU m4178839
+Node: Bootstrapping179652
+Node: Why Not Imake180268
+Node: Upgrading184677
+Node: Changed File Names186198
+Node: Changed Makefiles186934
+Node: Changed Macros188030
+Node: Invoking autoupdate189277
+Node: Changed Results190868
+Node: Changed Macro Writing192970
+Node: History194233
+Node: Genesis194940
+Node: Exodus196113
+Node: Leviticus199162
+Node: Numbers200685
+Node: Deuteronomy202601
+Node: Old Macro Names205265
+Node: Environment Variable Index208314
+Node: Output Variable Index209316
+Node: Preprocessor Symbol Index214177
+Node: Macro Index219047
 
 End Tag Table
diff --git a/src/util/autoconf/autoheader.sh b/src/util/autoconf/autoheader.sh
index abbc98350..a9aa44693 100644
--- a/src/util/autoconf/autoheader.sh
+++ b/src/util/autoconf/autoheader.sh
@@ -85,6 +85,7 @@ if test $show_version = yes; then
 fi
 
 TEMPLATES="${AC_MACRODIR}/acconfig.h"
+test -r ./acconfig.h && TEMPLATES="${TEMPLATES} ./acconfig.h"
 test -r $localdir/acconfig.h && TEMPLATES="${TEMPLATES} $localdir/acconfig.h"
 
 case $# in
diff --git a/src/util/autoconf/configure b/src/util/autoconf/configure
index 65ce229d5..d5f3ea864 100644
--- a/src/util/autoconf/configure
+++ b/src/util/autoconf/configure
@@ -906,7 +906,19 @@ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
   esac
   echo creating "$ac_file"
   rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+  # allow for outfile[:infile1[+infile2[+infile3...]]] syntax
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}+"
+  ac_files_in=
+  for ac_file_name in $ac_file_in
+  do
+    ac_files_in="$ac_files_in $ac_given_srcdir/$ac_file_name"
+  done
+  IFS="$ac_save_ifs"
+  configure_input=`echo $ac_files_in | sed 's%/./%/%g
+s%  *./%%g
+s%  *%+%g
+s%^%Generated automatically from %
+s%$% by configure.%'`
   case "$ac_file" in
   *Makefile*) ac_comsub="1i\\
 # $configure_input" ;;
@@ -917,7 +929,7 @@ s%@configure_input@%$configure_input%g
 s%@srcdir@%$srcdir%g
 s%@top_srcdir@%$top_srcdir%g
 s%@INSTALL@%$INSTALL%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
+" -f conftest.subs $ac_files_in > $ac_file
 fi; done
 rm -f conftest.subs
 
diff --git a/src/util/autoconf/standards.info b/src/util/autoconf/standards.info
index c673f9261..a51f1e2d1 100644
--- a/src/util/autoconf/standards.info
+++ b/src/util/autoconf/standards.info
@@ -1,4 +1,4 @@
-This is Info file standards.info, produced by Makeinfo-1.63 from the
+This is Info file standards.info, produced by Makeinfo-1.55 from the
 input file ./standards.texi.
 
 START-INFO-DIR-ENTRY