Changeset 54561a in git for m4


Ignore:
Timestamp:
Nov 29, 2021, 5:00:23 PM (2 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
39fe73698e3bd2363326506c938679abc12394d4
Parents:
c603805e5028408976e1a4581817d98a5485c26a
Message:
NTL_CPPFLGAS -> NTL_CXXFLAGS (-stdc0..), NTL_CPPFLAGS (-I..)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • m4/ntl-check.m4

    rc603805 r54561a  
    5252        if test "$NTL_HOME" != "DEFAULTS"; then
    5353                NTL_CPPFLAGS="-I${NTL_HOME}/include"
     54                NTL_CXXFLAGS=""
    5455                NTL_LIBS="-L${NTL_HOME}/lib -lntl"
    5556        else
    5657                NTL_CPPFLAGS=""
     58                NTL_CXXFLAGS=""
    5759                NTL_LIBS="-lntl"
    5860        fi
     
    9294dnl try again with -std=c++11 (for NTL >=10 with threads)
    9395        if test "$NTL_HOME" != "DEFAULTS"; then
    94                 NTL_CPPFLAGS="-std=c++11 -I${NTL_HOME}/include"
     96                NTL_CPPFLAGS="-I${NTL_HOME}/include"
     97                NTL_CXXFLAGS="-std=c++11"
    9598                NTL_LIBS="-L${NTL_HOME}/lib -lntl"
    9699        else
    97                 NTL_CPPFLAGS="-std=c++11"
     100                NTL_CPPFLAGS=""
     101                NTL_CXXFLAGS="-std=c++11"
    98102                NTL_LIBS="-lntl"
    99103        fi
    100         CXXFLAGS="${NTL_CPPFLAGS} ${BACKUP_CXXFLAGS} ${GMP_CPPFLAGS}"
     104        CXXFLAGS="${NTL_CXXFLAGS} ${NTL_CPPFLAGS} ${BACKUP_CXXFLAGS} ${GMP_CPPFLAGS}"
    101105        LIBS="${NTL_LIBS} ${GMP_LIBS} ${BACKUP_LIBS}"
    102106
Note: See TracChangeset for help on using the changeset viewer.