* acspecific.m4 (AC_C_INLINE): Proceed as for AC_C_CONST:

condition out the test case if __cpluscplus.
Don't document the autoheader template twice, one is enough.
* autoheader.m4 (AC_CONFIG_HEADER): don't hook on this guy, but
on...
(AC_CONFIG_HEADERS), since the former is defined on the latter.

diff --git a/ChangeLog b/ChangeLog
index 194bcc94af1a1f9a8a089270075553b070a043a8..23d2c1d9c7815bb38014458b9c6f77e43a3977b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-02-07  Akim Demaille  <akim@epita.fr>
+
+       * acspecific.m4 (AC_C_INLINE): Proceed as for AC_C_CONST:
+       condition out the test case if __cpluscplus.
+       Don't document the autoheader template twice, one is enough.
+       * autoheader.m4 (AC_CONFIG_HEADER): don't hook on this guy, but
+       on...
+       (AC_CONFIG_HEADERS), since the former is defined on the latter.
+
 2000-02-07  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (AC_CHECK_TYPE_INTERNAL): Use the scheme proposed

diff --git a/acgeneral.m4 b/acgeneral.m4
index 9140c523c918454d9bb7739e77294d62490bfd71..3db5d462a44d671e3fb46891ff11f97c44147611 100644 (file)
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -491,6 +491,9 @@ dnl If the REPLACED-FUNCTION and ARGUMENT are defined, then declare that
 dnl NAME is a specialized version of REPLACED-FUNCTION when its first
 dnl argument is ARGUMENT.  For instance AC_TYPE_SIZE_T is a specialization
 dnl of AC_CHECK_TYPE applied to `size_t'.
+dnl
+dnl This feature is not documented on purpose.  It might change in the
+dnl future.
 define([AC_DEFUN],
 [ifelse([$3],,
 [define([$1], [AC_PRO([$1])$2[]AC_EPI()])],

diff --git a/acspecific.m4 b/acspecific.m4
index a5a1f238ba7eecf91b196102d39b5eac4c5bf4d8..9c08643c1ed206e66d58bbad79d34e58876f74bc 100644 (file)
--- a/acspecific.m4
+++ b/acspecific.m4
@@ -2489,17 +2489,22 @@ fi
 
 
 
-dnl AC_C_INLINE
-dnl -----------
-dnl Do nothing if the compiler accepts the inline keyword.
-dnl Otherwise define inline to __inline__ or __inline if one of those work,
-dnl otherwise define inline to be empty.
+# AC_C_INLINE
+# -----------
+# Do nothing if the compiler accepts the inline keyword.
+# Otherwise define inline to __inline__ or __inline if one of those work,
+# otherwise define inline to be empty.
 AC_DEFUN(AC_C_INLINE,
 [AC_REQUIRE([AC_PROG_CC_STDC])dnl
 AC_CACHE_CHECK([for inline], ac_cv_c_inline,
 [ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  AC_TRY_COMPILE(, [} $ac_kw int foo() {], [ac_cv_c_inline=$ac_kw; break])
+  AC_TRY_COMPILE(,
+[#ifndef __cplusplus
+  } $ac_kw int foo() {
+#endif
+],
+[ac_cv_c_inline=$ac_kw; break])
 done
 ])
 case "$ac_cv_c_inline" in
@@ -2507,15 +2512,13 @@ case "$ac_cv_c_inline" in
   no) AC_DEFINE(inline,,
                 [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,
-                         [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
 ])dnl AC_C_INLINE
 
 
-dnl AC_C_CONST
-dnl ----------
+# AC_C_CONST
+# ----------
 AC_DEFUN(AC_C_CONST,
 [AC_REQUIRE([AC_PROG_CC_STDC])dnl
 AC_CACHE_CHECK([for an ANSI C-conforming const], ac_cv_c_const,

diff --git a/autoheader.in b/autoheader.in
index 16da8752908e01e85a8799f08d0d3eecf5e4da35..56fd735af39b5d30696ba7a3ee80249d0a1007c2 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -163,7 +163,7 @@ syms=`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`
 
 # Support "outfile[:infile]", defaulting infile="outfile.in".
 case "$config_h" in
-undefined) echo "error: AC_CONFIG_HEADER not found in $infile" >&2; exit 1 ;;
+undefined) echo "error: AC_CONFIG_HEADERS not found in $infile" >&2; exit 1 ;;
 *:*) config_h_in=`echo "$config_h"|sed 's%.*:%%'`
      config_h=`echo "$config_h"|sed 's%:.*%%'` ;;
 *) config_h_in="${config_h}.in" ;;

diff --git a/autoheader.m4 b/autoheader.m4
index 51fbdc1c348faac1d251ec4109e14ea8cfecb780..8c3023eb172793c9ce21cb78bcc93998e467a6eb 100644 (file)
--- a/autoheader.m4
+++ b/autoheader.m4
@@ -261,7 +261,7 @@ AH_TEMPLATE([F77_FUNC_],
               scheme of the Fortran 77 compiler.])])
 
 
-AH_DEFUN([AC_CONFIG_HEADER],
+AH_DEFUN([AC_CONFIG_HEADERS],
 [@@@config_h=patsubst($1, [ .*$], [])@@@
 ])
 

diff --git a/autoheader.sh b/autoheader.sh
index 16da8752908e01e85a8799f08d0d3eecf5e4da35..56fd735af39b5d30696ba7a3ee80249d0a1007c2 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -163,7 +163,7 @@ syms=`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`
 
 # Support "outfile[:infile]", defaulting infile="outfile.in".
 case "$config_h" in
-undefined) echo "error: AC_CONFIG_HEADER not found in $infile" >&2; exit 1 ;;
+undefined) echo "error: AC_CONFIG_HEADERS not found in $infile" >&2; exit 1 ;;
 *:*) config_h_in=`echo "$config_h"|sed 's%.*:%%'`
      config_h=`echo "$config_h"|sed 's%:.*%%'` ;;
 *) config_h_in="${config_h}.in" ;;

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 16da8752908e01e85a8799f08d0d3eecf5e4da35..56fd735af39b5d30696ba7a3ee80249d0a1007c2 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -163,7 +163,7 @@ syms=`for sym in $syms; do echo $sym; done | sort | uniq | sed 's@^@ @'`
 
 # Support "outfile[:infile]", defaulting infile="outfile.in".
 case "$config_h" in
-undefined) echo "error: AC_CONFIG_HEADER not found in $infile" >&2; exit 1 ;;
+undefined) echo "error: AC_CONFIG_HEADERS not found in $infile" >&2; exit 1 ;;
 *:*) config_h_in=`echo "$config_h"|sed 's%.*:%%'`
      config_h=`echo "$config_h"|sed 's%:.*%%'` ;;
 *) config_h_in="${config_h}.in" ;;

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 9140c523c918454d9bb7739e77294d62490bfd71..3db5d462a44d671e3fb46891ff11f97c44147611 100644 (file)
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -491,6 +491,9 @@ dnl If the REPLACED-FUNCTION and ARGUMENT are defined, then declare that
 dnl NAME is a specialized version of REPLACED-FUNCTION when its first
 dnl argument is ARGUMENT.  For instance AC_TYPE_SIZE_T is a specialization
 dnl of AC_CHECK_TYPE applied to `size_t'.
