diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/AUTHORS autoconf-2.12/AUTHORS --- autoconf-2.11/AUTHORS Wed Dec 31 19:00:00 1969 +++ autoconf-2.12/AUTHORS Tue Nov 19 19:21:34 1996 @@ -0,0 +1,3 @@ +Written by David MacKenzie, with help from +Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, +Roland McGrath, Noah Friedman, david d zuhn, and many others. diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/COPYING autoconf-2.12/COPYING --- autoconf-2.11/COPYING Thu Jun 22 22:57:42 1995 +++ autoconf-2.12/COPYING Tue Nov 26 13:09:37 1996 @@ -3,5 +3,6 @@ Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -306,5 +307,5 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Also add information on how to contact you by electronic and paper mail. diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/ChangeLog autoconf-2.12/ChangeLog --- autoconf-2.11/ChangeLog Mon Nov 18 10:28:30 1996 +++ autoconf-2.12/ChangeLog Tue Nov 26 13:09:39 1996 @@ -1,2 +1,75 @@ +Tue Nov 26 13:00:28 1996 David J MacKenzie + + * Version 2.12. + +Wed Nov 20 13:00:21 1996 David J MacKenzie + + * Test release 2.11.2. + + * acgeneral.m4 (AC_OUTPUT): Remove a now-wrong test for whether to + make an unquoted here document. + (AC_CACHE_SAVE): Double-up backslashes in double quotes. + From Paul Eggert. + + * Test release 2.11.1. + + * acgeneral.m4 (AC_TRY_COMPILE, AC_TRY_LINK): Make the final + newline consistent with the other AC_TRY_* macros: no final dnl + is needed to avoid extraneous blank lines. + (AC_CHECK_LIB, AC_HAVE_LIBRARY, AC_COMPILE_CHECK): Remove + extraneous dnl's. + (AC_DIVERSION_CMDS, AC_DIVERSION_ICMDS): New macros. + (AC_OUTPUT_COMMANDS, AC_OUTPUT): Use them instead of appending to + list macros. + + * acgeneral.m4 (AC_CACHE_SAVE): Handle cache variable values + correctly even if they contain single quote, or are quoted by + the shell. From Paul Eggert . + (AC_INIT_PREPARE): Set LC_MESSAGES to C if set. + From Hans Olsson . + Set LC_CTYPE to C if set. + From tom@vlsivie.tuwien.ac.AT (Thomas Winder). + * autoconf.sh, autoheader.sh: Likewise set LC_MESSAGES and LC_CTYPE. + +Tue Nov 19 10:29:06 1996 David J MacKenzie + + * testsuite/autoconf.g/sizeof.exp: Use the v2 macro name. + + * acgeneral.m4 (AC_OUTPUT_FILES, AC_OUTPUT_HEADER): Support + creating output files from multiple pieces, concatenated. + Suggested by "Theodore Ts'o" . + (AC_LINK_FILES): If called more than once, concatenate the + arguments. From Roland McGrath. + (AC_CONFIG_SUBDIRS): Likewise. + (AC_OUTPUT_COMMANDS): New macro. Suggested by + Tom Tromey . + (AC_OUTPUT): Use the lists it sets. + + * acgeneral.m4 (AC_TRY_RUN_NATIVE): Fail if linking fails, like + AC_TRY_LINK. + (AC_TRY_RUN): Don't require AC_C_CROSS. + (AC_TRY_COMPILER): New macro. + (AC_LANG_C, AC_LANG_CPLUSPLUS): Set cross_compiling. + * acspecific.m4 (AC_PROG_CC_WORKS, AC_PROG_CXX_WORKS): Use + AC_TRY_COMPILER instead of AC_TRY_LINK. + (AC_PROG_CC_GNU, AC_PROG_CC_G): Split out of AC_PROG_CC. + (AC_PROG_CXX_GNU, AC_PROG_CXX_G): Split out of AC_PROG_CXX. + For the *_G macros, make the cache variable names non-GNU-specific. + (AC_C_CROSS): Mark obsolete, and otherwise a no-op. + + * AUTHORS: New file. + * Makefile.in (DISTFILES): Add it. + + * acspecific.m4 (AC_FUNC_MMAP): Update the getpagesize + declarations from getpagesize.h. Check for unistd.h. + + * acgeneral.m4 (AC_OUTPUT_FILES): Run the eval in a subshell. + + * acfunctions: Map fnmatch, strftime, getpgrp, setpgrp to their + own macros. + + * acgeneral.m4 (AC_OUTPUT_HEADER): Check that $CONFIG_HEADERS is + unset, not that it's empty. + Mon Nov 18 10:24:50 1996 David J MacKenzie diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/Makefile.in autoconf-2.12/Makefile.in --- autoconf-2.11/Makefile.in Sun Jul 14 12:37:05 1996 +++ autoconf-2.12/Makefile.in Tue Nov 19 19:23:01 1996 @@ -62,5 +62,5 @@ DISTDEP = info Makefile # Files to distribute. -DISTFILES = COPYING ChangeLog ChangeLog.1 INSTALL \ +DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ Makefile.in NEWS README TODO $(M4FILES) \ acconfig.h acfunctions acheaders acidentifiers \ diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/NEWS autoconf-2.12/NEWS --- autoconf-2.11/NEWS Mon Nov 18 10:28:31 1996 +++ autoconf-2.12/NEWS Wed Nov 20 00:10:43 1996 @@ -1,2 +1,13 @@ +Major changes in release 2.12: + +* AC_OUTPUT and AC_CONFIG_HEADER can create output files by + concatenating multiple input files separated by colons, like so: + AC_CONFIG_HEADER(config.h:conf.pre:config.h.in:conf.post) + AC_OUTPUT(Makefile:Makefile.in:Makefile.rules) + The arguments may be shell variables, to compute the lists on the fly. +* AC_LINK_FILES and AC_CONFIG_SUBDIRS may be called multiple times. +* New macro AC_OUTPUT_COMMANDS adds more commands to run in config.status. +* Bug fixes. + Major changes in release 2.11: diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/TODO autoconf-2.12/TODO --- autoconf-2.11/TODO Thu Nov 14 19:07:25 1996 +++ autoconf-2.12/TODO Wed Nov 20 16:28:38 1996 @@ -85,4 +85,5 @@ prototypes IEEE double precision math + more ------------------------------------------------------------------------------ @@ -291,15 +292,4 @@ ------------------------------------------------------------------------------ -Testing for ANSI header files (AC_HEADER_STDC) fails under linux when -using the latest libraries (libc-4.6.30, at least libc-4.6.27 works -ok) when LC_CTYPE is set to ISO-8859-1. The islower/toupper test -reports errors. -Anyway, adding a line like -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -to the configure script can solve the problem. -From: tom@vlsivie.tuwien.ac.AT (Thomas Winder) - ------------------------------------------------------------------------------- - * Test suite: more things to test: ** That the shell scripts produce correct output on some simple data. @@ -366,18 +356,4 @@ ------------------------------------------------------------------------------ -configure-time pasting together of output files from multiple pieces. -AC_OUTPUT(Makefile:$pre_in:Makefile.in:$pre_out) - -This would concatenate the files $pre_in, Makefile.in, and $pre_out -before running sed to do the substitutions. -From: "Theodore Ts'o" - -Support a way of including makefile fragments that then have @var@ -substitutions done on them. - -Or ac_include? - ------------------------------------------------------------------------------- - I wonder if it is possible to get the path for X11's app-defaults directory by autoconf. Moreover, I'd like to have a general way of @@ -390,19 +366,4 @@ ------------------------------------------------------------------------------ -Whichever AC_LINK_FILES directive comes last is that one that gets -done. - -From Jim Meyering - -This is trivial, but I'm unsure of the m4 quoting reality. Is it: - -AC_DEFUN(AC_LINK_FILES, -[define([AC_LIST_FILES], ifdef([AC_LIST_FILES], AC_LIST_FILES ,)[$1])dnl -define([AC_LIST_LINKS], ifdef([AC_LIST_LINKS], AC_LIST_LINKS ,)[$2])]) - -Roland McGrath - ------------------------------------------------------------------------------- - Question: at least one common UNIX variant has a "cc" that is old K&R and "c89" for ANSI C. Is there any reason why AC_PROG_CC couldn't @@ -413,16 +374,4 @@ ------------------------------------------------------------------------------ -Modify the meaning of autoheader --localdir to add an additional -directory to look for acconfig.h instead of replacing the directory -containing configure.in. Also, autoreconf recurses on all -subdirectories containing a configure.in, not just those given by an -AC_CONFIG_SUBDIRS directive, so you can't have both directories that -are parts of a large package, and directories that are independent -packages. - -Marc Horowitz - ------------------------------------------------------------------------------- - Cache consistency checking: ignore cache if environment (CC or PATH) differs. @@ -466,30 +415,4 @@ ------------------------------------------------------------------------------ -in order to use the AC_CANONICAL_SYSTEM macro, I have to -have install-sh somewhere nearby --- why is this? I have no real -reason to distribute install-sh, other than that its absence breaks -this code. - -Shouldn't the above loop be looking for config.sub and config.guess? -From: jimb@totoro.bio.indiana.edu (Jim Blandy) - -adding AC_CANONICAL_HOST to my configure.in script caused -all sorts of odd/unexplained errors. Obviously, I had to go -get copies of config.guess, config.sub and install-sh from the -autoconf distribution, but the error messages and autoconf docs -didn't explain that very well. -From: bostic@bsdi.com (Keith Bostic) - ------------------------------------------------------------------------------- - -Combine AC_PROG_CC_WORKS with AC_C_CROSS. If the compiler exits with -a 0 status and produces a non-empty output file, consider it working. -If the output file is runnable, consider it native, also. -Perhaps also have AC_PROG_CC_WORKS try to link an invalid program, and -die if the compiler seemed to succeed--in which case it's not usable -with autoconf scripts. - ------------------------------------------------------------------------------- - When using CONFIG_FILES= and CONFIG_HEADERS= for controlling partial configuration, any AC_LINK_FILES is repeated in each case @@ -582,14 +505,4 @@ ------------------------------------------------------------------------------ -It would be nice if there were some way for an autoconf macro to add -code to be run at the same time as the `EXTRA-CMDS' argument to -AC_OUTPUT. -it would be most useful if it could be -run any number of times (and have all the command concatenated). - -From: Tom Tromey - ------------------------------------------------------------------------------- - I'd much prefer to see the absolute paths substituted for all the standard "dir" variables. It would be nice to have variables in @@ -607,4 +520,60 @@ correctly...so it's just a matter of seperating out the socket-related code. From: "Joel N. Weber II" + +------------------------------------------------------------------------------ + +Merge the two lex macros, AC_PROG_LEX and AC_DECL_YYTEXT? + +------------------------------------------------------------------------------ + +in order to use the AC_CANONICAL_SYSTEM macro, I have to +have install-sh somewhere nearby --- why is this? I have no real +reason to distribute install-sh, other than that its absence breaks +this code. + +Shouldn't the above loop be looking for config.sub and config.guess? +From: jimb@totoro.bio.indiana.edu (Jim Blandy) + +adding AC_CANONICAL_HOST to my configure.in script caused +all sorts of odd/unexplained errors. Obviously, I had to go +get copies of config.guess, config.sub and install-sh from the +autoconf distribution, but the error messages and autoconf docs +didn't explain that very well. +From: bostic@bsdi.com (Keith Bostic) + +------------------------------------------------------------------------------ + +Perhaps also have AC_TRY_COMPILER try to link an invalid program, and +die if the compiler seemed to succeed--in which case it's not usable +with autoconf scripts. + +------------------------------------------------------------------------------ + +there is absolutely no guarantee that 'a' to 'z' are +contiguous, and the ISLOWER macro is not guaranteed to correctly +reproduce the result of islower. In all variants of ASCII however, it +will work correctly in the C locale. + +There is also no guarantee that toupper(i) - i is the same constant if +non-zero. TOUPPER, hence, is not correct either. But, in all variants +of ASCII in the C locale, it works. + +Tanmoy Bhattacharya (tanmoy@qcd.lanl.gov> + +------------------------------------------------------------------------------ + +autoreconf doesn't support having (in the same tree) both directories +that are parts of a larger package (sharing aclocal.m4 and acconfig.h), +and directories that are independent packages (each with their own ac*). +It assumes that they are all part of the same package, if you use --localdir, +or that each directory is a separate package, if you don't use it. + +autoreconf should automatically figure out which ac* files to use--the +closest ones up the tree from each directory, probably, unless +overridden by --localdir. + +Also, autoreconf recurses on all subdirectories containing a +configure.in, not just those given by an AC_CONFIG_SUBDIRS directive. +This may not be a problem in practice. ------------------------------------------------------------------------------ diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/acfunctions autoconf-2.12/acfunctions --- autoconf-2.11/acfunctions Mon Sep 12 00:40:56 1994 +++ autoconf-2.12/acfunctions Tue Nov 19 19:23:05 1996 @@ -15,10 +15,14 @@ rindex AC_HEADER_STDC getgroups AC_TYPE_GETGROUPS +getpgrp AC_FUNC_GETPGRP +setpgrp AC_FUNC_SETPGRP signal AC_TYPE_SIGNAL alloca AC_FUNC_ALLOCA +fnmatch AC_FUNC_FNMATCH getloadavg AC_FUNC_GETLOADAVG mmap AC_FUNC_MMAP setvbuf AC_FUNC_SETVBUF_REVERSED strcoll AC_FUNC_STRCOLL +strftime AC_FUNC_STRFTIME utime AC_FUNC_UTIME_NULL vfork AC_FUNC_VFORK @@ -29,5 +33,4 @@ # Others. -fnmatch AC_CHECK_FUNCS ftime AC_CHECK_FUNCS gethostname AC_CHECK_FUNCS @@ -50,5 +53,4 @@ strdup AC_CHECK_FUNCS strerror AC_CHECK_FUNCS -strftime AC_CHECK_FUNCS strspn AC_CHECK_FUNCS strstr AC_CHECK_FUNCS diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/acgeneral.m4 autoconf-2.12/acgeneral.m4 --- autoconf-2.11/acgeneral.m4 Mon Nov 18 10:28:34 1996 +++ autoconf-2.12/acgeneral.m4 Tue Nov 26 13:09:42 1996 @@ -53,5 +53,5 @@ changequote([, ]) -define(AC_ACVERSION, 2.11) +define(AC_ACVERSION, 2.12) dnl Some old m4's don't support m4exit. But they provide @@ -73,15 +73,18 @@ dnl m4 output diversions. We let m4 output them all in order at the end, -dnl except that we explicitly undivert AC_DIVERSION_SED. +dnl except that we explicitly undivert AC_DIVERSION_SED, AC_DIVERSION_CMDS, +dnl and AC_DIVERSION_ICMDS. dnl AC_DIVERSION_NOTICE - 1 (= 0) AC_REQUIRE'd #! /bin/sh line define(AC_DIVERSION_NOTICE, 1)dnl copyright notice & option help strings define(AC_DIVERSION_INIT, 2)dnl initialization code -define(AC_DIVERSION_SED, 3)dnl variable substitutions in config.status -define(AC_DIVERSION_NORMAL_4, 4)dnl AC_REQUIRE'd code, 4 level deep -define(AC_DIVERSION_NORMAL_3, 5)dnl AC_REQUIRE'd code, 3 level deep -define(AC_DIVERSION_NORMAL_2, 6)dnl AC_REQUIRE'd code, 2 level deep -define(AC_DIVERSION_NORMAL_1, 7)dnl AC_REQUIRE'd code, 1 level deep -define(AC_DIVERSION_NORMAL, 8)dnl the tests and output code +define(AC_DIVERSION_NORMAL_4, 3)dnl AC_REQUIRE'd code, 4 level deep +define(AC_DIVERSION_NORMAL_3, 4)dnl AC_REQUIRE'd code, 3 level deep +define(AC_DIVERSION_NORMAL_2, 5)dnl AC_REQUIRE'd code, 2 level deep +define(AC_DIVERSION_NORMAL_1, 6)dnl AC_REQUIRE'd code, 1 level deep +define(AC_DIVERSION_NORMAL, 7)dnl the tests and output code +define(AC_DIVERSION_SED, 8)dnl variable substitutions in config.status +define(AC_DIVERSION_CMDS, 9)dnl extra shell commands in config.status +define(AC_DIVERSION_ICMDS, 10)dnl extra initialization in config.status dnl Change the diversion stream to STREAM, while stacking old values. @@ -634,9 +637,12 @@ # NLS nuisances. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. @@ -1050,12 +1056,25 @@ # EOF -changequote(, )dnl dnl Allow a site initialization script to override cache values. +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. # 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. -# HP-UX 10.01 sh prints single quotes around any value that contains spaces. +changequote(, )dnl (set) 2>&1 | -sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)='*\([^']*\)'*/\1=\${\1='\2'}/p"\ - >> confcache + case `(ac_space=' '; set) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache changequote([, ])dnl if cmp -s $cache_file confcache; then @@ -1179,4 +1198,5 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&AC_FD_CC' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' +cross_compiling=$ac_cv_prog_cc_cross ]) @@ -1189,4 +1209,5 @@ ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&AC_FD_CC' ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC' +cross_compiling=$ac_cv_prog_cxx_cross ]) @@ -1421,4 +1442,29 @@ ]) +dnl Sets WORKING_VAR to yes if the current compiler works, else no; +dnl sets CROSS-VAR to yes if it produces non-native executables, else no. +dnl Before calling this, call AC_LANG_* to set the right language. +dnl AC_TRY_COMPILER(TEST-PROGRAM, WORKING-VAR, CROSS-VAR) +AC_DEFUN(AC_TRY_COMPILER, +[cat > conftest.$ac_ext </dev/null; then + [$3]=no + else + [$3]=yes + fi +else + echo "configure: failed program was:" >&AC_FD_CC + cat conftest.$ac_ext >&AC_FD_CC + [$2]=no +fi +rm -fr conftest*]) + dnl ### Checking for libraries @@ -1450,5 +1496,5 @@ [$2()], eval "ac_cv_lib_$ac_lib_var=yes", - eval "ac_cv_lib_$ac_lib_var=no")dnl + eval "ac_cv_lib_$ac_lib_var=no") LIBS="$ac_save_LIBS" ])dnl @@ -1483,5 +1529,5 @@ [ac_save_LIBS="$LIBS" LIBS="-l[]AC_LIB_NAME[] $4 $LIBS" -AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)dnl +AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no) LIBS="$ac_save_LIBS" ])dnl @@ -1592,6 +1638,5 @@ ])dnl fi -rm -f conftest*] -) +rm -f conftest*]) @@ -1605,5 +1650,5 @@ ifelse([$1], , , [AC_CHECKING([for $1]) ])dnl -AC_TRY_LINK([$2], [$3], [$4], [$5])dnl +AC_TRY_LINK([$2], [$3], [$4], [$5]) ]) @@ -1631,6 +1676,5 @@ ])dnl fi -rm -f conftest*] -) +rm -f conftest*]) @@ -1641,6 +1685,5 @@ dnl [, ACTION-IF-CROSS-COMPILING]]]) AC_DEFUN(AC_TRY_RUN, -[AC_REQUIRE([AC_C_CROSS])dnl -if test "$cross_compiling" = yes; then +[if test "$cross_compiling" = yes; then ifelse([$4], , [errprint(__file__:__line__: warning: [AC_TRY_RUN] called without default to allow cross compiling @@ -1665,6 +1708,7 @@ [$1] EOF -AC_TRY_EVAL(ac_link) -if test -s conftest && (./conftest; exit) 2>/dev/null; then +if AC_TRY_EVAL(ac_link) && test -s conftest && (./conftest; exit) 2>/dev/null +then +dnl Don't remove the temporary files here, so they can be examined. ifelse([$2], , :, [$2]) else @@ -1743,5 +1787,5 @@ $1(); #endif -], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")])dnl +], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")]) if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then AC_MSG_RESULT(yes) @@ -1810,6 +1854,6 @@ AC_CACHE_VAL(ac_cv_type_$1, [AC_EGREP_CPP(dnl -changequote(<<<,>>>)dnl -<<<$1[^a-zA-Z_0-9]>>>dnl +changequote(<<,>>)dnl +<<$1[^a-zA-Z_0-9]>>dnl changequote([,]), [#include #if STDC_HEADERS @@ -1835,10 +1879,24 @@ dnl AC_LINK_FILES(SOURCE..., DEST...) AC_DEFUN(AC_LINK_FILES, -[define([AC_LIST_FILES], [$1])define([AC_LIST_LINKS], [$2])]) +[dnl +define([AC_LIST_FILES], ifdef([AC_LIST_FILES], [AC_LIST_FILES ],)[$1])dnl +define([AC_LIST_LINKS], ifdef([AC_LIST_LINKS], [AC_LIST_LINKS ],)[$2])]) + +dnl Add additional commands for AC_OUTPUT to put into config.status. +dnl Use diversions instead of macros so we can be robust in the +dnl presence of commas in $1 and/or $2. +dnl AC_OUTPUT_COMMANDS(EXTRA-CMDS, INIT-CMDS) +AC_DEFUN(AC_OUTPUT_COMMANDS, +[AC_DIVERT_PUSH(AC_DIVERSION_CMDS)dnl +[$1] +AC_DIVERT_POP()dnl +AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)dnl +[$2] +AC_DIVERT_POP()]) dnl AC_CONFIG_SUBDIRS(DIR ...) AC_DEFUN(AC_CONFIG_SUBDIRS, [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl -define([AC_LIST_SUBDIRS], [$1])dnl +define([AC_LIST_SUBDIRS], ifdef([AC_LIST_SUBDIRS], [AC_LIST_SUBDIRS ],)[$1])dnl subdirs="AC_LIST_SUBDIRS" AC_SUBST(subdirs)dnl @@ -1922,10 +1980,11 @@ ifdef([AC_LIST_HEADER], [AC_OUTPUT_HEADER(AC_LIST_HEADER)])dnl ifdef([AC_LIST_LINKS], [AC_OUTPUT_LINKS(AC_LIST_FILES, AC_LIST_LINKS)])dnl -ifelse([$3], , , -[EOF +EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF]) +cat >> $CONFIG_STATUS <<\EOF +undivert(AC_DIVERSION_CMDS)dnl $2 exit 0 @@ -2022,9 +2081,8 @@ cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then -dnl Specifying an input file breaks the trap to clean up on interrupt, -dnl but that's not a huge problem. - # Support "outfile[:infile]", defaulting infile="outfile.in". +changequote(, )dnl + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; @@ -2034,5 +2092,4 @@ # Remove last slash and all that follows it. Not all systems have dirname. -changequote(, )dnl ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` changequote([, ])dnl @@ -2076,4 +2133,6 @@ *) ac_comsub= ;; esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` sed -e "$ac_comsub s%@configure_input@%$configure_input%g @@ -2082,5 +2141,6 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL], [s%@INSTALL@%$INSTALL%g ])dnl -" $ac_given_srcdir/$ac_file_in | eval "$ac_sed_cmds" > $ac_file +dnl The parens around the eval prevent an "illegal io" in Ultrix sh. +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file dnl This would break Makefile dependencies. dnl if cmp -s $ac_file conftest.out 2>/dev/null; then @@ -2121,5 +2181,5 @@ changequote([, ])dnl -if test -z "$CONFIG_HEADERS"; then +if test "${CONFIG_HEADERS+set}" != set; then EOF dnl Support passing AC_CONFIG_HEADER a value containing shell variables. @@ -2130,15 +2190,18 @@ fi for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile]", defaulting infile="outfile.in". +changequote(, )dnl + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; *) ac_file_in="${ac_file}.in" ;; esac +changequote([, ])dnl echo creating $ac_file rm -f conftest.frag conftest.in conftest.out - cp $ac_given_srcdir/$ac_file_in conftest.in + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in EOF diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/acspecific.m4 autoconf-2.12/acspecific.m4 --- autoconf-2.11/acspecific.m4 Mon Nov 18 10:28:36 1996 +++ autoconf-2.12/acspecific.m4 Wed Nov 20 00:10:49 1996 @@ -80,20 +80,9 @@ AC_PROG_CC_WORKS -AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc, -[dnl The semicolon is to pacify NeXT's syntax-checking cpp. -cat > conftest.c </dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no -fi]) +AC_PROG_CC_GNU if test $ac_cv_prog_gcc = yes; then GCC=yes -dnl Check whether -g works even if CFLAGS is set, in case the package +dnl Check whether -g works, even if CFLAGS is set, in case the package dnl plays around with CFLAGS (such as to build both debugging and dnl normal versions of a library), tasteless as that idea is. @@ -101,16 +90,8 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= - AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_gcc_g, -[echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_gcc_g=yes -else - ac_cv_prog_gcc_g=no -fi -rm -f conftest* -]) + AC_PROG_CC_G if test "$ac_test_CFLAGS" = set; then CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_gcc_g = yes; then + elif test $ac_cv_prog_cc_g = yes; then CFLAGS="-g -O2" else @@ -128,19 +109,9 @@ AC_PROG_CXX_WORKS -AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx, -[dnl The semicolon is to pacify NeXT's syntax-checking cpp. -cat > conftest.C </dev/null 2>&1; then - ac_cv_prog_gxx=yes -else - ac_cv_prog_gxx=no -fi]) +AC_PROG_CXX_GNU + if test $ac_cv_prog_gxx = yes; then GXX=yes -dnl Check whether -g works even if CXXFLAGS is set, in case the package +dnl Check whether -g works, even if CXXFLAGS is set, in case the package dnl plays around with CXXFLAGS (such as to build both debugging and dnl normal versions of a library), tasteless as that idea is. @@ -148,17 +119,8 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= - AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_gxx_g, -[echo 'void f(){}' > conftest.cc -if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then - ac_cv_prog_gxx_g=yes -else - ac_cv_prog_gxx_g=no -fi -rm -f conftest* -]) -dnl + AC_PROG_CXX_G if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS="$ac_save_CXXFLAGS" - elif test $ac_cv_prog_gxx_g = yes; then + elif test $ac_cv_prog_cxx_g = yes; then CXXFLAGS="-g -O2" else @@ -175,14 +137,13 @@ AC_LANG_SAVE AC_LANG_C -dnl We can't try running a program here because we don't know yet if -dnl we're cross-compiling. And we can't check for that first, because the -dnl cross-compiling test being fooled by non-working compiler installations -dnl is the reason we're doing this in the first place. -AC_TRY_LINK(, , ac_cv_prog_cc_works=yes, ac_cv_prog_cc_works=no) +AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cc_works, ac_cv_prog_cc_cross) AC_LANG_RESTORE AC_MSG_RESULT($ac_cv_prog_cc_works) if test $ac_cv_prog_cc_works = no; then - AC_MSG_ERROR([Installation or configuration problem: C compiler cannot create executables.]) + AC_MSG_ERROR([installation or configuration problem: C compiler cannot create executables.]) fi +AC_MSG_CHECKING([whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler]) +AC_MSG_RESULT($ac_cv_prog_cc_cross) +cross_compiling=$ac_cv_prog_cc_cross ]) @@ -191,16 +152,65 @@ AC_LANG_SAVE AC_LANG_CPLUSPLUS -dnl We can't try running a program here because we don't know yet if -dnl we're cross-compiling. And we can't check for that first, because the -dnl cross-compiling test being fooled by non-working compiler installations -dnl is the reason we're doing this in the first place. -AC_TRY_LINK(, , ac_cv_prog_cxx_works=yes, ac_cv_prog_cxx_works=no) +AC_TRY_COMPILER([main(){return(0);}], ac_cv_prog_cxx_works, ac_cv_prog_cxx_cross) AC_LANG_RESTORE AC_MSG_RESULT($ac_cv_prog_cxx_works) if test $ac_cv_prog_cxx_works = no; then - AC_MSG_ERROR([Installation or configuration problem: C++ compiler cannot create executables.]) + AC_MSG_ERROR([installation or configuration problem: C++ compiler cannot create executables.]) fi +AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler]) +AC_MSG_RESULT($ac_cv_prog_cxx_cross) +cross_compiling=$ac_cv_prog_cxx_cross ]) +AC_DEFUN(AC_PROG_CC_GNU, +[AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc, +[dnl The semicolon is to pacify NeXT's syntax-checking cpp. +cat > conftest.c </dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi])]) + +AC_DEFUN(AC_PROG_CXX_GNU, +[AC_CACHE_CHECK(whether we are using GNU C++, ac_cv_prog_gxx, +[dnl The semicolon is to pacify NeXT's syntax-checking cpp. +cat > conftest.C </dev/null 2>&1; then + ac_cv_prog_gxx=yes +else + ac_cv_prog_gxx=no +fi])]) + +AC_DEFUN(AC_PROG_CC_G, +[AC_CACHE_CHECK(whether ${CC-cc} accepts -g, ac_cv_prog_cc_g, +[echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* +])]) + +AC_DEFUN(AC_PROG_CXX_G, +[AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g, +[echo 'void f(){}' > conftest.cc +if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes +else + ac_cv_prog_cxx_g=no +fi +rm -f conftest* +])]) + AC_DEFUN(AC_PROG_GCC_TRADITIONAL, [AC_REQUIRE([AC_PROG_CC])dnl @@ -427,5 +437,5 @@ if test -z "$INSTALL"; then AC_CACHE_VAL(ac_cv_path_install, -[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +[ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. @@ -450,5 +460,5 @@ esac done - IFS="$ac_save_ifs" + IFS="$ac_save_IFS" ])dnl if test "${ac_cv_path_install+set}" = set; then @@ -828,5 +838,6 @@ AC_DEFUN(AC_FUNC_MMAP, -[AC_CHECK_FUNCS(getpagesize) +[AC_CHECK_HEADERS(unistd.h) +AC_CHECK_FUNCS(getpagesize) AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, [AC_TRY_RUN([ @@ -856,23 +867,44 @@ #include +/* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE -# include -# ifdef EXEC_PAGESIZE -# define getpagesize() EXEC_PAGESIZE -# else -# ifdef NBPG -# define getpagesize() NBPG * CLSIZE -# ifndef CLSIZE -# define CLSIZE 1 -# endif -# else -# ifdef NBPC -# define getpagesize() NBPC -# else -# define getpagesize() PAGESIZE /* SVR4 */ -# endif -# endif +# ifdef HAVE_UNISTD_H +# include # endif -#endif + +/* Assume that all systems that can run configure have sys/param.h. */ +# ifndef HAVE_SYS_PARAM_H +# define HAVE_SYS_PARAM_H 1 +# endif + +# ifdef _SC_PAGESIZE +# define getpagesize() sysconf(_SC_PAGESIZE) +# else /* no _SC_PAGESIZE */ +# ifdef HAVE_SYS_PARAM_H +# include +# ifdef EXEC_PAGESIZE +# define getpagesize() EXEC_PAGESIZE +# else /* no EXEC_PAGESIZE */ +# ifdef NBPG +# define getpagesize() NBPG * CLSIZE +# ifndef CLSIZE +# define CLSIZE 1 +# endif /* no CLSIZE */ +# else /* no NBPG */ +# ifdef NBPC +# define getpagesize() NBPC +# else /* no NBPC */ +# ifdef PAGESIZE +# define getpagesize() PAGESIZE +# endif /* PAGESIZE */ +# endif /* no NBPC */ +# endif /* no NBPG */ +# endif /* no EXEC_PAGESIZE */ +# else /* no HAVE_SYS_PARAM_H */ +# define getpagesize() 8192 /* punt totally */ +# endif /* no HAVE_SYS_PARAM_H */ +# endif /* no _SC_PAGESIZE */ + +#endif /* no HAVE_GETPAGESIZE */ #ifdef __cplusplus @@ -1534,10 +1566,5 @@ AC_DEFUN(AC_C_CROSS, -[# If we cannot run a trivial program, we are probably using a cross compiler. -AC_CACHE_CHECK(whether using a cross-compiler, ac_cv_c_cross, -[AC_TRY_RUN([main(){return(0);}], - ac_cv_c_cross=no, ac_cv_c_cross=yes, ac_cv_c_cross=yes)]) -cross_compiling=$ac_cv_c_cross -]) +[AC_OBSOLETE([$0], [; it has been merged into AC_PROG_CC])]) AC_DEFUN(AC_C_CHAR_UNSIGNED, diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/autoconf.sh autoconf-2.12/autoconf.sh --- autoconf-2.11/autoconf.sh Mon Nov 11 19:15:12 1996 +++ autoconf-2.12/autoconf.sh Wed Nov 20 16:28:42 1996 @@ -27,9 +27,12 @@ # NLS nuisances. -# Only set `LANG' and `LC_ALL' to "C" if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi : ${AC_MACRODIR=@datadir@} diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/autoconf.texi autoconf-2.12/autoconf.texi --- autoconf-2.11/autoconf.texi Mon Nov 18 10:28:40 1996 +++ autoconf-2.12/autoconf.texi Tue Nov 26 13:09:46 1996 @@ -7,6 +7,6 @@ @c %**end of header -@set EDITION 2.11 -@set VERSION 2.11 +@set EDITION 2.12 +@set VERSION 2.12 @set UPDATED November 1996 @@ -62,5 +62,5 @@ @page @vskip 0pt plus 1filll -Copyright @copyright{} 1992, '93, '94, '95, '96 Free Software Foundation, Inc. +Copyright @copyright{} 1992, 93, 94, 95, 96 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of @@ -682,4 +682,13 @@ properly). +@code{autoreconf} does not support having, in the same directory tree, +both directories that are parts of a larger package (sharing +@file{aclocal.m4} and @file{acconfig.h}), and directories that are +independent packages (each with their own @file{aclocal.m4} and +@file{acconfig.h}). It assumes that they are all part of the same +package, if you use @samp{--localdir}, or that each directory is a +separate package, if you don't use it. This restriction may be removed +in the future. + @xref{Automatic Remaking}, for @file{Makefile} rules to automatically remake @code{configure} scripts when their source files change. That @@ -790,5 +799,5 @@ required macro is @code{AC_INIT} (@pxref{Input}). -@defmac AC_OUTPUT (@r{[}@var{file}@dots{}@r{] [,}@var{extra-cmds}@r{] [,}@var{init-cmds}@r{]}) +@defmac AC_OUTPUT (@r{[}@var{file}@dots{} @r{[}, @var{extra-cmds} @r{[}, @var{init-cmds}@r{]]]}) @maindex OUTPUT Create output files. Call this macro once, at the end of @file{configure.in}. @@ -814,9 +823,12 @@ @end example -You can override an input file name by appending it to @var{file}, -separated by a colon. For example, +You can override an input file name by appending to @var{file} a +colon-separated list of input files. Examples: @example AC_OUTPUT(Makefile:templates/top.mk lib/Makefile:templates/lib.mk) +AC_OUTPUT(Makefile:templates/vars.mk:Makefile.in:templates/rules.mk) @end example +Doing this allows you to keep your file names acceptable to MS-DOS, or +to prepend and/or append boilerplate to the file. If you pass @var{extra-cmds}, those commands will be inserted into @@ -826,5 +838,19 @@ substitutions performed on them in @code{configure}. You can use @var{init-cmds} to pass variables from @code{configure} to the -@var{extra-cmds}. +@var{extra-cmds}. If @code{AC_OUTPUT_COMMANDS} has been called, the +commands given to it are run just before the commands passed to this macro. +@end defmac + +@defmac AC_OUTPUT_COMMANDS (@var{extra-cmds} @r{[}, @var{init-cmds}@r{]}) +Specify additional shell commands to run at the end of +@file{config.status}, and shell commands to initialize any variables +from @code{configure}. This macro may be called multiple times. +Here is an unrealistic example: + +@example +fubar=27 +AC_OUTPUT_COMMANDS([echo this is extra $fubar, and so on.], fubar=$fubar) +AC_OUTPUT_COMMANDS([echo this is another, extra, bit], [echo init bit]) +@end example @end defmac @@ -1182,11 +1208,14 @@ Usually the input file is named @file{@var{header-to-create}.in}; -however, you can override the input file name by appending it to -@var{header-to-create}, separated by a colon. For example, +however, you can override the input file name by appending to +@var{header-to-create}, a colon-separated list of input files. +Examples: @example AC_CONFIG_HEADER(defines.h:defines.hin) +AC_CONFIG_HEADER(defines.h:defs.pre:defines.h.in:defs.post) @end example @noindent -Doing this allows you to keep your file names acceptable to MS-DOS. +Doing this allows you to keep your file names acceptable to MS-DOS, or +to prepend and/or append boilerplate to the file. @end defmac @@ -1326,5 +1355,7 @@ given @var{dir} contains @file{configure.in} but no @code{configure}, the Cygnus @code{configure} script found by @code{AC_CONFIG_AUXDIR} is -used. The subdirectory @code{configure} scripts are given the same +used. + +The subdirectory @code{configure} scripts are given the same command line options that were given to this @code{configure} script, with minor changes if needed (e.g., to adjust a relative path for the @@ -1332,5 +1363,6 @@ variable @code{subdirs} to the list of directories @samp{@var{dir} @dots{}}. @file{Makefile} rules can use this variable to determine -which subdirectories to recurse into. +which subdirectories to recurse into. This macro may be called multiple +times. @end defmac @@ -1501,12 +1533,19 @@ @ovindex CFLAGS Determine a C compiler to use. If @code{CC} is not already set in the -environment, check for @code{gcc}, and use @code{cc} if it's not found. +environment, check for @code{gcc}, and use @code{cc} if that's not found. Set output variable @code{CC} to the name of the compiler found. If using the GNU C compiler, set shell variable @code{GCC} to @samp{yes}, empty otherwise. If output variable @code{CFLAGS} was -not already set, set it to @samp{-g -O} for the GNU C compiler -(@samp{-O} on systems where GCC does not accept @samp{-g}), or @samp{-g} +not already set, set it to @samp{-g -O2} for the GNU C compiler +(@samp{-O2} on systems where GCC does not accept @samp{-g}), or @samp{-g} for other compilers. + +If the C compiler being used does not produce executables that can run +on the system where @code{configure} is being run, set the shell +variable @code{cross_compiling} to @samp{yes}, otherwise @samp{no}. +In other words, this tests whether the build system type is different +from the host system type (the target system type is irrelevant to this +test). @xref{Manual Configuration}, for more on support for cross compiling. @end defmac @@ -1545,7 +1584,14 @@ If using the GNU C++ compiler, set shell variable @code{GXX} to @samp{yes}, empty otherwise. If output variable @code{CXXFLAGS} was -not already set, set it to @samp{-g -O} for the GNU C++ compiler -(@samp{-O} on systems where G++ does not accept @samp{-g}), or @samp{-g} +not already set, set it to @samp{-g -O2} for the GNU C++ compiler +(@samp{-O2} on systems where G++ does not accept @samp{-g}), or @samp{-g} for other compilers. + +If the C++ compiler being used does not produce executables that can run +on the system where @code{configure} is being run, set the shell +variable @code{cross_compiling} to @samp{yes}, otherwise @samp{no}. +In other words, this tests whether the build system type is different +from the host system type (the target system type is irrelevant to this +test). @xref{Manual Configuration}, for more on support for cross compiling. @end defmac @@ -2945,6 +2991,5 @@ the system where @code{configure} is being run, then the test program is not run. If the optional shell commands @var{action-if-cross-compiling} -are given, they are run instead and this macro calls @code{AC_C_CROSS} -if it has not already been called. Otherwise, @code{configure} prints +are given, they are run instead. Otherwise, @code{configure} prints an error message and exits. @end defmac @@ -2966,5 +3011,5 @@ To provide a default for calls of @code{AC_TRY_RUN} that are embedded in other macros, including a few of the ones that come with Autoconf, you -can call @code{AC_C_CROSS} before running them. Then, if the shell +can call @code{AC_PROG_CC} before running them. Then, if the shell variable @code{cross_compiling} is set to @samp{yes}, use an alternate method to get the results instead of calling the macros. @@ -2972,10 +3017,5 @@ @defmac AC_C_CROSS @maindex C_CROSS -If the C compiler being used does not produce executables that can run -on the system where @code{configure} is being run, set the shell -variable @code{cross_compiling} to @samp{yes}, otherwise @samp{no}. -In other words, this tests whether the build system type is different -from the host system type (the target system type is irrelevant to this -test). @xref{Manual Configuration}, for more on support for cross compiling. +This macro is obsolete; it does nothing. @end defmac @@ -3172,5 +3212,7 @@ @maindex LANG_C Do compilation tests using @code{CC} and @code{CPP} and use extension -@file{.c} for test programs. +@file{.c} for test programs. Set the shell variable +@code{cross_compiling} to the value computed by @code{AC_PROG_CC} if it +has been run, empty otherwise. @end defmac @@ -3178,5 +3220,7 @@ @maindex LANG_CPLUSPLUS Do compilation tests using @code{CXX} and @code{CXXCPP} and use -extension @file{.C} for test programs. +extension @file{.C} for test programs. Set the shell variable +@code{cross_compiling} to the value computed by @code{AC_PROG_CXX} if +it has been run, empty otherwise. @end defmac @@ -3444,9 +3488,7 @@ @end table -Like their names, the values that may be assigned to cache variables -have a few restrictions. The values may not contain single quotes or -curly braces. Usually, their values will be boolean (@samp{yes} or -@samp{no}) or the names of files or functions; so this is not an -important restriction. +The values assigned to cache variables may not contain newlines. +Usually, their values will be boolean (@samp{yes} or @samp{no}) or the +names of files or functions; so this is not an important restriction. @node Cache Files, , Cache Variable Names, Caching Results @@ -4008,4 +4050,5 @@ possible, otherwise a hard link. The @var{dest} and @var{source} names should be relative to the top level source or build directory. +This macro may be called multiple times. For example, this call: diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/autoheader.sh autoconf-2.12/autoheader.sh --- autoconf-2.11/autoheader.sh Thu Nov 14 19:07:39 1996 +++ autoconf-2.12/autoheader.sh Wed Nov 20 16:28:47 1996 @@ -29,9 +29,12 @@ # NLS nuisances. -# Only set `LANG' and `LC_ALL' to "C" if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi test -z "${AC_MACRODIR}" && AC_MACRODIR=@datadir@ diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/autoreconf.sh autoconf-2.12/autoreconf.sh --- autoconf-2.11/autoreconf.sh Sun Jul 14 12:37:19 1996 +++ autoconf-2.12/autoreconf.sh Wed Nov 20 16:28:48 1996 @@ -73,7 +73,9 @@ fi +# The paths to the autoconf and autoheader scripts, at the top of the tree. top_autoconf=`echo $0|sed s%autoreconf%autoconf%` top_autoheader=`echo $0|sed s%autoreconf%autoheader%` +# Make a list of directories to process. # The xargs grep filters out Cygnus configure.in files. find . -name configure.in -print | diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/config.guess autoconf-2.12/config.guess --- autoconf-2.11/config.guess Thu Nov 14 19:07:40 1996 +++ autoconf-2.12/config.guess Tue Nov 26 13:09:48 1996 @@ -130,4 +130,7 @@ echo m68k-apple-openbsd${UNAME_RELEASE} exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 @@ -367,4 +370,7 @@ echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + F301:UNIX_System_V:*:*) + echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` + exit 0 ;; hp3[0-9][05]:NetBSD:*:*) echo m68k-hp-netbsd${UNAME_RELEASE} @@ -482,5 +488,5 @@ echo m68010-convergent-sysv exit 0 ;; - m68*:*:R3V[567]*:*) + M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) @@ -542,4 +548,8 @@ echo mips-unknown-sysv${UNAME_RELEASE} fi + exit 0 ;; + PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 exit 0 ;; esac diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/config.sub autoconf-2.12/config.sub --- autoconf-2.11/config.sub Mon Nov 11 19:15:20 1996 +++ autoconf-2.12/config.sub Fri Nov 22 11:45:56 1996 @@ -178,5 +178,5 @@ | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \ | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-*) + | mips64el-* | mips64orion-* | mips64orionel-* | f301-*) ;; # Recognize the various machine names and aliases which stand @@ -578,4 +578,7 @@ os=-vms ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs @@ -687,5 +690,5 @@ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -linux-gnu*) + | -linux-gnu* | -uxpv*) # Remember, each alternative MUST END IN *, to match a version number. ;; @@ -862,4 +865,7 @@ *-masscomp) os=-rtu + ;; + f301-fujitsu) + os=-uxpv ;; *) diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/install-sh autoconf-2.12/install-sh --- autoconf-2.11/install-sh Sun Jul 14 12:37:27 1996 +++ autoconf-2.12/install-sh Wed Nov 20 16:28:55 1996 @@ -21,6 +21,6 @@ # # This script is compatible with the BSD install script, but was written -# from scratch. -# +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/testsuite/autoconf.g/sizeof.exp autoconf-2.12/testsuite/autoconf.g/sizeof.exp --- autoconf-2.11/testsuite/autoconf.g/sizeof.exp Sat Nov 9 17:21:23 1996 +++ autoconf-2.12/testsuite/autoconf.g/sizeof.exp Wed Nov 20 00:10:59 1996 @@ -1 +1 @@ -autoconf_test AC_SIZEOF_TYPE "AC_SIZEOF_TYPE(long *)" +autoconf_test AC_CHECK_SIZEOF "AC_CHECK_SIZEOF(long *)" diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/testsuite/config/unix.exp autoconf-2.12/testsuite/config/unix.exp --- autoconf-2.11/testsuite/config/unix.exp Tue Nov 12 02:19:33 1996 +++ autoconf-2.12/testsuite/config/unix.exp Wed Nov 20 17:55:13 1996 @@ -89,4 +89,16 @@ } + # Check whether m4 processing left any icky residue. + # The autoconf script does this already, pretty much. + # catch "exec sed -n -e /dnl/p -e /AC_/p $args" exec_output + # if $verbose>1 then { + # send_user "Checked $args for unexpanded m4 macros\n" + # } + # if ![string match "" $exec_output] then { + # fail "$args, unexpanded m4 macros" + # send_log "$exec_output\n" + # return 0 + # } + # Capture only stderr in exec_output, not "creating Makefile" etc. catch "exec ./$args --cache=/dev/null >/dev/null" exec_output diff -r --unif=2 --entire --exclude=*.info* --exclude=INSTALL --exclude=configure autoconf-2.11/texinfo.tex autoconf-2.12/texinfo.tex --- autoconf-2.11/texinfo.tex Mon Nov 18 10:28:45 1996 +++ autoconf-2.12/texinfo.tex Tue Nov 19 19:23:19 1996 @@ -1,4 +1,4 @@ %% TeX macros to handle Texinfo files. -%% $Id: texinfo.tex,v 2.192 1996/11/17 00:12:46 karl Exp $ +%% $Id: texinfo.tex,v 2.193 1996/11/19 21:11:43 karl Exp $ % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, @@ -37,5 +37,5 @@ % This automatically updates the version number based on RCS. \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}} -\deftexinfoversion$Revision: 2.192 $ +\deftexinfoversion$Revision: 2.193 $ \message{Loading texinfo package [Version \texinfoversion]:} @@ -4050,11 +4050,13 @@ \def\deftypevar{\defvarparsebody\Edeftypevar\deftypevarx\deftypevarheader} -% #1 is the data type. #2 is the name. +% #1 is the data type. #2 is the name, perhaps followed by text that +% is actually part of the data type, which should not be put into the index. \def\deftypevarheader #1#2{% -\doind {vr}{\code{#2}}% Make entry in variables index +\dovarind#2 \relax% Make entry in variables index \begingroup\defname {\defheaderxcond#1\relax$$$#2}{Variable}% \interlinepenalty=10000 \endgraf\penalty 10000\vskip -\parskip\penalty 10000 \endgroup} +\def\dovarind#1 #2\relax{\doind{vr}{\code{#1}}} % @deftypevr {Global Flag} int enable @@ -4062,5 +4064,5 @@ \def\deftypevr{\defvrparsebody\Edeftypevr\deftypevrx\deftypevrheader} -\def\deftypevrheader #1#2#3{\doind {vr}{\code{#3}}% +\def\deftypevrheader #1#2#3{\dovarind#3 \relax% \begingroup\defname {\defheaderxcond#2\relax$$$#3}{#1} \interlinepenalty=10000