diff --git a/ChangeLog b/ChangeLog index bcce91e6..b85c6647 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-10-31 Akim Demaille + + * acgeneral.m4: Prefer `>file' over `> file' etc. + * acspecific.m4: Likewise. + 1999-10-31 Akim Demaille Rename the family AC_NEED_DECL as AC_CHECK: it is more uniform, diff --git a/acgeneral.m4 b/acgeneral.m4 index 5dec803e..ebdfc78f 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -931,7 +931,7 @@ changequote([, ])dnl # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. changequote(, )dnl - cat << \EOF + cat <<\EOF `configure' configures software source code packages to adapt to many kinds of systems. @@ -977,7 +977,7 @@ Program names: run sed PROGRAM on installed program names EOF - cat << \EOF + cat <<\EOF Host type: --build=BUILD configure for building on BUILD [BUILD=HOST] --host=HOST configure for HOST [guessed] @@ -1331,7 +1331,7 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h +echo >confdefs.h # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. @@ -1489,7 +1489,7 @@ AC_DEFUN(AC_ARG_PROGRAM, program_transform_name= else # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed + cat <<\EOF_SED >conftestsed s,\\,\\\\,g; s,\$,$$,g EOF_SED program_transform_name="`echo $program_transform_name|sed -f conftestsed`" @@ -1753,13 +1753,13 @@ define(AC_CACHE_LOAD, test -f "$cache_file" && . $cache_file else echo "creating cache $cache_file" - > $cache_file + >$cache_file fi ]) dnl AC_CACHE_SAVE() define(AC_CACHE_SAVE, -[cat > confcache <<\EOF +[cat >confcache <<\EOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure # scripts and configure runs. It is not useful on other systems. @@ -1795,14 +1795,14 @@ changequote(, )dnl # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' ;; - esac >> confcache + esac >>confcache changequote([, ])dnl if cmp -s $cache_file confcache; then : else if test -w $cache_file; then echo "updating cache $cache_file" - cat confcache > $cache_file + cat confcache >$cache_file else echo "not updating unwritable cache $cache_file" fi @@ -1841,7 +1841,7 @@ dnl Set VARIABLE to VALUE, verbatim, or 1. Remember the value dnl and if VARIABLE is affected the same VALUE, do nothing, else dnl die. The third argument is used by autoheader. define(AC_DEFINE, -[cat >> confdefs.h <<\EOF +[cat >>confdefs.h <<\EOF [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1) EOF ]) @@ -1852,7 +1852,7 @@ dnl AC_DEFINE_UNQUOTED(VARIABLE [, VALUE[, DESCRIPTION]]) dnl ----------------------------------------------------- dnl Similar, but perform shell substitutions $ ` \ once on VALUE. define(AC_DEFINE_UNQUOTED, -[cat >> confdefs.h <>confdefs.h < conftest.$ac_ext << EOF +[cat >conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < $CONFIG_STATUS <$CONFIG_STATUS <> $CONFIG_STATUS <>$CONFIG_STATUS <> $CONFIG_STATUS <>$CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\EOF undivert(AC_DIVERSION_CMDS)dnl exit 0 EOF @@ -3309,7 +3309,7 @@ dnl Using a here document instead of a string reduces the quoting nightmare. # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the cleanup section. Otherwise, # look for a macro that doesn't take arguments. -cat > $ac_cs_root.defs <<\EOF +cat >$ac_cs_root.defs <<\EOF changequote(<<, >>)dnl s%^[ ]*<<#>>[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)%-D\1=\2%g t cleanup @@ -3353,7 +3353,7 @@ dnl of the sed commands issued by AC_SUBST. So if you change one, change dnl the other too. changequote(, )dnl sed 's/%@/@@/; s/@%/@@/; s/%;t t\$/@;t t/; /@;t t\$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@;t t\$/%;t t/' > \$ac_cs_root.subs <<\\CEOF + s/@@/%@/; s/@@/@%/; s/@;t t\$/%;t t/' >\$ac_cs_root.subs <<\\CEOF changequote([, ])dnl dnl These here document variables are unquoted when configure runs dnl but quoted when config.status runs, so variables are expanded once. @@ -3363,7 +3363,7 @@ CEOF EOF -cat >> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. dnl One cannot portably go further than 100 commands because of HP-UX. @@ -3376,9 +3376,9 @@ ac_more_lines=: ac_sed_cmds="" while $ac_more_lines; do if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $ac_cs_root.subs > $ac_cs_root.sfrag + sed "1,${ac_beg}d; ${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag else - sed "${ac_end}q" $ac_cs_root.subs > $ac_cs_root.sfrag + sed "${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag fi if test ! -s $ac_cs_root.sfrag; then ac_more_lines=false @@ -3389,7 +3389,7 @@ while $ac_more_lines; do # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t -/@@BKL@a-zA-Z_@BKR@@BKL@a-zA-Z_0-9@BKR@*@/!b' && cat $ac_cs_root.sfrag) > $ac_cs_root.s$ac_sed_frag +/@@BKL@a-zA-Z_@BKR@@BKL@a-zA-Z_0-9@BKR@*@/!b' && cat $ac_cs_root.sfrag) >$ac_cs_root.s$ac_sed_frag if test -z "$ac_sed_cmds"; then ac_sed_cmds="sed -f $ac_cs_root.s$ac_sed_frag" else @@ -3406,7 +3406,7 @@ fi EOF -cat >> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then changequote(, )dnl # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". @@ -3486,7 +3486,7 @@ s%@top_srcdir@%$top_srcdir%;t t ifdef([AC_PROVIDE_AC_PROG_INSTALL], [s%@INSTALL@%$INSTALL%;t t ])dnl dnl The parens around the eval prevent an "illegal io" in Ultrix sh. -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_cs_root.out +" $ac_file_inputs | (eval "$ac_sed_cmds") >$ac_cs_root.out dnl This would break Makefile dependencies. dnl if cmp -s $ac_file $ac_cs_root.out 2>/dev/null; then dnl echo "$ac_file is unchanged" @@ -3588,8 +3588,8 @@ dnl first two small commands), we need to clear the `t' flag. This is the dnl purpose of `t clear; : clear'. dnl dnl Additionally, this works around a bug of IRIX' sed which does not -dnl clear the `t' flag between to cycles. -cat > $ac_cs_root.hdr <<\EOF +dnl clear the `t' flag between two cycles. +cat >$ac_cs_root.hdr <<\EOF changequote(<<, >>)dnl s/[\\&%]/\\&/g s%[\\$`]%\\&%g @@ -3677,7 +3677,7 @@ dnl dnl It has to send itself into $CONFIG_STATUS (eg, via here documents). dnl Upon exit, no here document shall be opened. define(AC_OUTPUT_LINKS, -[cat >> $CONFIG_STATUS <<\EOF +[cat >>$CONFIG_STATUS <<\EOF # # CONFIG_LINKS section. @@ -3744,7 +3744,7 @@ dnl dnl It has to send itself into $CONFIG_STATUS (eg, via here documents). dnl Upon exit, no here document shall be opened. define(AC_OUTPUT_COMMANDS_COMMANDS, -[cat >> $CONFIG_STATUS <<\EOF +[cat >>$CONFIG_STATUS <<\EOF # # CONFIG_COMMANDS section. @@ -3755,7 +3755,7 @@ for ac_file in .. $CONFIG_COMMANDS; do if test "x$ac_file" != x..; then echo "executing commands of $ac_dest" case "$ac_dest" in -AC_LIST_COMMANDS_COMMANDS[]dnl +AC_LIST_COMMANDS_COMMANDS()dnl esac fi;done EOF diff --git a/acspecific.m4 b/acspecific.m4 index e3f2c574..57192878 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -272,7 +272,7 @@ dnl -------------- AC_DEFUN(AC_PROG_CC_GNU, [AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc, [dnl The semicolon is to pacify NeXT's syntax-checking cpp. -cat > conftest.c <conftest.c < conftest.C <conftest.C < conftest.fpp <conftest.fpp < conftest.c +[echo 'void f(){}' >conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else @@ -338,7 +338,7 @@ dnl AC_PROG_CXX_G dnl ------------- AC_DEFUN(AC_PROG_CXX_G, [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g, -[echo 'void f(){}' > conftest.cc +[echo 'void f(){}' >conftest.cc if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then ac_cv_prog_cxx_g=yes else @@ -354,7 +354,7 @@ dnl Test whether the Fortran 77 compiler can accept the `-g' option to dnl enable debugging. AC_DEFUN(AC_PROG_F77_G, [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g, -[cat > conftest.f << EOF +[cat >conftest.f < conftest.c +[echo 'foo(){}' >conftest.c # Make sure it works both with $CC and with simple cc. # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. @@ -460,7 +460,7 @@ changequote(, )dnl sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" changequote([, ])dnl AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o, -[cat > conftest.f << EOF +[cat >conftest.f < conftestmake <<\EOF +[cat >conftestmake <<\EOF all: @echo 'ac_maketemp="${MAKE}"' EOF @@ -1833,7 +1833,7 @@ AC_SUBST(KMEM_GROUP)dnl AC_DEFUN(AC_FUNC_UTIME_NULL, [AC_CACHE_CHECK(whether utime accepts a null argument, ac_cv_func_utime_null, -[rm -f conftestdata; > conftestdata +[rm -f conftestdata; >conftestdata # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. AC_TRY_RUN([#include #include @@ -2428,7 +2428,7 @@ dnl -------------- dnl Checks if `#' can be used to glue strings together at the CPP level. dnl Defines HAVE_STRINGIZE if positive. AC_DEFUN(AC_C_STRINGIZE, -[AC_REQUIRE([AC_PROG_CPP]) +[AC_REQUIRE([AC_PROG_CPP])dnl AC_MSG_CHECKING([for preprocessor stringizing operator]) AC_CACHE_VAL(ac_cv_c_stringize, AC_EGREP_CPP([#teststring],[ @@ -2472,7 +2472,7 @@ AC_DEFUN(AC_OBJEXT, [AC_MSG_CHECKING([for object suffix]) AC_CACHE_VAL(ac_cv_objext, [rm -f conftest* -echo 'int i = 1;' > conftest.$ac_ext +echo 'int i = 1;' >conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then for ac_file in conftest.*; do case $ac_file in @@ -2529,14 +2529,14 @@ AC_DEFUN(AC_F77_LIBRARY_LDFLAGS, AC_CACHE_CHECK([for Fortran 77 libraries], ac_cv_flibs, [ - AC_REQUIRE([AC_PROG_F77]) - AC_REQUIRE([AC_CYGWIN]) + AC_REQUIRE([AC_PROG_F77])dnl + AC_REQUIRE([AC_CYGWIN])dnl AC_LANG_SAVE AC_LANG_FORTRAN77 # This is the simplest of all Fortran 77 programs. - cat > conftest.$ac_ext <conftest.$ac_ext < /dev/null 2>&1`; then + if test `echo $f77_link_output | grep xlfentry >/dev/null 2>&1`; then f77_link_output=`echo $f77_link_output | sed 's/,/ /g'` fi @@ -2704,13 +2704,13 @@ AC_DEFUN(AC_F77_NAME_MANGLING, AC_CACHE_CHECK([for Fortran 77 name-mangling scheme], ac_cv_f77_mangling, [ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PROG_F77]) + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_F77])dnl AC_LANG_SAVE AC_LANG_FORTRAN77 -cat > conftest.$ac_ext <conftest.$ac_ext < conftest +' >conftest chmod u+x conftest (SHELL=/bin/sh; export SHELL; ./conftest >/dev/null) if test $? -ne 69; then @@ -2880,8 +2880,8 @@ fi for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do test -d $ac_dir || continue test -w $ac_dir || continue # It is less confusing to not echo anything here. - (echo 1 > $ac_dir/conftest9012345) 2>/dev/null - (echo 2 > $ac_dir/conftest9012346) 2>/dev/null + (echo 1 >$ac_dir/conftest9012345) 2>/dev/null + (echo 2 >$ac_dir/conftest9012346) 2>/dev/null val=`cat $ac_dir/conftest9012345 2>/dev/null` if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then ac_cv_sys_long_file_names=no @@ -2977,7 +2977,7 @@ AC_DEFUN(AC_PATH_X_XMKMF, if mkdir conftestdir; then cd conftestdir # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' + cat >Imakefile <<'EOF' acfindx: @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' EOF @@ -3279,21 +3279,24 @@ ac_cv_emxos2=yes, ac_cv_emxos2=no)]) EMXOS2= test "$ac_cv_emxos2" = yes && EMXOS2=yes]) + +dnl AC_EXEEXT +dnl --------- dnl Check for the extension used for executables. This knows that we dnl add .exe for Cygwin or mingw32. Otherwise, it compiles a test dnl executable. If this is called, the executable extensions will be dnl automatically used by link commands run by the configure script. AC_DEFUN(AC_EXEEXT, -[AC_REQUIRE([AC_CYGWIN]) -AC_REQUIRE([AC_MINGW32]) -AC_REQUIRE([AC_EMXOS2]) +[AC_REQUIRE([AC_CYGWIN])dnl +AC_REQUIRE([AC_MINGW32])dnl +AC_REQUIRE([AC_EMXOS2])dnl AC_MSG_CHECKING([for executable suffix]) AC_CACHE_VAL(ac_cv_exeext, [if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext + echo 'int main () { return 0; }' >conftest.$ac_ext ac_cv_exeext= if AC_TRY_EVAL(ac_link); then for file in conftest.*; do @@ -3313,7 +3316,8 @@ test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} AC_MSG_RESULT(${ac_cv_exeext}) dnl Setting ac_exeext will implicitly change the ac_link command. ac_exeext=$EXEEXT -AC_SUBST(EXEEXT)]) +AC_SUBST(EXEEXT)dnl +])dnl AC_EXEEXT dnl ### Checks for UNIX variants diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 5dec803e..ebdfc78f 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -931,7 +931,7 @@ changequote([, ])dnl # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. changequote(, )dnl - cat << \EOF + cat <<\EOF `configure' configures software source code packages to adapt to many kinds of systems. @@ -977,7 +977,7 @@ Program names: run sed PROGRAM on installed program names EOF - cat << \EOF + cat <<\EOF Host type: --build=BUILD configure for building on BUILD [BUILD=HOST] --host=HOST configure for HOST [guessed] @@ -1331,7 +1331,7 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h # AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h +echo >confdefs.h # A filename unique to this package, relative to the directory that # configure is in, which we can look for to find out if srcdir is correct. @@ -1489,7 +1489,7 @@ AC_DEFUN(AC_ARG_PROGRAM, program_transform_name= else # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed + cat <<\EOF_SED >conftestsed s,\\,\\\\,g; s,\$,$$,g EOF_SED program_transform_name="`echo $program_transform_name|sed -f conftestsed`" @@ -1753,13 +1753,13 @@ define(AC_CACHE_LOAD, test -f "$cache_file" && . $cache_file else echo "creating cache $cache_file" - > $cache_file + >$cache_file fi ]) dnl AC_CACHE_SAVE() define(AC_CACHE_SAVE, -[cat > confcache <<\EOF +[cat >confcache <<\EOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure # scripts and configure runs. It is not useful on other systems. @@ -1795,14 +1795,14 @@ changequote(, )dnl # `set' quotes correctly as required by POSIX, so do not add quotes. sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' ;; - esac >> confcache + esac >>confcache changequote([, ])dnl if cmp -s $cache_file confcache; then : else if test -w $cache_file; then echo "updating cache $cache_file" - cat confcache > $cache_file + cat confcache >$cache_file else echo "not updating unwritable cache $cache_file" fi @@ -1841,7 +1841,7 @@ dnl Set VARIABLE to VALUE, verbatim, or 1. Remember the value dnl and if VARIABLE is affected the same VALUE, do nothing, else dnl die. The third argument is used by autoheader. define(AC_DEFINE, -[cat >> confdefs.h <<\EOF +[cat >>confdefs.h <<\EOF [#define] $1 ifelse($#, 2, [$2], $#, 3, [$2], 1) EOF ]) @@ -1852,7 +1852,7 @@ dnl AC_DEFINE_UNQUOTED(VARIABLE [, VALUE[, DESCRIPTION]]) dnl ----------------------------------------------------- dnl Similar, but perform shell substitutions $ ` \ once on VALUE. define(AC_DEFINE_UNQUOTED, -[cat >> confdefs.h <>confdefs.h < conftest.$ac_ext << EOF +[cat >conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext < $CONFIG_STATUS <$CONFIG_STATUS <> $CONFIG_STATUS <>$CONFIG_STATUS <> $CONFIG_STATUS <>$CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\EOF undivert(AC_DIVERSION_CMDS)dnl exit 0 EOF @@ -3309,7 +3309,7 @@ dnl Using a here document instead of a string reduces the quoting nightmare. # If the first sed substitution is executed (which looks for macros that # take arguments), then we branch to the cleanup section. Otherwise, # look for a macro that doesn't take arguments. -cat > $ac_cs_root.defs <<\EOF +cat >$ac_cs_root.defs <<\EOF changequote(<<, >>)dnl s%^[ ]*<<#>>[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)%-D\1=\2%g t cleanup @@ -3353,7 +3353,7 @@ dnl of the sed commands issued by AC_SUBST. So if you change one, change dnl the other too. changequote(, )dnl sed 's/%@/@@/; s/@%/@@/; s/%;t t\$/@;t t/; /@;t t\$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@;t t\$/%;t t/' > \$ac_cs_root.subs <<\\CEOF + s/@@/%@/; s/@@/@%/; s/@;t t\$/%;t t/' >\$ac_cs_root.subs <<\\CEOF changequote([, ])dnl dnl These here document variables are unquoted when configure runs dnl but quoted when config.status runs, so variables are expanded once. @@ -3363,7 +3363,7 @@ CEOF EOF -cat >> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. dnl One cannot portably go further than 100 commands because of HP-UX. @@ -3376,9 +3376,9 @@ ac_more_lines=: ac_sed_cmds="" while $ac_more_lines; do if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $ac_cs_root.subs > $ac_cs_root.sfrag + sed "1,${ac_beg}d; ${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag else - sed "${ac_end}q" $ac_cs_root.subs > $ac_cs_root.sfrag + sed "${ac_end}q" $ac_cs_root.subs >$ac_cs_root.sfrag fi if test ! -s $ac_cs_root.sfrag; then ac_more_lines=false @@ -3389,7 +3389,7 @@ while $ac_more_lines; do # is no need to browse any of the substitutions). # These are the two extra sed commands mentioned above. (echo ':t -/@@BKL@a-zA-Z_@BKR@@BKL@a-zA-Z_0-9@BKR@*@/!b' && cat $ac_cs_root.sfrag) > $ac_cs_root.s$ac_sed_frag +/@@BKL@a-zA-Z_@BKR@@BKL@a-zA-Z_0-9@BKR@*@/!b' && cat $ac_cs_root.sfrag) >$ac_cs_root.s$ac_sed_frag if test -z "$ac_sed_cmds"; then ac_sed_cmds="sed -f $ac_cs_root.s$ac_sed_frag" else @@ -3406,7 +3406,7 @@ fi EOF -cat >> $CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then changequote(, )dnl # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". @@ -3486,7 +3486,7 @@ s%@top_srcdir@%$top_srcdir%;t t ifdef([AC_PROVIDE_AC_PROG_INSTALL], [s%@INSTALL@%$INSTALL%;t t ])dnl dnl The parens around the eval prevent an "illegal io" in Ultrix sh. -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_cs_root.out +" $ac_file_inputs | (eval "$ac_sed_cmds") >$ac_cs_root.out dnl This would break Makefile dependencies. dnl if cmp -s $ac_file $ac_cs_root.out 2>/dev/null; then dnl echo "$ac_file is unchanged" @@ -3588,8 +3588,8 @@ dnl first two small commands), we need to clear the `t' flag. This is the dnl purpose of `t clear; : clear'. dnl dnl Additionally, this works around a bug of IRIX' sed which does not -dnl clear the `t' flag between to cycles. -cat > $ac_cs_root.hdr <<\EOF +dnl clear the `t' flag between two cycles. +cat >$ac_cs_root.hdr <<\EOF changequote(<<, >>)dnl s/[\\&%]/\\&/g s%[\\$`]%\\&%g @@ -3677,7 +3677,7 @@ dnl dnl It has to send itself into $CONFIG_STATUS (eg, via here documents). dnl Upon exit, no here document shall be opened. define(AC_OUTPUT_LINKS, -[cat >> $CONFIG_STATUS <<\EOF +[cat >>$CONFIG_STATUS <<\EOF # # CONFIG_LINKS section. @@ -3744,7 +3744,7 @@ dnl dnl It has to send itself into $CONFIG_STATUS (eg, via here documents). dnl Upon exit, no here document shall be opened. define(AC_OUTPUT_COMMANDS_COMMANDS, -[cat >> $CONFIG_STATUS <<\EOF +[cat >>$CONFIG_STATUS <<\EOF # # CONFIG_COMMANDS section. @@ -3755,7 +3755,7 @@ for ac_file in .. $CONFIG_COMMANDS; do if test "x$ac_file" != x..; then echo "executing commands of $ac_dest" case "$ac_dest" in -AC_LIST_COMMANDS_COMMANDS[]dnl +AC_LIST_COMMANDS_COMMANDS()dnl esac fi;done EOF diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index e3f2c574..57192878 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -272,7 +272,7 @@ dnl -------------- AC_DEFUN(AC_PROG_CC_GNU, [AC_CACHE_CHECK(whether we are using GNU C, ac_cv_prog_gcc, [dnl The semicolon is to pacify NeXT's syntax-checking cpp. -cat > conftest.c <conftest.c < conftest.C <conftest.C < conftest.fpp <conftest.fpp < conftest.c +[echo 'void f(){}' >conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else @@ -338,7 +338,7 @@ dnl AC_PROG_CXX_G dnl ------------- AC_DEFUN(AC_PROG_CXX_G, [AC_CACHE_CHECK(whether ${CXX-g++} accepts -g, ac_cv_prog_cxx_g, -[echo 'void f(){}' > conftest.cc +[echo 'void f(){}' >conftest.cc if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then ac_cv_prog_cxx_g=yes else @@ -354,7 +354,7 @@ dnl Test whether the Fortran 77 compiler can accept the `-g' option to dnl enable debugging. AC_DEFUN(AC_PROG_F77_G, [AC_CACHE_CHECK(whether $F77 accepts -g, ac_cv_prog_f77_g, -[cat > conftest.f << EOF +[cat >conftest.f < conftest.c +[echo 'foo(){}' >conftest.c # Make sure it works both with $CC and with simple cc. # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. @@ -460,7 +460,7 @@ changequote(, )dnl sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" changequote([, ])dnl AC_CACHE_VAL(ac_cv_prog_f77_${ac_f77}_c_o, -[cat > conftest.f << EOF +[cat >conftest.f < conftestmake <<\EOF +[cat >conftestmake <<\EOF all: @echo 'ac_maketemp="${MAKE}"' EOF @@ -1833,7 +1833,7 @@ AC_SUBST(KMEM_GROUP)dnl AC_DEFUN(AC_FUNC_UTIME_NULL, [AC_CACHE_CHECK(whether utime accepts a null argument, ac_cv_func_utime_null, -[rm -f conftestdata; > conftestdata +[rm -f conftestdata; >conftestdata # Sequent interprets utime(file, 0) to mean use start of epoch. Wrong. AC_TRY_RUN([#include #include @@ -2428,7 +2428,7 @@ dnl -------------- dnl Checks if `#' can be used to glue strings together at the CPP level. dnl Defines HAVE_STRINGIZE if positive. AC_DEFUN(AC_C_STRINGIZE, -[AC_REQUIRE([AC_PROG_CPP]) +[AC_REQUIRE([AC_PROG_CPP])dnl AC_MSG_CHECKING([for preprocessor stringizing operator]) AC_CACHE_VAL(ac_cv_c_stringize, AC_EGREP_CPP([#teststring],[ @@ -2472,7 +2472,7 @@ AC_DEFUN(AC_OBJEXT, [AC_MSG_CHECKING([for object suffix]) AC_CACHE_VAL(ac_cv_objext, [rm -f conftest* -echo 'int i = 1;' > conftest.$ac_ext +echo 'int i = 1;' >conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then for ac_file in conftest.*; do case $ac_file in @@ -2529,14 +2529,14 @@ AC_DEFUN(AC_F77_LIBRARY_LDFLAGS, AC_CACHE_CHECK([for Fortran 77 libraries], ac_cv_flibs, [ - AC_REQUIRE([AC_PROG_F77]) - AC_REQUIRE([AC_CYGWIN]) + AC_REQUIRE([AC_PROG_F77])dnl + AC_REQUIRE([AC_CYGWIN])dnl AC_LANG_SAVE AC_LANG_FORTRAN77 # This is the simplest of all Fortran 77 programs. - cat > conftest.$ac_ext <conftest.$ac_ext < /dev/null 2>&1`; then + if test `echo $f77_link_output | grep xlfentry >/dev/null 2>&1`; then f77_link_output=`echo $f77_link_output | sed 's/,/ /g'` fi @@ -2704,13 +2704,13 @@ AC_DEFUN(AC_F77_NAME_MANGLING, AC_CACHE_CHECK([for Fortran 77 name-mangling scheme], ac_cv_f77_mangling, [ - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PROG_F77]) + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_F77])dnl AC_LANG_SAVE AC_LANG_FORTRAN77 -cat > conftest.$ac_ext <conftest.$ac_ext < conftest +' >conftest chmod u+x conftest (SHELL=/bin/sh; export SHELL; ./conftest >/dev/null) if test $? -ne 69; then @@ -2880,8 +2880,8 @@ fi for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do test -d $ac_dir || continue test -w $ac_dir || continue # It is less confusing to not echo anything here. - (echo 1 > $ac_dir/conftest9012345) 2>/dev/null - (echo 2 > $ac_dir/conftest9012346) 2>/dev/null + (echo 1 >$ac_dir/conftest9012345) 2>/dev/null + (echo 2 >$ac_dir/conftest9012346) 2>/dev/null val=`cat $ac_dir/conftest9012345 2>/dev/null` if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then ac_cv_sys_long_file_names=no @@ -2977,7 +2977,7 @@ AC_DEFUN(AC_PATH_X_XMKMF, if mkdir conftestdir; then cd conftestdir # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' + cat >Imakefile <<'EOF' acfindx: @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' EOF @@ -3279,21 +3279,24 @@ ac_cv_emxos2=yes, ac_cv_emxos2=no)]) EMXOS2= test "$ac_cv_emxos2" = yes && EMXOS2=yes]) + +dnl AC_EXEEXT +dnl --------- dnl Check for the extension used for executables. This knows that we dnl add .exe for Cygwin or mingw32. Otherwise, it compiles a test dnl executable. If this is called, the executable extensions will be dnl automatically used by link commands run by the configure script. AC_DEFUN(AC_EXEEXT, -[AC_REQUIRE([AC_CYGWIN]) -AC_REQUIRE([AC_MINGW32]) -AC_REQUIRE([AC_EMXOS2]) +[AC_REQUIRE([AC_CYGWIN])dnl +AC_REQUIRE([AC_MINGW32])dnl +AC_REQUIRE([AC_EMXOS2])dnl AC_MSG_CHECKING([for executable suffix]) AC_CACHE_VAL(ac_cv_exeext, [if test "$CYGWIN" = yes || test "$MINGW32" = yes || test "$EMXOS2" = yes; then ac_cv_exeext=.exe else rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext + echo 'int main () { return 0; }' >conftest.$ac_ext ac_cv_exeext= if AC_TRY_EVAL(ac_link); then for file in conftest.*; do @@ -3313,7 +3316,8 @@ test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} AC_MSG_RESULT(${ac_cv_exeext}) dnl Setting ac_exeext will implicitly change the ac_link command. ac_exeext=$EXEEXT -AC_SUBST(EXEEXT)]) +AC_SUBST(EXEEXT)dnl +])dnl AC_EXEEXT dnl ### Checks for UNIX variants