diff options
| author | Tobias Grosser <tobias@grosser.es> | 2015-02-04 23:55:43 +0300 |
|---|---|---|
| committer | Tobias Grosser <tobias@grosser.es> | 2015-02-04 23:55:43 +0300 |
| commit | 52a25237d894fd5736a90f11df2c5c9391d13fd5 (patch) | |
| tree | 2b0e65b1e1de52b56aaa9b04999fe6223d1a7b0f /polly/autoconf | |
| parent | b6472fe3da9a20bcceb7b24af4ce9f0c4e79b254 (diff) | |
Import isl(+imath) as an external library into Polly
With this patch Polly is always GPL-free (no dependency on GMP any more). As a
result, building and distributing Polly will be easier. Furthermore, there is no
need to tightly coordinate isl and Polly releases anymore.
We import isl b3e0fa7a05d as well as imath 4d707e5ef2. These are the git
versions Polly currently was tested with when using utils/checkout_isl.sh. The
imported libraries are both MIT-style licensed.
We build isl and imath with -fvisibility=hidden to avoid clashes in case other
projects (such as gcc) use conflicting versions of isl. The use of imath can
temporarily reduce compile-time performance of Polly. We will work on
performance tuning in tree.
Patches to isl should be contributed first to the main isl repository and can
then later be reimported to Polly.
This patch is also a prerequisite for the upcoming isl C++ interface.
llvm-svn: 228193
Diffstat (limited to 'polly/autoconf')
| -rw-r--r-- | polly/autoconf/aclocal.m4 | 8 | ||||
| -rw-r--r-- | polly/autoconf/configure.ac | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/polly/autoconf/aclocal.m4 b/polly/autoconf/aclocal.m4 index d50306436425..07893d5893b2 100644 --- a/polly/autoconf/aclocal.m4 +++ b/polly/autoconf/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) dnl find_lib_and_headers(name, verify-header, library-name, requirded?) dnl Export dnl name_inc in -I"include-path" form diff --git a/polly/autoconf/configure.ac b/polly/autoconf/configure.ac index 15008f8c0645..0fd7103537af 100644 --- a/polly/autoconf/configure.ac +++ b/polly/autoconf/configure.ac @@ -72,18 +72,10 @@ dnl ************************************************************************** dnl ************************************************************************** dnl * Set the location of various third-party software packages dnl ************************************************************************** -dnl Find Gmp -find_lib_and_headers([gmp], [gmp.h], [gmp]) - -dnl Find Isl -saved_CXXFLAGS=$CXXFLAGS -CXXFLAGS="$CXXFLAGS" -find_lib_and_headers([isl], [isl/val.h], [isl], [required]) -CXXFLAGS=$saved_CXXFLAGS dnl Check that we have libpluto. saved_CXXFLAGS=$CXXFLAGS -CXXFLAGS="$CXXFLAGS $gmp_inc $isl_inc" +CXXFLAGS="$CXXFLAGS" find_lib_and_headers([pluto], [pluto/libpluto.h], [pluto]) CXXFLAGS=$saved_CXXFLAGS AS_IF([test "x$pluto_found" = "xyes"], |