Changeset 952bd16 in git

Timestamp:

Feb 19, 2020, 12:32:54 AM (4 years ago)

Author:

François Bissey <frp.bissey@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

5e781fbc9e5660907bb073083a509b84a3cb2864

Parents:

f051930c5ecfb853e0c8fdfb602c026c3727ddf9

Message:

sane detection for standard paths installation of flint

File:

• m4/flint-check.m4 (modified) (2 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,
@@ -41 +41 @@
 AC_LANG_PUSH([C])
 
-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_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} ${FLINT_CFLAGS} ${GMP_CPPFLAGS}"
+        CFLAGS="${BACKUP_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_HEADER([flint/fmpz.h],
+                [AC_CHECK_LIB(flint,fmpz_init,
+                        [flint_found="yes"],
+                        [],
+                        [])],
+                [],
+                [])
 fi
-done
+
+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
+
+                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}"
+
+                AC_CHECK_LIB(flint,fmpz_init,
+                [flint_found="yes"],
+                [],
+                []
+                )
+                fi
+        done
+fi
+
 AC_LANG_POP([C])