* configure.in, acinclude.m4 (GMP_CRAY_OPTIONS): New macro for Cray

	system setups, letting AC_REQUIRE do its job instead of a hard coded
	AC_PROG_EGREP.

1 files changed, 34 insertions, 3 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 6a979bdc5..a29ccb80b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -800,6 +800,37 @@ fi
 ])
 
 
+dnl  GMP_CRAY_HOST_TYPES(C90/T90-IEEE, C90/T90-CFP, J90/SV1)
+dnl  -------------------------------------------------------
+dnl  Execute the actions in the arguments on the respective Cray vector
+dnl  systems.  For other hosts, do nothing.
+dnl
+dnl  This macro should be used after the C compiler has been chosen, since
+dnl  on c90 and t90 we ask the compiler whether we're in IEEE or CFP float
+dnl  mode.
+dnl
+dnl  This code is in a macro so that any AC_REQUIRE pre-requisites of
+dnl  AC_EGREP_CPP will be expanded at the top-level, ie. for all hosts not
+dnl  merely c90 and t90.  In autoconf 2.57 for instance this means
+dnl  AC_PROG_EGREP, which is needed by various other macros.
+
+AC_DEFUN(GMP_CRAY_OPTIONS,
+[case $host_cpu in
+  c90 | t90)
+    AC_EGREP_CPP(yes,
+[#ifdef _CRAYIEEE
+yes
+#endif],
+    [$1],
+    [$2])
+    ;;
+  j90 | sv1)
+    [$3]
+    ;;
+esac
+])
+
+
 dnl  GMP_HPPA_LEVEL_20(cc/cflags [, ACTION-GOOD [,ACTION-BAD]])
 dnl  ----------------------------------------------------------
 dnl  Check that the given cc/cflags accepts HPPA 2.0n assembler code.
@@ -969,7 +1000,7 @@ echo ['define(<$1>, <$2>)'] >>ifelse([$3], [POST],
 ])
 
 
-dnl  GMP_DEFINE_RAW(STRING, [, LOCATION])
+dnl  GMP_DEFINE_RAW(STRING [, LOCATION])
 dnl  ------------------------------------
 dnl  Put STRING into config.m4 file.
 dnl
@@ -1456,8 +1487,8 @@ dnl  __GMP_DECLSPEC on their prototypes.  But this isn't an ideal situation,
 dnl  since we don't want perfectly valid calls going wrong just because
 dnl  there wasn't a prototype in scope.
 dnl
-dnl  When an auto-import takes place, the following a warning is given by
-dnl  the linker.  This shouldn't be seen for any functions.
+dnl  When an auto-import takes place, the following warning is given by the
+dnl  linker.  This shouldn't be seen for any functions.
 dnl
 dnl      Info: resolving _foo by linking to __imp__foo (auto-import)
 dnl