Revert "replace SAGE_ECMBIN with ECM"

This reverts commit e1d3f37.

Author: dimpase

build/pkgs/ecm/spkg-configure.m4

@@ -36,5 +36,5 @@ SAGE_SPKG_CONFIGURE([ecm], [
         ], [sage_spkg_install_ecm=yes])
     ])
     m4_popdef([SAGE_ECM_MINVER])
-    AC_SUBST(ECM, $SAGE_ECM_BIN)
+    AC_SUBST(SAGE_ECMBIN, $SAGE_ECM_BIN)
 ])

pkgs/sage-conf/_sage_conf/_conf.py.in

@@ -32,7 +32,7 @@ ECL_CONFIG = "@SAGE_ECL_CONFIG@".replace('${prefix}', SAGE_LOCAL)
 
 SAGE_NAUTY_BINS_PREFIX = "@SAGE_NAUTY_BINS_PREFIX@"
 
-ECM = "@ECM@"
+SAGE_ECMBIN = "@SAGE_ECMBIN@"
 
 # Names or paths of the 4ti2 executables
 FOURTITWO_HILBERT = "@FOURTITWO_HILBERT@"

src/sage/env.py

@@ -220,7 +220,7 @@ def var(key: str, *fallbacks: Optional[str], force: bool = False) -> Optional[st
 MAXIMA_FAS = var("MAXIMA_FAS")
 KENZO_FAS = var("KENZO_FAS")
 SAGE_NAUTY_BINS_PREFIX = var("SAGE_NAUTY_BINS_PREFIX", "")
-ECM = var("ECM")
+SAGE_ECMBIN = var("SAGE_ECMBIN")
 RUBIKS_BINS_PREFIX = var("RUBIKS_BINS_PREFIX", "")
 FOURTITWO_HILBERT = var("FOURTITWO_HILBERT")
 FOURTITWO_MARKOV = var("FOURTITWO_MARKOV")

src/sage/features/ecm.py

@@ -13,7 +13,7 @@
 # ****************************************************************************
 
 from . import Executable
-from sage.env import ECM
+from sage.env import SAGE_ECMBIN
 
 
 class Ecm(Executable):
@@ -34,7 +34,7 @@ def __init__(self):
             sage: isinstance(Ecm(), Ecm)
             True
         """
-        Executable.__init__(self, name="ecm", executable=ECM,
+        Executable.__init__(self, name="ecm", executable=SAGE_ECMBIN,
                             spkg="ecm", type="standard")
 
 

src/sage/interfaces/ecm.py

@@ -55,7 +55,7 @@
 from sage.structure.sage_object import SageObject
 from sage.rings.integer_ring import ZZ
 
-from sage.env import ECM
+from sage.env import SAGE_ECMBIN
 
 class ECM(SageObject):
 
@@ -183,7 +183,7 @@ def __init__(self, B1=10, B2=None, **kwds):
         self._cmd = self._make_cmd(B1, B2, kwds)
 
     def _make_cmd(self, B1, B2, kwds):
-        ecm = [ECM]
+        ecm = [SAGE_ECMBIN]
         options = []
         for x, v in kwds.items():
             if v is False: