Detect the isl code generation feature correctly

llvm-svn: 165034

diff --git a/polly/autoconf/configure.ac b/polly/autoconf/configure.ac
index 2199157..9ce989a 100644 (file)
--- a/polly/autoconf/configure.ac
+++ b/polly/autoconf/configure.ac
@@ -81,7 +81,7 @@ dnl Find Isl
 find_lib_and_headers([isl], [isl/config.h], [isl], [required])
 
 dnl Find whether ISL has a codegen.h file.
-find_lib_and_headers([isl], [isl/codegen.h], [isl])
+find_lib_and_headers([isl], [isl/ast.h], [isl])
 AS_IF([test "x$isl_found" = "xyes"],
   [AC_DEFINE([ISL_CODEGEN_FOUND],[1],[Define if ISL has a code generator])])
 

diff --git a/polly/cmake/FindIsl.cmake b/polly/cmake/FindIsl.cmake
index c739602..21ad8a2 100644 (file)
--- a/polly/cmake/FindIsl.cmake
+++ b/polly/cmake/FindIsl.cmake
@@ -1,5 +1,5 @@
 FIND_PATH(ISL_INCLUDE_DIR isl/set.h)
-FIND_PATH(ISL_CODEGEN_DIR isl/codegen.h)
+FIND_PATH(ISL_CODEGEN_DIR isl/ast.h)
 
 IF (ISL_CODEGEN_DIR)
   SET(ISL_CODEGEN_FOUND TRUE)

diff --git a/polly/configure b/polly/configure
index 36751e8..13bbaf0 100755 (executable)
--- a/polly/configure
+++ b/polly/configure
@@ -2597,13 +2597,13 @@ else
 fi
 
   # Check for library and headers works
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl: isl/codegen.h in $given_inc_path, and libisl in $given_lib_path" >&5
-$as_echo_n "checking for isl: isl/codegen.h in $given_inc_path, and libisl in $given_lib_path... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isl: isl/ast.h in $given_inc_path, and libisl in $given_lib_path" >&5
+$as_echo_n "checking for isl: isl/ast.h in $given_inc_path, and libisl in $given_lib_path... " >&6; }
 
   # try to compile a file that includes a header of the library
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <isl/codegen.h>
+#include <isl/ast.h>
 int
 main ()
 {