From 5b23dc7c81e4cca53a2c4a03978a756bf70b2e14 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Thu, 2 Apr 2020 20:12:12 -0400 Subject: [PATCH 1/8] Trac #29454: add AM_PPL_PATH from the ppl package to detect itself. PPL doesn't provide a pkg-config file, and it's a C++ library, which makes it (more) difficult to detect. Fortunately, upstream ships a ppl.m4 file containing a macro to do so. To keep things simple, this commit copies that file into SageMath's m4 directory. --- m4/ppl.m4 | 288 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 288 insertions(+) create mode 100644 m4/ppl.m4 diff --git a/m4/ppl.m4 b/m4/ppl.m4 new file mode 100644 index 00000000000..caeabbdea48 --- /dev/null +++ b/m4/ppl.m4 @@ -0,0 +1,288 @@ +dnl A function to test for the existence and usability of particular +dnl versions of the PPL, defining macros containing the required paths. +dnl Copyright (C) 1997 Owen Taylor +dnl Copyright (C) 2001-2010 Roberto Bagnara +dnl Copyright (C) 2010-2016 BUGSENG srl (http://bugseng.com) +dnl +dnl This file is part of the Parma Polyhedra Library (PPL). +dnl +dnl The PPL is free software; you can redistribute it and/or modify it +dnl under the terms of the GNU General Public License as published by the +dnl Free Software Foundation; either version 3 of the License, or (at your +dnl option) any later version. +dnl +dnl The PPL is distributed in the hope that it will be useful, but WITHOUT +dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +dnl for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software Foundation, +dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. +dnl +dnl For the most up-to-date information see the Parma Polyhedra Library +dnl site: http://bugseng.com/products/ppl/ . + +dnl AM_PATH_PPL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for PPL, and define PPL_CPPFLAGS, PPL_LDFLAGS, ... what else? + +AC_DEFUN([AM_PATH_PPL], +[ +dnl Get the required information from the ppl-config program. +AC_ARG_WITH(ppl-prefix, + AS_HELP_STRING([--with-ppl-prefix=PREFIX], + [prefix used to configure the PPL]), + ppl_prefix="$withval", + ppl_prefix="") +AC_ARG_WITH(ppl-exec-prefix, + AS_HELP_STRING([--with-ppl-exec-prefix=PREFIX], + [exec-prefix used to configure the PPL]), + ppl_exec_prefix="$withval", + ppl_exec_prefix="") +AC_ARG_ENABLE(ppl-test, + AS_HELP_STRING([--disable-ppltest], + [do not try to compile and run a test PPL program]), + , + enable_ppltest=yes) + +if test "x$ppl_exec_prefix" != x +then + ppl_config_args="$ppl_config_args --exec-prefix=$ppl_exec_prefix" + if test "x${PPL_CONFIG+set}" != xset + then + PPL_CONFIG="$ppl_exec_prefix/bin/ppl-config" + fi +fi +if test "x$ppl_prefix" != x +then + ppl_config_args="$ppl_config_args --prefix=$ppl_prefix" + if test "x${PPL_CONFIG+set}" != xset + then + PPL_CONFIG="$ppl_prefix/bin/ppl-config" + fi +fi + +AC_PATH_PROG(PPL_CONFIG, ppl-config, no) +min_ppl_version=ifelse([$1], ,0.0,$1) +if test \( "x$min_ppl_version" = "x0.0" \) -o \( "x$min_ppl_version" = "x0.0.0" \) +then + AC_MSG_CHECKING([for the Parma Polyhedra Library]) +else + AC_MSG_CHECKING([for the Parma Polyhedra Library, version >= $min_ppl_version]) +fi +no_ppl="" +if test $PPL_CONFIG = no +then + no_ppl=yes +else + PPL_CPPFLAGS=`$PPL_CONFIG $ppl_config_args --cppflags` + PPL_LDFLAGS=`$PPL_CONFIG $ppl_config_args --ldflags` + ppl_config_version="`$PPL_CONFIG $ppl_config_args --version`" + + if test "x$enable_ppltest" = xyes + then + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LDFLAGS="$LDFLAGS" + CPPFLAGS="$CPPFLAGS $PPL_CPPFLAGS" + LDFLAGS="$PPL_LDFLAGS $LDFLAGS" + +dnl Now check if the installed PPL is sufficiently new. +dnl (Also sanity checks the results of ppl-config to some extent.) + + AC_LANG_PUSH(C++) + + rm -f conf.ppltest + AC_TRY_RUN([ +#include +#include +#include +#include + +namespace PPL = Parma_Polyhedra_Library; + +using std::cout; +using std::endl; + +int +main() { + system("touch conf.ppltest"); + + unsigned min_ppl_major, min_ppl_minor, min_ppl_revision, min_ppl_beta; + int n = sscanf("$min_ppl_version", + "%u.%u.%upre%u%*c", + &min_ppl_major, &min_ppl_minor, + &min_ppl_revision, &min_ppl_beta); + bool min_ppl_version_ok = true; + if (n == 4) { + if (min_ppl_beta == 0) + min_ppl_version_ok = false; + } + else if (n == 3) { + n = sscanf("$min_ppl_version", + "%u.%u.%u%*c", + &min_ppl_major, &min_ppl_minor, &min_ppl_revision); + if (n != 3) + min_ppl_version_ok = false; + else + min_ppl_beta = 0; + } + else if (n == 2) { + n = sscanf("$min_ppl_version", + "%u.%upre%u%*c", + &min_ppl_major, &min_ppl_minor, &min_ppl_beta); + if (n == 3) { + if (min_ppl_beta == 0) + min_ppl_version_ok = false; + else + min_ppl_revision = 0; + } + else if (n == 2) { + n = sscanf("$min_ppl_version", + "%u.%u%*c", + &min_ppl_major, &min_ppl_minor); + if (n != 2) + min_ppl_version_ok = false; + else { + min_ppl_revision = 0; + min_ppl_beta = 0; + } + } + else + min_ppl_version_ok = false; + } + else + min_ppl_version_ok = false; + + if (!min_ppl_version_ok) { + cout << "illegal version string '$min_ppl_version'" + << endl; + return 1; + } + + if (strcmp("$ppl_config_version", PPL::version()) != 0) { + cout << "\n*** 'ppl-config --version' returned $ppl_config_version, " + "but PPL version " + << PPL::version() + << "\n*** was found! If ppl-config was correct, then it is best" + "\n*** to remove the old version of PPL." + " You may also be able to fix the error" + "\n*** by modifying your LD_LIBRARY_PATH enviroment variable," + " or by editing" + "\n*** /etc/ld.so.conf." + " Make sure you have run ldconfig if that is" + "\n*** required on your system." + "\n*** If ppl-config was wrong, set the environment variable" + " PPL_CONFIG" + "\n*** to point to the correct copy of ppl-config," + " and remove the file config.cache" + "\n*** before re-running configure." + << endl; + return 1; + } + else if (strcmp(PPL_VERSION, PPL::version()) != 0) { + cout << "\n*** PPL header file (version " PPL_VERSION ") does not match" + << "\n*** library (version " << PPL::version() << ")" + << endl; + return 1; + } + else if (PPL_VERSION_MAJOR < min_ppl_major + || (PPL_VERSION_MAJOR == min_ppl_major + && PPL_VERSION_MINOR < min_ppl_minor) + || (PPL_VERSION_MAJOR == min_ppl_major + && PPL_VERSION_MINOR == min_ppl_minor + && PPL_VERSION_REVISION < min_ppl_revision) + || (PPL_VERSION_MAJOR == min_ppl_major + && PPL_VERSION_MINOR == min_ppl_minor + && PPL_VERSION_REVISION == min_ppl_revision + && PPL_VERSION_BETA < min_ppl_beta)) { + cout << "\n*** An old version of PPL (" PPL_VERSION ") was found." + "\n*** You need at least PPL version $min_ppl_version." + " The latest version of" + "\n*** PPL is always available from ftp://ftp.cs.unipr.it/ppl/ ." + "\n***" + "\n*** If you have already installed a sufficiently new version," + " this error" + "\n*** probably means that the wrong copy of the ppl-config" + " program is" + "\n*** being found. The easiest way to fix this is to remove" + " the old version" + "\n*** of PPL, but you can also set the PPL_CONFIG environment" + " variable to point" + "\n*** to the correct copy of ppl-config. (In this case," + " you will have to" + "\n*** modify your LD_LIBRARY_PATH enviroment" + " variable or edit /etc/ld.so.conf" + "\n*** so that the correct libraries are found at run-time.)" + << endl; + return 1; + } + return 0; +} +],, no_ppl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + + AC_LANG_POP + + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + fi +fi + +if test "x$no_ppl" = x +then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) +else + AC_MSG_RESULT(no) + if test x"$PPL_CONFIG" = xno + then + echo "*** The ppl-config script installed by PPL could not be found." + echo "*** If the PPL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the PPL_CONFIG environment variable to the" + echo "*** full path to ppl-config." + else + if test -f conf.ppltest + then + : + else + echo "*** Could not run PPL test program, checking why..." + CPPFLAGS="$CPPFLAGS $PPL_CPPFLAGS" + LDFLAGS="$LDFLAGS $PPL_LDFLAGS" + AC_TRY_LINK([ +#include +using namespace Parma_Polyhedra_Library; +], +[ + return version_major() || version_minor() + || version_revision() || version_beta(); +], +[ + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding the PPL or finding the" + echo "*** wrong version of the PPL. If it is not finding the PPL, you will" + echo "*** need to set your LD_LIBRARY_PATH environment variable, or edit" + echo "*** /etc/ld.so.conf to point to the installed location. Also, make" + echo "*** sure you have run ldconfig if that is required on your system." + echo "***" + echo "*** If you have an old version installed, it is best to remove it," + echo "*** although you may also be able to get things to work by modifying" + echo "*** LD_LIBRARY_PATH." +], +[ + echo "*** The test program failed to compile or link. See the file" + echo "*** config.log for the exact error that occured. This usually means" + echo "*** the PPL was incorrectly installed or that someone moved the PPL" + echo "*** since it was installed. In both cases you should reinstall" + echo "*** the library." +]) + CPPFLAGS="$ac_save_CPPFLAGS" + LDFLAGS="$ac_save_LDFLAGS" + fi + fi + PPL_CPPFLAGS="" + PPL_LDFLAGS="" + ifelse([$3], , :, [$3]) +fi +AC_SUBST(PPL_CPPFLAGS) +AC_SUBST(PPL_LDFLAGS) +rm -f conf.ppltest +]) From eac273e5c674590e9c3cb739c9a39ef2fb665673 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Thu, 2 Apr 2020 20:20:00 -0400 Subject: [PATCH 2/8] Trac #29454: new spkg-configure.m4 for ppl. Standard stuff, except we use the custom AM_PATH_PPL macro (provided by PPL upstream) to detect the package and not pkg-config. I've chosen the latest 1.2 as the lower version bound not for any technical reason, but instead because everyone seems to have the latest version anyway. --- build/pkgs/ppl/spkg-configure.m4 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 build/pkgs/ppl/spkg-configure.m4 diff --git a/build/pkgs/ppl/spkg-configure.m4 b/build/pkgs/ppl/spkg-configure.m4 new file mode 100644 index 00000000000..cc094d67cb9 --- /dev/null +++ b/build/pkgs/ppl/spkg-configure.m4 @@ -0,0 +1,16 @@ +SAGE_SPKG_CONFIGURE([ppl], [ + SAGE_SPKG_DEPCHECK([glpk gmp mpir], [ + # If our dependencies come from the system, then we can use + # the system ppl, too. This macro works sort-of like the + # PKG_CHECK_MODULES macro, defining e.g. PPL_CFLAGS when a + # suitable version of PPL is detected. But notably, it doesn't + # define PPL_LIBS. + AM_PATH_PPL([1.2], + [sage_spkg_install_ppl=no], + [sage_spkg_install_ppl=yes]) + ], + [ # Some of its dependencies are installed as SPKGs, so install the + # ppl SPKG as well. + sage_spkg_install_ppl=yes + ]) +]) From d766c29f24e4e17f968eb97b4e45dbf5198908fe Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 3 Apr 2020 06:09:20 -0400 Subject: [PATCH 3/8] Trac #29454: add distros/* information for ppl. All of the upstream packages for PPL seem to be called just "ppl", with no ppl-devel or equivalent. That makes me a little suspicious, since PPL is a library, but let's see what happens. --- build/pkgs/ppl/distros/arch.txt | 1 + build/pkgs/ppl/distros/debian.txt | 1 + build/pkgs/ppl/distros/fedora.txt | 1 + build/pkgs/ppl/distros/gentoo.txt | 1 + build/pkgs/ppl/distros/homebrew.txt | 1 + 5 files changed, 5 insertions(+) create mode 100644 build/pkgs/ppl/distros/arch.txt create mode 100644 build/pkgs/ppl/distros/debian.txt create mode 100644 build/pkgs/ppl/distros/fedora.txt create mode 100644 build/pkgs/ppl/distros/gentoo.txt create mode 100644 build/pkgs/ppl/distros/homebrew.txt diff --git a/build/pkgs/ppl/distros/arch.txt b/build/pkgs/ppl/distros/arch.txt new file mode 100644 index 00000000000..0efaae6634f --- /dev/null +++ b/build/pkgs/ppl/distros/arch.txt @@ -0,0 +1 @@ +ppl diff --git a/build/pkgs/ppl/distros/debian.txt b/build/pkgs/ppl/distros/debian.txt new file mode 100644 index 00000000000..0efaae6634f --- /dev/null +++ b/build/pkgs/ppl/distros/debian.txt @@ -0,0 +1 @@ +ppl diff --git a/build/pkgs/ppl/distros/fedora.txt b/build/pkgs/ppl/distros/fedora.txt new file mode 100644 index 00000000000..0efaae6634f --- /dev/null +++ b/build/pkgs/ppl/distros/fedora.txt @@ -0,0 +1 @@ +ppl diff --git a/build/pkgs/ppl/distros/gentoo.txt b/build/pkgs/ppl/distros/gentoo.txt new file mode 100644 index 00000000000..11fd588324a --- /dev/null +++ b/build/pkgs/ppl/distros/gentoo.txt @@ -0,0 +1 @@ +dev-libs/ppl diff --git a/build/pkgs/ppl/distros/homebrew.txt b/build/pkgs/ppl/distros/homebrew.txt new file mode 100644 index 00000000000..0efaae6634f --- /dev/null +++ b/build/pkgs/ppl/distros/homebrew.txt @@ -0,0 +1 @@ +ppl From 23d2b366e4aea63d874784f3b86a27f1fc8b5509 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 3 Apr 2020 15:09:41 -0400 Subject: [PATCH 4/8] Trac #29454: hack m4/ppl.m4 to define PPL_LIBS. The upstream AM_PATH_PPL macro gets its LDFLAGS from the ppl-config program, but fails to differentiate between LDFLAGS and LIBS. This ultimately causes "-lppl" to be appended to the command-line in the wrong spot. This commit hacks the macro to additionally define a PPL_LIBS variable in the event that PPL is detected. This allows us to append the flag in the right place, and avoid appending it in the wrong place. --- build/pkgs/ppl/spkg-configure.m4 | 19 ++++++++++++------- m4/ppl.m4 | 23 ++++++++++++++++++++++- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/build/pkgs/ppl/spkg-configure.m4 b/build/pkgs/ppl/spkg-configure.m4 index cc094d67cb9..9b75a46959f 100644 --- a/build/pkgs/ppl/spkg-configure.m4 +++ b/build/pkgs/ppl/spkg-configure.m4 @@ -1,13 +1,18 @@ SAGE_SPKG_CONFIGURE([ppl], [ SAGE_SPKG_DEPCHECK([glpk gmp mpir], [ - # If our dependencies come from the system, then we can use - # the system ppl, too. This macro works sort-of like the + # If our dependencies come from the system, then we can use the + # system ppl, too. This macro works sort-of like the # PKG_CHECK_MODULES macro, defining e.g. PPL_CFLAGS when a - # suitable version of PPL is detected. But notably, it doesn't - # define PPL_LIBS. - AM_PATH_PPL([1.2], - [sage_spkg_install_ppl=no], - [sage_spkg_install_ppl=yes]) + # suitable version of PPL is detected. The upstream version fails + # to differentiate between LDFLAGS and LIBS (which is in turn the + # fault of the ppl-config program), leading to argument-order + # problems on the command line. Our version of the macro + # defines PPL_LIBS separately so that we can distinguish the two. + AM_PATH_PPL([1.2], [ + LIBS="$LIBS $PPL_LIBS" + sage_spkg_install_ppl=no + ], + [sage_spkg_install_ppl=yes]) ], [ # Some of its dependencies are installed as SPKGs, so install the # ppl SPKG as well. diff --git a/m4/ppl.m4 b/m4/ppl.m4 index caeabbdea48..060c93f394e 100644 --- a/m4/ppl.m4 +++ b/m4/ppl.m4 @@ -76,15 +76,31 @@ then no_ppl=yes else PPL_CPPFLAGS=`$PPL_CONFIG $ppl_config_args --cppflags` - PPL_LDFLAGS=`$PPL_CONFIG $ppl_config_args --ldflags` + PPL_LDFLAGS="" + PPL_LIBS="" + for flag in $($PPL_CONFIG $ppl_config_args --ldflags); do + dnl Check if each "ldflag" starts with -l or not. The ones that do + dnl start with -l are libs and belong in PPL_LIBS, the others belong + dnl in PPL_LDFLAGS. The LDFLAGS and LIBS variables get appended at + dnl different locations in the link command, so the distinction is + dnl not academic. + if test "x${flag#-l}" = "x$flag"; then + dnl this flag doesn't start with -l + PPL_LDFLAGS="$PPL_LDFLAGS $flag" + else + PPL_LIBS="$PPL_LIBS $flag" + fi + done ppl_config_version="`$PPL_CONFIG $ppl_config_args --version`" if test "x$enable_ppltest" = xyes then ac_save_CPPFLAGS="$CPPFLAGS" ac_save_LDFLAGS="$LDFLAGS" + ac_save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $PPL_CPPFLAGS" LDFLAGS="$PPL_LDFLAGS $LDFLAGS" + LIBS="$LIBS $PPL_LIBS" dnl Now check if the installed PPL is sufficiently new. dnl (Also sanity checks the results of ppl-config to some extent.) @@ -224,6 +240,7 @@ main() { CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" + LIBS="$ac_save_LIBS" fi fi @@ -247,6 +264,7 @@ else echo "*** Could not run PPL test program, checking why..." CPPFLAGS="$CPPFLAGS $PPL_CPPFLAGS" LDFLAGS="$LDFLAGS $PPL_LDFLAGS" + LIBS="$LIBS $PPL_LIBS" AC_TRY_LINK([ #include using namespace Parma_Polyhedra_Library; @@ -276,13 +294,16 @@ using namespace Parma_Polyhedra_Library; ]) CPPFLAGS="$ac_save_CPPFLAGS" LDFLAGS="$ac_save_LDFLAGS" + LIBS="$ac_save_LIBS" fi fi PPL_CPPFLAGS="" PPL_LDFLAGS="" + PPL_LIBS="" ifelse([$3], , :, [$3]) fi AC_SUBST(PPL_CPPFLAGS) AC_SUBST(PPL_LDFLAGS) +AC_SUBST(PPL_LIBS) rm -f conf.ppltest ]) From f9f18bd271e934388a036456bd6a8932fcbb5d95 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 3 Apr 2020 12:24:55 -0400 Subject: [PATCH 5/8] build/pkgs/ppl/distros/debian.txt: fixup --- build/pkgs/ppl/distros/debian.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/pkgs/ppl/distros/debian.txt b/build/pkgs/ppl/distros/debian.txt index 0efaae6634f..eda90eabe9c 100644 --- a/build/pkgs/ppl/distros/debian.txt +++ b/build/pkgs/ppl/distros/debian.txt @@ -1 +1 @@ -ppl +libppl-dev From c172077f0fdce838b26e4bdaccf0d819ef691a8d Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Fri, 3 Apr 2020 16:32:48 -0400 Subject: [PATCH 6/8] Trac #29454: add conda package information for PPL. --- build/pkgs/ppl/distros/conda.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 build/pkgs/ppl/distros/conda.txt diff --git a/build/pkgs/ppl/distros/conda.txt b/build/pkgs/ppl/distros/conda.txt new file mode 100644 index 00000000000..0efaae6634f --- /dev/null +++ b/build/pkgs/ppl/distros/conda.txt @@ -0,0 +1 @@ +ppl From ec3a771f46caf31fd8a48b896ac633d655ee6d10 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 4 Apr 2020 11:13:33 -0400 Subject: [PATCH 7/8] Trac #29454: require ppl-dev(el) on Debian/Fedora. --- build/pkgs/ppl/distros/debian.txt | 1 + build/pkgs/ppl/distros/fedora.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/build/pkgs/ppl/distros/debian.txt b/build/pkgs/ppl/distros/debian.txt index eda90eabe9c..be1642b61b1 100644 --- a/build/pkgs/ppl/distros/debian.txt +++ b/build/pkgs/ppl/distros/debian.txt @@ -1 +1,2 @@ libppl-dev +ppl-dev diff --git a/build/pkgs/ppl/distros/fedora.txt b/build/pkgs/ppl/distros/fedora.txt index 0efaae6634f..bed9ea7b421 100644 --- a/build/pkgs/ppl/distros/fedora.txt +++ b/build/pkgs/ppl/distros/fedora.txt @@ -1 +1,2 @@ ppl +ppl-devel From fa6e0d998fa5905010741c221248814879acf2e5 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 5 Apr 2020 18:03:22 -0400 Subject: [PATCH 8/8] Trac #29454: don't use PPL's LDFLAGS to compile its test program. When (for example) PPL was build with a hardened toolchain, its PPL_LDFLAGS as determined by the AM_PATH_PPL macro can contain things like, -Wl,-z,relro ... -specs=/usr/lib/rpm/redhat/redhat-hardened-ld which we don't actually want to use while compiling the test program. This commit modifies m4/ppl.m4 to compile and link the test program without PPL_LDFLAGS in LDFLAGS. The PPL_LDFLAGS symbol is however still defined. --- m4/ppl.m4 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/m4/ppl.m4 b/m4/ppl.m4 index 060c93f394e..05d5223a404 100644 --- a/m4/ppl.m4 +++ b/m4/ppl.m4 @@ -96,10 +96,8 @@ else if test "x$enable_ppltest" = xyes then ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" ac_save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $PPL_CPPFLAGS" - LDFLAGS="$PPL_LDFLAGS $LDFLAGS" LIBS="$LIBS $PPL_LIBS" dnl Now check if the installed PPL is sufficiently new. @@ -239,7 +237,6 @@ main() { AC_LANG_POP CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" LIBS="$ac_save_LIBS" fi fi @@ -263,7 +260,6 @@ else else echo "*** Could not run PPL test program, checking why..." CPPFLAGS="$CPPFLAGS $PPL_CPPFLAGS" - LDFLAGS="$LDFLAGS $PPL_LDFLAGS" LIBS="$LIBS $PPL_LIBS" AC_TRY_LINK([ #include @@ -293,7 +289,6 @@ using namespace Parma_Polyhedra_Library; echo "*** the library." ]) CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" LIBS="$ac_save_LIBS" fi fi