Index: ChangeLog from Akim Demaille * aclocal.m4, bin/autoconf.as, lib/autoconf/autoconf.m4, * lib/autoconf/autoheader.m4, lib/autoconf/autoupdate.m4, * lib/autoconf/c.m4, lib/autoconf/fortran.m4, * lib/autoconf/general.m4, lib/autoconf/headers.m4, * lib/autoconf/lang.m4, lib/autoconf/libs.m4, * lib/autoconf/programs.m4, lib/autoconf/specific.m4, * lib/autoconf/status.m4, lib/autoconf/types.m4, * lib/autotest/general.m4, lib/m4sugar/m4sugar.m4, * tests/atspecific.m4, tests/base.at, * tests/compile.at, tests/foreign.at, tests/m4sh.at, * tests/semantics.at, tests/tools.at, tests/torture.at: Whitespace clean up. Suggested by Jim Meyering. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/aclocal.m4,v retrieving revision 1.37 diff -u -u -r1.37 aclocal.m4 --- aclocal.m4 6 May 2003 07:17:42 -0000 1.37 +++ aclocal.m4 22 May 2003 12:05:39 -0000 @@ -105,13 +105,13 @@ _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ]) ]) @@ -530,10 +530,10 @@ [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], + [am_cv_$1_dependencies_compiler_type], [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -577,15 +577,15 @@ source=conftest.c object=conftest.o \ depfile=conftest.Po tmpdepfile=conftest.TPo \ $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \ - >/dev/null 2>conftest.err && + >/dev/null 2>conftest.err && grep conftest.h conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # (even with -Werror). So we grep stderr for any message # that says an option was ignored. if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break + am_cv_$1_dependencies_compiler_type=$depmode + break fi fi done @@ -801,7 +801,7 @@ # Define a conditional. AC_DEFUN([AM_CONDITIONAL], [ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE]) AC_SUBST([$1_FALSE]) if $2; then @@ -863,14 +863,14 @@ # Redirecting /dev/null should help a bit; pity we can't detect "broken" # emacsen earlier and avoid running this altogether. AC_RUN_LOG([$EMACS -batch -q -eval '(while load-path (princ (concat (car load-path) "\n")) (setq load-path (cdr load-path)))' conftest.out]) - am_cv_lispdir=`sed -n \ + am_cv_lispdir=`sed -n \ -e 's,/$,,' \ -e '/.*\/lib\/\(x\?emacs\/site-lisp\)$/{s,,${libdir}/\1,;p;q;}' \ -e '/.*\/share\/\(x\?emacs\/site-lisp\)$/{s,,${datadir}/\1,;p;q;}' \ conftest.out` rm conftest.out if test -z "$am_cv_lispdir"; then - am_cv_lispdir='${datadir}/emacs/site-lisp' + am_cv_lispdir='${datadir}/emacs/site-lisp' fi ]) lispdir="$am_cv_lispdir" Index: bin/autoconf.as =================================================================== RCS file: /cvsroot/autoconf/autoconf/bin/autoconf.as,v retrieving revision 1.7 diff -u -u -r1.7 autoconf.as --- bin/autoconf.as 16 May 2003 09:54:46 -0000 1.7 +++ bin/autoconf.as 22 May 2003 12:05:39 -0000 @@ -85,9 +85,9 @@ # Parse command line. while test $# -gt 0 ; do option=[`expr "x$1" : 'x\(--[^=]*\)' \| \ - "x$1" : 'x\(-.\)'`] + "x$1" : 'x\(-.\)'`] optarg=[`expr "x$1" : 'x--[^=]*=\(.*\)' \| \ - "x$1" : 'x-.\(.*\)'`] + "x$1" : 'x-.\(.*\)'`] case $1 in --version | -V ) echo "$version" ; exit 0 ;; @@ -154,8 +154,8 @@ 0) if test -f configure.ac; then if test -f configure.in; then - echo "$me: warning: both \`configure.ac' and \`configure.in' are present." >&2 - echo "$me: warning: proceeding with \`configure.ac'." >&2 + echo "$me: warning: both \`configure.ac' and \`configure.in' are present." >&2 + echo "$me: warning: proceeding with \`configure.ac'." >&2 fi infile=configure.ac elif test -f configure.in; then Index: lib/autoconf/autoconf.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/autoconf.m4,v retrieving revision 1.42 diff -u -u -r1.42 autoconf.m4 --- lib/autoconf/autoconf.m4 28 Sep 2002 14:06:07 -0000 1.42 +++ lib/autoconf/autoconf.m4 22 May 2003 12:05:39 -0000 @@ -104,10 +104,10 @@ # Yet some people have started to use m4_patsubst and m4_regexp. m4_define([m4_patsubst], [m4_expand_once([m4_warn([syntax], - [do not use m4_patsubst: use patsubst or m4_bpatsubst])])dnl + [do not use m4_patsubst: use patsubst or m4_bpatsubst])])dnl patsubst($@)]) m4_define([m4_regexp], [m4_expand_once([m4_warn([syntax], - [do not use m4_regexp: use regexp or m4_bregexp])])dnl + [do not use m4_regexp: use regexp or m4_bregexp])])dnl regexp($@)]) Index: lib/autoconf/autoheader.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/autoheader.m4,v retrieving revision 1.5 diff -u -u -r1.5 autoheader.m4 --- lib/autoconf/autoheader.m4 5 Nov 2002 20:28:08 -0000 1.5 +++ lib/autoconf/autoheader.m4 22 May 2003 12:05:39 -0000 @@ -68,7 +68,7 @@ # Quote for Perl '' strings, which are those used by Autoheader. m4_define([AH_VERBATIM], [AS_LITERAL_IF([$1], - [AH_OUTPUT([$1], AS_ESCAPE([[$2]], [\\'']))]) + [AH_OUTPUT([$1], AS_ESCAPE([[$2]], [\\'']))]) ]) @@ -78,7 +78,7 @@ # DESCRIPTION (properly wrapped), and then #undef KEY. m4_define([AH_TEMPLATE], [AH_VERBATIM([$1], - m4_text_wrap([$2 */], [ ], [/* ])[ + m4_text_wrap([$2 */], [ ], [/* ])[ #undef $1])]) Index: lib/autoconf/autoupdate.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/autoupdate.m4,v retrieving revision 1.1 diff -u -u -r1.1 autoupdate.m4 --- lib/autoconf/autoupdate.m4 27 Aug 2001 07:17:23 -0000 1.1 +++ lib/autoconf/autoupdate.m4 22 May 2003 12:05:39 -0000 @@ -78,10 +78,10 @@ # See `acobsolete.m4' for a longer description. m4_define([AU_DEFUN], [AU_DEFINE([$1], - [AC_DIAGNOSE([obsolete], [The macro `$1' is obsolete. + [AC_DIAGNOSE([obsolete], [The macro `$1' is obsolete. You should run autoupdate.])dnl $2], - [$3])dnl + [$3])dnl ]) Index: lib/autoconf/c.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/c.m4,v retrieving revision 1.177 diff -u -u -r1.177 c.m4 --- lib/autoconf/c.m4 14 Apr 2003 03:47:30 -0000 1.177 +++ lib/autoconf/c.m4 22 May 2003 12:05:39 -0000 @@ -309,8 +309,8 @@ # AC_PROG_{CC, CPP, CXX, CXXCPP}. AC_DEFUN([_AC_ARG_VAR_CPPFLAGS], [AC_ARG_VAR([CPPFLAGS], - [C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory ])]) + [C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory ])]) # _AC_ARG_VAR_LDFLAGS @@ -319,8 +319,8 @@ # AC_PROG_{CC, CXX, F77}. AC_DEFUN([_AC_ARG_VAR_LDFLAGS], [AC_ARG_VAR([LDFLAGS], - [linker flags, e.g. -L if you have libraries in a - nonstandard directory ])]) + [linker flags, e.g. -L if you have libraries in a + nonstandard directory ])]) @@ -352,17 +352,17 @@ @%:@else @%:@ include @%:@endif - Syntax error]])], - [], - [# Broken: fails on valid input. + Syntax error]])], + [], + [# Broken: fails on valid input. continue]) # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. _AC_PREPROC_IFELSE([AC_LANG_SOURCE(address@hidden:@include ]])], - [# Broken: success on invalid input. + [# Broken: success on invalid input. continue], - [# Passes both tests. + [# Passes both tests. ac_preproc_ok=: break]) @@ -405,7 +405,7 @@ fi AC_MSG_RESULT([$CPP]) _AC_PROG_PREPROC_WORKS_IFELSE([], - [AC_MSG_FAILURE([C preprocessor "$CPP" fails sanity check])]) + [AC_MSG_FAILURE([C preprocessor "$CPP" fails sanity check])]) AC_SUBST(CPP)dnl AC_LANG_POP(C)dnl ])# AC_PROG_CPP @@ -476,7 +476,7 @@ _AC_COMPILE_IFELSE(address@hidden:@ifndef __cplusplus choke me @%:@endif], - [_AC_PROG_CXX_EXIT_DECLARATION]) + [_AC_PROG_CXX_EXIT_DECLARATION]) AC_LANG_POP(C)dnl ])# AC_PROG_CC @@ -491,8 +491,8 @@ ac_save_CFLAGS=$CFLAGS CFLAGS="-g" AC_CACHE_CHECK(whether $CC accepts -g, ac_cv_prog_cc_g, - [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ac_cv_prog_cc_g=yes], - [ac_cv_prog_cc_g=no])]) + [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ac_cv_prog_cc_g=yes], + [ac_cv_prog_cc_g=no])]) if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -563,11 +563,11 @@ if AC_TRY_EVAL(ac_try) && test -f conftest.$ac_objext && AC_TRY_EVAL(ac_try); then - # cc works too. - : + # cc works too. + : else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no + # cc exists but doesn't like -o. + eval ac_cv_prog_cc_${ac_cc}_c_o=no fi fi fi @@ -581,7 +581,7 @@ else AC_MSG_RESULT([no]) AC_DEFINE(NO_MINUS_C_MINUS_O, 1, - [Define to 1 if your C compiler doesn't accept -c and -o together.]) + [Define to 1 if your C compiler doesn't accept -c and -o together.]) fi ])# AC_PROG_CC_C_O @@ -625,7 +625,7 @@ fi AC_MSG_RESULT([$CXXCPP]) _AC_PROG_PREPROC_WORKS_IFELSE([], - [AC_MSG_FAILURE([C++ preprocessor "$CXXCPP" fails sanity check])]) + [AC_MSG_FAILURE([C++ preprocessor "$CXXCPP" fails sanity check])]) AC_SUBST(CXXCPP)dnl AC_LANG_POP(C++)dnl ])# AC_PROG_CXXCPP @@ -668,9 +668,9 @@ _AC_ARG_VAR_LDFLAGS()dnl _AC_ARG_VAR_CPPFLAGS()dnl AC_CHECK_TOOLS(CXX, - [$CCC m4_default([$1], - [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC])], - g++) + [$CCC m4_default([$1], + [g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC])], + g++) # Provide some information about the compiler. echo "$as_me:$LINENO:" \ @@ -700,9 +700,9 @@ ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="-g" AC_CACHE_CHECK(whether $CXX accepts -g, ac_cv_prog_cxx_g, - [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], - [ac_cv_prog_cxx_g=yes], - [ac_cv_prog_cxx_g=no])]) + [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], + [ac_cv_prog_cxx_g=yes], + [ac_cv_prog_cxx_g=no])]) if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -736,12 +736,12 @@ do _AC_COMPILE_IFELSE([AC_LANG_PROGRAM(address@hidden:@include $ac_declaration], - [exit (42);])], - [], - [continue]) + [exit (42);])], + [], + [continue]) _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration], - [exit (42);])], - [break]) + [exit (42);])], + [break]) done rm -f conftest* if test -n "$ac_declaration"; then @@ -818,7 +818,7 @@ do CC="$ac_save_CC $ac_arg" _AC_COMPILE_IFELSE([], - [ac_cv_prog_cc_stdc=$ac_arg + [ac_cv_prog_cc_stdc=$ac_arg break]) done rm -f conftest.$ac_ext conftest.$ac_objext @@ -879,8 +879,8 @@ #endif])dnl AC_CACHE_CHECK(whether char is unsigned, ac_cv_c_char_unsigned, [AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([])], - [((char) -1) < 0])], - ac_cv_c_char_unsigned=no, ac_cv_c_char_unsigned=yes)]) + [((char) -1) < 0])], + ac_cv_c_char_unsigned=no, ac_cv_c_char_unsigned=yes)]) if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then AC_DEFINE(__CHAR_UNSIGNED__) fi @@ -898,13 +898,13 @@ [#include long double foo = 0.0;], [/* Using '|' rather than '||' catches a GCC 2.95.2 x86 bug. */ - (DBL_MAX < LDBL_MAX) | (LDBL_EPSILON < DBL_EPSILON) + (DBL_MAX < LDBL_MAX) | (LDBL_EPSILON < DBL_EPSILON) | (DBL_MAX_EXP < LDBL_MAX_EXP) | (DBL_MANT_DIG < LDBL_MANT_DIG)])], ac_cv_c_long_double=yes, ac_cv_c_long_double=no)]) if test $ac_cv_c_long_double = yes; then AC_DEFINE(HAVE_LONG_DOUBLE, 1, - [Define to 1 if long double works and has more range or precision than double.]) + [Define to 1 if long double works and has more range or precision than double.]) fi ])# AC_C_LONG_DOUBLE @@ -942,8 +942,8 @@ u.l = 1; exit (u.c[sizeof (long) - 1] == 1); }]])], - [ac_cv_c_bigendian=no], - [ac_cv_c_bigendian=yes], + [ac_cv_c_bigendian=no], + [ac_cv_c_bigendian=yes], [# try to guess the endianness by grepping values into an object file ac_cv_c_bigendian=unknown AC_COMPILE_IFELSE([AC_LANG_PROGRAM( @@ -969,7 +969,7 @@ yes) m4_default([$1], [AC_DEFINE([WORDS_BIGENDIAN], 1, - [Define to 1 if your processor stores words with the most significant + [Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX).])]) ;; no) $2 ;; @@ -1002,14 +1002,14 @@ $ac_kw foo_t foo () {return 0; } #endif ])], - [ac_cv_c_inline=$ac_kw; break]) + [ac_cv_c_inline=$ac_kw; break]) done ]) case $ac_cv_c_inline in inline | yes) ;; no) AC_DEFINE(inline,, - [Define as `__inline' if that's what the C compiler calls it, - or to nothing if it is not supported.]) ;; + [Define as `__inline' if that's what the C compiler calls it, + or to nothing if it is not supported.]) ;; *) AC_DEFINE_UNQUOTED(inline, $ac_cv_c_inline) ;; esac ])# AC_C_INLINE @@ -1068,11 +1068,11 @@ } #endif ]])], - [ac_cv_c_const=yes], - [ac_cv_c_const=no])]) + [ac_cv_c_const=yes], + [ac_cv_c_const=no])]) if test $ac_cv_c_const = no; then AC_DEFINE(const,, - [Define to empty if `const' does not conform to ANSI C.]) + [Define to empty if `const' does not conform to ANSI C.]) fi ])# AC_C_CONST @@ -1105,8 +1105,8 @@ case $ac_cv_c_restrict in restrict) ;; no) AC_DEFINE(restrict,, - [Define to equivalent of C99 restrict keyword, or to nothing if this - is not supported. Do not define if restrict is supported directly.]) ;; + [Define to equivalent of C99 restrict keyword, or to nothing if this + is not supported. Do not define if restrict is supported directly.]) ;; *) AC_DEFINE_UNQUOTED(restrict, $ac_cv_c_restrict) ;; esac ])# AC_C_RESTRICT @@ -1126,13 +1126,13 @@ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [ volatile int x; int * volatile y;])], - [ac_cv_c_volatile=yes], - [ac_cv_c_volatile=no])]) + [ac_cv_c_volatile=yes], + [ac_cv_c_volatile=no])]) if test $ac_cv_c_volatile = no; then AC_DEFINE(volatile,, - [Define to empty if the keyword `volatile' does not work. - Warning: valid code using `volatile' can become incorrect - without. Disable with care.]) + [Define to empty if the keyword `volatile' does not work. + Warning: valid code using `volatile' can become incorrect + without. Disable with care.]) fi ])# AC_C_VOLATILE @@ -1143,16 +1143,16 @@ # Defines HAVE_STRINGIZE if positive. AC_DEFUN([AC_C_STRINGIZE], [AC_CACHE_CHECK([for preprocessor stringizing operator], - [ac_cv_c_stringize], + [ac_cv_c_stringize], [AC_EGREP_CPP(address@hidden:@teststring], - address@hidden:@define x(y) #y + address@hidden:@define x(y) #y char *s = x(teststring);], - [ac_cv_c_stringize=no], - [ac_cv_c_stringize=yes])]) + [ac_cv_c_stringize=no], + [ac_cv_c_stringize=yes])]) if test $ac_cv_c_stringize = yes; then AC_DEFINE(HAVE_STRINGIZE, 1, - [Define to 1 if cpp supports the ANSI @%:@ stringizing operator.]) + [Define to 1 if cpp supports the ANSI @%:@ stringizing operator.]) fi ])# AC_C_STRINGIZE @@ -1167,9 +1167,9 @@ if test "$ac_cv_prog_cc_stdc" != no; then AC_MSG_RESULT([yes]) AC_DEFINE(PROTOTYPES, 1, - [Define to 1 if the C compiler supports function prototypes.]) + [Define to 1 if the C compiler supports function prototypes.]) AC_DEFINE(__PROTOTYPES, 1, - [Define like PROTOTYPES; this can be used by system headers.]) + [Define like PROTOTYPES; this can be used by system headers.]) else AC_MSG_RESULT([no]) fi Index: lib/autoconf/fortran.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/fortran.m4,v retrieving revision 1.163 diff -u -u -r1.163 fortran.m4 --- lib/autoconf/fortran.m4 27 Oct 2002 18:24:51 -0000 1.163 +++ lib/autoconf/fortran.m4 22 May 2003 12:05:39 -0000 @@ -200,7 +200,7 @@ # Find the Fortran 77 preprocessor. Must be AC_DEFUN'd to be AC_REQUIRE'able. AC_DEFUN([AC_LANG_PREPROC(Fortran 77)], [m4_warn([syntax], - [$0: No preprocessor defined for ]_AC_LANG)]) + [$0: No preprocessor defined for ]_AC_LANG)]) # AC_LANG_COMPILER(Fortran 77) @@ -247,7 +247,7 @@ _AC_ARG_VAR_LDFLAGS()dnl AC_CHECK_TOOLS(F77, [m4_default([$1], - [g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95])]) + [g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95])]) # Provide some information about the compiler. echo "$as_me:__oline__:" \ @@ -315,7 +315,7 @@ AC_DEFUN([AC_PROG_F77_C_O], [AC_REQUIRE([AC_PROG_F77])dnl AC_CACHE_CHECK([whether $F77 understand -c and -o together], - [ac_cv_prog_f77_c_o], + [ac_cv_prog_f77_c_o], [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) # We test twice because some compilers refuse to overwrite an existing # `.o' file with `-o', although they will create one. @@ -330,8 +330,8 @@ rm -f conftest*]) if test $ac_cv_prog_f77_c_o = no; then AC_DEFINE(F77_NO_MINUS_C_MINUS_O, 1, - [Define to 1 if your Fortran 77 compiler doesn't accept - -c and -o together.]) + [Define to 1 if your Fortran 77 compiler doesn't accept + -c and -o together.]) fi ])# AC_PROG_F77_C_O @@ -407,7 +407,7 @@ # Some compilers don't accept -v (Lahey: -verbose, xlf: -V, Fujitsu: -###) AC_DEFUN([_AC_PROG_F77_V], [AC_CACHE_CHECK([how to get verbose linking output from $F77], - [ac_cv_prog_f77_v], + [ac_cv_prog_f77_v], [AC_LANG_ASSERT(Fortran 77) AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [ac_cv_prog_f77_v= @@ -417,16 +417,16 @@ # look for -l* and *.a constructs in the output for ac_arg in $ac_f77_v_output; do case $ac_arg in - [[\\/]]*.a | ?:[[\\/]]*.a | -[[lLRu]]*) - ac_cv_prog_f77_v=$ac_verb - break 2 ;; + [[\\/]]*.a | ?:[[\\/]]*.a | -[[lLRu]]*) + ac_cv_prog_f77_v=$ac_verb + break 2 ;; esac done done if test -z "$ac_cv_prog_f77_v"; then AC_MSG_WARN([cannot determine how to obtain linking information from $F77]) fi], - [AC_MSG_WARN([compilation failed])]) + [AC_MSG_WARN([compilation failed])]) ])])# _AC_PROG_F77_V @@ -478,45 +478,45 @@ shift ac_arg=$[1] case $ac_arg in - [[\\/]]*.a | ?:[[\\/]]*.a) - _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_flibs, , - ac_cv_flibs="$ac_cv_flibs $ac_arg") - ;; - -bI:*) - _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_flibs, , - [_AC_LINKER_OPTION([$ac_arg], ac_cv_flibs)]) - ;; - # Ignore these flags. - -lang* | -lcrt0.o | -lc | -lgcc | -libmil | -LANG:=*) - ;; - -lkernel32) - test x"$CYGWIN" != xyes && ac_cv_flibs="$ac_cv_flibs $ac_arg" - ;; - -[[LRuY]]) - # These flags, when seen by themselves, take an argument. - # We remove the space between option and argument and re-iterate - # unless we find an empty arg or a new option (starting with -) + [[\\/]]*.a | ?:[[\\/]]*.a) + _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_flibs, , + ac_cv_flibs="$ac_cv_flibs $ac_arg") + ;; + -bI:*) + _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_flibs, , + [_AC_LINKER_OPTION([$ac_arg], ac_cv_flibs)]) + ;; + # Ignore these flags. + -lang* | -lcrt0.o | -lc | -lgcc | -libmil | -LANG:=*) + ;; + -lkernel32) + test x"$CYGWIN" != xyes && ac_cv_flibs="$ac_cv_flibs $ac_arg" + ;; + -[[LRuY]]) + # These flags, when seen by themselves, take an argument. + # We remove the space between option and argument and re-iterate + # unless we find an empty arg or a new option (starting with -) case $[2] in - "" | -*);; - *) + "" | -*);; + *) ac_arg="$ac_arg$[2]" shift; shift set X $ac_arg "address@hidden" ;; esac - ;; - -YP,*) - for ac_j in `echo $ac_arg | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do - _AC_LIST_MEMBER_IF($ac_j, $ac_cv_flibs, , - [ac_arg="$ac_arg $ac_j" - ac_cv_flibs="$ac_cv_flibs $ac_j"]) - done - ;; - -[[lLR]]*) - _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_flibs, , - ac_cv_flibs="$ac_cv_flibs $ac_arg") - ;; - # Ignore everything else. + ;; + -YP,*) + for ac_j in `echo $ac_arg | sed -e 's/-YP,/-L/;s/:/ -L/g'`; do + _AC_LIST_MEMBER_IF($ac_j, $ac_cv_flibs, , + [ac_arg="$ac_arg $ac_j" + ac_cv_flibs="$ac_cv_flibs $ac_j"]) + done + ;; + -[[lLR]]*) + _AC_LIST_MEMBER_IF($ac_arg, $ac_cv_flibs, , + ac_cv_flibs="$ac_cv_flibs $ac_arg") + ;; + # Ignore everything else. esac done # restore positional arguments @@ -528,9 +528,9 @@ case `(uname -sr) 2>/dev/null` in "SunOS 5"*) ac_ld_run_path=`echo $ac_f77_v_output | - sed -n 's,^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$,-R\1,p'` + sed -n 's,^.*LD_RUN_PATH *= *\(/[[^ ]]*\).*$,-R\1,p'` test "x$ac_ld_run_path" != x && - _AC_LINKER_OPTION([$ac_ld_run_path], ac_cv_flibs) + _AC_LINKER_OPTION([$ac_ld_run_path], ac_cv_flibs) ;; esac fi # test "x$FLIBS" = "x" @@ -586,20 +586,20 @@ #endif ]) AC_CACHE_CHECK([for dummy main to link with Fortran 77 libraries], - ac_cv_f77_dummy_main, + ac_cv_f77_dummy_main, [AC_LANG_PUSH(C)dnl ac_f77_dm_save_LIBS=$LIBS LIBS="$LIBS $FLIBS" # First, try linking without a dummy main: AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], - [ac_cv_f77_dummy_main=none], - [ac_cv_f77_dummy_main=unknown]) + [ac_cv_f77_dummy_main=none], + [ac_cv_f77_dummy_main=unknown]) if test $ac_cv_f77_dummy_main = unknown; then for ac_func in MAIN__ MAIN_ __main MAIN _MAIN __MAIN main_ main__ _main; do AC_LINK_IFELSE([AC_LANG_PROGRAM(address@hidden:@define F77_DUMMY_MAIN $ac_func]])], - [ac_cv_f77_dummy_main=$ac_func; break]) + [ac_cv_f77_dummy_main=$ac_func; break]) done fi rm -f conftest* @@ -611,11 +611,11 @@ [m4_default([$1], [if test $F77_DUMMY_MAIN != none; then AC_DEFINE_UNQUOTED([F77_DUMMY_MAIN], $F77_DUMMY_MAIN, - [Define to dummy `main' function (if any) required to - link to the Fortran 77 libraries.]) + [Define to dummy `main' function (if any) required to + link to the Fortran 77 libraries.]) fi])], [m4_default([$2], - [AC_MSG_FAILURE([linking to Fortran libraries from C fails])])]) + [AC_MSG_FAILURE([linking to Fortran libraries from C fails])])]) ])# AC_F77_DUMMY_MAIN @@ -630,7 +630,7 @@ AC_DEFUN([AC_F77_MAIN], [AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])dnl AC_CACHE_CHECK([for alternate main to link with Fortran 77 libraries], - ac_cv_f77_main, + ac_cv_f77_main, [AC_LANG_PUSH(C)dnl ac_f77_m_save_LIBS=$LIBS LIBS="$LIBS $FLIBS" @@ -639,15 +639,15 @@ for ac_func in MAIN__ MAIN_ __main MAIN _MAIN __MAIN main_ main__ _main; do AC_LINK_IFELSE([AC_LANG_PROGRAM(address@hidden:@undef F77_DUMMY_MAIN @%:@define main $ac_func])], - [ac_cv_f77_main=$ac_func; break]) + [ac_cv_f77_main=$ac_func; break]) done rm -f conftest* LIBS=$ac_f77_m_save_LIBS AC_LANG_POP(C)dnl ]) AC_DEFINE_UNQUOTED([F77_MAIN], $ac_cv_f77_main, - [Define to alternate name for `main' routine that is - called from a `main' in the Fortran libraries.]) + [Define to alternate name for `main' routine that is + called from a `main' in the Fortran libraries.]) ])# AC_F77_MAIN @@ -670,7 +670,7 @@ [AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS])dnl AC_REQUIRE([AC_F77_DUMMY_MAIN])dnl AC_CACHE_CHECK([for Fortran 77 name-mangling scheme], - ac_cv_f77_mangling, + ac_cv_f77_mangling, [AC_LANG_PUSH(Fortran 77)dnl AC_COMPILE_IFELSE( [ subroutine foobar() @@ -691,41 +691,41 @@ for ac_underscore in "" "_"; do ac_func="$ac_foobar$ac_underscore" AC_LINK_IFELSE([AC_LANG_CALL([], [$ac_func])], - [ac_success=yes; break 2]) + [ac_success=yes; break 2]) done done if test "$ac_success" = "yes"; then case $ac_foobar in - foobar) - ac_case=lower - ac_foo_bar=foo_bar - ;; - FOOBAR) - ac_case=upper - ac_foo_bar=FOO_BAR - ;; + foobar) + ac_case=lower + ac_foo_bar=foo_bar + ;; + FOOBAR) + ac_case=upper + ac_foo_bar=FOO_BAR + ;; esac ac_success_extra=no for ac_extra in "" "_"; do - ac_func="$ac_foo_bar$ac_underscore$ac_extra" - AC_LINK_IFELSE([AC_LANG_CALL([], [$ac_func])], - [ac_success_extra=yes; break]) + ac_func="$ac_foo_bar$ac_underscore$ac_extra" + AC_LINK_IFELSE([AC_LANG_CALL([], [$ac_func])], + [ac_success_extra=yes; break]) done if test "$ac_success_extra" = "yes"; then ac_cv_f77_mangling="$ac_case case" - if test -z "$ac_underscore"; then - ac_cv_f77_mangling="$ac_cv_f77_mangling, no underscore" + if test -z "$ac_underscore"; then + ac_cv_f77_mangling="$ac_cv_f77_mangling, no underscore" else - ac_cv_f77_mangling="$ac_cv_f77_mangling, underscore" - fi - if test -z "$ac_extra"; then - ac_cv_f77_mangling="$ac_cv_f77_mangling, no extra underscore" + ac_cv_f77_mangling="$ac_cv_f77_mangling, underscore" + fi + if test -z "$ac_extra"; then + ac_cv_f77_mangling="$ac_cv_f77_mangling, no extra underscore" else - ac_cv_f77_mangling="$ac_cv_f77_mangling, extra underscore" - fi + ac_cv_f77_mangling="$ac_cv_f77_mangling, extra underscore" + fi else ac_cv_f77_mangling="unknown" fi @@ -760,32 +760,32 @@ [As F77_FUNC, but for C identifiers containing underscores.])dnl case $ac_cv_f77_mangling in "lower case, no underscore, no extra underscore") - AC_DEFINE([F77_FUNC(name,NAME)], [name]) - AC_DEFINE([F77_FUNC_(name,NAME)], [name]) ;; + AC_DEFINE([F77_FUNC(name,NAME)], [name]) + AC_DEFINE([F77_FUNC_(name,NAME)], [name]) ;; "lower case, no underscore, extra underscore") - AC_DEFINE([F77_FUNC(name,NAME)], [name]) - AC_DEFINE([F77_FUNC_(name,NAME)], [name ## _]) ;; + AC_DEFINE([F77_FUNC(name,NAME)], [name]) + AC_DEFINE([F77_FUNC_(name,NAME)], [name ## _]) ;; "lower case, underscore, no extra underscore") - AC_DEFINE([F77_FUNC(name,NAME)], [name ## _]) - AC_DEFINE([F77_FUNC_(name,NAME)], [name ## _]) ;; + AC_DEFINE([F77_FUNC(name,NAME)], [name ## _]) + AC_DEFINE([F77_FUNC_(name,NAME)], [name ## _]) ;; "lower case, underscore, extra underscore") - AC_DEFINE([F77_FUNC(name,NAME)], [name ## _]) - AC_DEFINE([F77_FUNC_(name,NAME)], [name ## __]) ;; + AC_DEFINE([F77_FUNC(name,NAME)], [name ## _]) + AC_DEFINE([F77_FUNC_(name,NAME)], [name ## __]) ;; "upper case, no underscore, no extra underscore") - AC_DEFINE([F77_FUNC(name,NAME)], [NAME]) - AC_DEFINE([F77_FUNC_(name,NAME)], [NAME]) ;; + AC_DEFINE([F77_FUNC(name,NAME)], [NAME]) + AC_DEFINE([F77_FUNC_(name,NAME)], [NAME]) ;; "upper case, no underscore, extra underscore") - AC_DEFINE([F77_FUNC(name,NAME)], [NAME]) - AC_DEFINE([F77_FUNC_(name,NAME)], [NAME ## _]) ;; + AC_DEFINE([F77_FUNC(name,NAME)], [NAME]) + AC_DEFINE([F77_FUNC_(name,NAME)], [NAME ## _]) ;; "upper case, underscore, no extra underscore") - AC_DEFINE([F77_FUNC(name,NAME)], [NAME ## _]) - AC_DEFINE([F77_FUNC_(name,NAME)], [NAME ## _]) ;; + AC_DEFINE([F77_FUNC(name,NAME)], [NAME ## _]) + AC_DEFINE([F77_FUNC_(name,NAME)], [NAME ## _]) ;; "upper case, underscore, extra underscore") - AC_DEFINE([F77_FUNC(name,NAME)], [NAME ## _]) - AC_DEFINE([F77_FUNC_(name,NAME)], [NAME ## __]) ;; + AC_DEFINE([F77_FUNC(name,NAME)], [NAME ## _]) + AC_DEFINE([F77_FUNC_(name,NAME)], [NAME ## __]) ;; *) - AC_MSG_WARN([unknown Fortran 77 name-mangling scheme]) - ;; + AC_MSG_WARN([unknown Fortran 77 name-mangling scheme]) + ;; esac ])# AC_F77_WRAPPERS Index: lib/autoconf/general.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/general.m4,v retrieving revision 1.813 diff -u -u -r1.813 general.m4 --- lib/autoconf/general.m4 27 Mar 2003 13:18:34 -0000 1.813 +++ lib/autoconf/general.m4 22 May 2003 12:05:40 -0000 @@ -246,20 +246,20 @@ AS_LITERAL_IF([$2], [], [m4_warn([syntax], [AC_INIT: not a literal: $2])]) AS_LITERAL_IF([$3], [], [m4_warn([syntax], [AC_INIT: not a literal: $3])]) m4_ifndef([AC_PACKAGE_NAME], - [m4_define([AC_PACKAGE_NAME], [$1])]) + [m4_define([AC_PACKAGE_NAME], [$1])]) m4_ifndef([AC_PACKAGE_TARNAME], - [m4_define([AC_PACKAGE_TARNAME], - m4_default([$4], - [m4_bpatsubst(m4_tolower(m4_bpatsubst([[[$1]]], - [GNU ])), - [[^_abcdefghijklmnopqrstuvwxyz0123456789]], - [-])]))]) + [m4_define([AC_PACKAGE_TARNAME], + m4_default([$4], + [m4_bpatsubst(m4_tolower(m4_bpatsubst([[[$1]]], + [GNU ])), + [[^_abcdefghijklmnopqrstuvwxyz0123456789]], + [-])]))]) m4_ifndef([AC_PACKAGE_VERSION], - [m4_define([AC_PACKAGE_VERSION], [$2])]) + [m4_define([AC_PACKAGE_VERSION], [$2])]) m4_ifndef([AC_PACKAGE_STRING], - [m4_define([AC_PACKAGE_STRING], [$1 $2])]) + [m4_define([AC_PACKAGE_STRING], [$1 $2])]) m4_ifndef([AC_PACKAGE_BUGREPORT], - [m4_define([AC_PACKAGE_BUGREPORT], [$3])]) + [m4_define([AC_PACKAGE_BUGREPORT], [$3])]) ]) @@ -289,7 +289,7 @@ # which sees the opening of a string. m4_define([AC_REVISION], [m4_divert_text([HEADER-REVISION], - address@hidden:@ From __file__ m4_translit([$1], [$""]).])dnl + address@hidden:@ From __file__ m4_translit([$1], [$""]).])dnl ]) @@ -345,8 +345,8 @@ m4_ifset([AC_PACKAGE_STRING], [ for AC_PACKAGE_STRING]).]) m4_ifset([AC_PACKAGE_BUGREPORT], - [m4_divert_text([HEADER-COMMENT], - address@hidden:@ + [m4_divert_text([HEADER-COMMENT], + address@hidden:@ @%:@ Report bugs to .])]) ]) @@ -361,7 +361,7 @@ Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it.], - [VERSION_FSF])dnl + [VERSION_FSF])dnl ]) @@ -414,15 +414,15 @@ # Identity of this package. AC_SUBST([PACKAGE_NAME], - [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])dnl + [m4_ifdef([AC_PACKAGE_NAME], ['AC_PACKAGE_NAME'])])dnl AC_SUBST([PACKAGE_TARNAME], - [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])dnl + [m4_ifdef([AC_PACKAGE_TARNAME], ['AC_PACKAGE_TARNAME'])])dnl AC_SUBST([PACKAGE_VERSION], - [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])dnl + [m4_ifdef([AC_PACKAGE_VERSION], ['AC_PACKAGE_VERSION'])])dnl AC_SUBST([PACKAGE_STRING], - [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])dnl + [m4_ifdef([AC_PACKAGE_STRING], ['AC_PACKAGE_STRING'])])dnl AC_SUBST([PACKAGE_BUGREPORT], - [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])dnl + [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])dnl m4_divert_pop([DEFAULTS])dnl m4_wrap([m4_divert_text([DEFAULTS], @@ -855,7 +855,7 @@ # Be sure to have absolute paths. for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir + localstatedir libdir includedir oldincludedir infodir mandir do eval ac_val=$`echo $ac_var` case $ac_val in @@ -905,8 +905,8 @@ # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF \`configure' configures m4_ifset([AC_PACKAGE_STRING], - [AC_PACKAGE_STRING], - [this package]) to adapt to many kinds of systems. + [AC_PACKAGE_STRING], + [this package]) to adapt to many kinds of systems. Usage: $[0] [[OPTION]]... [[VAR=VALUE]]... @@ -931,9 +931,9 @@ cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1013,7 +1013,7 @@ echo $SHELL $ac_srcdir/configure --help=recursive elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then + test -f $ac_srcdir/configure.in; then echo $ac_configure --help else @@ -1036,8 +1036,8 @@ [if $ac_init_version; then cat <<\_ACEOF])dnl m4_ifset([AC_PACKAGE_STRING], - [m4_divert_text([VERSION_BEGIN], - [dnl + [m4_divert_text([VERSION_BEGIN], + [dnl m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])configure[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) generated by m4_PACKAGE_STRING])]) @@ -1121,21 +1121,21 @@ dnl and (ii) not to strip long options (--prefix foo --prefix bar might dnl give --prefix foo bar). if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. + ac_must_keep_next=false # Got value, back to normal. else - case $ac_arg in + case $ac_arg in dnl Use broad patterns, as arguments that would have already made configure dnl exit don't matter. - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac fi ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" # Get rid of the leading space. @@ -1160,9 +1160,9 @@ AS_BOX([Cache variables.]) echo m4_bpatsubsts(m4_defn([_AC_CACHE_DUMP]), - [^ *\(#.*\)? + [^ *\(#.*\)? ], [], - ['], ['"'"']) + ['], ['"'"']) echo AS_BOX([Output variables.]) @@ -1180,7 +1180,7 @@ for ac_var in $ac_subst_files do eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -1211,16 +1211,16 @@ # Predefined preprocessor variables. AC_DEFINE_UNQUOTED([PACKAGE_NAME], ["$PACKAGE_NAME"], - [Define to the full name of this package.]) + [Define to the full name of this package.]) AC_DEFINE_UNQUOTED([PACKAGE_TARNAME], ["$PACKAGE_TARNAME"], - [Define to the one symbol short name of this package.]) + [Define to the one symbol short name of this package.]) AC_DEFINE_UNQUOTED([PACKAGE_VERSION], ["$PACKAGE_VERSION"], - [Define to the version of this package.]) + [Define to the version of this package.]) AC_DEFINE_UNQUOTED([PACKAGE_STRING], ["$PACKAGE_STRING"], - [Define to the full name and version of this package.]) + [Define to the full name and version of this package.]) AC_DEFINE_UNQUOTED([PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"], - [Define to the address where bug reports for this package - should be sent.]) + [Define to the address where bug reports for this package + should be sent.]) # Let the site file select an alternate cache file if it wants to. AC_SITE_LOAD @@ -1246,7 +1246,7 @@ # This macro is used only for Autoupdate. AU_DEFUN([AC_INIT], [m4_ifval([$2], [[AC_INIT($@)]], - [m4_ifval([$1], + [m4_ifval([$1], [[AC_INIT] AC_CONFIG_SRCDIR([$1])], [[AC_INIT]])])[]dnl ]) @@ -1263,7 +1263,7 @@ m4_pattern_forbid([^_?A[CHUM]_]) m4_pattern_forbid([_AC_]) m4_pattern_forbid([^LIBOBJS$], - [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) + [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) # Actually reserved by M4sh. m4_pattern_allow([^AS_FLAGS$]) AS_INIT @@ -1386,7 +1386,7 @@ # value. ac_cache_corrupted=false for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([[a-zA-Z_0-9]]*\)_set=.*/\1/p'`; do + sed -n 's/^ac_env_\([[a-zA-Z_0-9]]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set eval ac_old_val="\$ac_cv_env_${ac_var}_value" @@ -1401,10 +1401,10 @@ ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - AS_MESSAGE([error: `$ac_var' has changed since the previous run:], 2) - AS_MESSAGE([ former value: $ac_old_val], 2) - AS_MESSAGE([ current value: $ac_new_val], 2) - ac_cache_corrupted=: + AS_MESSAGE([error: `$ac_var' has changed since the previous run:], 2) + AS_MESSAGE([ former value: $ac_old_val], 2) + AS_MESSAGE([ current value: $ac_new_val], 2) + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. @@ -1440,8 +1440,8 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations.]])dnl m4_expand_once([m4_divert_once([HELP_VAR], - [AS_HELP_STRING([$1], [$2], [ ])])], - [$0($1)])dnl + [AS_HELP_STRING([$1], [$2], [ ])])], + [$0($1)])dnl _AC_ARG_VAR_PRECIOUS([$1])dnl ])# AC_ARG_VAR @@ -1562,11 +1562,11 @@ [AC_SUBST([$1], [$ac_cv_$1])dnl dnl FIXME: AC_SUBST([$1_alias], [$ac_cv_$1_alias])dnl AC_SUBST([$1_cpu], - [`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])dnl + [`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])dnl AC_SUBST([$1_vendor], - [`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])dnl + [`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])dnl AC_SUBST([$1_os], - [`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])dnl + [`echo $ac_cv_$1 | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])dnl ])# _AC_CANONICAL_SPLIT @@ -1712,13 +1712,13 @@ # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ - ["s/'/'\\\\''/g; + ["s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"] ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n \ - ["s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"] + ["s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"] ;; esac; }dnl @@ -1772,12 +1772,12 @@ # Should be dnl'ed. Try to catch common mistakes. m4_defun([AC_CACHE_VAL], [m4_bmatch([$2], [AC_DEFINE], - [AC_DIAGNOSE(syntax, + [AC_DIAGNOSE(syntax, [$0($1, ...): suspicious presence of an AC_DEFINE in the second argument, ]dnl [where no actions should be taken])])dnl AS_VAR_SET_IF([$1], - [_AS_ECHO_N([(cached) ])], - [$2])]) + [_AS_ECHO_N([(cached) ])], + [$2])]) # AC_CACHE_CHECK(MESSAGE, CACHE-ID, COMMANDS) @@ -1993,7 +1993,7 @@ # Eval COMMAND, save the exit status in ac_status, and log it. AC_DEFUN([_AC_EVAL], [_AC_RUN_LOG([eval $1], - [eval echo "$as_me:$LINENO: \"$1\""])]) + [eval echo "$as_me:$LINENO: \"$1\""])]) # _AC_EVAL_STDERR(COMMAND) @@ -2003,7 +2003,7 @@ # Note that when tracing, most shells will leave the traces in stderr AC_DEFUN([_AC_EVAL_STDERR], [_AC_RUN_LOG_STDERR([eval $1], - [eval echo "$as_me:$LINENO: \"$1\""])]) + [eval echo "$as_me:$LINENO: \"$1\""])]) # AC_TRY_EVAL(VARIABLE) @@ -2025,7 +2025,7 @@ # ------------------- AC_DEFUN([AC_RUN_LOG], [_AC_RUN_LOG([$1], - [echo "$as_me:$LINENO: AS_ESCAPE([$1])"])]) + [echo "$as_me:$LINENO: AS_ESCAPE([$1])"])]) @@ -2132,7 +2132,7 @@ [m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl rm -f conftest.$ac_objext AS_IF([AC_TRY_EVAL(ac_compile) && - AC_TRY_COMMAND([test -s conftest.$ac_objext])], + AC_TRY_COMMAND([test -s conftest.$ac_objext])], [$2], [_AC_MSG_LOG_CONFTEST m4_ifvaln([$3],[$3])dnl])dnl @@ -2171,7 +2171,7 @@ [m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl rm -f conftest.$ac_objext conftest$ac_exeext AS_IF([AC_TRY_EVAL(ac_link) && - AC_TRY_COMMAND([test -s conftest$ac_exeext])], + AC_TRY_COMMAND([test -s conftest$ac_exeext])], [$2], [_AC_MSG_LOG_CONFTEST m4_ifvaln([$3], [$3])dnl])[]dnl @@ -2228,10 +2228,10 @@ [echo "$as_me: program exited with status $ac_status" >&AS_MESSAGE_LOG_FD _AC_MSG_LOG_CONFTEST m4_ifvaln([$3], - [( exit $ac_status ) + [( exit $ac_status ) $3])dnl])[]dnl rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext m4_ifval([$1], - [conftest.$ac_ext])[]dnl + [conftest.$ac_ext])[]dnl ])# _AC_RUN_IFELSE @@ -2245,11 +2245,11 @@ AC_DEFUN([AC_RUN_IFELSE], [AC_LANG_COMPILER_REQUIRE()dnl m4_ifval([$4], [], - [AC_DIAGNOSE([cross], - [$0 called without default to allow cross compiling])])dnl + [AC_DIAGNOSE([cross], + [$0 called without default to allow cross compiling])])dnl if test "$cross_compiling" = yes; then m4_default([$4], - [AC_MSG_FAILURE([cannot run test program while cross compiling])]) + [AC_MSG_FAILURE([cannot run test program while cross compiling])]) else _AC_RUN_IFELSE($@) fi]) @@ -2274,7 +2274,7 @@ # Check for the existence of FILE. AC_DEFUN([AC_CHECK_FILE], [AC_DIAGNOSE([cross], - [cannot check for file existence when cross compiling])dnl + [cannot check for file existence when cross compiling])dnl AS_VAR_PUSHDEF([ac_File], [ac_cv_file_$1])dnl AC_CACHE_CHECK([for $1], ac_File, [test "$cross_compiling" = yes && @@ -2294,11 +2294,11 @@ AC_DEFUN([AC_CHECK_FILES], [AC_FOREACH([AC_FILE_NAME], [$1], [AC_CHECK_FILE(AC_FILE_NAME, - [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_FILE_NAME), 1, - [Define to 1 if you have the - file `]AC_File['.]) + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_FILE_NAME), 1, + [Define to 1 if you have the + file `]AC_File['.]) $2], - [$3])])]) + [$3])])]) ## ------------------------------- ## @@ -2319,8 +2319,8 @@ char *p = (char *) $1; #endif ])], - [AS_VAR_SET(ac_Symbol, yes)], - [AS_VAR_SET(ac_Symbol, no)])]) + [AS_VAR_SET(ac_Symbol, yes)], + [AS_VAR_SET(ac_Symbol, no)])]) AS_IF([test AS_VAR_GET(ac_Symbol) = yes], [$2], [$3])[]dnl AS_VAR_POPDEF([ac_Symbol])dnl ])# AC_CHECK_DECL @@ -2336,13 +2336,13 @@ AC_DEFUN([AC_CHECK_DECLS], [m4_foreach([AC_Symbol], [$1], [AC_CHECK_DECL(AC_Symbol, - [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_DECL_]AC_Symbol), 1, - [Define to 1 if you have the declaration - of `]AC_Symbol[', and to 0 if you don't.]) + [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_DECL_]AC_Symbol), 1, + [Define to 1 if you have the declaration + of `]AC_Symbol[', and to 0 if you don't.]) $2], - [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_DECL_]AC_Symbol), 0) + [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_DECL_]AC_Symbol), 0) $3], - [$4])]) + [$4])]) ])# AC_CHECK_DECLS @@ -2357,7 +2357,7 @@ # Announce LIBOBJ replacement files are in $top_srcdir/DIRNAME. AC_DEFUN_ONCE([AC_CONFIG_LIBOBJ_DIR], [m4_bmatch([$1], [^]m4_defn([m4_cr_symbols2]), - [AC_WARNING([invalid replacement directory: $1])])dnl + [AC_WARNING([invalid replacement directory: $1])])dnl m4_divert_text([DEFAULTS], [ac_config_libobj_dir=$1])[]dnl ]) @@ -2373,7 +2373,7 @@ # Announce we might need these files. m4_define([AC_LIBSOURCES], [m4_foreach([_AC_FILENAME], [$1], - [AC_LIBSOURCE(_AC_FILENAME)])]) + [AC_LIBSOURCE(_AC_FILENAME)])]) # _AC_LIBOBJ(FILENAME-NOEXT, ACTION-IF-INDIR) @@ -2382,8 +2382,8 @@ # We don't use AC_SUBST/2 because it forces an unnecessary eol. m4_define([_AC_LIBOBJ], [AS_LITERAL_IF([$1], - [AC_LIBSOURCE([$1.c])], - [$2])dnl + [AC_LIBSOURCE([$1.c])], + [$2])dnl AC_SUBST([LIB@&address@hidden)dnl LIB@&address@hidden"$LIB@&address@hidden $1.$ac_objext"]) @@ -2395,8 +2395,8 @@ # We don't use AC_SUBST/2 because it forces an unnecessary eol. m4_define([AC_LIBOBJ], [_AC_LIBOBJ([$1], - [AC_DIAGNOSE(syntax, - [$0($1): you should use literals])])dnl + [AC_DIAGNOSE(syntax, + [$0($1): you should use literals])])dnl ]) @@ -2411,7 +2411,7 @@ for ac_i in : $LIB@&address@hidden; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` # 2. Add them. ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' @@ -2436,32 +2436,32 @@ [ac_lo=0 ac_mid=0 while :; do AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$3], [($1) <= $ac_mid])], - [ac_hi=$ac_mid; break], - [ac_lo=`expr $ac_mid + 1` - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid + 1`]) + [ac_hi=$ac_mid; break], + [ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1`]) done], [AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$3], [($1) < 0])], [ac_hi=-1 ac_mid=-1 while :; do AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$3], [($1) >= $ac_mid])], - [ac_lo=$ac_mid; break], - [ac_hi=`expr '(' $ac_mid ')' - 1` - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - ac_mid=`expr 2 '*' $ac_mid`]) + [ac_lo=$ac_mid; break], + [ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid`]) done], [ac_lo= ac_hi=])]) # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$3], [($1) <= $ac_mid])], - [ac_hi=$ac_mid], [ac_lo=`expr '(' $ac_mid ')' + 1`]) + [ac_hi=$ac_mid], [ac_lo=`expr '(' $ac_mid ')' + 1`]) done case $ac_lo in ?*) $2=$ac_lo;; @@ -2475,7 +2475,7 @@ # Store the evaluation of the integer EXPRESSION in VARIABLE. m4_define([_AC_COMPUTE_INT_RUN], [AC_RUN_IFELSE([AC_LANG_INT_SAVE([$3], [$1])], - [$2=`cat conftest.val`], [$4])]) + [$2=`cat conftest.val`], [$4])]) # _AC_COMPUTE_INT(EXPRESSION, VARIABLE, INCLUDES, IF-FAILS) Index: lib/autoconf/headers.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/headers.m4,v retrieving revision 1.32 diff -u -u -r1.32 headers.m4 --- lib/autoconf/headers.m4 29 Mar 2003 09:50:11 -0000 1.32 +++ lib/autoconf/headers.m4 22 May 2003 12:05:40 -0000 @@ -85,9 +85,9 @@ # semantics only. AC_DEFUN([AC_CHECK_HEADER], [m4_case([$4], - [], [_AC_CHECK_HEADER_MONGREL($@)], - [-], [_AC_CHECK_HEADER_OLD($@)], - [_AC_CHECK_HEADER_NEW($@)]) + [], [_AC_CHECK_HEADER_MONGREL($@)], + [-], [_AC_CHECK_HEADER_OLD($@)], + [_AC_CHECK_HEADER_NEW($@)]) ])# AC_CHECK_HEADER @@ -104,20 +104,20 @@ m4_define([_AC_CHECK_HEADER_MONGREL], [AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl AS_VAR_SET_IF(ac_Header, - [AC_CACHE_CHECK([for $1], ac_Header, [])], - [# Is the header compilable? + [AC_CACHE_CHECK([for $1], ac_Header, [])], + [# Is the header compilable? AC_MSG_CHECKING([$1 usability]) AC_COMPILE_IFELSE([AC_LANG_SOURCE([AC_INCLUDES_DEFAULT([$4]) @%:@include <$1>])], - [ac_header_compiler=yes], - [ac_header_compiler=no]) + [ac_header_compiler=yes], + [ac_header_compiler=no]) AC_MSG_RESULT([$ac_header_compiler]) # Is the header present? AC_MSG_CHECKING([$1 presence]) AC_PREPROC_IFELSE([AC_LANG_SOURCE(address@hidden:@include <$1>])], - [ac_header_preproc=yes], - [ac_header_preproc=no]) + [ac_header_preproc=yes], + [ac_header_preproc=no]) AC_MSG_RESULT([$ac_header_preproc]) # So? What about this header? @@ -136,14 +136,14 @@ AC_MSG_WARN([$1: in the future, the compiler will take precedence]) ( AS_BOX([Report this to ]m4_ifset([AC_PACKAGE_BUGREPORT], - [AC_PACKAGE_BUGREPORT], - [the AC_PACKAGE_NAME lists. ])) + [AC_PACKAGE_BUGREPORT], + [the AC_PACKAGE_NAME lists. ])) ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac AC_CACHE_CHECK([for $1], ac_Header, - [AS_VAR_SET(ac_Header, $ac_header_preproc)]) + [AS_VAR_SET(ac_Header, $ac_header_preproc)]) ])dnl ! set ac_HEADER AS_IF([test AS_VAR_GET(ac_Header) = yes], [$2], [$3])[]dnl AS_VAR_POPDEF([ac_Header])dnl @@ -158,10 +158,10 @@ m4_define([_AC_CHECK_HEADER_NEW], [AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl AC_CACHE_CHECK([for $1], ac_Header, - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([AC_INCLUDES_DEFAULT([$4]) + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([AC_INCLUDES_DEFAULT([$4]) @%:@include <$1>])], - [AS_VAR_SET(ac_Header, yes)], - [AS_VAR_SET(ac_Header, no)])]) + [AS_VAR_SET(ac_Header, yes)], + [AS_VAR_SET(ac_Header, no)])]) AS_IF([test AS_VAR_GET(ac_Header) = yes], [$2], [$3])[]dnl AS_VAR_POPDEF([ac_Header])dnl ])# _AC_CHECK_HEADER_NEW @@ -174,9 +174,9 @@ m4_define([_AC_CHECK_HEADER_OLD], [AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl AC_CACHE_CHECK([for $1], ac_Header, - [AC_PREPROC_IFELSE([AC_LANG_SOURCE(address@hidden:@include <$1>])], - [AS_VAR_SET(ac_Header, yes)], - [AS_VAR_SET(ac_Header, no)])]) + [AC_PREPROC_IFELSE([AC_LANG_SOURCE(address@hidden:@include <$1>])], + [AS_VAR_SET(ac_Header, yes)], + [AS_VAR_SET(ac_Header, no)])]) AS_IF([test AS_VAR_GET(ac_Header) = yes], [$2], [$3])[]dnl AS_VAR_POPDEF([ac_Header])dnl ])# _AC_CHECK_HEADER_OLD @@ -187,7 +187,7 @@ m4_define([AH_CHECK_HEADERS], [AC_FOREACH([AC_Header], [$1], [AH_TEMPLATE(AS_TR_CPP(HAVE_[]AC_Header), - [Define to 1 if you have the <]AC_Header[> header file.])])]) + [Define to 1 if you have the <]AC_Header[> header file.])])]) # AC_CHECK_HEADERS(HEADER-FILE... @@ -199,9 +199,9 @@ for ac_header in $1 do AC_CHECK_HEADER($ac_header, - [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_header)) $2], - [$3], - [$4])dnl + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_header)) $2], + [$3], + [$4])dnl done ])# AC_CHECK_HEADERS @@ -262,8 +262,8 @@ AC_REQUIRE([AC_HEADER_STDC])dnl # On IRIX 5.3, sys/types and inttypes.h are conflicting. AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h], - [], [], $ac_includes_default) + inttypes.h stdint.h unistd.h], + [], [], $ac_includes_default) ])# _AC_INCLUDES_DEFAULT_REQUIREMENTS @@ -279,7 +279,7 @@ AC_DEFUN([AC_INCLUDES_DEFAULT], [m4_ifval([$1], [$1 ], - [AC_REQUIRE([_AC_INCLUDES_DEFAULT_REQUIREMENTS])dnl + [AC_REQUIRE([_AC_INCLUDES_DEFAULT_REQUIREMENTS])dnl $ac_includes_default])]) @@ -369,10 +369,10 @@ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include #include <$1> ], - [if ((DIR *) 0) + [if ((DIR *) 0) return 0;])], - [AS_VAR_SET(ac_Header, yes)], - [AS_VAR_SET(ac_Header, no)])]) + [AS_VAR_SET(ac_Header, yes)], + [AS_VAR_SET(ac_Header, no)])]) AS_IF([test AS_VAR_GET(ac_Header) = yes], [$2], [$3])[]dnl AS_VAR_POPDEF([ac_Header])dnl ])# _AC_CHECK_HEADER_DIRENT @@ -383,8 +383,8 @@ m4_define([AH_CHECK_HEADERS_DIRENT], [AC_FOREACH([AC_Header], [$1], [AH_TEMPLATE(AS_TR_CPP(HAVE_[]AC_Header), - [Define to 1 if you have the <]AC_Header[> header file, and - it defines `DIR'.])])]) + [Define to 1 if you have the <]AC_Header[> header file, and + it defines `DIR'.])])]) # AC_HEADER_DIRENT @@ -398,7 +398,7 @@ ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do _AC_CHECK_HEADER_DIRENT($ac_hdr, - [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_hdr), 1) + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$ac_hdr), 1) ac_header_dirent=$ac_hdr; break]) done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. @@ -418,24 +418,24 @@ AN_HEADER([sys/mkdev.h], [AC_HEADER_MAJOR]) AC_DEFUN([AC_HEADER_MAJOR], [AC_CACHE_CHECK(whether sys/types.h defines makedev, - ac_cv_header_sys_types_h_makedev, + ac_cv_header_sys_types_h_makedev, [AC_LINK_IFELSE([AC_LANG_PROGRAM(address@hidden:@include ]], - [[return makedev(0, 0);]])], - [ac_cv_header_sys_types_h_makedev=yes], - [ac_cv_header_sys_types_h_makedev=no]) + [[return makedev(0, 0);]])], + [ac_cv_header_sys_types_h_makedev=yes], + [ac_cv_header_sys_types_h_makedev=no]) ]) if test $ac_cv_header_sys_types_h_makedev = no; then AC_CHECK_HEADER(sys/mkdev.h, - [AC_DEFINE(MAJOR_IN_MKDEV, 1, - [Define to 1 if `major', `minor', and `makedev' are - declared in .])]) + [AC_DEFINE(MAJOR_IN_MKDEV, 1, + [Define to 1 if `major', `minor', and `makedev' are + declared in .])]) if test $ac_cv_header_sys_mkdev_h = no; then AC_CHECK_HEADER(sys/sysmacros.h, - [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, - [Define to 1 if `major', `minor', and `makedev' - are declared in .])]) + [AC_DEFINE(MAJOR_IN_SYSMACROS, 1, + [Define to 1 if `major', `minor', and `makedev' + are declared in .])]) fi fi ])# AC_HEADER_MAJOR @@ -483,8 +483,8 @@ ], ac_cv_header_stat_broken=yes, ac_cv_header_stat_broken=no)]) if test $ac_cv_header_stat_broken = yes; then AC_DEFINE(STAT_MACROS_BROKEN, 1, - [Define to 1 if the `S_IS*' macros in do not - work properly.]) + [Define to 1 if the `S_IS*' macros in do not + work properly.]) fi ])# AC_HEADER_STAT @@ -520,17 +520,17 @@ # error __bool_true_false_are_defined is not defined #endif - struct s { _Bool s: 1; _Bool t; } s; + struct s { _Bool s: 1; _Bool t; } s; - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) -0.5 == true ? 1 : -1]; - bool e = &s; - char f[(_Bool) -0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) -0.5 == true ? 1 : -1]; + bool e = &s; + char f[(_Bool) -0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; ]], [[ return !a + !b + !c + !d + !e + !f + !g + !h + !i; ]])], [ac_cv_header_stdbool_h=yes], @@ -573,8 +573,8 @@ #include #include ]])], - [ac_cv_header_stdc=yes], - [ac_cv_header_stdc=no]) + [ac_cv_header_stdc=yes], + [ac_cv_header_stdc=no]) if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -595,9 +595,9 @@ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) #else # define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) #endif @@ -608,14 +608,14 @@ int i; for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) + || toupper (i) != TOUPPER (i)) exit(2); exit (0); }]])], , ac_cv_header_stdc=no, :) fi]) if test $ac_cv_header_stdc = yes; then AC_DEFINE(STDC_HEADERS, 1, - [Define to 1 if you have the ANSI C header files.]) + [Define to 1 if you have the ANSI C header files.]) fi ])# AC_HEADER_STDC @@ -639,11 +639,11 @@ [ int s; wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;])], - [ac_cv_header_sys_wait_h=yes], - [ac_cv_header_sys_wait_h=no])]) + [ac_cv_header_sys_wait_h=yes], + [ac_cv_header_sys_wait_h=no])]) if test $ac_cv_header_sys_wait_h = yes; then AC_DEFINE(HAVE_SYS_WAIT_H, 1, - [Define to 1 if you have that is POSIX.1 compatible.]) + [Define to 1 if you have that is POSIX.1 compatible.]) fi ])# AC_HEADER_SYS_WAIT @@ -660,12 +660,12 @@ ], [if ((struct tm *) 0) return 0;])], - [ac_cv_header_time=yes], - [ac_cv_header_time=no])]) + [ac_cv_header_time=yes], + [ac_cv_header_time=no])]) if test $ac_cv_header_time = yes; then AC_DEFINE(TIME_WITH_SYS_TIME, 1, - [Define to 1 if you can safely include both - and .]) + [Define to 1 if you can safely include both + and .]) fi ])# AC_HEADER_TIME @@ -674,16 +674,16 @@ # ---------------------------------- m4_define([_AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H], [AC_CACHE_CHECK([whether termios.h defines TIOCGWINSZ], - ac_cv_sys_tiocgwinsz_in_termios_h, + ac_cv_sys_tiocgwinsz_in_termios_h, [AC_EGREP_CPP([yes], - [#include + [#include #include #ifdef TIOCGWINSZ yes #endif ], - ac_cv_sys_tiocgwinsz_in_termios_h=yes, - ac_cv_sys_tiocgwinsz_in_termios_h=no)]) + ac_cv_sys_tiocgwinsz_in_termios_h=yes, + ac_cv_sys_tiocgwinsz_in_termios_h=no)]) ])# _AC_HEADER_TIOCGWINSZ_IN_TERMIOS_H @@ -691,16 +691,16 @@ # ---------------------------------- m4_define([_AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL], [AC_CACHE_CHECK([whether sys/ioctl.h defines TIOCGWINSZ], - ac_cv_sys_tiocgwinsz_in_sys_ioctl_h, + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h, [AC_EGREP_CPP([yes], - [#include + [#include #include #ifdef TIOCGWINSZ yes #endif ], - ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes, - ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no)]) + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes, + ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no)]) ])# _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL @@ -715,7 +715,7 @@ _AC_HEADER_TIOCGWINSZ_IN_SYS_IOCTL if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1, - [Define to 1 if `TIOCGWINSZ' requires .]) + [Define to 1 if `TIOCGWINSZ' requires .]) fi fi ])# AC_HEADER_TIOCGWINSZ @@ -736,13 +736,13 @@ when you adjust your code to use HAVE_STRING_H.])dnl AC_MSG_CHECKING([for BSD string and memory functions]) AC_LINK_IFELSE([AC_LANG_PROGRAM(address@hidden:@include ]], - [[rindex(0, 0); bzero(0, 0);]])], - [AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no) - AC_DEFINE(USG, 1, - [Define to 1 if you do not have , index, - bzero, etc... This symbol is obsolete, you should - not depend upon it.])]) + [[rindex(0, 0); bzero(0, 0);]])], + [AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no) + AC_DEFINE(USG, 1, + [Define to 1 if you do not have , index, + bzero, etc... This symbol is obsolete, you should + not depend upon it.])]) AC_CHECK_HEADERS(string.h) ])# AU::AC_USG @@ -765,8 +765,8 @@ `AC_CHECK_HEADER(memory.h, AC_DEFINE(...))' when you adjust your code to use and HAVE_STRING_H and HAVE_MEMORY_H, not NEED_MEMORY_H.])dnl AC_CHECK_HEADER(memory.h, - [AC_DEFINE([NEED_MEMORY_H], 1, - [Same as `HAVE_MEMORY_H', don't depend on me.])]) + [AC_DEFINE([NEED_MEMORY_H], 1, + [Same as `HAVE_MEMORY_H', don't depend on me.])]) AC_CHECK_HEADERS(string.h memory.h) ]) Index: lib/autoconf/lang.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/lang.m4,v retrieving revision 1.163 diff -u -u -r1.163 lang.m4 --- lib/autoconf/lang.m4 12 May 2003 14:48:20 -0000 1.163 +++ lib/autoconf/lang.m4 22 May 2003 12:05:40 -0000 @@ -128,7 +128,7 @@ # Set the current language to LANG. m4_defun([AC_LANG], [_AC_LANG_SET(m4_ifdef([_AC_LANG], [m4_defn([_AC_LANG])]), - [$1])dnl + [$1])dnl m4_define([_AC_LANG], [$1])]) @@ -137,7 +137,7 @@ # Save the current language, and use LANG. m4_defun([AC_LANG_PUSH], [_AC_LANG_SET(m4_ifdef([_AC_LANG], [m4_defn([_AC_LANG])]), - [$1])dnl + [$1])dnl m4_pushdef([_AC_LANG], [$1])]) @@ -161,7 +161,7 @@ # Save the current language, but don't change language. AU_DEFUN([AC_LANG_SAVE], [AC_DIAGNOSE([obsolete], - [instead of using `AC_LANG', `AC_LANG_SAVE', + [instead of using `AC_LANG', `AC_LANG_SAVE', and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.]) m4_pushdef([_AC_LANG], _AC_LANG)]) @@ -275,7 +275,7 @@ # instance, the latter must be AC_DEFUN'd, not just define'd. m4_define([AC_LANG_COMPILER], [AC_BEFORE([AC_LANG_COMPILER(]_AC_LANG[)], - [AC_LANG_PREPROC(]_AC_LANG[)])dnl + [AC_LANG_PREPROC(]_AC_LANG[)])dnl _AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) @@ -284,7 +284,7 @@ # Ensure we have a compiler for the current LANG. AC_DEFUN([AC_LANG_COMPILER_REQUIRE], [m4_require([AC_LANG_COMPILER(]_AC_LANG[)], - [AC_LANG_COMPILER])]) + [AC_LANG_COMPILER])]) @@ -300,13 +300,13 @@ # continuation line, and warn instead of reporting an error. m4_define([_AC_LANG_COMPILER_GNU], [AC_CACHE_CHECK([whether we are using the GNU _AC_LANG compiler], - [ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu], + [ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu], [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __GNUC__ choke me #endif ]])], - [ac_compiler_gnu=yes], - [ac_compiler_gnu=no]) + [ac_compiler_gnu=yes], + [ac_compiler_gnu=no]) ac_cv_[]_AC_LANG_ABBREV[]_compiler_gnu=$ac_compiler_gnu ])])# _AC_LANG_COMPILER_GNU @@ -327,7 +327,7 @@ # Ensure we have a preprocessor for the current language. AC_DEFUN([AC_LANG_PREPROC_REQUIRE], [m4_require([AC_LANG_PREPROC(]_AC_LANG[)], - [AC_LANG_PREPROC])]) + [AC_LANG_PREPROC])]) # AC_REQUIRE_CPP @@ -458,23 +458,23 @@ test -f "$ac_file" || continue case $ac_file in _AC_COMPILER_EXEEXT_REJECT ) - ;; + ;; conftest.$ac_ext ) - # This is the source file. - ;; + # This is the source file. + ;; [[ab]].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; + # We found the default executable, but exeext='' is most + # certainly right. + break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : ['[^.]*\(\..*\)']` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; + ac_cv_exeext=`expr "$ac_file" : ['[^.]*\(\..*\)']` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext + break;; * ) - break;; + break;; esac done], [_AC_MSG_LOG_CONFTEST @@ -534,12 +534,12 @@ case $ac_file in _AC_COMPILER_EXEEXT_REJECT ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : ['[^.]*\(\..*\)']` - export ac_cv_exeext - break;; + export ac_cv_exeext + break;; * ) break;; esac done], - [AC_MSG_FAILURE([cannot compute suffix of executables: cannot compile and link])]) + [AC_MSG_FAILURE([cannot compute suffix of executables: cannot compile and link])]) rm -f conftest$ac_cv_exeext AC_MSG_RESULT([$ac_cv_exeext]) ])# _AC_COMPILER_EXEEXT_O Index: lib/autoconf/libs.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/libs.m4,v retrieving revision 1.7 diff -u -u -r1.7 libs.m4 --- lib/autoconf/libs.m4 27 Oct 2002 18:21:32 -0000 1.7 +++ lib/autoconf/libs.m4 22 May 2003 12:05:40 -0000 @@ -71,12 +71,12 @@ [ac_func_search_save_LIBS=$LIBS ac_cv_search_$1=no AC_LINK_IFELSE([AC_LANG_CALL([], [$1])], - [ac_cv_search_$1="none required"]) + [ac_cv_search_$1="none required"]) if test "$ac_cv_search_$1" = no; then for ac_lib in $2; do LIBS="-l$ac_lib $5 $ac_func_search_save_LIBS" AC_LINK_IFELSE([AC_LANG_CALL([], [$1])], - [ac_cv_search_$1="-l$ac_lib" + [ac_cv_search_$1="-l$ac_lib" break]) done fi @@ -116,14 +116,14 @@ AC_DEFUN([AC_CHECK_LIB], [m4_ifval([$3], , [AH_CHECK_LIB([$1])])dnl AS_LITERAL_IF([$1], - [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])], - [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl + [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$2])], + [AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1''_$2])])dnl AC_CACHE_CHECK([for $2 in -l$1], ac_Lib, [ac_check_lib_save_LIBS=$LIBS LIBS="-l$1 $5 $LIBS" AC_LINK_IFELSE([AC_LANG_CALL([], [$2])], - [AS_VAR_SET(ac_Lib, yes)], - [AS_VAR_SET(ac_Lib, no)]) + [AS_VAR_SET(ac_Lib, yes)], + [AS_VAR_SET(ac_Lib, no)]) LIBS=$ac_check_lib_save_LIBS]) AS_IF([test AS_VAR_GET(ac_Lib) = yes], [m4_default([$3], [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1)) @@ -138,7 +138,7 @@ # --------------------- m4_define([AH_CHECK_LIB], [AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1), - [Define to 1 if you have the `]$1[' library (-l]$1[).])]) + [Define to 1 if you have the `]$1[' library (-l]$1[).])]) # AC_HAVE_LIBRARY(LIBRARY, @@ -153,9 +153,9 @@ # it must be a literal name. AU_DEFUN([AC_HAVE_LIBRARY], [m4_pushdef([AC_Lib_Name], - m4_bpatsubst(m4_bpatsubst([[$1]], - [lib\([^\.]*\)\.a], [\1]), - [-l], []))dnl + m4_bpatsubst(m4_bpatsubst([[$1]], + [lib\([^\.]*\)\.a], [\1]), + [-l], []))dnl AC_CHECK_LIB(AC_Lib_Name, main, [$2], [$3], [$4])dnl ac_cv_lib_[]AC_Lib_Name()=ac_cv_lib_[]AC_Lib_Name()_main m4_popdef([AC_Lib_Name])dnl @@ -194,8 +194,8 @@ # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break + test -f $ac_im_libdir/libX11.$ac_extension; then + ac_im_usrlibdir=$ac_im_libdir; break fi done # Screen out bogus values from the imake configuration. They are @@ -279,11 +279,11 @@ ac_save_LIBS=$LIBS LIBS="-lXt $LIBS" AC_LINK_IFELSE([AC_LANG_PROGRAM(address@hidden:@include ], - [XtMalloc (0)])], - [LIBS=$ac_save_LIBS + [XtMalloc (0)])], + [LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries=], - [LIBS=$ac_save_LIBS + [LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! @@ -313,7 +313,7 @@ else # Record where we found X for the cache. ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi])dnl ]) @@ -372,7 +372,7 @@ if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. AC_DEFINE([X_DISPLAY_MISSING], 1, - [Define to 1 if the X Window System is missing or not being used.]) + [Define to 1 if the X Window System is missing or not being used.]) X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else if test -n "$x_includes"; then @@ -419,7 +419,7 @@ # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" AC_LINK_IFELSE([AC_LANG_CALL([], [XOpenDisplay])], - [], + [], [AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) if test $ac_cv_lib_dnet_dnet_ntoa = no; then AC_CHECK_LIB(dnet_stub, dnet_ntoa, @@ -439,7 +439,7 @@ if test $ac_cv_func_gethostbyname = no; then AC_CHECK_LIB(nsl, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl") if test $ac_cv_lib_nsl_gethostbyname = no; then - AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd") + AC_CHECK_LIB(bsd, gethostbyname, X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd") fi fi Index: lib/autoconf/programs.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/programs.m4,v retrieving revision 1.16 diff -u -u -r1.16 programs.m4 --- lib/autoconf/programs.m4 1 Apr 2003 21:27:52 -0000 1.16 +++ lib/autoconf/programs.m4 22 May 2003 12:05:40 -0000 @@ -233,8 +233,8 @@ for ac_prog in $2 do AC_CHECK_PROG([$1], - [$ac_tool_prefix$ac_prog], [$ac_tool_prefix$ac_prog],, - [$4]) + [$ac_tool_prefix$ac_prog], [$ac_tool_prefix$ac_prog],, + [$4]) test -n "$$1" && break done fi @@ -325,20 +325,20 @@ # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if AS_EXECUTABLE_P(["$as_dir/$ac_prog$ac_exec_ext"]); then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + if AS_EXECUTABLE_P(["$as_dir/$ac_prog$ac_exec_ext"]); then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi done done ;; @@ -428,8 +428,8 @@ dnl if test $ac_cv_prog_lex_yytext_pointer = yes; then AC_DEFINE(YYTEXT_POINTER, 1, - [Define to 1 if `lex' declares `yytext' as a `char *' by default, - not a `char[]'.]) + [Define to 1 if `lex' declares `yytext' as a `char *' by default, + not a `char[]'.]) fi ])# _AC_PROG_LEX_YYTEXT_DECL Index: lib/autoconf/specific.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/specific.m4,v retrieving revision 1.354 diff -u -u -r1.354 specific.m4 --- lib/autoconf/specific.m4 17 May 2003 09:44:22 -0000 1.354 +++ lib/autoconf/specific.m4 22 May 2003 12:05:40 -0000 @@ -155,7 +155,7 @@ # http://www.unix-systems.org/version2/whatsnew/lfs20mar.html AC_DEFUN([AC_SYS_LARGEFILE], [AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) + [ --disable-largefile omit support for large files]) if test "$enable_largefile" != no; then AC_CACHE_CHECK([for special C compiler options needed for large files], @@ -166,11 +166,11 @@ while :; do # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. - AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])]) + AC_LANG_CONFTEST([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_INCLUDES])]) AC_COMPILE_IFELSE([], [break]) CC="$CC -n32" AC_COMPILE_IFELSE([], [ac_cv_sys_largefile_CC=' -n32'; break]) - break + break done CC=$ac_save_CC rm -f conftest.$ac_ext @@ -241,7 +241,7 @@ done]) if test $ac_cv_sys_long_file_names = yes; then AC_DEFINE(HAVE_LONG_FILE_NAMES, 1, - [Define to 1 if you support file names longer than 14 characters.]) + [Define to 1 if you support file names longer than 14 characters.]) fi ]) @@ -301,12 +301,12 @@ exit (status == -1); }])], - [ac_cv_sys_restartable_syscalls=yes], - [ac_cv_sys_restartable_syscalls=no])]) + [ac_cv_sys_restartable_syscalls=yes], + [ac_cv_sys_restartable_syscalls=no])]) if test $ac_cv_sys_restartable_syscalls = yes; then AC_DEFINE(HAVE_RESTARTABLE_SYSCALLS, 1, - [Define to 1 if system calls automatically restart after - interruption by a signal.]) + [Define to 1 if system calls automatically restart after + interruption by a signal.]) fi ])# AC_SYS_RESTARTABLE_SYSCALLS @@ -319,10 +319,10 @@ #include #include ]], - [/* SunOS 4.0.3 has termios.h but not the library calls. */ + [/* SunOS 4.0.3 has termios.h but not the library calls. */ tcgetattr(0, 0);])], - ac_cv_sys_posix_termios=yes, - ac_cv_sys_posix_termios=no)]) + ac_cv_sys_posix_termios=yes, + ac_cv_sys_posix_termios=no)]) ])# AC_SYS_POSIX_TERMIOS @@ -354,10 +354,10 @@ AU_DEFUN([AC_CYGWIN], [AC_CANONICAL_HOST AC_DIAGNOSE([obsolete], - [$0 is obsolete: use AC_CANONICAL_HOST and $host_os])dnl + [$0 is obsolete: use AC_CANONICAL_HOST and $host_os])dnl case $host_os in *cygwin* ) CYGWIN=yes;; - * ) CYGWIN=no;; + * ) CYGWIN=no;; esac ])# AC_CYGWIN @@ -369,7 +369,7 @@ AU_DEFUN([AC_EMXOS2], [AC_CANONICAL_HOST AC_DIAGNOSE([obsolete], - [$0 is obsolete: use AC_CANONICAL_HOST and $host_os])dnl + [$0 is obsolete: use AC_CANONICAL_HOST and $host_os])dnl case $host_os in *emx* ) EMXOS2=yes;; * ) EMXOS2=no;; @@ -384,10 +384,10 @@ AU_DEFUN([AC_MINGW32], [AC_CANONICAL_HOST AC_DIAGNOSE([obsolete], - [$0 is obsolete: use AC_CANONICAL_HOST and $host_os])dnl + [$0 is obsolete: use AC_CANONICAL_HOST and $host_os])dnl case $host_os in *mingw32* ) MINGW32=yes;; - * ) MINGW32=no;; + * ) MINGW32=no;; esac ])# AC_MINGW32 @@ -434,13 +434,13 @@ AC_CHECK_HEADER(minix/config.h, MINIX=yes, MINIX=) if test "$MINIX" = yes; then AC_DEFINE(_POSIX_SOURCE, 1, - [Define to 1 if you need to in order for `stat' and other things to - work.]) + [Define to 1 if you need to in order for `stat' and other things to + work.]) AC_DEFINE(_POSIX_1_SOURCE, 2, - [Define to 2 if the system does not provide POSIX.1 features except - with this defined.]) + [Define to 2 if the system does not provide POSIX.1 features except + with this defined.]) AC_DEFINE(_MINIX, 1, - [Define to 1 if on MINIX.]) + [Define to 1 if on MINIX.]) fi ])# AC_MINIX @@ -459,8 +459,8 @@ [#if defined(M_XENIX) && !defined(M_UNIX) yes @%:@endif], - [AC_MSG_RESULT([yes]); XENIX=yes], - [AC_MSG_RESULT([no]); XENIX=]) + [AC_MSG_RESULT([yes]); XENIX=yes], + [AC_MSG_RESULT([no]); XENIX=]) AC_HEADER_DIRENT[]dnl ]) Index: lib/autoconf/status.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/status.m4,v retrieving revision 1.33 diff -u -u -r1.33 status.m4 --- lib/autoconf/status.m4 28 Feb 2003 10:11:12 -0000 1.33 +++ lib/autoconf/status.m4 22 May 2003 12:05:40 -0000 @@ -188,7 +188,7 @@ # be quoted. Currently `+*.' are quoted. m4_define([AC_CONFIG_IF_MEMBER], [m4_bmatch(m4_defn([$2]), [\(^\| \)]m4_re_escape([$1])[\([: ]\|$\)], - [$3], [$4])]) + [$3], [$4])]) # AC_FILE_DEPENDENCY_TRACE(DEST, SOURCE1, [SOURCE2...]) @@ -204,8 +204,8 @@ # `DEST.in'. m4_define([_AC_CONFIG_DEPENDENCY], [m4_ifval([$2], - [AC_FILE_DEPENDENCY_TRACE($@)], - [AC_FILE_DEPENDENCY_TRACE([$1], [$1.in])])]) + [AC_FILE_DEPENDENCY_TRACE($@)], + [AC_FILE_DEPENDENCY_TRACE([$1], [$1.in])])]) # _AC_CONFIG_DEPENDENCIES(DEST[:SOURCE1[:SOURCE2...]]...) @@ -258,8 +258,8 @@ # was the case in AC_OUTPUT_COMMANDS. m4_define([_AC_CONFIG_COMMANDS_INIT], [m4_ifval([$1], - [m4_append([_AC_OUTPUT_COMMANDS_INIT], - [$1 + [m4_append([_AC_OUTPUT_COMMANDS_INIT], + [$1 ])])]) # Initialize. @@ -504,11 +504,11 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[[^:]]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[[^:]]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[[^:]]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac @@ -521,21 +521,21 @@ case $f in -) echo $tmp/stdin ;; [[\\/$]]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || AC_MSG_ERROR([cannot find input file: $f]) - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || AC_MSG_ERROR([cannot find input file: $f]) + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - AC_MSG_ERROR([cannot find input file: $f]) - fi;; + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + AC_MSG_ERROR([cannot find input file: $f]) + fi;; esac done` || AS_EXIT([1]) # Remove the trailing spaces. @@ -665,7 +665,7 @@ dnl If running for Automake, be ready to perform additional dnl commands to set up the timestamp files. m4_ifdef([_AC_AM_CONFIG_HEADER_HOOK], - [_AC_AM_CONFIG_HEADER_HOOK([$ac_file]) + [_AC_AM_CONFIG_HEADER_HOOK([$ac_file]) ])dnl m4_ifset([AC_LIST_HEADERS_COMMANDS], [ # Run the commands associated with the file. @@ -877,11 +877,11 @@ dnl but quoted when config.status runs, so variables are expanded once. dnl Insert the sed substitutions of variables. m4_ifdef([_AC_SUBST_VARS], - [AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_VARS]), + [AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_VARS]), [s,@AC_Var@,$AC_Var,;t t ])])dnl m4_ifdef([_AC_SUBST_FILES], - [AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_FILES]), + [AC_FOREACH([AC_Var], m4_defn([_AC_SUBST_FILES]), [/@AC_Var@/r $AC_Var s,@AC_Var@,,;t t ])])dnl @@ -936,11 +936,11 @@ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[[^:]]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[[^:]]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; *:* ) ac_file_in=`echo "$ac_file" | sed 's,[[^:]]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; * ) ac_file_in=$ac_file.in ;; esac @@ -969,7 +969,7 @@ configure_input="$ac_file. " fi configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -978,20 +978,20 @@ case $f in -) echo $tmp/stdin ;; [[\\/$]]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || AC_MSG_ERROR([cannot find input file: $f]) - echo "$f";; + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || AC_MSG_ERROR([cannot find input file: $f]) + echo "$f";; *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - AC_MSG_ERROR([cannot find input file: $f]) - fi;; + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + AC_MSG_ERROR([cannot find input file: $f]) + fi;; esac done` || AS_EXIT([1]) _ACEOF @@ -1067,9 +1067,9 @@ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl m4_append([_AC_LIST_SUBDIRS], [ $1])dnl AS_LITERAL_IF([$1], [], - [AC_DIAGNOSE(syntax, [$0: you should use literals])]) + [AC_DIAGNOSE(syntax, [$0: you should use literals])]) m4_divert_text([DEFAULTS], - [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"]) + [ac_subdirs_all="$ac_subdirs_all m4_normalize([$1])"]) AC_SUBST(subdirs, "$subdirs $1")dnl ]) @@ -1153,14 +1153,14 @@ case $cache_file in [[\\/]]* | ?:[[\\/]]* ) ac_sub_cache_file=$cache_file ;; *) # Relative path. - ac_sub_cache_file=$ac_top_builddir$cache_file ;; + ac_sub_cache_file=$ac_top_builddir$cache_file ;; esac AC_MSG_NOTICE([running $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir]) # The eval makes quoting arguments work. eval $ac_sub_configure $ac_sub_configure_args \ - --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || - AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir]) + --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir || + AC_MSG_ERROR([$ac_sub_configure failed for $ac_dir]) fi cd $ac_popdir @@ -1183,9 +1183,9 @@ # proper modern macros. AU_DEFUN([AC_OUTPUT], [m4_ifvaln([$1], - [AC_CONFIG_FILES([$1])])dnl + [AC_CONFIG_FILES([$1])])dnl m4_ifvaln([$2$3], - [AC_CONFIG_COMMANDS(default, [[$2]], [[$3]])])dnl + [AC_CONFIG_COMMANDS(default, [[$2]], [[$3]])])dnl [AC_OUTPUT]]) @@ -1199,12 +1199,12 @@ m4_define([AC_OUTPUT], [dnl Dispatch the extra arguments to their native macros. m4_ifval([$1], - [AC_CONFIG_FILES([$1])])dnl + [AC_CONFIG_FILES([$1])])dnl m4_ifval([$2$3], - [AC_CONFIG_COMMANDS(default, [$2], [$3])])dnl + [AC_CONFIG_COMMANDS(default, [$2], [$3])])dnl m4_ifval([$1$2$3], - [AC_DIAGNOSE([obsolete], - [$0 should be used without arguments. + [AC_DIAGNOSE([obsolete], + [$0 should be used without arguments. You should run autoupdate.])])dnl AC_CACHE_SAVE @@ -1351,11 +1351,11 @@ --recheck update $as_me by reconfiguring in the same conditions m4_ifset([AC_LIST_FILES], [[ --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + instantiate the configuration file FILE ]])dnl m4_ifset([AC_LIST_HEADERS], [[ --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + instantiate the configuration header FILE ]])dnl m4_ifset([AC_LIST_FILES], Index: lib/autoconf/types.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autoconf/types.m4,v retrieving revision 1.22 diff -u -u -r1.22 types.m4 --- lib/autoconf/types.m4 27 Oct 2002 18:21:32 -0000 1.22 +++ lib/autoconf/types.m4 22 May 2003 12:05:40 -0000 @@ -147,8 +147,8 @@ return 0; if (sizeof ($1)) return 0;])], - [AS_VAR_SET(ac_Type, yes)], - [AS_VAR_SET(ac_Type, no)])]) + [AS_VAR_SET(ac_Type, yes)], + [AS_VAR_SET(ac_Type, no)])]) AS_IF([test AS_VAR_GET(ac_Type) = yes], [$2], [$3])[]dnl AS_VAR_POPDEF([ac_Type])dnl ])# _AC_CHECK_TYPE_NEW @@ -163,12 +163,12 @@ AC_DEFUN([AC_CHECK_TYPES], [m4_foreach([AC_Type], [$1], [_AC_CHECK_TYPE_NEW(AC_Type, - [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_Type), 1, - [Define to 1 if the system has the - type `]AC_Type['.]) + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_Type), 1, + [Define to 1 if the system has the + type `]AC_Type['.]) $2], - [$3], - [$4])])]) + [$3], + [$4])])]) # _AC_CHECK_TYPE_OLD(TYPE, DEFAULT) @@ -179,7 +179,7 @@ m4_define([_AC_CHECK_TYPE_OLD], [_AC_CHECK_TYPE_NEW([$1],, [AC_DEFINE_UNQUOTED([$1], [$2], - [Define to `$2' if does not define.])])dnl + [Define to `$2' if does not define.])])dnl ])# _AC_CHECK_TYPE_OLD @@ -193,8 +193,8 @@ # for better common-useward backward compatibility. m4_define([_AC_CHECK_TYPE_REPLACEMENT_TYPE_P], [m4_bmatch([$1], - [^\(_Bool\|bool\|char\|double\|float\|int\|long\|short\|\(un\)?signed\|[_a-zA-Z][_a-zA-Z0-9]*_t\)[][_a-zA-Z0-9() *]*$], - 1, 0)dnl + [^\(_Bool\|bool\|char\|double\|float\|int\|long\|short\|\(un\)?signed\|[_a-zA-Z][_a-zA-Z0-9]*_t\)[][_a-zA-Z0-9() *]*$], + 1, 0)dnl ])# _AC_CHECK_TYPE_REPLACEMENT_TYPE_P @@ -203,7 +203,7 @@ # Return `1' if STRING looks like a C/C++ type. m4_define([_AC_CHECK_TYPE_MAYBE_TYPE_P], [m4_bmatch([$1], [^[_a-zA-Z0-9 ]+\([_a-zA-Z0-9() *]\|\[\|\]\)*$], - 1, 0)dnl + 1, 0)dnl ])# _AC_CHECK_TYPE_MAYBE_TYPE_P @@ -222,14 +222,14 @@ # 4. default => NEW AC_DEFUN([AC_CHECK_TYPE], [m4_if($#, 3, - [_AC_CHECK_TYPE_NEW($@)], + [_AC_CHECK_TYPE_NEW($@)], $#, 4, - [_AC_CHECK_TYPE_NEW($@)], + [_AC_CHECK_TYPE_NEW($@)], _AC_CHECK_TYPE_REPLACEMENT_TYPE_P([$2]), 1, - [_AC_CHECK_TYPE_OLD($@)], + [_AC_CHECK_TYPE_OLD($@)], _AC_CHECK_TYPE_MAYBE_TYPE_P([$2]), 1, - [AC_DIAGNOSE([syntax], - [$0: assuming `$2' is not a type])_AC_CHECK_TYPE_NEW($@)], + [AC_DIAGNOSE([syntax], + [$0: assuming `$2' is not a type])_AC_CHECK_TYPE_NEW($@)], [_AC_CHECK_TYPE_NEW($@)])[]dnl ])# AC_CHECK_TYPE @@ -269,14 +269,14 @@ for (i = 0; i < NGID; i++) gidset[i] = val.gval; n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1, - gidset); + gidset); /* Exit non-zero if getgroups seems to require an array of ints. This happens when gid_t is short but getgroups modifies an array of ints. */ exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0); }]])], - [ac_cv_type_getgroups=gid_t], - [ac_cv_type_getgroups=int], - [ac_cv_type_getgroups=cross]) + [ac_cv_type_getgroups=gid_t], + [ac_cv_type_getgroups=int], + [ac_cv_type_getgroups=cross]) if test $ac_cv_type_getgroups = cross; then dnl When we can't run the test program (we are cross compiling), presume dnl that has either an accurate prototype for getgroups or none. @@ -285,8 +285,8 @@ ac_cv_type_getgroups=gid_t, ac_cv_type_getgroups=int) fi]) AC_DEFINE_UNQUOTED(GETGROUPS_T, $ac_cv_type_getgroups, - [Define to the type of elements in the array set by - `getgroups'. Usually this is either `int' or `gid_t'.]) + [Define to the type of elements in the array set by + `getgroups'. Usually this is either `int' or `gid_t'.]) ])# AC_TYPE_GETGROUPS @@ -363,12 +363,12 @@ void (*signal ()) (); #endif ], - [int i;])], - [ac_cv_type_signal=void], - [ac_cv_type_signal=int])]) + [int i;])], + [ac_cv_type_signal=void], + [ac_cv_type_signal=int])]) AC_DEFINE_UNQUOTED(RETSIGTYPE, $ac_cv_type_signal, - [Define as the return type of signal handlers - (`int' or `void').]) + [Define as the return type of signal handlers + (`int' or `void').]) ]) @@ -385,7 +385,7 @@ # --------------------------------------------------------------- AC_DEFUN([AC_CHECK_SIZEOF], [AS_LITERAL_IF([$1], [], - [AC_FATAL([$0: requires literal arguments])])dnl + [AC_FATAL([$0: requires literal arguments])])dnl AC_CHECK_TYPE([$1], [], [], [$3]) AC_CACHE_CHECK([size of $1], AS_TR_SH([ac_cv_sizeof_$1]), [if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then @@ -394,14 +394,14 @@ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. _AC_COMPUTE_INT([(long) (sizeof ($1))], - [AS_TR_SH([ac_cv_sizeof_$1])], - [AC_INCLUDES_DEFAULT([$3])], - [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) + [AS_TR_SH([ac_cv_sizeof_$1])], + [AC_INCLUDES_DEFAULT([$3])], + [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])]) else AS_TR_SH([ac_cv_sizeof_$1])=0 fi])dnl AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]), - [The size of a `$1', as computed by sizeof.]) + [The size of a `$1', as computed by sizeof.]) ])# AC_CHECK_SIZEOF @@ -416,12 +416,12 @@ AU_DEFUN([AC_INT_16_BITS], [AC_CHECK_SIZEOF([int]) AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon `INT_16_BITS', but upon - `SIZEOF_INT'. Remove this warning and the `AC_DEFINE' when you - adjust the code.])dnl + your code should no longer depend upon `INT_16_BITS', but upon + `SIZEOF_INT'. Remove this warning and the `AC_DEFINE' when you + adjust the code.])dnl test $ac_cv_sizeof_int = 2 && AC_DEFINE(INT_16_BITS, 1, - [Define to 1 if `sizeof (int)' = 2. Obsolete, use `SIZEOF_INT'.]) + [Define to 1 if `sizeof (int)' = 2. Obsolete, use `SIZEOF_INT'.]) ]) @@ -430,13 +430,13 @@ AU_DEFUN([AC_LONG_64_BITS], [AC_CHECK_SIZEOF([long int]) AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon `LONG_64_BITS', but upon - `SIZEOF_LONG_INT'. Remove this warning and the `AC_DEFINE' when - you adjust the code.])dnl + your code should no longer depend upon `LONG_64_BITS', but upon + `SIZEOF_LONG_INT'. Remove this warning and the `AC_DEFINE' when + you adjust the code.])dnl test $ac_cv_sizeof_long_int = 8 && AC_DEFINE(LONG_64_BITS, 1, - [Define to 1 if `sizeof (long int)' = 8. Obsolete, use - `SIZEOF_LONG_INT'.]) + [Define to 1 if `sizeof (long int)' = 8. Obsolete, use + `SIZEOF_LONG_INT'.]) ]) @@ -458,9 +458,9 @@ # variables are not a valid argument. AC_DEFUN([AC_CHECK_MEMBER], [AS_LITERAL_IF([$1], [], - [AC_FATAL([$0: requires literal arguments])])dnl + [AC_FATAL([$0: requires literal arguments])])dnl m4_bmatch([$1], [\.], , - [m4_fatal([$0: Did not see any dot in `$1'])])dnl + [m4_fatal([$0: Did not see any dot in `$1'])])dnl AS_VAR_PUSHDEF([ac_Member], [ac_cv_member_$1])dnl dnl Extract the aggregate name, and the member name AC_CACHE_CHECK([for $1], ac_Member, @@ -470,15 +470,15 @@ dnl ac_aggr.MEMBER; if (ac_aggr.m4_bpatsubst([$1], [^[^.]*\.])) return 0;])], - [AS_VAR_SET(ac_Member, yes)], + [AS_VAR_SET(ac_Member, yes)], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])], [dnl AGGREGATE ac_aggr; static m4_bpatsubst([$1], [\..*]) ac_aggr; dnl sizeof ac_aggr.MEMBER; if (sizeof ac_aggr.m4_bpatsubst([$1], [^[^.]*\.])) return 0;])], - [AS_VAR_SET(ac_Member, yes)], - [AS_VAR_SET(ac_Member, no)])])]) + [AS_VAR_SET(ac_Member, yes)], + [AS_VAR_SET(ac_Member, no)])])]) AS_IF([test AS_VAR_GET(ac_Member) = yes], [$2], [$3])dnl AS_VAR_POPDEF([ac_Member])dnl ])# AC_CHECK_MEMBER @@ -492,13 +492,13 @@ AC_DEFUN([AC_CHECK_MEMBERS], [m4_foreach([AC_Member], [$1], [AC_CHECK_MEMBER(AC_Member, - [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_Member), 1, - [Define to 1 if `]m4_bpatsubst(AC_Member, - [^[^.]*\.])[' is - member of `]m4_bpatsubst(AC_Member, [\..*])['.]) + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]AC_Member), 1, + [Define to 1 if `]m4_bpatsubst(AC_Member, + [^[^.]*\.])[' is + member of `]m4_bpatsubst(AC_Member, [\..*])['.]) $2], - [$3], - [$4])])]) + [$3], + [$4])])]) @@ -516,14 +516,14 @@ # -------------------- AU_DEFUN([AC_STRUCT_ST_BLKSIZE], [AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon `HAVE_ST_BLKSIZE', but - `HAVE_STRUCT_STAT_ST_BLKSIZE'. Remove this warning and - the `AC_DEFINE' when you adjust the code.]) + your code should no longer depend upon `HAVE_ST_BLKSIZE', but + `HAVE_STRUCT_STAT_ST_BLKSIZE'. Remove this warning and + the `AC_DEFINE' when you adjust the code.]) AC_CHECK_MEMBERS([struct stat.st_blksize], - [AC_DEFINE(HAVE_ST_BLKSIZE, 1, - [Define to 1 if your `struct stat' has - `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead.])]) + [AC_DEFINE(HAVE_ST_BLKSIZE, 1, + [Define to 1 if your `struct stat' has + `st_blksize'. Deprecated, use + `HAVE_STRUCT_STAT_ST_BLKSIZE' instead.])]) ])# AC_STRUCT_ST_BLKSIZE @@ -544,11 +544,11 @@ AN_IDENTIFIER([st_blocks], [AC_STRUCT_ST_BLOCKS]) AC_DEFUN([AC_STRUCT_ST_BLOCKS], [AC_CHECK_MEMBERS([struct stat.st_blocks], - [AC_DEFINE(HAVE_ST_BLOCKS, 1, - [Define to 1 if your `struct stat' has - `st_blocks'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLOCKS' instead.])], - [AC_LIBOBJ([fileblocks])]) + [AC_DEFINE(HAVE_ST_BLOCKS, 1, + [Define to 1 if your `struct stat' has + `st_blocks'. Deprecated, use + `HAVE_STRUCT_STAT_ST_BLOCKS' instead.])], + [AC_LIBOBJ([fileblocks])]) ])# AC_STRUCT_ST_BLOCKS @@ -556,14 +556,14 @@ # ----------------- AU_DEFUN([AC_STRUCT_ST_RDEV], [AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon `HAVE_ST_RDEV', but - `HAVE_STRUCT_STAT_ST_RDEV'. Remove this warning and - the `AC_DEFINE' when you adjust the code.]) + your code should no longer depend upon `HAVE_ST_RDEV', but + `HAVE_STRUCT_STAT_ST_RDEV'. Remove this warning and + the `AC_DEFINE' when you adjust the code.]) AC_CHECK_MEMBERS([struct stat.st_rdev], - [AC_DEFINE(HAVE_ST_RDEV, 1, - [Define to 1 if your `struct stat' has `st_rdev'. - Deprecated, use `HAVE_STRUCT_STAT_ST_RDEV' - instead.])]) + [AC_DEFINE(HAVE_ST_RDEV, 1, + [Define to 1 if your `struct stat' has `st_rdev'. + Deprecated, use `HAVE_STRUCT_STAT_ST_RDEV' + instead.])]) ])# AC_STRUCT_ST_RDEV @@ -578,12 +578,12 @@ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include #include ], - [struct tm *tp; tp->tm_sec;])], - [ac_cv_struct_tm=time.h], - [ac_cv_struct_tm=sys/time.h])]) + [struct tm *tp; tp->tm_sec;])], + [ac_cv_struct_tm=time.h], + [ac_cv_struct_tm=sys/time.h])]) if test $ac_cv_struct_tm = sys/time.h; then AC_DEFINE(TM_IN_SYS_TIME, 1, - [Define to 1 if your declares `struct tm'.]) + [Define to 1 if your declares `struct tm'.]) fi ])# AC_STRUCT_TM @@ -601,8 +601,8 @@ ]) if test "$ac_cv_member_struct_tm_tm_zone" = yes; then AC_DEFINE(HAVE_TM_ZONE, 1, - [Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use - `HAVE_STRUCT_TM_TM_ZONE' instead.]) + [Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use + `HAVE_STRUCT_TM_TM_ZONE' instead.]) else AC_CACHE_CHECK(for tzname, ac_cv_var_tzname, [AC_LINK_IFELSE([AC_LANG_PROGRAM( @@ -612,12 +612,12 @@ #endif ]], [atoi(*tzname);])], - [ac_cv_var_tzname=yes], - [ac_cv_var_tzname=no])]) + [ac_cv_var_tzname=yes], + [ac_cv_var_tzname=no])]) if test $ac_cv_var_tzname = yes; then AC_DEFINE(HAVE_TZNAME, 1, - [Define to 1 if you don't have `tm_zone' but do have the external - array `tzname'.]) + [Define to 1 if you don't have `tm_zone' but do have the external + array `tzname'.]) fi fi ])# AC_STRUCT_TIMEZONE Index: lib/autotest/general.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/autotest/general.m4,v retrieving revision 1.142 diff -u -u -r1.142 general.m4 --- lib/autotest/general.m4 29 Apr 2003 20:54:12 -0000 1.142 +++ lib/autotest/general.m4 22 May 2003 12:05:40 -0000 @@ -126,7 +126,7 @@ m4_define([AT_INIT], [m4_pattern_forbid([^_?AT_]) m4_define([AT_TESTSUITE_NAME], - m4_defn([AT_PACKAGE_STRING])[ test suite]m4_ifval([$1], [: $1])) + m4_defn([AT_PACKAGE_STRING])[ test suite]m4_ifval([$1], [: $1])) m4_define([AT_ordinal], 0) m4_define([AT_banner_ordinal], 0) AS_INIT @@ -224,58 +224,58 @@ case $at_option in --help | -h ) - at_help_p=: - ;; + at_help_p=: + ;; --list | -l ) - at_list_p=: - ;; + at_list_p=: + ;; --version | -V ) - echo "$as_me (AT_PACKAGE_STRING)" - exit 0 - ;; + echo "$as_me (AT_PACKAGE_STRING)" + exit 0 + ;; --clean | -c ) - rm -rf $at_suite_dir $as_me.log - exit 0 - ;; + rm -rf $at_suite_dir $as_me.log + exit 0 + ;; --debug | -d ) - at_debug_p=: - ;; + at_debug_p=: + ;; --errexit | -e ) - at_debug_p=: - at_errexit_p=: - ;; + at_debug_p=: + at_errexit_p=: + ;; --verbose | -v ) - at_verbose=echo; at_quiet=: - ;; + at_verbose=echo; at_quiet=: + ;; --trace | -x ) - at_traceon='set -vx'; at_traceoff='set +vx' - ;; + at_traceon='set -vx'; at_traceoff='set +vx' + ;; [[0-9] | [0-9][0-9] | [0-9][0-9][0-9] | [0-9][0-9][0-9][0-9]]) - at_groups="$at_groups$at_option " - ;; + at_groups="$at_groups$at_option " + ;; # Ranges [[0-9]- | [0-9][0-9]- | [0-9][0-9][0-9]- | [0-9][0-9][0-9][0-9]-]) - at_range_start=`echo $at_option |tr -d '-'` - at_range=`echo " $at_groups_all " | \ - sed -e 's,^.* '$at_range_start' ,'$at_range_start' ,'` - at_groups="$at_groups$at_range " - ;; + at_range_start=`echo $at_option |tr -d '-'` + at_range=`echo " $at_groups_all " | \ + sed -e 's,^.* '$at_range_start' ,'$at_range_start' ,'` + at_groups="$at_groups$at_range " + ;; [-[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | -[0-9][0-9][0-9][0-9]]) - at_range_end=`echo $at_option |tr -d '-'` - at_range=`echo " $at_groups_all " | \ - sed -e 's, '$at_range_end' .*$, '$at_range_end','` - at_groups="$at_groups$at_range " - ;; + at_range_end=`echo $at_option |tr -d '-'` + at_range=`echo " $at_groups_all " | \ + sed -e 's, '$at_range_end' .*$, '$at_range_end','` + at_groups="$at_groups$at_range " + ;; [[0-9]-[0-9] | [0-9]-[0-9][0-9] | [0-9]-[0-9][0-9][0-9]] | \ [[0-9]-[0-9][0-9][0-9][0-9] | [0-9][0-9]-[0-9][0-9]] | \ @@ -283,14 +283,14 @@ [[0-9][0-9][0-9]-[0-9][0-9][0-9]] | \ [[0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]] | \ [[0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9]] ) - at_range_start=`echo $at_option |sed 's,-.*,,'` - at_range_end=`echo $at_option |sed 's,.*-,,'` - # FIXME: Maybe test to make sure start <= end? - at_range=`echo " $at_groups_all " | \ - sed -e 's,^.* '$at_range_start' ,'$at_range_start' ,' \ - -e 's, '$at_range_end' .*$, '$at_range_end','` - at_groups="$at_groups$at_range " - ;; + at_range_start=`echo $at_option |sed 's,-.*,,'` + at_range_end=`echo $at_option |sed 's,.*-,,'` + # FIXME: Maybe test to make sure start <= end? + at_range=`echo " $at_groups_all " | \ + sed -e 's,^.* '$at_range_start' ,'$at_range_start' ,' \ + -e 's, '$at_range_end' .*$, '$at_range_end','` + at_groups="$at_groups$at_range " + ;; # Keywords. --keywords | -k ) @@ -316,9 +316,9 @@ ;; *) echo "$as_me: invalid option: $at_option" >&2 - echo "Try \`$[0] --help' for more information." >&2 - exit 1 - ;; + echo "Try \`$[0] --help' for more information." >&2 + exit 1 + ;; esac done @@ -377,13 +377,13 @@ Execution tuning: -k, --keywords=KEYWORDS - select the tests matching all the comma separated KEYWORDS - accumulates + select the tests matching all the comma separated KEYWORDS + accumulates -e, --errexit abort as soon as a test fails; implies --debug -v, --verbose force more detailed output - default for debugging scripts + default for debugging scripts -d, --debug inhibit clean up and debug script creation - default for debugging scripts + default for debugging scripts -x, --trace enable tests shell tracing _ATEOF m4_divert_pop([HELP_TUNING])dnl @@ -408,9 +408,9 @@ at_groups_pattern=`echo "$at_groups" | sed 's/^ *//;s/ *$//;s/ */|/g'` echo "$at_help_all" | awk 'BEGIN { FS = ";" } - { if ($[1] !~ /^('"$at_groups_pattern"')$/) next } - { if ($[1]) printf " %3d: %-18s %s\n", $[1], $[2], $[3] - if ($[4]) printf " %s\n", $[4] } ' + { if ($[1] !~ /^('"$at_groups_pattern"')$/) next } + { if ($[1]) printf " %3d: %-18s %s\n", $[1], $[2], $[3] + if ($[4]) printf " %s\n", $[4] } ' exit 0 fi m4_divert_pop([HELP_END])dnl @@ -451,8 +451,8 @@ [as_dir=`(cd "$as_dir" && pwd) 2>/dev/null` test -d "$as_dir" || continue case $PATH in - $as_dir | \ - $as_dir$PATH_SEPARATOR* | \ + $as_dir | \ + $as_dir$PATH_SEPARATOR* | \ *$PATH_SEPARATOR$as_dir | \ *$PATH_SEPARATOR$as_dir$PATH_SEPARATOR* ) ;; @@ -617,46 +617,46 @@ banner-*) ;; *) if test ! -f $at_check_line_file; then - sed "s/^ */$as_me: warning: /" <<_ATEOF - A failure happened in a test group before any test could be - run. This means that test suite is improperly designed. Please - report this failure to . + sed "s/^ */$as_me: warning: /" <<_ATEOF + A failure happened in a test group before any test could be + run. This means that test suite is improperly designed. Please + report this failure to . _ATEOF echo "$at_setup_line" >$at_check_line_file fi at_group_count=`expr 1 + $at_group_count` $at_verbose $ECHO_N "$at_group. $at_setup_line: $ECHO_C" case $at_status in - 0) at_msg="ok" - at_pass_list="$at_pass_list $at_group" - # Cleanup the group directory, unless the user wants the files. - $at_debug_p || rm -rf $at_group_dir - ;; - 77) at_msg="ok (skipped near \``cat $at_check_line_file`')" - at_skip_list="$at_skip_list $at_group" - # Cleanup the group directory, unless the user wants the files. - $at_debug_p || rm -rf $at_group_dir - ;; - *) at_msg="FAILED near \``cat $at_check_line_file`'" - at_fail_list="$at_fail_list $at_group" - # Up failure, keep the group directory for autopsy. - # Create the debugging script. - { - echo "#! /bin/sh" - echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"address@hidden"}'\''='\''"address@hidden"'\''' - echo "cd $at_dir" - echo 'exec ${CONFIG_SHELL-'"$SHELL"'}' "$[0]" \ - '-v -d' "$at_debug_args" "$at_group" '${1+"address@hidden"}' - echo 'exit 1' - } >$at_group_dir/run - chmod +x $at_group_dir/run - ;; + 0) at_msg="ok" + at_pass_list="$at_pass_list $at_group" + # Cleanup the group directory, unless the user wants the files. + $at_debug_p || rm -rf $at_group_dir + ;; + 77) at_msg="ok (skipped near \``cat $at_check_line_file`')" + at_skip_list="$at_skip_list $at_group" + # Cleanup the group directory, unless the user wants the files. + $at_debug_p || rm -rf $at_group_dir + ;; + *) at_msg="FAILED near \``cat $at_check_line_file`'" + at_fail_list="$at_fail_list $at_group" + # Up failure, keep the group directory for autopsy. + # Create the debugging script. + { + echo "#! /bin/sh" + echo 'test "${ZSH_VERSION+set}" = set && alias -g '\''${1+"address@hidden"}'\''='\''"address@hidden"'\''' + echo "cd $at_dir" + echo 'exec ${CONFIG_SHELL-'"$SHELL"'}' "$[0]" \ + '-v -d' "$at_debug_args" "$at_group" '${1+"address@hidden"}' + echo 'exit 1' + } >$at_group_dir/run + chmod +x $at_group_dir/run + ;; esac echo $at_msg at_log_msg="$at_group. $at_setup_line: $at_msg" # If the group failed, $at_times_file is not available. test -f $at_times_file && - at_log_msg="$at_log_msg (`sed 1d $at_times_file`)" + at_log_msg="$at_log_msg (`sed 1d $at_times_file`)" echo "$at_log_msg" >&AS_MESSAGE_LOG_FD $at_errexit_p && test -n "$at_fail_list" && break ;; @@ -791,7 +791,7 @@ at_setup_line='m4_defn([AT_line])' $at_verbose "AT_ordinal. m4_defn([AT_line]): testing $1..." $at_quiet $ECHO_N "m4_format([[%3d: %-18s]], - AT_ordinal, m4_defn([AT_line]))[]$ECHO_C" + AT_ordinal, m4_defn([AT_line]))[]$ECHO_C" ( $at_traceon ]) @@ -928,18 +928,18 @@ at_failed=false dnl Check stderr. m4_case([$4], - stderr, [(echo stderr:; tee stderr <$at_stderr) >&5], - ignore, [(echo stderr:; cat $at_stderr) >&5], - experr, [$at_diff experr $at_stderr >&5 || at_failed=:], - [], [$at_diff $at_devnull $at_stderr >&5 || at_failed=:], - [echo >>$at_stderr; echo "AS_ESCAPE([$4])" | $at_diff - $at_stderr >&5 || at_failed=:]) + stderr, [(echo stderr:; tee stderr <$at_stderr) >&5], + ignore, [(echo stderr:; cat $at_stderr) >&5], + experr, [$at_diff experr $at_stderr >&5 || at_failed=:], + [], [$at_diff $at_devnull $at_stderr >&5 || at_failed=:], + [echo >>$at_stderr; echo "AS_ESCAPE([$4])" | $at_diff - $at_stderr >&5 || at_failed=:]) dnl Check stdout. m4_case([$3], - stdout, [(echo stdout:; tee stdout <$at_stdout) >&5], - ignore, [(echo stdout:; cat $at_stdout) >&5], - expout, [$at_diff expout $at_stdout >&5 || at_failed=:], - [], [$at_diff $at_devnull $at_stdout >&5 || at_failed=:], - [echo >>$at_stdout; echo "AS_ESCAPE([$3])" | $at_diff - $at_stdout >&5 || at_failed=:]) + stdout, [(echo stdout:; tee stdout <$at_stdout) >&5], + ignore, [(echo stdout:; cat $at_stdout) >&5], + expout, [$at_diff expout $at_stdout >&5 || at_failed=:], + [], [$at_diff $at_devnull $at_stdout >&5 || at_failed=:], + [echo >>$at_stdout; echo "AS_ESCAPE([$3])" | $at_diff - $at_stdout >&5 || at_failed=:]) dnl Check exit val. Don't `skip' if we are precisely checking $? = 77. case $at_status in m4_case([$2], Index: lib/m4sugar/m4sh.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sh.m4,v retrieving revision 1.96 diff -u -u -r1.96 m4sh.m4 --- lib/m4sugar/m4sh.m4 21 May 2003 19:04:41 -0000 1.96 +++ lib/m4sugar/m4sh.m4 22 May 2003 12:05:40 -0000 @@ -131,7 +131,7 @@ # m4_define([AS_REQUIRE], [m4_provide_if([$1], [], - [m4_divert_text([M4SH-INIT], [$1])])]) + [m4_divert_text([M4SH-INIT], [$1])])]) # AS_SHELL_SANITIZE @@ -312,8 +312,8 @@ # Escape the CHARS in STRING. m4_define([AS_ESCAPE], [m4_bpatsubst([$1], - m4_ifval([$2], [[\([$2]\)]], [[\([\"$`]\)]]), - [\\\1])]) + m4_ifval([$2], [[\([$2]\)]], [[\([\"$`]\)]]), + [\\\1])]) # _AS_QUOTE_IFELSE(STRING, IF-MODERN-QUOTATION, IF-OLD-QUOTATION) @@ -326,9 +326,9 @@ # We use two quotes in the pattern to keep highlighting tools at peace. m4_define([_AS_QUOTE_IFELSE], [m4_bmatch([$1], - [\\[\\$]], [$2], - [\\[`""]], [$3], - [$2])]) + [\\[\\$]], [$2], + [\\[`""]], [$3], + [$2])]) # _AS_ECHO_UNQUOTED(STRING, [FD = AS_MESSAGE_FD]) @@ -344,9 +344,9 @@ # backslash all the quotes. m4_define([_AS_QUOTE], [_AS_QUOTE_IFELSE([$1], - [AS_ESCAPE([$1], m4_default([$2], [`""]))], - [m4_warn([obsolete], - [back quotes and double quotes must not be escaped in: $1])dnl + [AS_ESCAPE([$1], m4_default([$2], [`""]))], + [m4_warn([obsolete], + [back quotes and double quotes must not be escaped in: $1])dnl $1])]) @@ -382,16 +382,16 @@ m4_define([_AS_ECHO_N], [AS_REQUIRE([_AS_ECHO_N_PREPARE])dnl echo $ECHO_N "_AS_QUOTE([$1])$ECHO_C" >&m4_default([$2], - [AS_MESSAGE_FD])]) + [AS_MESSAGE_FD])]) # AS_MESSAGE(STRING, [FD = AS_MESSAGE_FD]) # ---------------------------------------- m4_define([AS_MESSAGE], [m4_ifset([AS_MESSAGE_LOG_FD], - [{ _AS_ECHO([$as_me:$LINENO: $1], [AS_MESSAGE_LOG_FD]) + [{ _AS_ECHO([$as_me:$LINENO: $1], [AS_MESSAGE_LOG_FD]) _AS_ECHO([$as_me: $1], [$2]);}], - [_AS_ECHO([$as_me: $1], [$2])])[]dnl + [_AS_ECHO([$as_me: $1], [$2])])[]dnl ]) @@ -431,10 +431,10 @@ m4_defun([AS_DIRNAME_EXPR], [AS_REQUIRE([_AS_EXPR_PREPARE])dnl $as_expr X[]$1 : 'X\(.*[[^/]]\)//*[[^/][^/]]*/*$' \| \ - X[]$1 : 'X\(//\)[[^/]]' \| \ - X[]$1 : 'X\(//\)$' \| \ - X[]$1 : 'X\(/\)' \| \ - . : '\(.\)']) + X[]$1 : 'X\(//\)[[^/]]' \| \ + X[]$1 : 'X\(//\)$' \| \ + X[]$1 : 'X\(/\)' \| \ + . : '\(.\)']) m4_defun([AS_DIRNAME_SED], [echo X[]$1 | @@ -541,7 +541,7 @@ case $[0] in *[[\\/]]* ) as_myself=$[0] ;; *) _AS_PATH_WALK([], - [test -r "$as_dir/$[0]" && as_myself=$as_dir/$[0] && break]) + [test -r "$as_dir/$[0]" && as_myself=$as_dir/$[0] && break]) ;; esac # We did not find ourselves, most probably we were run as `sh COMMAND' @@ -760,8 +760,8 @@ # must not be `/'). m4_define([AS_BOX], [AS_LITERAL_IF([$1], - [_AS_BOX_LITERAL($@)], - [_AS_BOX_INDIR($@)])]) + [_AS_BOX_LITERAL($@)], + [_AS_BOX_INDIR($@)])]) # _AS_BOX_LITERAL(MESSAGE, [FRAME-CHARACTER = `-']) # ------------------------------------------------- @@ -786,7 +786,7 @@ # definitely a literal, but will not be recognized as such. m4_define([AS_LITERAL_IF], [m4_bmatch([$1], [[`$]], - [$3], [$2])]) + [$3], [$2])]) # AS_TMPDIR(PREFIX, [DIRECTORY = $TMPDIR [= /tmp]]) @@ -896,7 +896,7 @@ m4_define([AS_HELP_STRING], [m4_pushdef([AS_Prefix], m4_default([$3], [ ]))dnl m4_pushdef([AS_Prefix_Format], - [ %-]m4_eval(m4_len(AS_Prefix) - 3)[s ])dnl [ %-23s ] + [ %-]m4_eval(m4_len(AS_Prefix) - 3)[s ])dnl [ %-23s ] m4_text_wrap([$2], AS_Prefix, m4_format(AS_Prefix_Format, [$1]))dnl m4_popdef([AS_Prefix_Format])dnl m4_popdef([AS_Prefix])dnl @@ -945,9 +945,9 @@ m4_defun([AS_TR_SH], [AS_REQUIRE([_$0_PREPARE])dnl AS_LITERAL_IF([$1], - [m4_bpatsubst(m4_translit([[$1]], [*+], [pp]), - [[^a-zA-Z0-9_]], [_])], - [`echo "$1" | $as_tr_sh`])]) + [m4_bpatsubst(m4_translit([[$1]], [*+], [pp]), + [[^a-zA-Z0-9_]], [_])], + [`echo "$1" | $as_tr_sh`])]) # _AS_TR_CPP_PREPARE @@ -967,11 +967,11 @@ m4_defun([AS_TR_CPP], [AS_REQUIRE([_$0_PREPARE])dnl AS_LITERAL_IF([$1], - [m4_bpatsubst(m4_translit([[$1]], - [*abcdefghijklmnopqrstuvwxyz], - [PABCDEFGHIJKLMNOPQRSTUVWXYZ]), - [[^A-Z0-9_]], [_])], - [`echo "$1" | $as_tr_cpp`])]) + [m4_bpatsubst(m4_translit([[$1]], + [*abcdefghijklmnopqrstuvwxyz], + [PABCDEFGHIJKLMNOPQRSTUVWXYZ]), + [[^A-Z0-9_]], [_])], + [`echo "$1" | $as_tr_cpp`])]) # _AS_TR_PREPARE @@ -1005,8 +1005,8 @@ # perform whenever possible at m4 level, otherwise sh level. m4_define([AS_VAR_SET], [AS_LITERAL_IF([$1], - [$1=$2], - [eval "$1=AS_ESCAPE([$2])"])]) + [$1=$2], + [eval "$1=AS_ESCAPE([$2])"])]) # AS_VAR_GET(VARIABLE) @@ -1016,8 +1016,8 @@ # else into the appropriate `eval' sequence. m4_define([AS_VAR_GET], [AS_LITERAL_IF([$1], - [$$1], - [`eval echo '${'m4_bpatsubst($1, [[\\`]], [\\\&])'}'`])]) + [$$1], + [`eval echo '${'m4_bpatsubst($1, [[\\`]], [\\\&])'}'`])]) # AS_VAR_TEST_SET(VARIABLE) @@ -1026,8 +1026,8 @@ # is set. Polymorphic. Should be dnl'ed. m4_define([AS_VAR_TEST_SET], [AS_LITERAL_IF([$1], - [test "${$1+set}" = set], - [eval "test \"\${$1+set}\" = set"])]) + [test "${$1+set}" = set], + [eval "test \"\${$1+set}\" = set"])]) # AS_VAR_SET_IF(VARIABLE, IF-TRUE, IF-FALSE) @@ -1071,8 +1071,8 @@ # the transliteration is handled here. To be dnl'ed. m4_define([AS_VAR_PUSHDEF], [AS_LITERAL_IF([$2], - [m4_pushdef([$1], [AS_TR_SH($2)])], - [as_$1=AS_TR_SH($2) + [m4_pushdef([$1], [AS_TR_SH($2)])], + [as_$1=AS_TR_SH($2) m4_pushdef([$1], [$as_[$1]])])]) Index: lib/m4sugar/m4sugar.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/lib/m4sugar/m4sugar.m4,v retrieving revision 2.70 diff -u -u -r2.70 m4sugar.m4 --- lib/m4sugar/m4sugar.m4 19 May 2003 18:15:37 -0000 2.70 +++ lib/m4sugar/m4sugar.m4 22 May 2003 12:05:40 -0000 @@ -228,12 +228,12 @@ # Implementation of the loop described above. m4_define([_m4_warning_ifelse], [m4_case([$4], - [$1], [$2], - [all], [$2], - [], [$3], - [none], [$3], - [no-$1], [$3], - [$0([$1], [$2], [$3], m4_shiftn(4, $@))])]) + [$1], [$2], + [all], [$2], + [], [$3], + [none], [$3], + [no-$1], [$3], + [$0([$1], [$2], [$3], m4_shiftn(4, $@))])]) # _m4_warning_error_ifelse(IF-TRUE, IF-FALSE) @@ -248,10 +248,10 @@ # The same as _m4_warning_ifelse, but scan for `error' only. m4_define([__m4_warning_error_ifelse], [m4_case([$3], - [error], [$1], - [], [$2], - [no-error], [$2], - [$0([$1], [$2], m4_shiftn(3, $@))])]) + [error], [$1], + [], [$2], + [no-error], [$2], + [$0([$1], [$2], m4_shiftn(3, $@))])]) @@ -261,7 +261,7 @@ # in which case report a fatal error. m4_define([_m4_warn], [_m4_warning_error_ifelse([m4_fatal([$1])], - [m4_warning([$1])])]) + [m4_warning([$1])])]) # m4_warn(CATEGORY, MESSAGE) @@ -296,7 +296,7 @@ # been included. m4_define([m4_include_unique], [m4_ifdef([m4_include($1)], - [m4_warn([syntax], [file `$1' included several times])])dnl + [m4_warn([syntax], [file `$1' included several times])])dnl m4_define([m4_include($1)])]) @@ -349,7 +349,7 @@ m4_define([m4_n], [m4_if([$1], [], [], - [$1 + [$1 ])]) @@ -360,7 +360,7 @@ m4_define([m4_ifvaln], [m4_if([$1], [], [m4_n([$3])], - [m4_n([$2])])]) + [m4_n([$2])])]) # m4_ifset(MACRO, [IF-TRUE], [IF-FALSE]) @@ -369,8 +369,8 @@ # expand IF-FALSE, otherwise IF-TRUE. m4_define([m4_ifset], [m4_ifdef([$1], - [m4_if(m4_defn([$1]), [], [$3], [$2])], - [$3])]) + [m4_if(m4_defn([$1]), [], [$3], [$2])], + [$3])]) # m4_ifndef(NAME, [IF-NOT-DEFINED], [IF-DEFINED]) @@ -477,7 +477,7 @@ [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])], [$#], 2, [m4_builtin([patsubst], $@)], [$0(m4_builtin([patsubst], [[$1]], [$2], [$3]), - m4_shiftn(3, $@))])]) + m4_shiftn(3, $@))])]) @@ -512,7 +512,7 @@ # undefined. m4_define([m4_defn], [m4_ifndef([$1], - [m4_fatal([$0: undefined macro: $1])])dnl + [m4_fatal([$0: undefined macro: $1])])dnl m4_builtin([defn], $@)]) @@ -520,7 +520,7 @@ # --------------------- m4_define([_m4_dumpdefs_up], [m4_ifdef([$1], - [m4_pushdef([_m4_dumpdefs], m4_defn([$1]))dnl + [m4_pushdef([_m4_dumpdefs], m4_defn([$1]))dnl m4_dumpdef([$1])dnl m4_popdef([$1])dnl _m4_dumpdefs_up([$1])])]) @@ -530,7 +530,7 @@ # ----------------------- m4_define([_m4_dumpdefs_down], [m4_ifdef([_m4_dumpdefs], - [m4_pushdef([$1], m4_defn([_m4_dumpdefs]))dnl + [m4_pushdef([$1], m4_defn([_m4_dumpdefs]))dnl m4_popdef([_m4_dumpdefs])dnl _m4_dumpdefs_down([$1])])]) @@ -550,7 +550,7 @@ # undefined. m4_define([m4_popdef], [m4_ifndef([$1], - [m4_fatal([$0: undefined macro: $1])])dnl + [m4_fatal([$0: undefined macro: $1])])dnl m4_builtin([popdef], $@)]) @@ -595,7 +595,7 @@ # undefined. m4_define([m4_undefine], [m4_ifndef([$1], - [m4_fatal([$0: undefined macro: $1])])dnl + [m4_fatal([$0: undefined macro: $1])])dnl m4_builtin([undefine], $@)]) @@ -610,8 +610,8 @@ # Both limits are included, and bounds are checked for consistency. m4_define([m4_for], [m4_case(m4_sign(m4_eval($3 - $2)), - 1, [m4_assert(m4_sign(m4_default($4, 1)) == 1)], - -1, [m4_assert(m4_sign(m4_default($4, -1)) == -1)])dnl + 1, [m4_assert(m4_sign(m4_default($4, 1)) == 1)], + -1, [m4_assert(m4_sign(m4_default($4, -1)) == -1)])dnl m4_pushdef([$1], [$2])dnl m4_if(m4_eval([$3 > $2]), 1, [_m4_for([$1], [$3], m4_default([$4], 1), [$5])], @@ -733,8 +733,8 @@ m4_define([_m4_foreach], [m4_if([$2], [[]], [], [m4_define([$1], m4_car($2))$3[]_m4_foreach([$1], - m4_cdr($2), - [$3])])]) + m4_cdr($2), + [$3])])]) @@ -749,8 +749,8 @@ # otherwise if is a NUMBER return it. m4_define([_m4_divert], [m4_ifdef([_m4_divert($1)], - [m4_indir([_m4_divert($1)])], - [$1])]) + [m4_indir([_m4_divert($1)])], + [$1])]) # KILL is only used to suppress output. m4_define([_m4_divert(KILL)], -1) @@ -761,7 +761,7 @@ # Change the diversion stream to DIVERSION-NAME. m4_define([m4_divert], [m4_define([m4_divert_stack], - m4_location[: $0: $1]m4_ifdef([m4_divert_stack], [ + m4_location[: $0: $1]m4_ifdef([m4_divert_stack], [ m4_defn([m4_divert_stack])]))dnl m4_builtin([divert], _m4_divert([$1]))dnl ]) @@ -772,7 +772,7 @@ # Change the diversion stream to DIVERSION-NAME, while stacking old values. m4_define([m4_divert_push], [m4_pushdef([m4_divert_stack], - m4_location[: $0: $1]m4_ifdef([m4_divert_stack], [ + m4_location[: $0: $1]m4_ifdef([m4_divert_stack], [ m4_defn([m4_divert_stack])]))dnl m4_pushdef([_m4_divert_diversion], [$1])dnl m4_builtin([divert], _m4_divert(_m4_divert_diversion))dnl @@ -786,14 +786,14 @@ m4_define([m4_divert_pop], [m4_ifval([$1], [m4_if(_m4_divert([$1]), m4_divnum, [], - [m4_fatal([$0($1): diversion mismatch: ] + [m4_fatal([$0($1): diversion mismatch: ] m4_defn([m4_divert_stack]))])])dnl m4_popdef([_m4_divert_diversion])dnl dnl m4_ifndef([_m4_divert_diversion], dnl [m4_fatal([too many m4_divert_pop])])dnl m4_builtin([divert], - m4_ifdef([_m4_divert_diversion], - [_m4_divert(_m4_divert_diversion)], -1))dnl + m4_ifdef([_m4_divert_diversion], + [_m4_divert(_m4_divert_diversion)], -1))dnl m4_popdef([m4_divert_stack])dnl ]) @@ -1161,7 +1161,7 @@ # ----------------------------- m4_define([m4_expansion_stack_push], [m4_pushdef([m4_expansion_stack], - [$1]m4_ifdef([m4_expansion_stack], [ + [$1]m4_ifdef([m4_expansion_stack], [ m4_defn([m4_expansion_stack])]))]) @@ -1177,7 +1177,7 @@ # Dump the expansion stack. m4_define([m4_expansion_stack_dump], [m4_ifdef([m4_expansion_stack], - [m4_errprintn(m4_defn([m4_expansion_stack]))])dnl + [m4_errprintn(m4_defn([m4_expansion_stack]))])dnl m4_errprintn(m4_location[: the top level])]) @@ -1207,8 +1207,8 @@ [m4_expansion_stack_push(m4_defn([m4_location($1)])[: $1 is expanded from...])dnl m4_pushdef([_m4_expanding($1)])dnl m4_ifdef([_m4_divert_dump], - [m4_divert_push(m4_defn([_m4_divert_diversion]))], - [m4_copy([_m4_divert_diversion], [_m4_divert_dump])dnl + [m4_divert_push(m4_defn([_m4_divert_diversion]))], + [m4_copy([_m4_divert_diversion], [_m4_divert_dump])dnl m4_divert_push([GROW])])dnl ]) @@ -1241,7 +1241,7 @@ m4_define([m4_defun], [m4_define([m4_location($1)], m4_location)dnl m4_define([$1], - [_m4_defun_pro([$1])$2[]_m4_defun_epi([$1])])]) + [_m4_defun_pro([$1])$2[]_m4_defun_epi([$1])])]) # m4_defun_once(NAME, EXPANSION) @@ -1251,9 +1251,9 @@ m4_define([m4_defun_once], [m4_define([m4_location($1)], m4_location)dnl m4_define([$1], - [m4_provide_if([$1], - [m4_warn([syntax], [$1 invoked multiple times])], - [_m4_defun_pro([$1])$2[]_m4_defun_epi([$1])])])]) + [m4_provide_if([$1], + [m4_warn([syntax], [$1 invoked multiple times])], + [_m4_defun_pro([$1])$2[]_m4_defun_epi([$1])])])]) # m4_pattern_forbid(ERE, [WHY]) @@ -1279,7 +1279,7 @@ # --------------------------------------------- m4_define([m4_before], [m4_provide_if([$2], - [m4_warn([syntax], [$2 was called before $1])])]) + [m4_warn([syntax], [$2 was called before $1])])]) # m4_require(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK]) @@ -1317,20 +1317,20 @@ m4_define([m4_require], [m4_expansion_stack_push(m4_location[: $1 is required by...])dnl m4_ifdef([_m4_expanding($1)], - [m4_fatal([$0: circular dependency of $1])])dnl + [m4_fatal([$0: circular dependency of $1])])dnl m4_ifndef([_m4_divert_dump], - [m4_fatal([$0: cannot be used outside of an m4_defun'd macro])])dnl + [m4_fatal([$0: cannot be used outside of an m4_defun'd macro])])dnl m4_provide_if([$1], - [], - [m4_divert_push(m4_eval(m4_divnum - 1))dnl + [], + [m4_divert_push(m4_eval(m4_divnum - 1))dnl m4_default([$2], [$1]) m4_divert(m4_defn([_m4_divert_dump]))dnl m4_undivert(m4_defn([_m4_divert_diversion]))dnl m4_divert_pop(m4_defn([_m4_divert_dump]))])dnl m4_provide_if([$1], - [], - [m4_warn([syntax], - [$1 is m4_require'd but is not m4_defun'd])])dnl + [], + [m4_warn([syntax], + [$1 is m4_require'd but is not m4_defun'd])])dnl m4_expansion_stack_pop()dnl ]) @@ -1341,8 +1341,8 @@ # as a memory that TEXT has already been expanded. m4_define([m4_expand_once], [m4_provide_if(m4_ifval([$2], [[$2]], [[$1]]), - [], - [m4_provide(m4_ifval([$2], [[$2]], [[$1]]))[]$1])]) + [], + [m4_provide(m4_ifval([$2], [[$2]], [[$1]]))[]$1])]) # m4_provide(MACRO-NAME) @@ -1359,7 +1359,7 @@ # information is coded. m4_define([m4_provide_if], [m4_ifdef([m4_provide($1)], - [$2], [$3])]) + [$2], [$3])]) ## -------------------- ## @@ -1401,7 +1401,7 @@ # Escape BRE active characters in STRING. m4_define([m4_re_escape], [m4_bpatsubst([$1], - [[][+*.]], [\\\&])]) + [[][+*.]], [\\\&])]) # m4_re_string @@ -1507,9 +1507,9 @@ # character, since there are two leading `['; equally for the last pattern. m4_define([m4_strip], [m4_bpatsubsts([[$1]], - [[ ]+], [ ], - [^\(..\) ], [\1], - [ \(..\)$], [\1])]) + [[ ]+], [ ], + [^\(..\) ], [\1], + [ \(..\)$], [\1])]) # m4_normalize(STRING) @@ -1534,9 +1534,9 @@ # Produce ARG1SEPARG2...SEPARGn. m4_defun([m4_join], [m4_case([$#], - [1], [], - [2], [[$2]], - [[$2][$1]$0([$1], m4_shiftn(2, $@))])]) + [1], [], + [2], [[$2]], + [[$2][$1]$0([$1], m4_shiftn(2, $@))])]) @@ -1574,7 +1574,7 @@ # => active m4_define([m4_append], [m4_define([$1], - m4_ifdef([$1], [m4_defn([$1])$3])[$2])]) + m4_ifdef([$1], [m4_defn([$1])$3])[$2])]) # m4_append_uniq(MACRO-NAME, STRING, [SEPARATOR]) @@ -1582,9 +1582,9 @@ # As `m4_append', but append only if not yet present. m4_define([m4_append_uniq], [m4_ifdef([$1], - [m4_bmatch([$3]m4_defn([$1])[$3], m4_re_escape([$3$2$3]), [], - [m4_append($@)])], - [m4_append($@)])]) + [m4_bmatch([$3]m4_defn([$1])[$3], m4_re_escape([$3$2$3]), [], + [m4_append($@)])], + [m4_append($@)])]) # m4_text_wrap(STRING, [PREFIX], [FIRST-PREFIX], [WIDTH]) @@ -1640,7 +1640,7 @@ dnl of the words. m4_if(m4_eval(m4_Cursor > m4_Width), 1, [m4_define([m4_Cursor], - m4_eval(m4_len(m4_Prefix) + m4_len(m4_defn([m4_Word])) + 1))] + m4_eval(m4_len(m4_Prefix) + m4_len(m4_defn([m4_Word])) + 1))] m4_Prefix, [m4_Separator])[]dnl m4_defn([m4_Word])[]dnl @@ -1673,9 +1673,9 @@ # The sign of the integer A. m4_define([m4_sign], [m4_bmatch([$1], - [^-], -1, - [^0+], 0, - 1)]) + [^-], -1, + [^0+], 0, + 1)]) # m4_cmp(A, B) # ------------ @@ -1704,9 +1704,9 @@ [$1], [()], [$0((0), [$2])], [$2], [()], [$0([$1], (0))], [m4_case(m4_cmp(m4_car$1, m4_car$2), - -1, -1, - 1, 1, - 0, [$0((m4_shift$1), (m4_shift$2))])])]) + -1, -1, + 1, 1, + 0, [$0((m4_shift$1), (m4_shift$2))])])]) @@ -1726,14 +1726,14 @@ # reasonable version numbers and is valid up to `z', no double letters. m4_define([m4_version_unletter], [m4_translit(m4_bpatsubsts([$1], - [\([0-9]+\)\([abcdefghi]\)], - [m4_eval(\1 + 1).-1.\2], - [\([0-9]+\)\([jklmnopqrs]\)], - [m4_eval(\1 + 1).-1.1\2], - [\([0-9]+\)\([tuvwxyz]\)], - [m4_eval(\1 + 1).-1.2\2]), - [abcdefghijklmnopqrstuvwxyz], - [12345678901234567890123456])]) + [\([0-9]+\)\([abcdefghi]\)], + [m4_eval(\1 + 1).-1.\2], + [\([0-9]+\)\([jklmnopqrs]\)], + [m4_eval(\1 + 1).-1.1\2], + [\([0-9]+\)\([tuvwxyz]\)], + [m4_eval(\1 + 1).-1.2\2]), + [abcdefghijklmnopqrstuvwxyz], + [12345678901234567890123456])]) # m4_version_compare(VERSION-1, VERSION-2) @@ -1744,7 +1744,7 @@ # 1 if > m4_define([m4_version_compare], [m4_list_cmp((m4_split(m4_version_unletter([$1]), [\.])), - (m4_split(m4_version_unletter([$2]), [\.])))]) + (m4_split(m4_version_unletter([$2]), [\.])))]) # m4_PACKAGE_NAME @@ -1762,7 +1762,7 @@ m4_define([m4_version_prereq], [m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), -1, [m4_default([$3], - [m4_fatal([Autoconf version $1 or higher is required])])], + [m4_fatal([Autoconf version $1 or higher is required])])], [$2])[]dnl ]) @@ -1805,7 +1805,7 @@ # Check the divert push/pop perfect balance. m4_wrap([m4_ifdef([_m4_divert_diversion], - [m4_fatal([$0: unbalanced m4_divert_push:] + [m4_fatal([$0: unbalanced m4_divert_push:] m4_defn([m4_divert_stack]))])[]]) m4_divert_push([KILL]) Index: tests/atspecific.m4 =================================================================== RCS file: /cvsroot/autoconf/autoconf/tests/atspecific.m4,v retrieving revision 1.77 diff -u -u -r1.77 atspecific.m4 --- tests/atspecific.m4 3 Mar 2003 20:13:50 -0000 1.77 +++ tests/atspecific.m4 22 May 2003 12:05:40 -0000 @@ -53,11 +53,11 @@ [AT_CHECK([autom4te $1], [$2], [$3], m4_ifval([$4], [stderr])) m4_ifval([$4], [AT_CHECK([[sed -e 's,^\([^:]*\): *\([0-9][0-9]*\): *[^:]*m4: ,m4: \1: \2: ,' \ - -e 's,^[^:]*m4: *\([^:]*\): *\([0-9][0-9]*\): ,m4: \1: \2: ,' \ - -e 's/^autom4te: [^ ]*m4 /autom4te: m4 /' \ - -e 's/^autom4te: [^ ]*m4.exe /autom4te: m4 /' \ - -e 's/ (E[A-Z]*)$//' \ - stderr]], [0],[$4])]) + -e 's,^[^:]*m4: *\([^:]*\): *\([0-9][0-9]*\): ,m4: \1: \2: ,' \ + -e 's/^autom4te: [^ ]*m4 /autom4te: m4 /' \ + -e 's/^autom4te: [^ ]*m4.exe /autom4te: m4 /' \ + -e 's/ (E[A-Z]*)$//' \ + stderr]], [0],[$4])]) ]) @@ -73,16 +73,16 @@ m4_define([AT_DATA_M4SUGAR], [AT_DATA([$1], [m4_bpatsubsts([$2], - [@&address@hidden, [@&@&address@hidden@], - [\(m4\)_], [\1@&address@hidden, - [dnl], [d@&address@hidden)])]) + [@&address@hidden, [@&@&address@hidden@], + [\(m4\)_], [\1@&address@hidden, + [dnl], [d@&address@hidden)])]) # AT_CHECK_M4SUGAR(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR) # ---------------------------------------------------------- m4_define([AT_CHECK_M4SUGAR], [AT_CHECK_AUTOM4TE([--language=m4sugar script.4s -o script $1], - m4_default([$2], [0]), [$3], [$4])]) + m4_default([$2], [0]), [$3], [$4])]) @@ -97,16 +97,16 @@ m4_define([AT_DATA_M4SH], [AT_DATA([$1], [m4_bpatsubsts([$2], - [@&address@hidden, [@&@&address@hidden@], - [\(m4\|AS\)_], [\1@&address@hidden, - [dnl], [d@&address@hidden)])]) + [@&address@hidden, [@&@&address@hidden@], + [\(m4\|AS\)_], [\1@&address@hidden, + [dnl], [d@&address@hidden)])]) # AT_CHECK_M4SH(FLAGS, [EXIT-STATUS = 0], STDOUT, STDERR) # ------------------------------------------------------- m4_define([AT_CHECK_M4SH], [AT_CHECK([autom4te --language=m4sh script.as -o script $1], - m4_default([$2], [0]), [$3], [$4])]) + m4_default([$2], [0]), [$3], [$4])]) @@ -121,9 +121,9 @@ m4_define([AT_DATA_AUTOCONF], [AT_DATA([$1], [m4_bpatsubsts([$2], - [@&address@hidden, [@&@&address@hidden@], - [\(m4\|AS\|AC\)_], [\1@&address@hidden, - [dnl], [d@&address@hidden)])]) + [@&address@hidden, [@&@&address@hidden@], + [\(m4\|AS\|AC\)_], [\1@&address@hidden, + [dnl], [d@&address@hidden)])]) @@ -211,7 +211,7 @@ # ---------------------------------------------------------- m4_define([AT_CHECK_AUTOCONF], [AT_CHECK([autoconf $1], - [$2], [$3], [$4])]) + [$2], [$3], [$4])]) # AT_CHECK_AUTOHEADER(ARGS, [EXIT-STATUS = 0], STDOUT, STDERR) @@ -229,9 +229,9 @@ # Using --srcdir is more expensive. m4_define([AT_CHECK_CONFIGURE], [AT_CHECK([top_srcdir=$abs_top_srcdir ./configure $1], - [$2], - m4_default([$3], [ignore]), [$4], - [test $at_verbose = echo && echo "$srcdir/AT_LINE: config.log" && cat config.log])]) + [$2], + m4_default([$3], [ignore]), [$4], + [test $at_verbose = echo && echo "$srcdir/AT_LINE: config.log" && cat config.log])]) # AT_CHECK_ENV @@ -273,7 +273,7 @@ /SYS_STAT/d /SYS_TYPES/d /UNISTD/d' config.h]],, - [$1])]) + [$1])]) # AT_CHECK_AUTOUPDATE Index: tests/base.at =================================================================== RCS file: /cvsroot/autoconf/autoconf/tests/base.at,v retrieving revision 1.30 diff -u -u -r1.30 base.at --- tests/base.at 8 Oct 2001 08:21:00 -0000 1.30 +++ tests/base.at 22 May 2003 12:05:40 -0000 @@ -192,8 +192,8 @@ AT_DATA([configure.ac], [[AC_INIT AC_CACHE_CHECK([for nothing], - [ac_nothing], - [ac_nothing=found]) + [ac_nothing], + [ac_nothing=found]) ]]) AT_CHECK_AUTOCONF @@ -212,16 +212,16 @@ [[AC_INIT if AC_TRY_COMMAND([(echo "The Cat in the Hat"; - echo "The Hat in the Cat" >&2) - | grep \^The\ Cat\ in\ the\ Hat\$ >/dev/null]); then + echo "The Hat in the Cat" >&2) + | grep \^The\ Cat\ in\ the\ Hat\$ >/dev/null]); then : else AC_MSG_ERROR([Didn't see the Cat in the Hat!]) fi if AC_TRY_COMMAND([(echo "The Cat in the Hat"; - echo "The Hat in the Cat" >&2) - | grep \^The\ Hat\ in\ the\ Cat\$ >/dev/null]); then + echo "The Hat in the Cat" >&2) + | grep \^The\ Hat\ in\ the\ Cat\$ >/dev/null]); then AC_MSG_ERROR([Saw the Hat in the Cat!]) fi ]]) Index: tests/compile.at =================================================================== RCS file: /cvsroot/autoconf/autoconf/tests/compile.at,v retrieving revision 1.25 diff -u -u -r1.25 compile.at --- tests/compile.at 27 Sep 2001 13:28:15 -0000 1.25 +++ tests/compile.at 22 May 2003 12:05:40 -0000 @@ -117,19 +117,19 @@ [[AC_INIT AC_RUN_IFELSE([AC_LANG_PROGRAM([], [exit (0)])], - [], - [AC_MSG_ERROR([saw `exit 0' as a failure])]) + [], + [AC_MSG_ERROR([saw `exit 0' as a failure])]) AC_RUN_IFELSE([AC_LANG_PROGRAM([], [exit (2)])], - [AC_MSG_ERROR([saw `exit 2' as a success])], - [status=$? + [AC_MSG_ERROR([saw `exit 2' as a success])], + [status=$? test $status != 2 && AC_MSG_ERROR([did not get as 2 exit status: $status])]) # The old stinky one. AC_TRY_RUN([int main () { exit (3); }], - [AC_MSG_ERROR([saw `exit 3' as a success])], - [status=$? + [AC_MSG_ERROR([saw `exit 3' as a success])], + [status=$? test $status != 3 && AC_MSG_ERROR([did not get 3 as exit status: $status])]) @@ -146,6 +146,6 @@ AT_CHECK_MACRO([AC_TRY_LINK_FUNC], [AC_TRY_LINK_FUNC(printf,, - [AC_MSG_ERROR([cannot find `printf'])]) + [AC_MSG_ERROR([cannot find `printf'])]) AC_TRY_LINK_FUNC(Be_doomed_if_your_libc_has_a_function_named_like_this, - [AC_MSG_ERROR([found a nonexistent function])])]) + [AC_MSG_ERROR([found a nonexistent function])])]) Index: tests/foreign.at =================================================================== RCS file: /cvsroot/autoconf/autoconf/tests/foreign.at,v retrieving revision 1.18 diff -u -u -r1.18 foreign.at --- tests/foreign.at 14 May 2003 08:34:10 -0000 1.18 +++ tests/foreign.at 22 May 2003 12:05:40 -0000 @@ -28,7 +28,7 @@ # Skip this test if there is no libtoolize. AT_CHECK([libtoolize --version || exit 77], - ignore, ignore, ignore) + ignore, ignore, ignore) # CVS Autoconf probably does not work with too old Libtools. AT_CHECK([[ case `libtoolize --version | @@ -36,7 +36,7 @@ 0.* ) exit 77;; 1.[0123]* ) exit 77;; esac]], - ignore, ignore, ignore) + ignore, ignore, ignore) # FIXME: Once Libtool `configure.ac' aware, change this. # Using a configure.in, have libtoolize confess where libtool.m4 is. Index: tests/semantics.at =================================================================== RCS file: /cvsroot/autoconf/autoconf/tests/semantics.at,v retrieving revision 1.42 diff -u -u -r1.42 semantics.at --- tests/semantics.at 18 May 2003 14:48:02 -0000 1.42 +++ tests/semantics.at 22 May 2003 12:05:40 -0000 @@ -33,10 +33,10 @@ # this test fail, so exit successfully if `cos' is in libc. AT_CHECK_MACRO([AC_CHECK_LIB], [AC_TRY_LINK_FUNC(cos, - [AC_MSG_ERROR([`cos' is in `libc'], 77)]) + [AC_MSG_ERROR([`cos' is in `libc'], 77)]) AC_CHECK_LIB(m, cos,, - [AC_MSG_ERROR([cannot find `cos' in `libm'])]) + [AC_MSG_ERROR([cannot find `cos' in `libm'])]) # No kidding, using variables was broken in 2.50 :( ac_sin=sin @@ -55,7 +55,7 @@ # correctly detect failures. AC_CHECK_LIB(m, cossack, - [AC_MSG_ERROR([found `cossack' in `libm'])]) + [AC_MSG_ERROR([found `cossack' in `libm'])]) # No kidding, using variables was broken in 2.50 :( ac_sinner=sinner @@ -78,14 +78,14 @@ AT_CHECK_MACRO([AC_SEARCH_LIBS], [ AC_SEARCH_LIBS(cos, oser m ust,, - [AC_MSG_ERROR([cannot find `cos'])]) + [AC_MSG_ERROR([cannot find `cos'])]) case "$ac_cv_search_cos" in -loser|-lust) AC_MSG_ERROR([jeez, $ac_cv_search_cos must be a cool library!]) ;; esac AC_SEARCH_LIBS(printf, oser c ust,, - [AC_MSG_ERROR([cannot find `printf'])]) + [AC_MSG_ERROR([cannot find `printf'])]) case "$ac_cv_search_printf" in -loser|-lust) AC_MSG_ERROR([jeez, $ac_cv_search_printf must be a cool library!]) ;; @@ -101,7 +101,7 @@ # Must define NEED_NO_DECL, but not NEED_YES_DECL. AT_CHECK_MACRO([AC_CHECK_DECLS], [[AC_CHECK_DECLS([yes, no],,, - [int yes = 1;])]], + [int yes = 1;])]], [AT_CHECK_DEFINES( [#define HAVE_DECL_NO 0 #define HAVE_DECL_YES 1 @@ -145,7 +145,7 @@ ]) AT_CHECK([sed 's/ */ /g;s/^ //;s/ $//' config.libobjs], [], - [autoconf_ftnirp$U.o + [autoconf_ftnirp$U.o ]) AT_CLEANUP([config.libobjs]) @@ -232,7 +232,7 @@ # Must define HAVE_STRUCT_YES_S_YES, but not HAVE_STRUCT_YES_S_NO. AT_CHECK_MACRO([AC_CHECK_MEMBERS], [[AC_CHECK_MEMBERS([struct yes_s.yes, struct yes_s.no],,, - [struct yes_s { int yes ;} ;])]], + [struct yes_s { int yes ;} ;])]], [AT_CHECK_DEFINES( [/* #undef HAVE_STRUCT_YES_S_NO */ #define HAVE_STRUCT_YES_S_YES 1 @@ -282,7 +282,7 @@ # builtin types, and defined types. AT_CHECK_MACRO([AC_CHECK_TYPES], [[AC_CHECK_TYPES([int, struct yes_s, struct no_s],,, - [struct yes_s { int yes ;} ;])]], + [struct yes_s { int yes ;} ;])]], [AT_CHECK_DEFINES( [#define HAVE_INT 1 /* #undef HAVE_STRUCT_NO_S */ @@ -314,8 +314,8 @@ AT_CHECK_AUTOCONF AT_CHECK([[sed -e '/^#(cut-from-here/,/^#to-here)/!d' -e '/^#/d' configure]], - 0, - [NEW + 0, + [NEW OLD OLD OLD Index: tests/tools.at =================================================================== RCS file: /cvsroot/autoconf/autoconf/tests/tools.at,v retrieving revision 1.69 diff -u -u -r1.69 tools.at --- tests/tools.at 22 Oct 2002 08:20:19 -0000 1.69 +++ tests/tools.at 22 May 2003 12:05:40 -0000 @@ -97,7 +97,7 @@ # Ignore it, it might change between releases. m4_define([AT_CHECK_PERL_SYNTAX], [AT_CHECK([autom4te_perllibdir=$abs_top_srcdir/lib $PERL -c $abs_top_builddir/bin/$1], - 0, [], [ignore])]) + 0, [], [ignore])]) AT_CHECK_PERL_SYNTAX([autoheader]) AT_CHECK_PERL_SYNTAX([autom4te]) @@ -248,7 +248,7 @@ ]]) AT_CHECK_AUTOCONF([[-t define | sed -n '$p']], - 0, + 0, [[configure.ac:1:define:active:ACTIVE ]]) @@ -257,7 +257,7 @@ # Note that using `-i' means we need the *.m4 files, not the *.m4f files, # hence we need srcdir, not builddir. AT_CHECK_AUTOCONF([[-t define:'$1' -i| sed -n '$p']], - 0, + 0, [[active ]]) @@ -593,12 +593,12 @@ echo "AC_PREREQ($autoupdate_version)" >expout AT_CHECK([echo "AC_PREREQ(1.0)" | autoupdate -], - 0, [expout], []) + 0, [expout], []) AT_CHECK([echo "AC_PREREQ($autoupdate_version)" | autoupdate -], - 0, [expout], []) + 0, [expout], []) AT_CHECK([echo "AC_PREREQ(999.99)" | autoupdate -], - 1, [], [ignore]) + 1, [], [ignore]) AT_CLEANUP Index: tests/torture.at =================================================================== RCS file: /cvsroot/autoconf/autoconf/tests/torture.at,v retrieving revision 1.42 diff -u -u -r1.42 torture.at --- tests/torture.at 1 Apr 2003 17:33:59 -0000 1.42 +++ tests/torture.at 22 May 2003 12:05:40 -0000 @@ -56,8 +56,8 @@ # Initial value. m4_ifval([$1], - [precious='$1'; export precious], - [unset precious]) + [precious='$1'; export precious], + [unset precious]) AT_CHECK_CONFIGURE([--config-cache -q]) AT_CHECK([cat file], [], [`$1' ]) @@ -74,8 +74,8 @@ # Second value: we should issue an error here: the value # has changed! m4_ifval([$2], - [precious='$2'; export precious], - [unset precious]) + [precious='$2'; export precious], + [unset precious]) AT_CHECK_CONFIGURE([--config-cache], [1], [], [ignore]) ])# AT_CHECK_AC_ARG_VAR @@ -145,10 +145,10 @@ command) AC_CONFIG_COMMANDS(command:input, - [cp input command]);; + [cp input command]);; var-command) AC_CONFIG_COMMANDS(var-command:$command_in, - [cp $command_in var-command], [command_in=input]);; + [cp $command_in var-command], [command_in=input]);; link) AC_CONFIG_LINKS(link:input);; @@ -170,7 +170,7 @@ m4_define([AT_CHECK_CONFIG_CREATION], [AT_CHECK_CONFIGURE([what_to_test=$1]) AT_CHECK([ls header var-header file var-file command var-command link var-link 2>/dev/null], - [ignore], [$1 + [ignore], [$1 ]) AT_CHECK([grep OK $1], [], [OK ]) @@ -180,7 +180,7 @@ # really broken... AT_CHECK([./config.status var-$1 /dev/null], - [ignore], [var-$1 + [ignore], [var-$1 ]) AT_CHECK([grep OK var-$1], [], [OK ]) @@ -250,19 +250,19 @@ AT_CHECK_AUTOCONF AT_CHECK_CONFIGURE([one=one --enable-two=two --with-three=three | - sed -n -e 's/^result=//p'], 0, - [onetwothree + sed -n -e 's/^result=//p'], 0, + [onetwothree ]) AT_CHECK([./config.status --recheck | sed -n 's/^result=//p'], 0, - [onetwothree + [onetwothree ]) AT_CHECK_CONFIGURE([one="\"'$ " --enable-two="\" ' $" --with-three=" \"'$"| - sed -n -e 's/^result=//p'], 0, - ["'$ " ' $ "'$ + sed -n -e 's/^result=//p'], 0, + ["'$ " ' $ "'$ ]) AT_CHECK([./config.status --recheck | sed -n 's/^result=//p'], 0, - ["'$ " ' $ "'$ + ["'$ " ' $ "'$ ]) AT_CLEANUP @@ -428,7 +428,7 @@ m4_defun([AC_DEFUBST], [AC_DUMMY_VAR($1)="AC_BIG_VALUE" AC_DEFINE_UNQUOTED(AC_DUMMY_VAR($1), "$AC_DUMMY_VAR($1)", - AC_DESCRIPTION) + AC_DESCRIPTION) AC_SUBST(AC_DUMMY_VAR($1))]) AC_INIT @@ -494,7 +494,7 @@ AC_CONFIG_COMMANDS([report], [test -f $srcdir/configure.ac || AC_MSG_ERROR([cannot find $srcdir/configure.ac])], - [srcdir=$srcdir]) + [srcdir=$srcdir]) AC_OUTPUT rm -rf foo at-dir/bar Index: tests/wrapper.in =================================================================== RCS file: /cvsroot/autoconf/autoconf/tests/wrapper.in,v retrieving revision 1.2 diff -u -u -r1.2 wrapper.in --- tests/wrapper.in 5 Nov 2002 07:16:59 -0000 1.2 +++ tests/wrapper.in 22 May 2003 12:05:40 -0000 @@ -15,7 +15,7 @@ fi # Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then +if (as_foo=foo; unset as_foo) >/dev/null 2>&1; then as_unset=unset else as_unset=false @@ -34,7 +34,7 @@ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ LC_TELEPHONE LC_TIME do - if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else $as_unset $as_var @@ -58,9 +58,9 @@ # Name of the executable. as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } /^X\/\(\/\/\)$/{ s//\1/; q; }