Changeset 4f73dff in git

Timestamp:

Aug 13, 2020, 4:20:48 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

434c6e787064e48585654b1670b62446b19cef4f

Parents:

b95d18bb8d3434dbb881a78c202aedede6c0a3980fc833d77c088e98bd5b599a1917f64be0d8859a

Message:

Merge branch 'mh/gfanlib-check' of https://github.com/fingolfin/Singular into fingolfin-mh/gfanlib-check

Files:

• factory/FLINTconvert.cc (modified) (1 diff)
• m4/gfanlib-check.m4 (modified) (3 diffs)

factory/FLINTconvert.cc

@@ -64 +64 @@
 #include <flint/fmpq_mpoly.h>
 
-// planed, but not yet in FLINT: #if (__FLINT_RELEASE < 20602)
-#if (__FLINT_RELEASE < 20603)
+// planed, but not yet in FLINT:
+#if (__FLINT_RELEASE < 20604)
 // helper for fq_nmod_t -> nmod_poly_t
 static void fq_nmod_get_nmod_poly(nmod_poly_t a, const fq_nmod_t b, const fq_nmod_ctx_t ctx)

m4/gfanlib-check.m4

@@ -20 +20 @@
         AC_MSG_WARN([Error, setoper.h is missing!])
  fi
-
- AC_MSG_CHECKING([whether libcddgmp is usable])
 
 # Check whether --with-gmp was given.
@@ -83 +81 @@
  LIBS=$BACKUP_LIBS
 
+ AC_MSG_CHECKING([whether libcddgmp is usable])
  if test "x$PASSED_ALL_TESTS_FOR_GFANLIB" = x1; then
   AC_MSG_RESULT([yes])
@@ -93 +92 @@
   fi
  fi
- AC_MSG_RESULT(no)
 
  AC_SUBST(CDDGMPLDFLAGS)