Skip to content

Commit 2ea4345

Browse files
committed
remove call to baseline
1 parent c84929a commit 2ea4345

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

build/pkgs/ecm/spkg-configure.m4

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SAGE_SPKG_CONFIGURE([ecm], [
22
m4_pushdef([SAGE_ECM_MINVER],[7.0.4])
3-
SAGE_ECM_BIN=ecm
3+
ECMBIN=ecm
44
SAGE_SPKG_DEPCHECK([gmp], [
55
AC_CHECK_HEADER(ecm.h, [
66
AX_ABSOLUTE_HEADER([ecm.h])
@@ -20,21 +20,20 @@ SAGE_SPKG_CONFIGURE([ecm], [
2020
])
2121
])
2222
AC_PATH_PROGS([ECMBIN], [ecm gmp-ecm])
23-
if test x$ECMBIN != x; then
24-
SAGE_ECM_BIN=`basename $ECMBIN`
23+
AS_IF([test x$ECMBIN != x], [
2524
ecmbin_version=`echo 121 | $ECMBIN 4 | grep ^GMP |
2625
$SED -n -e 's/GMP\-ECM \([[0-9]]*\.[[0-9]]*\.[[0-9]]*\).*/\1/p'`
27-
fi
28-
AS_IF([test -n "$ecmbin_version"], [
29-
AX_COMPARE_VERSION([$ecmbin_version], [ge], [$SAGE_ECM_MINVER], [
30-
ac_cv_ECMBIN="$ecmbin_version"
26+
AS_IF([test -n "$ecmbin_version"], [
27+
AX_COMPARE_VERSION([$ecmbin_version], [ge], [$SAGE_ECM_MINVER], [
28+
ac_cv_ECMBIN="$ecmbin_version"
29+
])
3130
])
32-
])
31+
], [ECMBIN=ecm])
3332
fi
3433
AS_IF([test -z "$ac_cv_ECM"], [sage_spkg_install_ecm=yes])
3534
AS_IF([test -z "$ac_cv_ECMBIN"], [sage_spkg_install_ecm=yes])
3635
], [sage_spkg_install_ecm=yes])
3736
])
3837
m4_popdef([SAGE_ECM_MINVER])
39-
AC_SUBST(SAGE_ECMBIN, $SAGE_ECM_BIN)
38+
AC_SUBST(SAGE_ECMBIN, $ECMBIN)
4039
])

0 commit comments

Comments
 (0)