Changeset aaa6f6 in git for m4

Timestamp:

Apr 3, 2021, 2:51:17 AM (3 years ago)

Author:

Matthias Koeppe <mkoeppe@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

667529e8a32e9ef38583a0bd6b869c9b45a11fd2

Parents:

1733ed9a4d750611a361aa6089edb436c8173c79

git-author:

Matthias Koeppe <mkoeppe@math.ucdavis.edu>2021-04-02 17:51:17-07:00

git-committer:

Matthias Koeppe <mkoeppe@math.ucdavis.edu>2021-04-03 09:43:28-07:00

Message:

m4/ntl-check.m4: In the search loop, put NTL_CPPFLAGS to the front of CXXFLAGS; use AC_CHECK_HEADER instead of 'test -r'

File:

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

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