From 700ce3be48cf6fbabf549c218dab3c9b57c4affc Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Mon, 11 May 2020 18:03:22 +0100 Subject: [PATCH 1/4] spkg-configure for palp --- build/pkgs/palp/distros/arch.txt | 1 + build/pkgs/palp/distros/conda.txt | 1 + build/pkgs/palp/distros/debian.txt | 1 + build/pkgs/palp/distros/fedora.txt | 1 + build/pkgs/palp/spkg-configure.m4 | 4 ++++ 5 files changed, 8 insertions(+) create mode 100644 build/pkgs/palp/distros/arch.txt create mode 100644 build/pkgs/palp/distros/conda.txt create mode 100644 build/pkgs/palp/distros/debian.txt create mode 100644 build/pkgs/palp/distros/fedora.txt create mode 100644 build/pkgs/palp/spkg-configure.m4 diff --git a/build/pkgs/palp/distros/arch.txt b/build/pkgs/palp/distros/arch.txt new file mode 100644 index 00000000000..f037baef346 --- /dev/null +++ b/build/pkgs/palp/distros/arch.txt @@ -0,0 +1 @@ +palp diff --git a/build/pkgs/palp/distros/conda.txt b/build/pkgs/palp/distros/conda.txt new file mode 100644 index 00000000000..f037baef346 --- /dev/null +++ b/build/pkgs/palp/distros/conda.txt @@ -0,0 +1 @@ +palp diff --git a/build/pkgs/palp/distros/debian.txt b/build/pkgs/palp/distros/debian.txt new file mode 100644 index 00000000000..f037baef346 --- /dev/null +++ b/build/pkgs/palp/distros/debian.txt @@ -0,0 +1 @@ +palp diff --git a/build/pkgs/palp/distros/fedora.txt b/build/pkgs/palp/distros/fedora.txt new file mode 100644 index 00000000000..f037baef346 --- /dev/null +++ b/build/pkgs/palp/distros/fedora.txt @@ -0,0 +1 @@ +palp diff --git a/build/pkgs/palp/spkg-configure.m4 b/build/pkgs/palp/spkg-configure.m4 new file mode 100644 index 00000000000..bb82b78c8c6 --- /dev/null +++ b/build/pkgs/palp/spkg-configure.m4 @@ -0,0 +1,4 @@ +SAGE_SPKG_CONFIGURE([palp], [ + AC_PATH_PROG([PALP], [poly.x]) + AS_IF([test -z "$ac_cv_path_PALP"], [sage_spkg_install_palp=yes]) +]) From c79fc1b959060ab8f07fe5eb2526249e028f7244 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Thu, 4 Jun 2020 10:50:53 +0100 Subject: [PATCH 2/4] inner loop macro --- build/pkgs/palp/spkg-configure.m4 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/build/pkgs/palp/spkg-configure.m4 b/build/pkgs/palp/spkg-configure.m4 index bb82b78c8c6..29a43a387ab 100644 --- a/build/pkgs/palp/spkg-configure.m4 +++ b/build/pkgs/palp/spkg-configure.m4 @@ -1,4 +1,14 @@ +AC_DEFUN([SAGE_TEST_PALP_PROGS], [ + AC_PATH_PROG(PALP[$1], [[$1].x]) + AS_IF([test x$PALP[$1] = x], [sage_spkg_install_palp=yes]) + m4_foreach([suff], [4, 5, 6, 11], [ + AC_PATH_PROG(PALP[$1]suff, [[$1][-]suff[d.x]]) + AS_IF([test x$PALP[$1]suff = x], [sage_spkg_install_palp=yes]) + ]) +]) + SAGE_SPKG_CONFIGURE([palp], [ - AC_PATH_PROG([PALP], [poly.x]) - AS_IF([test -z "$ac_cv_path_PALP"], [sage_spkg_install_palp=yes]) + dnl m4_foreach([palpprog], [[poly], [class], [nef], [cws]], [ + SAGE_TEST_PALP_PROGS(poly) + dnl ]) ]) From 4a6ec7012007e4417801e73666631f572ac107ff Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Thu, 4 Jun 2020 11:25:30 +0100 Subject: [PATCH 3/4] getting quoting right everywhere --- build/pkgs/palp/spkg-configure.m4 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/build/pkgs/palp/spkg-configure.m4 b/build/pkgs/palp/spkg-configure.m4 index 29a43a387ab..f44c857ccbd 100644 --- a/build/pkgs/palp/spkg-configure.m4 +++ b/build/pkgs/palp/spkg-configure.m4 @@ -1,14 +1,10 @@ -AC_DEFUN([SAGE_TEST_PALP_PROGS], [ - AC_PATH_PROG(PALP[$1], [[$1].x]) - AS_IF([test x$PALP[$1] = x], [sage_spkg_install_palp=yes]) - m4_foreach([suff], [4, 5, 6, 11], [ - AC_PATH_PROG(PALP[$1]suff, [[$1][-]suff[d.x]]) - AS_IF([test x$PALP[$1]suff = x], [sage_spkg_install_palp=yes]) - ]) -]) - SAGE_SPKG_CONFIGURE([palp], [ - dnl m4_foreach([palpprog], [[poly], [class], [nef], [cws]], [ - SAGE_TEST_PALP_PROGS(poly) - dnl ]) + m4_foreach([palpprog], [[poly], [class], [nef], [cws]], [ + AC_PATH_PROG(PALP[]palpprog, [palpprog.x]) + AS_IF([test x$PALP[]palpprog = x], [sage_spkg_install_palp=yes]) + m4_foreach([suff], [4, 5, 6, 11], [ + AC_PATH_PROG(PALP[]palpprog[]suff, [palpprog[-]suff[d.x]]) + AS_IF([test x$PALP[]palpprog[]suff = x], [sage_spkg_install_palp=yes]) + ]) + ]) ]) From 926c9f32b7bcfcf673c92c3fa88cdfda5fb38197 Mon Sep 17 00:00:00 2001 From: Dima Pasechnik Date: Thu, 11 Jun 2020 10:57:27 +0100 Subject: [PATCH 4/4] added quotes --- build/pkgs/palp/spkg-configure.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pkgs/palp/spkg-configure.m4 b/build/pkgs/palp/spkg-configure.m4 index f44c857ccbd..f4e293970ec 100644 --- a/build/pkgs/palp/spkg-configure.m4 +++ b/build/pkgs/palp/spkg-configure.m4 @@ -1,10 +1,10 @@ SAGE_SPKG_CONFIGURE([palp], [ m4_foreach([palpprog], [[poly], [class], [nef], [cws]], [ AC_PATH_PROG(PALP[]palpprog, [palpprog.x]) - AS_IF([test x$PALP[]palpprog = x], [sage_spkg_install_palp=yes]) + AS_IF([test "x$PALP[]palpprog" = "x"], [sage_spkg_install_palp=yes]) m4_foreach([suff], [4, 5, 6, 11], [ AC_PATH_PROG(PALP[]palpprog[]suff, [palpprog[-]suff[d.x]]) - AS_IF([test x$PALP[]palpprog[]suff = x], [sage_spkg_install_palp=yes]) + AS_IF([test "x$PALP[]palpprog[]suff" = "x"], [sage_spkg_install_palp=yes]) ]) ]) ])