Changeset db225a in git

Timestamp:

Aug 2, 2018, 10:44:03 AM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

8ac0543abc53e49f3dfa217c1250d95fa23928fb

Parents:

d8ad3714bba84907b786fa682671a1c879fad6c0

Message:

fix: ntl-test: try first without -std=c++11

File:

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

m4/ntl-check.m4

@@ -52 +52 @@
 
         if test "x$NTL_HOME" != "x/usr"; then
+                NTL_CPPFLAGS="-I${NTL_HOME}/include"
+                NTL_LIBS="-L${NTL_HOME}/lib -lntl"
+        else
+                NTL_CPPFLAGS=""
+                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}"
+
+        AC_TRY_LINK(
+        [#include <NTL/ZZ.h>],
+        [NTL::ZZ a;],
+        [
+        AC_TRY_RUN(
+        [#include <NTL/version.h>
+        #include <NTL/config.h>
+        #ifndef NTL_GMP_LIP
+        int main() {return -1;}
+        #else
+        int main () { if (NTL_MAJOR_VERSION < 5) return -1; else return 0;}
+        #endif
+        ],[
+        ntl_found="yes"
+        break
+        ],[
+        ntl_problem="$problem $NTL_HOME"
+        unset NTL_CPPFLAGS
+        unset NTL_LIBS
+        ],[
+        ntl_found="yes"
+        ntl_cross="yes"
+        break
+        ])
+        ],
+        [
+        ntl_found="no"
+        ntl_checked="$checked $NTL_HOME"
+        unset NTL_CPPFLAGS
+        unset NTL_LIBS
+        ])
+dnl try again with -std=c++11 (for NTL >=10 with threads)
+        if test "x$NTL_HOME" != "x/usr"; then
                 NTL_CPPFLAGS="-std=c++11 -I${NTL_HOME}/include"
                 NTL_LIBS="-L${NTL_HOME}/lib -lntl"
@@ -99 +142 @@
 
 if test "x$ntl_found" = "xyes" ; then
-        AC_TRY_RUN(
-        [#include <NTL/version.h>
-        #include <NTL/config.h>
-        int main () { if (NTL_MAJOR_VERSION < 10) return -1; else return 0;}
-        ],[
-        break
-        ],[
-                NTL_CPPFLAGS="-I${NTL_HOME}/include"
-        ],[
-        break
-        ])
         AC_SUBST(NTL_CPPFLAGS)
         AC_SUBST(NTL_LIBS)