Changeset 3b920ed in git

Timestamp:

Apr 6, 2021, 10:56:03 AM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

c69c1449f9256724d4c9e0ac18c7524a65d69389

Parents:

950a9492a285ef0e171fff1212d40c3d1e4ff276d66b187a28e7b886166363f1d7cba11f4c3270e7

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-04-06 10:56:03+02:00

git-committer:

GitHub <noreply@github.com>2021-04-06 10:56:03+02:00

Message:

Merge pull request #1080 from mkoeppe/DEFAULT_CHECKING_PATH_try_default_flags_first

m4/*-check.m4: Check DEFAULTS first, following flint-check.m4

Location:

m4

Files:

• ccluster-check.m4 (modified) (1 diff)
• default_checking_path.m4 (modified) (1 diff)
• gmp-check.m4 (modified) (3 diffs)
• ntl-check.m4 (modified) (3 diffs)

m4/ccluster-check.m4

@@ -8 +8 @@
 [  --with-ccluster= <path>|yes Use ccluster library.  ],
                 [if test "$withval" = yes ; then
-                        CCLUSTER_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+                        CCLUSTER_HOME_PATH="${DEFAULT_CHECKING_PATH} /usr"
                  elif test "$withval" != no ; then
-                        CCLUSTERMP_HOME_PATH="$withval"
+                        CCLUSTER_HOME_PATH="$withval"
                 fi],
-                [CCLUSTER_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
+                [CCLUSTER_HOME_PATH="${DEFAULT_CHECKING_PATH} /usr"])
 
 dnl Check for existence

m4/default_checking_path.m4

@@ -1 +1 @@
 AC_DEFUN([SING_DEFAULT_CHECKING_PATH], [
-    DEFAULT_CHECKING_PATH="/opt/homebrew /opt/local /sw /usr/local /usr"
+    DEFAULT_CHECKING_PATH="/opt/homebrew /opt/local /sw /usr/local"
 ])

m4/gmp-check.m4

@@ -6 +6 @@
     dnl Given
 if test "$with_gmp" = yes ; then
-        GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+        GMP_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"
 elif test "$with_gmp" != no ; then
         GMP_HOME_PATH="$with_gmp"
@@ -14 +14 @@
 ], [
     dnl Not given
-    GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+    GMP_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"
 ])
 
@@ -23 +23 @@
 for GMP_HOME in ${GMP_HOME_PATH}
 do
-    if test "x$GMP_HOME" != "x/usr"; then
+    if test "$GMP_HOME" != "DEFAULTS"; then
       GMP_CPPFLAGS="-I${GMP_HOME}/include"
       GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath,${GMP_HOME}/lib -lgmp"
-      CFLAGS="${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
-      LIBS=" ${GMP_LIBS} ${BACKUP_LIBS}"
     else
       GMP_CPPFLAGS=""
       GMP_LIBS="-lgmp"
     fi
+    CFLAGS="${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
+    LIBS=" ${GMP_LIBS} ${BACKUP_LIBS}"
     AC_TRY_LINK([#include <gmp.h>
                 ],
                 [mpz_t a; mpz_init (a);], [
       gmp_found=yes
+      break
     ])
 done

m4/ntl-check.m4

@@ -27 +27 @@
              ],
              [if test "$withval" = yes ; then
-                        NTL_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+                        NTL_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"
               elif test "$withval" != no ; then
                         NTL_HOME_PATH="$withval"
                         NTL_SHOULD_BE_PRESENT="yes"
              fi],
-             [NTL_HOME_PATH="${DEFAULT_CHECKING_PATH}"])
+             [NTL_HOME_PATH="DEFAULTS ${DEFAULT_CHECKING_PATH}"])
 
 min_ntl_version=ifelse([$1], ,1.0,$1)
@@ -50 +50 @@
 for NTL_HOME in ${NTL_HOME_PATH}
  do
-        if test "x$NTL_HOME" != "x/usr"; then
+        if test "$NTL_HOME" != "DEFAULTS"; then
                 NTL_CPPFLAGS="-I${NTL_HOME}/include"
                 NTL_LIBS="-L${NTL_HOME}/lib -lntl"
@@ -91 +91 @@
         ])
 dnl try again with -std=c++11 (for NTL >=10 with threads)
-        if test "x$NTL_HOME" != "x/usr"; then
+        if test "$NTL_HOME" != "DEFAULTS"; then
                 NTL_CPPFLAGS="-std=c++11 -I${NTL_HOME}/include"
                 NTL_LIBS="-L${NTL_HOME}/lib -lntl"