From: Akim Demaille Date: Fri, 14 Jan 2000 18:06:22 +0000 (+0000) Subject: 1999-10-31 Akim Demaille X-Git-Tag: autoconf-2.50~1280 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=553eefdb5f524f05caaf184b7ed573cb10701ce1;p=thirdparty%2Fautoconf.git 1999-10-31 Akim Demaille * acgeneral.m4: Formatting changes. * acspecific.m4: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 3d3acc730..530021193 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-10-31 Akim Demaille + + * acgeneral.m4: Formatting changes. + * acspecific.m4: Likewise. + 1999-10-31 Akim Demaille * acgeneral.m4 (AC_CONFIG_LINKS): Allow a second argument, diff --git a/acgeneral.m4 b/acgeneral.m4 index 5856bba38..b600dbf41 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -2922,7 +2922,7 @@ AC_DEFUN(AC_CHECK_TYPE, [AC_REQUIRE([AC_HEADER_STDC])dnl AC_VAR_PUSHDEF([ac_Type], [ac_cv_type_$1])dnl AC_CACHE_CHECK([for $1], ac_Type, -[AC_EGREP_CPP(dnl +[AC_EGREP_CPP( changequote(<<,>>)dnl <<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl changequote([,]), @@ -2936,7 +2936,7 @@ m4_default([$3], [#include AC_SHELL_IFELSE(test AC_VAR_GET(ac_Type) = yes,, [AC_DEFINE_UNQUOTED($1, $2, [Define to `$2' if - does not define `$1'.])])dnl + does not define.])])dnl AC_VAR_POPDEF([ac_Type])dnl ])dnl AC_CHECK_TYPE @@ -3254,16 +3254,16 @@ dnl so uname gets run too. # Files that config.status was made for. ifset([AC_LIST_FILES], [config_files="\\ -AC_WRAP(AC_LIST_FILES, [ ])" +AC_WRAP(AC_LIST_FILES, [ ])" ])dnl ifset([AC_LIST_HEADERS], [config_headers="\\ -AC_WRAP(AC_LIST_HEADERS, [ ])" +AC_WRAP(AC_LIST_HEADERS, [ ])" ])dnl ifset([AC_LIST_LINKS], [config_links="\\ -AC_WRAP(AC_LIST_LINKS, [ ])" +AC_WRAP(AC_LIST_LINKS, [ ])" ])dnl ifset([AC_LIST_COMMANDS], [config_commands="\\ -AC_WRAP(AC_LIST_COMMANDS, [ ])" +AC_WRAP(AC_LIST_COMMANDS, [ ])" ])dnl ac_cs_usage="\\ @@ -3396,6 +3396,10 @@ ifset([AC_LIST_COMMANDS], [AC_OUTPUT_COMMANDS_COMMANDS()])dnl cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF diff --git a/acspecific.m4 b/acspecific.m4 index 1b624a115..bcc7ac749 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -167,12 +167,10 @@ else fi ]) -dnl AC_PROG_F77 takes an optional first argument which, if specified, -dnl must be a space separated list of Fortran 77 compilers to search -dnl for. This just gives the user an opportunity to specify an -dnl alternative search list for the Fortran 77 compiler. -dnl -dnl AC_PROG_F77() +dnl AC_PROG_F77([COMPILERS...]) +dnl --------------------------- +dnl COMPILERS is a space separated list of Fortran 77 compilers to search +dnl for. AC_DEFUN(AC_PROG_F77, [AC_BEFORE([$0], [AC_PROG_CPP])dnl AC_CHECK_PROGS(F77, @@ -239,7 +237,7 @@ fi AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler]) AC_MSG_RESULT($ac_cv_prog_cxx_cross) cross_compiling=$ac_cv_prog_cxx_cross -]) +])dnl AC_PROG_CXX_WORKS dnl AC_PROG_F77_WORKS @@ -252,7 +250,7 @@ AC_DEFUN(AC_PROG_F77_WORKS, [AC_MSG_CHECKING([whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works]) AC_LANG_SAVE AC_LANG_FORTRAN77 -AC_TRY_COMPILER(dnl +AC_TRY_COMPILER( [ program conftest end ], ac_cv_prog_f77_works, ac_cv_prog_f77_cross) @@ -264,7 +262,7 @@ fi AC_MSG_CHECKING([whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler]) AC_MSG_RESULT($ac_cv_prog_f77_cross) cross_compiling=$ac_cv_prog_f77_cross -]) +])dnl AC_PROG_F77_WORKS dnl AC_PROG_CC_GNU @@ -281,7 +279,8 @@ if AC_TRY_COMMAND(${CC-cc} -E conftest.c) | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no -fi])]) +fi])dnl +]) dnl AC_PROG_CXX_GNU @@ -298,7 +297,8 @@ if AC_TRY_COMMAND(${CXX-g++} -E conftest.C) | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no -fi])]) +fi])dnl +]) dnl AC_PROG_F77_GNU @@ -2014,7 +2014,7 @@ changequote(<<, >>)dnl #if TIME_WITH_SYS_TIME # include # include - #else +#else # if HAVE_SYS_TIME_H # include # else diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 5856bba38..b600dbf41 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -2922,7 +2922,7 @@ AC_DEFUN(AC_CHECK_TYPE, [AC_REQUIRE([AC_HEADER_STDC])dnl AC_VAR_PUSHDEF([ac_Type], [ac_cv_type_$1])dnl AC_CACHE_CHECK([for $1], ac_Type, -[AC_EGREP_CPP(dnl +[AC_EGREP_CPP( changequote(<<,>>)dnl <<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl changequote([,]), @@ -2936,7 +2936,7 @@ m4_default([$3], [#include AC_SHELL_IFELSE(test AC_VAR_GET(ac_Type) = yes,, [AC_DEFINE_UNQUOTED($1, $2, [Define to `$2' if - does not define `$1'.])])dnl + does not define.])])dnl AC_VAR_POPDEF([ac_Type])dnl ])dnl AC_CHECK_TYPE @@ -3254,16 +3254,16 @@ dnl so uname gets run too. # Files that config.status was made for. ifset([AC_LIST_FILES], [config_files="\\ -AC_WRAP(AC_LIST_FILES, [ ])" +AC_WRAP(AC_LIST_FILES, [ ])" ])dnl ifset([AC_LIST_HEADERS], [config_headers="\\ -AC_WRAP(AC_LIST_HEADERS, [ ])" +AC_WRAP(AC_LIST_HEADERS, [ ])" ])dnl ifset([AC_LIST_LINKS], [config_links="\\ -AC_WRAP(AC_LIST_LINKS, [ ])" +AC_WRAP(AC_LIST_LINKS, [ ])" ])dnl ifset([AC_LIST_COMMANDS], [config_commands="\\ -AC_WRAP(AC_LIST_COMMANDS, [ ])" +AC_WRAP(AC_LIST_COMMANDS, [ ])" ])dnl ac_cs_usage="\\ @@ -3396,6 +3396,10 @@ ifset([AC_LIST_COMMANDS], [AC_OUTPUT_COMMANDS_COMMANDS()])dnl cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\EOF diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index 1b624a115..bcc7ac749 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -167,12 +167,10 @@ else fi ]) -dnl AC_PROG_F77 takes an optional first argument which, if specified, -dnl must be a space separated list of Fortran 77 compilers to search -dnl for. This just gives the user an opportunity to specify an -dnl alternative search list for the Fortran 77 compiler. -dnl -dnl AC_PROG_F77() +dnl AC_PROG_F77([COMPILERS...]) +dnl --------------------------- +dnl COMPILERS is a space separated list of Fortran 77 compilers to search +dnl for. AC_DEFUN(AC_PROG_F77, [AC_BEFORE([$0], [AC_PROG_CPP])dnl AC_CHECK_PROGS(F77, @@ -239,7 +237,7 @@ fi AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler]) AC_MSG_RESULT($ac_cv_prog_cxx_cross) cross_compiling=$ac_cv_prog_cxx_cross -]) +])dnl AC_PROG_CXX_WORKS dnl AC_PROG_F77_WORKS @@ -252,7 +250,7 @@ AC_DEFUN(AC_PROG_F77_WORKS, [AC_MSG_CHECKING([whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) works]) AC_LANG_SAVE AC_LANG_FORTRAN77 -AC_TRY_COMPILER(dnl +AC_TRY_COMPILER( [ program conftest end ], ac_cv_prog_f77_works, ac_cv_prog_f77_cross) @@ -264,7 +262,7 @@ fi AC_MSG_CHECKING([whether the Fortran 77 compiler ($F77 $FFLAGS $LDFLAGS) is a cross-compiler]) AC_MSG_RESULT($ac_cv_prog_f77_cross) cross_compiling=$ac_cv_prog_f77_cross -]) +])dnl AC_PROG_F77_WORKS dnl AC_PROG_CC_GNU @@ -281,7 +279,8 @@ if AC_TRY_COMMAND(${CC-cc} -E conftest.c) | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no -fi])]) +fi])dnl +]) dnl AC_PROG_CXX_GNU @@ -298,7 +297,8 @@ if AC_TRY_COMMAND(${CXX-g++} -E conftest.C) | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no -fi])]) +fi])dnl +]) dnl AC_PROG_F77_GNU @@ -2014,7 +2014,7 @@ changequote(<<, >>)dnl #if TIME_WITH_SYS_TIME # include # include - #else +#else # if HAVE_SYS_TIME_H # include # else