Changeset d42570 in git

Timestamp:

Apr 4, 2021, 5:18:58 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

03514358a007bf6bb923bc7b510ec15fb877158b03e1a6b2f2adb73ea1fb4db1dc3cb7b91c092e242151c5ebd7e3a9fb9ce46ab1567a1e0db68f4e5168efee280d28d45c36fe198205a93c29e0641ea8

Parents:

a6066346d52c8c0689e6c1366c1a4d6badfcb3c11e09dec2091147319c529a7dc8c0acdfd137f5d7

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-04-04 17:18:58+02:00

git-committer:

GitHub <noreply@github.com>2021-04-04 17:18:58+02:00

Message:

Merge pull request #1076 from mkoeppe/DEFAULT_CHECKING_PATH_use_AC_CHECK_HEADER_instead_of_test

m4/*.m4: In the search loops, test for the presence of headers using the compiler

Location:

m4

Files:

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

m4/flint-check.m4

@@ -44 +44 @@
 
         # we suppose that mpfr and mpir to be in the same place or available by default
-        CFLAGS="${BACKUP_CFLAGS} ${GMP_CPPFLAGS}"
+        CFLAGS=" ${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
         LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
 
-        AC_CHECK_HEADER([flint/fmpz.h],
-                [AC_CHECK_LIB(flint,fmpz_init,
-                        [flint_found="yes"],
-                        [],
-                        [])],
-                [],
-                [])
+        AC_TRY_LINK([#include <flint/fmpz.h>
+                    ],
+                    [fmpz_t x; fmpz_init(x);], [
+                flint_found="yes"
+        ])
 fi
 
@@ -60 +58 @@
         for FLINT_HOME in ${FLINT_HOME_PATH}
         do
-                if test -r "$FLINT_HOME/include/flint/fmpz.h"; then
 
                 FLINT_CFLAGS="-I${FLINT_HOME}/include/"
@@ -66 +63 @@
 
         # we suppose that mpfr and mpir to be in the same place or available by default
-                CFLAGS="${BACKUP_CFLAGS} ${FLINT_CFLAGS} ${GMP_CPPFLAGS}"
+                CFLAGS="${FLINT_CFLAGS} ${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
                 LIBS="${FLINT_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
 
-                AC_CHECK_LIB(flint,fmpz_init,
-                [flint_found="yes"],
-                [],
-                []
-                )
-                if test "x$flint_found" = "xyes" ; then
-                    break
-                  fi
-                fi
+                AC_TRY_LINK([#include <flint/fmpz.h>
+                            ],
+                            [fmpz_t x; fmpz_init(x);], [
+                        flint_found="yes"
+                        break
+                ])
         done
 fi

m4/gmp-check.m4

@@ -1 +1 @@
 AC_DEFUN([SING_CHECK_GMP], [
+AC_REQUIRE([SING_DEFAULT_CHECKING_PATH])
 # Check whether --with-gmp was given.
 AC_ARG_WITH([gmp],[AS_HELP_STRING([--with-gmp=path],
-                    [provide a non-standard location of gmp])])
-AC_REQUIRE([SING_DEFAULT_CHECKING_PATH])
-GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+                    [provide a non-standard location of gmp])], [
+    dnl Given
 if test "$with_gmp" = yes ; then
         GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
 elif test "$with_gmp" != no ; then
         GMP_HOME_PATH="$with_gmp"
+else
+     AC_MSG_ERROR([Use of GNU MP is required, cannot use --without-gmp])
 fi
+], [
+    dnl Not given
+    GMP_HOME_PATH="${DEFAULT_CHECKING_PATH}"
+])
 
 BACKUP_CFLAGS=${CFLAGS}
 BACKUP_LIBS=${LIBS}
 
+gmp_found=no
 for GMP_HOME in ${GMP_HOME_PATH}
 do
-  if test "x$GMP_HOME" != "x/usr"; then
-    if test -e ${GMP_HOME}/include/gmp.h; then
+    if test "x$GMP_HOME" != "x/usr"; then
       GMP_CPPFLAGS="-I${GMP_HOME}/include"
       GMP_LIBS="-L${GMP_HOME}/lib -Wl,-rpath,${GMP_HOME}/lib -lgmp"
-      break
+      CFLAGS="${GMP_CPPFLAGS} ${BACKUP_CFLAGS}"
+      LIBS=" ${GMP_LIBS} ${BACKUP_LIBS}"
+    else
+      GMP_CPPFLAGS=""
+      GMP_LIBS="-lgmp"
     fi
-  fi
+    AC_TRY_LINK([#include <gmp.h>
+                ],
+                [mpz_t a; mpz_init (a);], [
+      gmp_found=yes
+    ])
 done
-if test -z "${GMP_LIBS}"
-then
-  GMP_LIBS="-lgmp"
+if test "$gmp_found" != yes; then
+    AC_MSG_ERROR([GNU MP not found])
 fi
-
-CFLAGS="${BACKUP_CFLAGS} ${GMP_CPPFLAGS}"
-LIBS=" ${GMP_LIBS} ${BACKUP_LIBS}"
 
 AC_SUBST(GMP_CPPFLAGS)
 AC_SUBST(GMP_LIBS)
 
-AC_CHECK_HEADERS([gmp.h], ,[AC_MSG_ERROR([GNU MP not found])])
-AC_CHECK_LIB(gmp, __gmpz_init, , [AC_MSG_ERROR([GNU MP not found])])
-
 ])

m4/ntl-check.m4

@@ -50 +50 @@
 for NTL_HOME in ${NTL_HOME_PATH}
  do
-if test -r "$NTL_HOME/include/NTL/ZZ.h"; then
-
         if test "x$NTL_HOME" != "x/usr"; then
-          if test -e  $NTL_HOME/include/NTL/mat_ZZ.h; then
                 NTL_CPPFLAGS="-I${NTL_HOME}/include"
                 NTL_LIBS="-L${NTL_HOME}/lib -lntl"
-          fi
         else
                 NTL_CPPFLAGS=""
                 NTL_LIBS="-lntl"
         fi
-###     CFLAGS="${BACKUP_CFLAGS} ${NTL_CPPFLAGS} ${GMP_CPPFLAGS}"
-        CXXFLAGS="${BACKUP_CXXFLAGS} ${NTL_CPPFLAGS} ${GMP_CPPFLAGS}"
+        CXXFLAGS="${NTL_CPPFLAGS} ${GMP_CPPFLAGS} ${BACKUP_CXXFLAGS}"
         LIBS="${NTL_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
 
@@ -103 +98 @@
                 NTL_LIBS="-lntl"
         fi
-###     CFLAGS="${BACKUP_CFLAGS} ${NTL_CPPFLAGS} ${GMP_CPPFLAGS}"
-        CXXFLAGS="${BACKUP_CXXFLAGS} ${NTL_CPPFLAGS} ${GMP_CPPFLAGS}"
-        LIBS="${BACKUP_LIBS} ${NTL_LIBS} ${GMP_LIBS}"
+        CXXFLAGS="${NTL_CPPFLAGS} ${BACKUP_CXXFLAGS} ${GMP_CPPFLAGS}"
+        LIBS="${NTL_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
 
         AC_TRY_LINK(
@@ -137 +131 @@
         unset NTL_LIBS
         ])
-else
-        ntl_found="no"
-fi
 done