Changeset 502dd5 in git

Timestamp:

Jun 3, 2013, 7:22:36 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

92644b759d66f085c842e4284d78c2e203291b67

Parents:

c244a9512b02adbbf7523f1eb5797517817486fcdbf5d117920b748b850f37199276cc4894eb28e2

Message:

Merge pull request #333 from mmklee/NTLcheck

chg: check if NTL_GMP_LIP=on was given to NTL's configure

Files:

• Singular/attrib.cc (modified) (1 diff)
• m4/ntl-check.m4 (modified) (2 diffs)

Singular/attrib.cc

@@ -169 +169 @@
     attr *a=root->Attribute();
     int rt=root->Typ();
-    if ((rt!=RING_CMD)
+    if (a==NULL)
+      WerrorS("cannot set attributes of this object");
+    else if ((rt!=RING_CMD)
     && (rt!=QRING_CMD)
     && (!RingDependend(rt))&&(RingDependend(typ)))

m4/ntl-check.m4

@@ -68 +68 @@
         AC_TRY_RUN(
         [#include <NTL/version.h>
-        int main () { if (NTL_MAJOR_VERSION < 5) return -1; else return 0; }    
+        #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" 
@@ -108 +113 @@
 elif test -n "$ntl_problem"; then
         AC_MSG_RESULT(problem)
-        echo "Sorry, your NTL version is too old. Disabling."
+        echo "Sorry, your NTL version is too old or not configured with NTL_GMP_LIP=on. Disabling."
         ifelse([$3], , :, [$3])
 elif test   "x$ntl_found" = "xno";  then