* acinclude.m4 (GMP_C_INLINE): Remove.

	(GMP_H_EXTERN_INLINE): Use AC_C_INLINE.
	(GMP_PROG_AR): Comment on automake $ARFLAGS.

1 files changed, 8 insertions, 44 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 06db9f3e2..cd2fbce4f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -249,6 +249,10 @@ dnl  latter fails when libtool goes into piecewise mode and is unlucky
 dnl  enough to have two same-named objects in separate pieces, as happens
 dnl  for instance to random.o (and others) on vax-dec-ultrix4.5.  Naturally
 dnl  a user-selected $AR_FLAGS is left unchanged.
+dnl
+dnl  For reference, $ARFLAGS is used by automake (1.8) for its ".a" archive
+dnl  file rules.  This doesn't get used by the piecewise linking, so we
+dnl  leave it at the default "cru".
 
 AC_DEFUN([GMP_PROG_AR],
 [dnl  Want to establish $AR before libtool initialization.
@@ -2936,46 +2940,6 @@ esac
 ])
 
 
-dnl  GMP_C_INLINE
-dnl  ------------
-dnl  Establish an "inline" keyword, if possible.
-dnl
-dnl  This is the same as AC_C_INLINE, but the #define of inline is applied
-dnl  only to C, not C++.
-dnl
-dnl  FIXME: Hopefully autoconf will address this itself some time.
-
-AC_DEFUN([GMP_C_INLINE],
-[AC_CACHE_CHECK([for inline], gmp_cv_c_inline,
-[gmp_cv_c_inline=no
-for i in inline __inline__ __inline; do
-  AC_TRY_COMPILE(
-[#ifndef __cplusplus
-typedef int foo_t;
-$i foo_t func1 () { return 0; }
-static $i foo_t func2 () { return 0; }
-#endif], ,
-    [gmp_cv_c_inline=$i
-    break])
-done
-if test $gmp_cv_c_inline = inline; then
-  gmp_cv_c_inline=yes
-fi
-])
-AH_VERBATIM(inline,
-[/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
-#ifndef __cplusplus
-#undef inline
-#endif])
-case $gmp_cv_c_inline in
-  inline | yes) ;;
-  no) AC_DEFINE(inline, [ ]) ;;
-  *)  AC_DEFINE_UNQUOTED(inline, $gmp_cv_c_inline) ;;
-esac
-])
-
-
 dnl  GMP_C_RIGHT_SHIFT
 dnl  -----------------
 dnl  Test whether a signed right shift is arithmetic, ie. high bit positions
@@ -3298,8 +3262,8 @@ dnl  If the compiler has an "inline" of some sort, check whether the
 dnl  #ifdef's in gmp.h recognise it.
 
 AC_DEFUN([GMP_H_EXTERN_INLINE],
-[AC_REQUIRE([GMP_C_INLINE])
-case $gmp_cv_c_inline in
+[AC_REQUIRE([AC_C_INLINE])
+case $ac_cv_c_inline in
 no) ;;
 *)
   AC_TRY_COMPILE(
@@ -3309,9 +3273,9 @@ no) ;;
 die die die
 #endif
 ],,,
-  [case $gmp_cv_c_inline in
+  [case $ac_cv_c_inline in
   yes) tmp_inline=inline ;;
-  *)   tmp_inline=$gmp_cv_c_inline ;;
+  *)   tmp_inline=$ac_cv_c_inline ;;
   esac    
   AC_MSG_WARN([gmp.h doesnt recognise compiler "$tmp_inline", inlines will be unavailable])])
   ;;