Changeset c3239f9 in git for m4

Timestamp:

Jan 21, 2020, 11:44:38 AM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

1c9d9824e066f96f9c671ab35777b37f9ba9124f

Parents:

9abd6ac1002e12503f4242662b375dddf81dcff00d7b0d730875bbec6a77aef58999ff69444ca348

Message:

Merge branch 'machine_learning' of https://github.com/MHeymann/Sources into MHeymann-machine_learning

Location:

m4

Files:

• flint-check.m4 (modified) (4 diffs)
• gfanlib-check.m4 (modified) (1 diff)
• mathic-check.m4 (modified) (1 diff)
• ntl-check.m4 (modified) (1 diff)
• options.m4 (modified) (1 diff)

m4/flint-check.m4

@@ -9 +9 @@
 # Shamelessly stolen from Owen Taylor
 
-dnl LB_CHECK_FLINT ([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-dnl
 dnl Test for FLINT and define
 dnl FLINT_CFLAGS and FLINT_LIBS
@@ -26 +24 @@
                             <path> to the directory which contain the library.
              ],
-             [if test "$withval" = yes ; then
+             [if test "x$withval" = xyes ; then
                         FLINT_HOME_PATH="${DEFAULT_CHECKING_PATH}"
-              elif test "$withval" != no ; then
+              elif test "x$withval" != xno ; then
                         FLINT_HOME_PATH="$withval"
              fi],
              [FLINT_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
-
-min_flint_version=ifelse([$1], ,2.3,$1)
-
 
 dnl Check for existence
@@ -55 +50 @@
         # we suppose that mpfr and mpir to be in the same place or available by default
         CFLAGS="${BACKUP_CFLAGS} ${FLINT_CFLAGS} ${GMP_CPPFLAGS}"
-        LIBS="${BACKUP_LIBS} ${FLINT_LIBS} ${GMP_LIBS}"
+        LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUPLIBS}"
 
-        AC_TRY_LINK(
-        [#include <flint/fmpz.h>],
-        [fmpz_t a; fmpz_init (a);],
-        [
-        AC_TRY_RUN(
-        [#include <flint/flint.h>
-        int main () { if ((int) version[0] < 2) return -1; else return 0; }
-        ],[
-        flint_found="yes"
-        break
-        ],[
-        flint_problem="$problem $FLINT_HOME"
-        unset FLINT_CFLAGS
-        unset FLINT_LIBS
-        ],[
-        flint_found="yes"
-        flint_cross="yes"
-        break
-        ])
-        ],
-        [
-        flint_found="no"
-        flint_checked="$checked $FLINT_HOME"
-        unset FLINT_CFLAGS
-        unset FLINT_LIBS
-        ])
+        AC_CHECK_LIB(flint,fmpz_init,
+        [flint_found="yes"],
+        [flint_found="mo"],
+        []
+        )
 else
         flint_found="no"
@@ -100 +74 @@
         AC_DEFINE(HAVE_FLINT,1,[Define if FLINT is installed])
         HAVE_FLINT=yes
-        if test "x$flint_cross" != "xyes"; then
-                AC_MSG_RESULT(found)
-        else
-                AC_MSG_RESULT(unknown)
-                echo "WARNING: You appear to be cross compiling, so there is no way to determine"
-                echo "whether your FLINT version is new enough. I am assuming it is."
-        fi
-        ifelse([$2], , :, [$2])
-elif test -n "$flint_problem"; then
-        AC_MSG_RESULT(problem)
-        echo "Sorry, your FLINT version is too old. Disabling."
-        ifelse([$3], , :, [$3])
-elif test   "x$flint_found" = "xno";  then
+        AC_MSG_RESULT(found)
+else
         AC_MSG_RESULT(not found)
-        ifelse([$3], , :, [$3])
 fi
-
-AM_CONDITIONAL(SING_HAVE_FLINT, test "x$HAVE_FLINT" = "xyes")
 ])
 

m4/gfanlib-check.m4

@@ -25 +25 @@
  BACKUP_LIBS=$LIBS
 
- LIBS="$LIBS -lcddgmp $GMP_LIBS "
+ LIBS="-lcddgmp -lgmp $GMP_LIBS $LIBS"
 
  AC_LANG_PUSH(C++)

m4/mathic-check.m4

@@ -22 +22 @@
   AC_CHECK_LIB(mathic, libmathicIsPresent, [],
     [AC_MSG_ERROR([Cannot find libmathic, which is required for MathicGB.])])
+  AC_CHECK_LIB(tbb, libtbbIsPresent, [],
+    [])
   AC_CHECK_LIB(mathicgb, libmathicgbIsPresent, [],
     [AC_MSG_ERROR([Cannot find the MathicGB library.])])

m4/ntl-check.m4

@@ -61 +61 @@
 ###     CFLAGS="${BACKUP_CFLAGS} ${NTL_CPPFLAGS} ${GMP_CPPFLAGS}"
         CXXFLAGS="${BACKUP_CXXFLAGS} ${NTL_CPPFLAGS} ${GMP_CPPFLAGS}"
-        LIBS="${BACKUP_LIBS} ${NTL_LIBS} ${GMP_LIBS}"
+        LIBS="${NTL_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
 
         AC_TRY_LINK(

m4/options.m4

@@ -418 +418 @@
  AM_CONDITIONAL([SI_BUILTIN_SYSTHREADS], [test x$bi_systhreads = xtrue])
  AM_CONDITIONAL([SI_BUILTIN_LOCTRIV], [test x$bi_loctriv = xtrue])
+ AM_CONDITIONAL([SI_BUILTIN_MACHINELEARNING], [test x$bi_machinelearning = xtrue])
 
  AC_MSG_CHECKING([BUILTIN_LIBS...])