Changeset c6b4e50 in git

Timestamp:

Feb 20, 2020, 12:06:32 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

286859c2190d45687e4046b3c8bbcd22ec9fd860

Parents:

cce62fd4f828ad04b6f9fe5a21640b663ff10d926b44a806d602e8ec6446a900742a49e24adb1277

Message:

Merge branch 'kiwifb-flint_detection' into spielwiese

File:

• m4/flint-check.m4 (modified) (3 diffs)

m4/flint-check.m4

@@ -14 +14 @@
 AC_DEFUN([LB_CHECK_FLINT],
 [
-DEFAULT_CHECKING_PATH="/usr /usr/local /sw /opt/local"
+DEFAULT_CHECKING_PATH="/sw /opt/local"
 
 AC_ARG_WITH(flint,
@@ -35 +35 @@
 BACKUP_LIBS=${LIBS}
 
-if test -n "$FLINT_HOME_PATH"; then
-AC_MSG_CHECKING(for FLINT >= $min_flint_version)
+AC_LANG_PUSH([C])
+
+flint_found="no"
+dnl check for system installed libraries if FLINT_HOME_PATH is the default
+if test "$FLINT_HOME_PATH" = "$DEFAULT_CHECKING_PATH" ; then
+        FLINT_CFLAGS=""
+        FLINT_LIBS="-lflint -lmpfr"
+
+        # we suppose that mpfr and mpir to be in the same place or available by default
+        CFLAGS="${BACKUP_CFLAGS} ${GMP_CPPFLAGS}"
+        LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUPLIBS}"
+
+        AC_CHECK_HEADER([flint/fmpz.h],
+                [AC_CHECK_LIB(flint,fmpz_init,
+                        [flint_found="yes"],
+                        [],
+                        [])],
+                [],
+                [])
 fi
 
-AC_LANG_PUSH([C])
+dnl if flint was not previously found, search FLINT_HOME_PATH
+if test "x$flint_found" = "xno" ; then
+        for FLINT_HOME in ${FLINT_HOME_PATH}
+        do
+                if test -r "$FLINT_HOME/include/flint/fmpz.h"; then
 
-for FLINT_HOME in ${FLINT_HOME_PATH}
- do
- if test -r "$FLINT_HOME/include/flint/fmpz.h"; then
-
-        FLINT_CFLAGS="-I${FLINT_HOME}/include/"
-        FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr"
+                FLINT_CFLAGS="-I${FLINT_HOME}/include/"
+                FLINT_LIBS="-L${FLINT_HOME}/lib -lflint -lmpfr"
 
         # we suppose that mpfr and mpir to be in the same place or available by default
-        CFLAGS="${BACKUP_CFLAGS} ${FLINT_CFLAGS} ${GMP_CPPFLAGS}"
-        LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUPLIBS}"
+                CFLAGS="${BACKUP_CFLAGS} ${FLINT_CFLAGS} ${GMP_CPPFLAGS}"
+                LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUPLIBS}"
 
-        AC_CHECK_LIB(flint,fmpz_init,
-        [flint_found="yes"],
-        [flint_found="mo"],
-        []
-        )
-else
-        flint_found="no"
+                AC_CHECK_LIB(flint,fmpz_init,
+                [flint_found="yes"],
+                [],
+                []
+                )
+                fi
+        done
 fi
-done
+
 AC_LANG_POP([C])
 
@@ -67 +84 @@
 #unset LD_LIBRARY_PATH
 
+AC_MSG_CHECKING(for FLINT)
 
 if test "x$flint_found" = "xyes" ; then