diff options
| -rw-r--r-- | src/util/autoconf/ChangeLog | 4 | ||||
| -rw-r--r-- | src/util/autoconf/NEWS | 12 | ||||
| -rw-r--r-- | src/util/autoconf/acgeneral.m4 | 4 | ||||
| -rw-r--r-- | src/util/autoconf/acspecific.m4 | 2 | ||||
| -rw-r--r-- | src/util/autoconf/autoconf.info | 232 | ||||
| -rw-r--r-- | src/util/autoconf/autoconf.info-1 | 12 | ||||
| -rw-r--r-- | src/util/autoconf/autoconf.info-3 | 14 | ||||
| -rw-r--r-- | src/util/autoconf/autoconf.info-4 | 32 | ||||
| -rw-r--r-- | src/util/autoconf/autoconf.texi | 21 | ||||
| -rw-r--r-- | src/util/autoconf/config.sub | 10 | ||||
| -rw-r--r-- | src/util/autoconf/configure | 6 | ||||
| -rw-r--r-- | src/util/autoconf/texinfo.tex | 131 |
12 files changed, 262 insertions, 218 deletions
diff --git a/src/util/autoconf/ChangeLog b/src/util/autoconf/ChangeLog index 083888359..51f53dd9c 100644 --- a/src/util/autoconf/ChangeLog +++ b/src/util/autoconf/ChangeLog @@ -1,3 +1,7 @@ +Wed Oct 26 18:40:41 1994 David J. MacKenzie <djm@duality.gnu.ai.mit.edu> + + * Version 2.0. + Tue Oct 25 11:04:16 1994 David J. MacKenzie <djm@duality.gnu.ai.mit.edu> * acgeneral.m4 (AC_CHECK_HEADER, AC_CHECK_HEADERS): Change - diff --git a/src/util/autoconf/NEWS b/src/util/autoconf/NEWS index eaab94303..9f51474e6 100644 --- a/src/util/autoconf/NEWS +++ b/src/util/autoconf/NEWS @@ -28,9 +28,9 @@ Major changes in release 2.0: * autoscan to generate a preliminary configure.in for a package by scanning its source code for commonly used nonportable functions, programs, and header files. -* autoupdate to update a configure.in to use the new macro names. * ifnames to list the symbols used in #if and #ifdef directives in a source tree. +* autoupdate to update a configure.in to use the version 2 macro names. * autoreconf to recursively remake configure and configuration header files in a source tree. @@ -49,10 +49,10 @@ Major changes in release 2.0: * AC_ARG_PROGRAM to use the options --program-prefix, --program-suffix, and --program-transform-name to change the names of programs being installed. -* AC_PREFIX_DEFAULT to change the default prefix. +* AC_PREFIX_DEFAULT to change the default installation prefix. * AC_TRY_COMPILE to compile a test program without linking it. -* AC_CHECK_TYPE to check whether sys/types.h defines a given type. -* AC_CHECK_LIB to check for a particular function in a library. +* AC_CHECK_TYPE to check whether sys/types.h or stdlib.h defines a given type. +* AC_CHECK_LIB to check for a particular function and library. * AC_MSG_CHECKING and AC_MSG_RESULT to print test results, on a single line, whether or not the test succeeds. They obsolete AC_CHECKING and AC_VERBOSE. * AC_SUBST_FILE to insert one file into another. @@ -83,9 +83,9 @@ Major changes in release 2.0: * AC_DEFINE, AC_DEFINE_UNQUOTED, and AC_SUBST are more robust and smaller. * AC_DEFINE no longer prints anything, because of the new result reporting mechanism (AC_MSG_CHECKING and AC_MSG_RESULT). +* AC_VERBOSE pays attention to --quiet/--silent, not --verbose. * AC_ARG_ENABLE and AC_ARG_WITH support whitespace in the arguments to --enable- and --with- options. -* AC_VERBOSE pays attention to --quiet/--silent, not --verbose. * AC_CHECK_FUNCS and AC_CHECK_HEADERS take optional shell commands to execute on success or failure. * Checking for C functions in C++ works. @@ -106,7 +106,7 @@ Major changes in release 2.0: * configure saves compiler output to ./config.log for debugging. * New files autoconf.m4 and autoheader.m4 load the other Autoconf macros. * acsite.m4 is the new name for the system-wide aclocal.m4. -* Has the beginnings of a DejaGnu test suite. +* Has a DejaGnu test suite. Major changes in release 1.11: diff --git a/src/util/autoconf/acgeneral.m4 b/src/util/autoconf/acgeneral.m4 index b0bdfc0a3..ee06735fa 100644 --- a/src/util/autoconf/acgeneral.m4 +++ b/src/util/autoconf/acgeneral.m4 @@ -46,12 +46,12 @@ dnl to the GPL from your modified version. dnl dnl Written by David MacKenzie, with help from dnl Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, -dnl Roland McGrath, Noah Friedman, and david d zuhn. +dnl Roland McGrath, Noah Friedman, david d zuhn, and many others. dnl divert(-1)dnl Throw away output until AC_INIT is called. changequote([, ]) -define(AC_ACVERSION, 1.126) +define(AC_ACVERSION, 2.0) dnl Some old m4's don't support m4exit. But they provide dnl equivalent functionality by core dumping because of the diff --git a/src/util/autoconf/acspecific.m4 b/src/util/autoconf/acspecific.m4 index 876ac15cf..095423079 100644 --- a/src/util/autoconf/acspecific.m4 +++ b/src/util/autoconf/acspecific.m4 @@ -45,7 +45,7 @@ dnl to the GPL from your modified version. dnl dnl Written by David MacKenzie, with help from dnl Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, -dnl Roland McGrath, and Noah Friedman. +dnl Roland McGrath, Noah Friedman, david d zuhn, and many others. dnl ### Checks for programs diff --git a/src/util/autoconf/autoconf.info b/src/util/autoconf/autoconf.info index 90d19f92b..9a75f38a9 100644 --- a/src/util/autoconf/autoconf.info +++ b/src/util/autoconf/autoconf.info @@ -28,125 +28,125 @@ translation approved by the Foundation. Indirect: autoconf.info-1: 1085 -autoconf.info-2: 49676 -autoconf.info-3: 99256 -autoconf.info-4: 148276 -autoconf.info-5: 195482 +autoconf.info-2: 49802 +autoconf.info-3: 99382 +autoconf.info-4: 148397 +autoconf.info-5: 196506 Tag Table: (Indirect) Node: Top1085 -Node: Introduction9214 -Node: Making configure Scripts13054 -Node: Writing configure.in16119 -Node: Invoking autoscan19366 -Node: Invoking ifnames21671 -Node: Invoking autoconf23161 -Node: Invoking autoreconf24999 -Node: Setup26562 -Node: Input27448 -Node: Output29064 -Node: Makefile Substitutions31814 -Node: Preset Output Variables33396 -Node: Build Directories36634 -Node: Automatic Remaking38360 -Node: Configuration Headers40296 -Node: Header Templates42663 -Node: Invoking autoheader43842 -Node: Subdirectories46929 -Node: Default Prefix48272 -Node: Versions49676 -Node: Existing Tests51578 -Node: Alternative Programs53043 -Node: Particular Programs53707 -Node: Generic Programs59017 -Node: Libraries60694 -Node: Library Functions62523 -Node: Particular Functions63081 -Node: Generic Functions68828 -Node: Header Files70669 -Node: Particular Headers71228 -Node: Generic Headers78199 -Node: Structures79499 -Node: Typedefs81736 -Node: Particular Typedefs82240 -Node: Generic Typedefs83498 -Node: Compiler Characteristics83947 -Node: System Services86403 -Node: UNIX Variants88724 -Node: Writing Tests90743 -Node: Examining Declarations92515 -Node: Examining Syntax94981 -Node: Examining Libraries96036 -Node: Run Time98295 -Node: Test Programs99256 -Node: Guidelines101791 -Node: Test Functions102980 -Node: Portable Shell104523 -Node: Testing Values and Files106175 -Node: Multiple Cases107830 -Node: Language Choice109028 -Node: Results110586 -Node: Defining Symbols111345 -Node: Setting Output Variables114354 -Node: Caching Results116205 -Node: Cache Variable Names118107 -Node: Cache Files119656 -Node: Printing Messages121441 -Node: Writing Macros124728 -Node: Macro Definitions125347 -Node: Macro Names126452 -Node: Quoting128903 -Node: Dependencies Between Macros130805 -Node: Prerequisite Macros131437 -Node: Suggested Ordering132892 -Node: Obsolete Macros134422 -Node: Manual Configuration135646 -Node: Specifying Names136555 -Node: Canonicalizing138427 -Node: System Type Variables139741 -Node: Using System Type140488 -Node: Site Configuration141768 -Node: External Software142541 -Node: Package Options145006 -Node: Site Details147062 -Node: Transforming Names148276 -Node: Transformation Options149455 -Node: Transformation Examples149921 -Node: Transformation Rules151421 -Node: Site Defaults152044 -Node: Invoking configure155184 -Node: Basic Installation156051 -Node: Compilers and Options158373 -Node: Build Directory159015 -Node: Installation Names159716 -Node: Optional Features160634 -Node: System Type161404 -Node: Sharing Defaults162426 -Node: Operation Controls163050 -Node: Invoking config.status163914 -Node: Questions167302 -Node: Distributing167834 -Node: Why GNU m4168960 -Node: Bootstrapping169773 -Node: Why Not Imake170389 -Node: Upgrading174970 -Node: Changed File Names176491 -Node: Changed Makefiles177227 -Node: Changed Macros178307 -Node: Invoking autoupdate179521 -Node: Changed Results181112 -Node: Changed Macro Writing183214 -Node: History184477 -Node: Genesis185184 -Node: Exodus186357 -Node: Leviticus189406 -Node: Numbers190929 -Node: Deuteronomy192845 -Node: Old Macro Names195482 -Node: Environment Variable Index198531 -Node: Output Variable Index199533 -Node: Preprocessor Symbol Index203614 -Node: Macro Index208422 +Node: Introduction9210 +Node: Making configure Scripts13050 +Node: Writing configure.in16115 +Node: Invoking autoscan19362 +Node: Invoking ifnames21667 +Node: Invoking autoconf23157 +Node: Invoking autoreconf24995 +Node: Setup26558 +Node: Input27444 +Node: Output29060 +Node: Makefile Substitutions31810 +Node: Preset Output Variables33392 +Node: Build Directories36630 +Node: Automatic Remaking38356 +Node: Configuration Headers40422 +Node: Header Templates42789 +Node: Invoking autoheader43968 +Node: Subdirectories47055 +Node: Default Prefix48398 +Node: Versions49802 +Node: Existing Tests51704 +Node: Alternative Programs53169 +Node: Particular Programs53833 +Node: Generic Programs59143 +Node: Libraries60820 +Node: Library Functions62649 +Node: Particular Functions63207 +Node: Generic Functions68954 +Node: Header Files70795 +Node: Particular Headers71354 +Node: Generic Headers78325 +Node: Structures79625 +Node: Typedefs81862 +Node: Particular Typedefs82366 +Node: Generic Typedefs83624 +Node: Compiler Characteristics84073 +Node: System Services86529 +Node: UNIX Variants88850 +Node: Writing Tests90869 +Node: Examining Declarations92641 +Node: Examining Syntax95107 +Node: Examining Libraries96162 +Node: Run Time98421 +Node: Test Programs99382 +Node: Guidelines101917 +Node: Test Functions103106 +Node: Portable Shell104649 +Node: Testing Values and Files106301 +Node: Multiple Cases107956 +Node: Language Choice109154 +Node: Results110712 +Node: Defining Symbols111471 +Node: Setting Output Variables114480 +Node: Caching Results116326 +Node: Cache Variable Names118228 +Node: Cache Files119777 +Node: Printing Messages121562 +Node: Writing Macros124849 +Node: Macro Definitions125468 +Node: Macro Names126573 +Node: Quoting129024 +Node: Dependencies Between Macros130926 +Node: Prerequisite Macros131558 +Node: Suggested Ordering133013 +Node: Obsolete Macros134543 +Node: Manual Configuration135767 +Node: Specifying Names136676 +Node: Canonicalizing138548 +Node: System Type Variables139862 +Node: Using System Type140609 +Node: Site Configuration141889 +Node: External Software142662 +Node: Package Options145127 +Node: Site Details147183 +Node: Transforming Names148397 +Node: Transformation Options149576 +Node: Transformation Examples150042 +Node: Transformation Rules151610 +Node: Site Defaults153019 +Node: Invoking configure156181 +Node: Basic Installation157048 +Node: Compilers and Options159370 +Node: Build Directory160012 +Node: Installation Names160713 +Node: Optional Features161631 +Node: System Type162401 +Node: Sharing Defaults163423 +Node: Operation Controls164047 +Node: Invoking config.status164911 +Node: Questions168299 +Node: Distributing168831 +Node: Why GNU m4169957 +Node: Bootstrapping170770 +Node: Why Not Imake171386 +Node: Upgrading175967 +Node: Changed File Names177488 +Node: Changed Makefiles178224 +Node: Changed Macros179304 +Node: Invoking autoupdate180518 +Node: Changed Results182109 +Node: Changed Macro Writing184211 +Node: History185474 +Node: Genesis186181 +Node: Exodus187354 +Node: Leviticus190403 +Node: Numbers191926 +Node: Deuteronomy193842 +Node: Old Macro Names196506 +Node: Environment Variable Index199555 +Node: Output Variable Index200557 +Node: Preprocessor Symbol Index204638 +Node: Macro Index209446 End Tag Table diff --git a/src/util/autoconf/autoconf.info-1 b/src/util/autoconf/autoconf.info-1 index cd067c672..f84e9cca1 100644 --- a/src/util/autoconf/autoconf.info-1 +++ b/src/util/autoconf/autoconf.info-1 @@ -30,7 +30,7 @@ File: autoconf.info, Node: Top, Next: Introduction, Up: (dir) This file documents the GNU Autoconf package for creating scripts to configure source code packages using templates and an `m4' macro -package. This is edition 1.125, for Autoconf version 1.125. +package. This is edition 2.0, for Autoconf version 2.0. * Menu: @@ -885,6 +885,9 @@ optional files, such as `aclocal.m4' and those related to configuration header files. Omit from the `Makefile.in' rules any of these files that your package does not use. + The `${srcdir}/' prefix is included because of limitations in the +`VPATH' mechanism. + The `stamp-' files are necessary because the timestamps of `config.h.in' and `config.h' will not be changed if remaking them does not change their contents. This feature avoids unnecessary @@ -894,12 +897,13 @@ some old BSD systems, `touch' or any command that results in an empty file does not update the timestamps, so use a command like `date' as a workaround. - configure: configure.in aclocal.m4 + ${srcdir}/configure: configure.in aclocal.m4 cd ${srcdir} && autoconf # autoheader might not change config.h.in, so touch a stamp file. - config.h.in: stamp-h.in - stamp-h.in: configure.in aclocal.m4 acconfig.h config.h.top config.h.bot + ${srcdir}/config.h.in: stamp-h.in + ${srcdir}/stamp-h.in: configure.in aclocal.m4 acconfig.h \ + config.h.top config.h.bot cd ${srcdir} && autoheader date > ${srcdir}/stamp-h.in diff --git a/src/util/autoconf/autoconf.info-3 b/src/util/autoconf/autoconf.info-3 index 5cc6b5748..129c1d30e 100644 --- a/src/util/autoconf/autoconf.info-3 +++ b/src/util/autoconf/autoconf.info-3 @@ -396,13 +396,13 @@ are always available. - Macro: AC_SUBST_FILE (VARIABLE) Another way to create an output variable from a shell variable. - Make `AC_OUTPUT' substitute the contents of the file named by shell - variable VARIABLE into output files (typically one or more - `Makefile's). This means that `AC_OUTPUT' will replace instances - of `@VARIABLE@' in the `Makefile.in' files with the contents of - the file that the shell variable VARIABLE names when `AC_OUTPUT' - is called. Set the variable to `/dev/null' for cases which do not - have a file to insert. + Make `AC_OUTPUT' insert (without substitutions) the contents of + the file named by shell variable VARIABLE into output files. This + means that `AC_OUTPUT' will replace instances of `@VARIABLE@' in + output files (such as `Makefile.in') with the contents of the file + that the shell variable VARIABLE names when `AC_OUTPUT' is called. + Set the variable to `/dev/null' for cases that do not have a file + to insert. This macro is useful for inserting `Makefile' fragments containing special dependencies or other `make' directives for particular host diff --git a/src/util/autoconf/autoconf.info-4 b/src/util/autoconf/autoconf.info-4 index 7f33e6502..226ed26ce 100644 --- a/src/util/autoconf/autoconf.info-4 +++ b/src/util/autoconf/autoconf.info-4 @@ -100,7 +100,8 @@ feature.) One way to install multiple versions of some programs simultaneously is to append a version number to the name of one or both. For example, -you can configure Autoconf using `--program-suffix=2' to install the +if you want to keep Autoconf version 1 around for awhile, you can +configure Autoconf version 2 using `--program-suffix=2' to install the programs as `/usr/local/bin/autoconf2', `/usr/local/bin/autoheader2', etc. @@ -116,6 +117,9 @@ Transformation Rules transform=@program_transform_name@ install: all $(INSTALL_PROGRAM) myprog $(bindir)/`echo myprog|sed '$(transform)'` + + uninstall: + rm -f $(bindir)/`echo myprog|sed '$(transform)'` If you have more than one program to install, you can do it in a loop: @@ -124,6 +128,21 @@ If you have more than one program to install, you can do it in a loop: for p in $(PROGRAMS); do \ $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ done + + uninstall: + for p in $(PROGRAMS); do \ + rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ + done + + Whether to do the transformations on documentation files (Texinfo or +`man') is a tricky question; there seems to be no perfect answer, due +to the several reasons for name transforming. Documentation is not +usually particular to a specific architecture, and Texinfo files do not +conflict with system documentation. But they might conflict with +earlier versions of the same files, and `man' pages sometimes do +conflict with system documentation. As a compromise, it is probably +best to do name transformations on `man' pages but not on Texinfo +manuals. File: autoconf.info, Node: Site Defaults, Prev: Transforming Names, Up: Site Configuration @@ -164,8 +183,8 @@ that require running a test program. You could "prime the cache" by setting those values correctly for that system in `PREFIX/etc/config.site'. To find out the names of the cache variables you need to set, look for shell variables with `_cv_' in their names in -the affected configure scripts, or in the Autoconf `m4' source code for -those macros. +the affected `configure' scripts, or in the Autoconf `m4' source code +for those macros. The cache file is careful to not override any variables set in the site files. Similarly, you should not override command-line options in @@ -175,7 +194,7 @@ and `cache_file' have their default values (as set near the top of Here is a sample file `/usr/share/local/gnu/share/config.site'. The command `configure --prefix=/usr/share/local/gnu' would read this file -(if `CONFIG_SITE' is not set). +(if `CONFIG_SITE' is not set to a different file). # config.site for configure # @@ -1094,8 +1113,9 @@ shown that Autoconf has a pronounced tendency to regress when we change it. Again, several alpha testers gave invaluable feedback, especially -Franc,ois Pinard, Jim Meyering, Karl Berry, Rob Savoye, and Ken Raeburn. +Franc,ois Pinard, Jim Meyering, Karl Berry, Rob Savoye, Ken Raeburn, +and Mark Eichin. Finally, version 2.0 was ready. And there was much rejoicing. (And -I have free time again. I think.) +I have free time again. I think. Yeah, right.) diff --git a/src/util/autoconf/autoconf.texi b/src/util/autoconf/autoconf.texi index a6383703c..1933160d5 100644 --- a/src/util/autoconf/autoconf.texi +++ b/src/util/autoconf/autoconf.texi @@ -6,8 +6,8 @@ @c @setchapternewpage odd @c %**end of header -@set EDITION 1.126 -@set VERSION 1.126 +@set EDITION 2.0 +@set VERSION 2.0 @set UPDATED October 1994 @iftex @@ -1003,8 +1003,8 @@ optional files, such as @file{aclocal.m4} and those related to configuration header files. Omit from the @file{Makefile.in} rules any of these files that your package does not use. -The @samp{$@{srcdir@}/} prefix is included to work around limitations of -the @code{VPATH} implementations in some non-GNU @code{make}s. +The @samp{$@{srcdir@}/} prefix is included because of limitations in the +@code{VPATH} mechanism. The @file{stamp-} files are necessary because the timestamps of @file{config.h.in} and @file{config.h} will not be changed if remaking @@ -1022,7 +1022,8 @@ $@{srcdir@}/configure: configure.in aclocal.m4 # autoheader might not change config.h.in, so touch a stamp file. $@{srcdir@}/config.h.in: stamp-h.in -stamp-h.in: configure.in aclocal.m4 acconfig.h config.h.top config.h.bot +$@{srcdir@}/stamp-h.in: configure.in aclocal.m4 acconfig.h \ + config.h.top config.h.bot cd $@{srcdir@} && autoheader date > $@{srcdir@}/stamp-h.in @@ -3124,13 +3125,13 @@ newlines. @defmac AC_SUBST_FILE (@var{variable}) @maindex SUBST_FILE Another way to create an output variable from a shell variable. Make -@code{AC_OUTPUT} substitute the contents of the file named by shell -variable @var{variable} into output files (typically one or more -@file{Makefile}s). This means that @code{AC_OUTPUT} will replace -instances of @samp{@@@var{variable}@@} in the @file{Makefile.in} files +@code{AC_OUTPUT} insert (without substitutions) the contents of the file +named by shell variable @var{variable} into output files. This means +that @code{AC_OUTPUT} will replace instances of +@samp{@@@var{variable}@@} in output files (such as @file{Makefile.in}) with the contents of the file that the shell variable @var{variable} names when @code{AC_OUTPUT} is called. Set the variable to -@file{/dev/null} for cases which do not have a file to insert. +@file{/dev/null} for cases that do not have a file to insert. This macro is useful for inserting @file{Makefile} fragments containing special dependencies or other @code{make} directives for particular host diff --git a/src/util/autoconf/config.sub b/src/util/autoconf/config.sub index 5627f87ae..bf932cb9d 100644 --- a/src/util/autoconf/config.sub +++ b/src/util/autoconf/config.sub @@ -123,7 +123,7 @@ case $basic_machine in | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \ | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \ | powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \ - | mips64el | mips64orion | mips64orionel ) + | pdp11 | mips64el | mips64orion | mips64orionel ) basic_machine=$basic_machine-unknown ;; # Object if more than one company name word. @@ -138,7 +138,7 @@ case $basic_machine in | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \ | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \ | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ - | sh-* | powerpc-* | sparc64-* | mips64-* | mipsel-* \ + | pdp11-* | sh-* | powerpc-* | sparc64-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* ) ;; # Recognize the various machine names and aliases which stand @@ -524,6 +524,9 @@ case $basic_machine in vax) basic_machine=vax-dec ;; + pdp11) + basic_machine=pdp11-dec + ;; we32k) basic_machine=we32k-att ;; @@ -656,6 +659,9 @@ case $basic_machine in *-acorn) os=-riscix1.2 ;; + pdp11-*) + os=-none + ;; *-dec | vax-*) os=-ultrix4.2 ;; diff --git a/src/util/autoconf/configure b/src/util/autoconf/configure index e70449d8d..767884fce 100644 --- a/src/util/autoconf/configure +++ b/src/util/autoconf/configure @@ -1,7 +1,7 @@ #!/bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 1.126 +# Generated automatically using autoconf version 2.0 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -217,7 +217,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 1.126" + echo "configure generated by autoconf version 2.0" exit 0 ;; -with-* | --with-*) @@ -648,7 +648,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 1.126" + echo "$CONFIG_STATUS generated by autoconf version 2.0" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; diff --git a/src/util/autoconf/texinfo.tex b/src/util/autoconf/texinfo.tex index 00eb0a5fe..c8eab25a3 100644 --- a/src/util/autoconf/texinfo.tex +++ b/src/util/autoconf/texinfo.tex @@ -899,28 +899,37 @@ where each line of input produces a line of output.} %% Try out Computer Modern fonts at \magstephalf \let\mainmagstep=\magstephalf +% Set the font macro #1 to the font named #2, adding on the +% specified font prefix (normally `cm'). +\def\fontprefix{cm} +\def\setfont#1#2{\font#1=\fontprefix#2} + +% Enter `@setfontprefix dc' to use the dc fonts instead of the cm fonts. +\def\setfontprefix{\parsearg\\setfontprefixzzz} +\def\setfontprefixzzz#1{\gdef\fontprefix{#1}} + \ifx\bigger\relax \let\mainmagstep=\magstep1 -\font\textrm=cmr12 -\font\texttt=cmtt12 +\setfont\textrm{r12} +\setfont\texttt{tt12} \else -\font\textrm=cmr10 scaled \mainmagstep -\font\texttt=cmtt10 scaled \mainmagstep +\setfont\textrm{r10 scaled \mainmagstep} +\setfont\texttt{tt10 scaled \mainmagstep} \fi % Instead of cmb10, you many want to use cmbx10. % cmbx10 is a prettier font on its own, but cmb10 % looks better when embedded in a line with cmr10. -\font\textbf=cmb10 scaled \mainmagstep -\font\textit=cmti10 scaled \mainmagstep -\font\textsl=cmsl10 scaled \mainmagstep -\font\textsf=cmss10 scaled \mainmagstep -\font\textsc=cmcsc10 scaled \mainmagstep -\font\texti=cmmi10 scaled \mainmagstep -\font\textsy=cmsy10 scaled \mainmagstep +\setfont\textbf{b10 scaled \mainmagstep} +\setfont\textit{ti10 scaled \mainmagstep} +\setfont\textsl{sl10 scaled \mainmagstep} +\setfont\textsf{ss10 scaled \mainmagstep} +\setfont\textsc{csc10 scaled \mainmagstep} +\setfont\texti{mi10 scaled \mainmagstep} +\setfont\textsy{sy10 scaled \mainmagstep} % A few fonts for @defun, etc. -\font\defbf=cmbx10 scaled \magstep1 %was 1314 -\font\deftt=cmtt10 scaled \magstep1 +\setfont\defbf{bx10 scaled \magstep1 %was 1314} +\setfont\deftt{tt10 scaled \magstep1} \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf} % Fonts for indices and small examples. @@ -928,66 +937,66 @@ where each line of input produces a line of output.} % because texinfo normally uses the slanted fonts for that. % Do not make many font distinctions in general in the index, since they % aren't very useful. -\font\ninett=cmtt9 -\font\indrm=cmr9 -\font\indit=cmsl9 +\setfont\ninett{tt9} +\setfont\indrm{r9} +\setfont\indit{sl9} \let\indsl=\indit \let\indtt=\ninett \let\indsf=\indrm \let\indbf=\indrm \let\indsc=\indrm -\font\indi=cmmi9 -\font\indsy=cmsy9 +\setfont\indi{mi9} +\setfont\indsy{sy9} % Fonts for headings -\font\chaprm=cmbx12 scaled \magstep2 -\font\chapit=cmti12 scaled \magstep2 -\font\chapsl=cmsl12 scaled \magstep2 -\font\chaptt=cmtt12 scaled \magstep2 -\font\chapsf=cmss12 scaled \magstep2 +\setfont\chaprm{bx12 scaled \magstep2} +\setfont\chapit{ti12 scaled \magstep2} +\setfont\chapsl{sl12 scaled \magstep2} +\setfont\chaptt{tt12 scaled \magstep2} +\setfont\chapsf{ss12 scaled \magstep2} \let\chapbf=\chaprm -\font\chapsc=cmcsc10 scaled\magstep3 -\font\chapi=cmmi12 scaled \magstep2 -\font\chapsy=cmsy10 scaled \magstep3 - -\font\secrm=cmbx12 scaled \magstep1 -\font\secit=cmti12 scaled \magstep1 -\font\secsl=cmsl12 scaled \magstep1 -\font\sectt=cmtt12 scaled \magstep1 -\font\secsf=cmss12 scaled \magstep1 -\font\secbf=cmbx12 scaled \magstep1 -\font\secsc=cmcsc10 scaled\magstep2 -\font\seci=cmmi12 scaled \magstep1 -\font\secsy=cmsy10 scaled \magstep2 - -% \font\ssecrm=cmbx10 scaled \magstep1 % This size an font looked bad. -% \font\ssecit=cmti10 scaled \magstep1 % The letters were too crowded. -% \font\ssecsl=cmsl10 scaled \magstep1 -% \font\ssectt=cmtt10 scaled \magstep1 -% \font\ssecsf=cmss10 scaled \magstep1 - -%\font\ssecrm=cmb10 scaled 1315 % Note the use of cmb rather than cmbx. -%\font\ssecit=cmti10 scaled 1315 % Also, the size is a little larger than -%\font\ssecsl=cmsl10 scaled 1315 % being scaled magstep1. -%\font\ssectt=cmtt10 scaled 1315 -%\font\ssecsf=cmss10 scaled 1315 +\setfont\chapsc{csc10 scaled\magstep3} +\setfont\chapi{mi12 scaled \magstep2} +\setfont\chapsy{sy10 scaled \magstep3} + +\setfont\secrm{bx12 scaled \magstep1} +\setfont\secit{ti12 scaled \magstep1} +\setfont\secsl{sl12 scaled \magstep1} +\setfont\sectt{tt12 scaled \magstep1} +\setfont\secsf{ss12 scaled \magstep1} +\setfont\secbf{bx12 scaled \magstep1} +\setfont\secsc{csc10 scaled\magstep2} +\setfont\seci{mi12 scaled \magstep1} +\setfont\secsy{sy10 scaled \magstep2} + +% \setfont\ssecrm{bx10 scaled \magstep1} % This size an font looked bad. +% \setfont\ssecit{cmti10 scaled \magstep1} % The letters were too crowded. +% \setfont\ssecsl{sl10 scaled \magstep1} +% \setfont\ssectt{tt10 scaled \magstep1} +% \setfont\ssecsf{ss10 scaled \magstep1} + +%\setfont\ssecrm{b10 scaled 1315} % Note the use of cmb rather than cmbx. +%\setfont\ssecit{ti10 scaled 1315} % Also, the size is a little larger than +%\setfont\ssecsl{sl10 scaled 1315} % being scaled magstep1. +%\setfont\ssectt{tt10 scaled 1315} +%\setfont\ssecsf{ss10 scaled 1315} %\let\ssecbf=\ssecrm -\font\ssecrm=cmbx12 scaled \magstephalf -\font\ssecit=cmti12 scaled \magstephalf -\font\ssecsl=cmsl12 scaled \magstephalf -\font\ssectt=cmtt12 scaled \magstephalf -\font\ssecsf=cmss12 scaled \magstephalf -\font\ssecbf=cmbx12 scaled \magstephalf -\font\ssecsc=cmcsc10 scaled \magstep1 -\font\sseci=cmmi12 scaled \magstephalf -\font\ssecsy=cmsy10 scaled \magstep1 +\setfont\ssecrm{bx12 scaled \magstephalf} +\setfont\ssecit{ti12 scaled \magstephalf} +\setfont\ssecsl{sl12 scaled \magstephalf} +\setfont\ssectt{tt12 scaled \magstephalf} +\setfont\ssecsf{ss12 scaled \magstephalf} +\setfont\ssecbf{bx12 scaled \magstephalf} +\setfont\ssecsc{csc10 scaled \magstep1} +\setfont\sseci{mi12 scaled \magstephalf} +\setfont\ssecsy{sy10 scaled \magstep1} % The smallcaps and symbol fonts should actually be scaled \magstep1.5, % but that is not a standard magnification. % Fonts for title page: -\font\titlerm = cmbx12 scaled \magstep3 +\setfont\titlerm ={bx12 scaled \magstep3} \let\authorrm = \secrm % In order for the font changes to affect most math symbols and letters, @@ -1043,9 +1052,9 @@ where each line of input produces a line of output.} \newcount\fontdepth \fontdepth=0 % Fonts for short table of contents. -\font\shortcontrm=cmr12 -\font\shortcontbf=cmbx12 -\font\shortcontsl=cmsl12 +\setfont\shortcontrm{r12} +\setfont\shortcontbf{bx12} +\setfont\shortcontsl{sl12} %% Add scribe-like font environments, plus @l for inline lisp (usually sans %% serif) and @ii for TeX italic |