build/pkgs/flint/spkg-configure.m4: Reject FLINT < 2.6.0

sagemath · Mar 19, 2021 · 7b1dee7 · 7b1dee7
1 parent d1a3d23
commit 7b1dee7
Showing 1 changed file with 4 additions and 12 deletions.
diff --git a/build/pkgs/flint/spkg-configure.m4 b/build/pkgs/flint/spkg-configure.m4
@@ -1,14 +1,8 @@
 SAGE_SPKG_CONFIGURE([flint], [
-    AC_REQUIRE([SAGE_SPKG_CONFIGURE_MPFR])
-    AC_REQUIRE([SAGE_SPKG_CONFIGURE_NTL])
-    AC_MSG_CHECKING([installing mpfr or ntl? ])
-    if test x$sage_spkg_install_mpfr = xyes -o x$sage_spkg_install_ntl = xyes; then
-        AC_MSG_RESULT([yes; install flint as well])
-        sage_spkg_install_flint=yes
-    else
+    SAGE_SPKG_DEPCHECK([mpfr ntl], [
         AC_CHECK_HEADER(flint/flint.h, [
-          dnl fmpz_mat_is_hadamard appears in Flint 2.5.0
-          AC_SEARCH_LIBS([fmpz_mat_is_hadamard], [flint], [
+          dnl fmpz_mod_ctx_init appears in Flint 2.6.0
+          AC_SEARCH_LIBS([fmpz_mod_ctx_init], [flint], [
             dnl check that NTL is linked in
             AC_SEARCH_LIBS([fmpz_poly_get_ZZX], [flint], [
 
@@ -26,13 +20,11 @@ SAGE_SPKG_CONFIGURE([flint], [
             ], [sage_spkg_install_flint=yes])
           ], [sage_spkg_install_flint=yes])
         ], [sage_spkg_install_flint=yes])
-    fi
+    ])
 ], [], [], [
      if test x$sage_spkg_install_flint = xyes; then
         AC_SUBST(SAGE_FLINT_PREFIX, ['$SAGE_LOCAL'])
-        AC_MSG_RESULT([using Sage's flint SPKG])
      else
         AC_SUBST(SAGE_FLINT_PREFIX, [''])
-        AC_MSG_RESULT([using flint library from the system])
      fi
 ])