Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit bf8c1d9

Browse files
committed
use macro to check pari/gp deps
1 parent 526d15c commit bf8c1d9

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

build/pkgs/pari/spkg-configure.m4

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
SAGE_SPKG_CONFIGURE([pari], [
2-
dnl See gp_version below on how the version is computed from MAJV.MINV.PATCHV
3-
m4_pushdef([SAGE_PARI_MINVER],["133889"])
4-
AC_REQUIRE([SAGE_SPKG_CONFIGURE_GMP])
5-
AC_REQUIRE([SAGE_SPKG_CONFIGURE_READLINE])
6-
AC_MSG_CHECKING([installing gmp/mpir or readline? ])
7-
if test x$sage_spkg_install_mpir = xyes -o x$sage_spkg_install_gmp = xyes -o x$sage_spkg_install_readline = xyes; then dnl deps test
8-
AC_MSG_RESULT([yes; install pari as well])
9-
sage_spkg_install_pari=yes
10-
else
11-
AC_MSG_RESULT([no])
2+
dnl See gp_version below on how the version is computed from MAJV.MINV.PATCHV
3+
m4_pushdef([SAGE_PARI_MINVER],["133889"])
4+
SAGE_SPKG_DEPCHECK([gmp mpir readline], [
125
AC_PATH_PROG([GP], [gp])
136
if test x$GP = x; then dnl GP test
147
AC_MSG_NOTICE([gp is not found])
@@ -139,8 +132,8 @@ SAGE_SPKG_CONFIGURE([pari], [
139132
AC_LANG_POP()
140133
], [sage_spkg_install_pari=yes])
141134
fi dnl end main PARI test
142-
fi dnl end deps test
143-
m4_popdef([SAGE_PARI_MINVER])
135+
])
136+
m4_popdef([SAGE_PARI_MINVER])
144137
], [], [], [
145138
if test x$sage_spkg_install_pari = xyes; then
146139
AC_SUBST(SAGE_PARI_PREFIX, ['$SAGE_LOCAL'])

0 commit comments

Comments
 (0)