+dnl
+dnl This feature is not documented on purpose.  It might change in the
+dnl future.
 define([AC_DEFUN],
 [ifelse([$3],,
 [define([$1], [AC_PRO([$1])$2[]AC_EPI()])],

diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4
index a5a1f238ba7eecf91b196102d39b5eac4c5bf4d8..9c08643c1ed206e66d58bbad79d34e58876f74bc 100644 (file)
--- a/lib/autoconf/specific.m4
+++ b/lib/autoconf/specific.m4
@@ -2489,17 +2489,22 @@ fi
 
 
 
-dnl AC_C_INLINE
-dnl -----------
-dnl Do nothing if the compiler accepts the inline keyword.
-dnl Otherwise define inline to __inline__ or __inline if one of those work,
-dnl otherwise define inline to be empty.
+# AC_C_INLINE
+# -----------
+# Do nothing if the compiler accepts the inline keyword.
+# Otherwise define inline to __inline__ or __inline if one of those work,
+# otherwise define inline to be empty.
 AC_DEFUN(AC_C_INLINE,
 [AC_REQUIRE([AC_PROG_CC_STDC])dnl
 AC_CACHE_CHECK([for inline], ac_cv_c_inline,
 [ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  AC_TRY_COMPILE(, [} $ac_kw int foo() {], [ac_cv_c_inline=$ac_kw; break])
+  AC_TRY_COMPILE(,
+[#ifndef __cplusplus
+  } $ac_kw int foo() {
+#endif
+],
+[ac_cv_c_inline=$ac_kw; break])
 done
 ])
 case "$ac_cv_c_inline" in
@@ -2507,15 +2512,13 @@ case "$ac_cv_c_inline" in
   no) AC_DEFINE(inline,,
                 [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,
-                         [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
 ])dnl AC_C_INLINE
 
 
-dnl AC_C_CONST
-dnl ----------
+# AC_C_CONST
+# ----------
 AC_DEFUN(AC_C_CONST,
 [AC_REQUIRE([AC_PROG_CC_STDC])dnl
 AC_CACHE_CHECK([for an ANSI C-conforming const], ac_cv_c_const,