* acgeneral.m4: Formatting changes.
* acspecific.m4: Likewise.
+1999-10-31 Akim Demaille <akim@epita.fr>
+
+ * acgeneral.m4: Formatting changes.
+ * acspecific.m4: Likewise.
+
1999-10-31 Akim Demaille <akim@epita.fr>
* acgeneral.m4 (AC_CONFIG_LINKS): Allow a second argument,
[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([,]),
AC_SHELL_IFELSE(test AC_VAR_GET(ac_Type) = yes,,
[AC_DEFINE_UNQUOTED($1, $2,
[Define to `$2' if <sys/types.h>
- does not define `$1'.])])dnl
+ does not define.])])dnl
AC_VAR_POPDEF([ac_Type])dnl
])dnl AC_CHECK_TYPE
# 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="\\
[AC_OUTPUT_COMMANDS_COMMANDS()])dnl
cat >>$CONFIG_STATUS <<EOF
+#
+# AC_OUTPUT_COMMANDS section.
+#
+
undivert(AC_DIVERSION_ICMDS)dnl
EOF
cat >>$CONFIG_STATUS <<\EOF
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,
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
[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)
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
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
-fi])])
+fi])dnl
+])
dnl AC_PROG_CXX_GNU
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
-fi])])
+fi])dnl
+])
dnl AC_PROG_F77_GNU
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
- #else
+#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
[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([,]),
AC_SHELL_IFELSE(test AC_VAR_GET(ac_Type) = yes,,
[AC_DEFINE_UNQUOTED($1, $2,
[Define to `$2' if <sys/types.h>
- does not define `$1'.])])dnl
+ does not define.])])dnl
AC_VAR_POPDEF([ac_Type])dnl
])dnl AC_CHECK_TYPE
# 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="\\
[AC_OUTPUT_COMMANDS_COMMANDS()])dnl
cat >>$CONFIG_STATUS <<EOF
+#
+# AC_OUTPUT_COMMANDS section.
+#
+
undivert(AC_DIVERSION_ICMDS)dnl
EOF
cat >>$CONFIG_STATUS <<\EOF
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,
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
[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)
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
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
-fi])])
+fi])dnl
+])
dnl AC_PROG_CXX_GNU
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
-fi])])
+fi])dnl
+])
dnl AC_PROG_F77_GNU
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
- #else
+#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else