Use variables NTL_INCDIR, NTL_LIBDIR in sage_conf, separate from NTL_PREFIX used in sage-build-env-config; set -std=c++11 in NTL_CFLAGS

Author: Matthias Koeppe

build/pkgs/ntl/spkg-configure.m4

@@ -49,6 +49,9 @@ SAGE_SPKG_CONFIGURE([ntl], [
         AC_SUBST(SAGE_NTL_PREFIX, ['$SAGE_LOCAL'])
     else
         AC_SUBST(SAGE_NTL_PREFIX, [''])
+        AX_ABSOLUTE_HEADER([NTL/ZZ.h])
+        AC_SUBST(NTL_INCDIR, [`AS_DIRNAME(AS_DIRNAME($gl_cv_absolute_NTL_ZZ_h))`])
+        AC_SUBST(NTL_LIBDIR, [`AS_DIRNAME($NTL_INCDIR)/lib`])
     fi
 ])
 

build/pkgs/sage_conf/src/sage_conf.py.in

@@ -6,7 +6,8 @@ MAXIMA = "@prefix@/bin/maxima"
 
 ARB_LIBRARY = "@SAGE_ARB_LIBRARY@"
 
-NTL_PREFIX = "@SAGE_NTL_PREFIX@"
+NTL_INCDIR = "@NTL_INCDIR@"
+NTL_LIBDIR = "@NTL_LIBDIR@"
 
 # Path to the ecl-config script
 # TODO: At the moment this is hard-coded, needs to be set during the configure phase if we want to support system-installed ecl.

src/sage/env.py

@@ -211,7 +211,8 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
 ARB_LIBRARY = var("ARB_LIBRARY", "arb")
 CBLAS_PC_MODULES = var("CBLAS_PC_MODULES", "cblas:openblas:blas")
 ECL_CONFIG = var("ECL_CONFIG", "ecl-config")
-NTL_PREFIX = var("NTL_PREFIX", SAGE_LOCAL)
+NTL_INCDIR = var("NTL_INCDIR")
+NTL_LIBDIR = var("NTL_LIBDIR")
 
 # misc
 SAGE_BANNER = var("SAGE_BANNER", "")
@@ -475,9 +476,9 @@ def uname_specific(name, value, alternative):
     aliases["ECL_LIBEXTRA"] = list(filter(lambda s: not s.startswith(('-l','-L')), ecl_libs))
 
     # NTL
-    aliases["NTL_CFLAGS"] = []
-    aliases["NTL_INCDIR"] = [os.path.join(NTL_PREFIX, 'include')] if NTL_PREFIX else []
-    aliases["NTL_LIBDIR"] = [os.path.join(NTL_PREFIX, 'lib')] if NTL_PREFIX else []
+    aliases["NTL_CFLAGS"] = ['-std=c++11']
+    aliases["NTL_INCDIR"] = [NTL_INCDIR] if NTL_INCDIR else []
+    aliases["NTL_LIBDIR"] = [NTL_LIBDIR] if NTL_LIBDIR else []
     aliases["NTL_LIBRARIES"] = ['ntl']
     aliases["NTL_LIBEXTRA"] = []