Changeset 502dd5 in git


Ignore:
Timestamp:
Jun 3, 2013, 7:22:36 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
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:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/attrib.cc

    rdbf5d1 r502dd5  
    169169    attr *a=root->Attribute();
    170170    int rt=root->Typ();
    171     if ((rt!=RING_CMD)
     171    if (a==NULL)
     172      WerrorS("cannot set attributes of this object");
     173    else if ((rt!=RING_CMD)
    172174    && (rt!=QRING_CMD)
    173175    && (!RingDependend(rt))&&(RingDependend(typ)))
  • m4/ntl-check.m4

    rc244a95 r502dd5  
    6868        AC_TRY_RUN(
    6969        [#include <NTL/version.h>
    70         int main () { if (NTL_MAJOR_VERSION < 5) return -1; else return 0; }   
     70        #include <NTL/config.h>
     71        #ifndef NTL_GMP_LIP
     72        int main() {return -1;}
     73        #else
     74        int main () { if (NTL_MAJOR_VERSION < 5) return -1; else return 0;}
     75        #endif 
    7176        ],[
    7277        ntl_found="yes"
     
    108113elif test -n "$ntl_problem"; then
    109114        AC_MSG_RESULT(problem)
    110         echo "Sorry, your NTL version is too old. Disabling."
     115        echo "Sorry, your NTL version is too old or not configured with NTL_GMP_LIP=on. Disabling."
    111116        ifelse([$3], , :, [$3])
    112117elif test   "x$ntl_found" = "xno";  then
Note: See TracChangeset for help on using the changeset viewer.