[polly] r240657 - Fix autotools build

[Michael Kruse]

Author: meinersbur
Date: Thu Jun 25 11:50:13 2015
New Revision: 240657

URL: http://llvm.org/viewvc/llvm-project?rev=240657&view=rev
Log:
Fix autotools build

There were two issues:
* ISL's configure generates include/isl/stdint.h, not isl/stdint.h as
  assumed. This is also changed in the CMake build.

* Need to pass --with-int=imath to ISL's configure; the default is gmp. 

Polly's configure has been regenerated due to changing configure.ac


Modified:
    polly/trunk/CMakeLists.txt
    polly/trunk/Makefile.config.in
    polly/trunk/autoconf/configure.ac
    polly/trunk/configure
    polly/trunk/lib/CMakeLists.txt

Modified: polly/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/CMakeLists.txt?rev=240657&r1=240656&r2=240657&view=diff
==============================================================================
--- polly/trunk/CMakeLists.txt (original)
+++ polly/trunk/CMakeLists.txt Thu Jun 25 11:50:13 2015
@@ -114,6 +114,7 @@ include_directories(
   BEFORE
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/JSON/include
+  ${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_BINARY_DIR}/lib/External/isl
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/include
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/External/isl/imath

Modified: polly/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/Makefile.config.in?rev=240657&r1=240656&r2=240657&view=diff
==============================================================================
--- polly/trunk/Makefile.config.in (original)
+++ polly/trunk/Makefile.config.in Thu Jun 25 11:50:13 2015
@@ -51,6 +51,7 @@ CUDALIB_FOUND := @cuda_found@
 
 # Set include directories
 POLLY_INC :=  @cuda_inc@ \
+              -I$(POLLY_OBJ_ROOT)/lib/External/isl/include \
               -I$(POLLY_OBJ_ROOT)/lib/External/isl \
               -I$(POLLY_SRC_ROOT)/lib/JSON/include \
               -I$(POLLY_SRC_ROOT)/lib/External/isl/include \

Modified: polly/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/autoconf/configure.ac?rev=240657&r1=240656&r2=240657&view=diff
==============================================================================
--- polly/trunk/autoconf/configure.ac (original)
+++ polly/trunk/autoconf/configure.ac Thu Jun 25 11:50:13 2015
@@ -97,6 +97,11 @@ dnl ************************************
 
 dnl Let ISL's configure generate isl_config.h and gitversion.h
 AC_CONFIG_SUBDIRS(lib/External/isl)
+AC_CONFIG_COMMANDS_POST([
+  dnl Configure ISL with small integer optimization, but do not add the
+  dnl option to config.status as it is mandatory for Polly.
+  ac_configure_args="$ac_configure_args --with-int=imath"
+])
 
 dnl This must be last
 AC_CONFIG_HEADERS(include/polly/Config/config.h)

Modified: polly/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/configure?rev=240657&r1=240656&r2=240657&view=diff
==============================================================================
--- polly/trunk/configure (original)
+++ polly/trunk/configure Thu Jun 25 11:50:13 2015
@@ -2499,6 +2499,7 @@ fi
 subdirs="$subdirs lib/External/isl"
 
 
+
 ac_config_headers="$ac_config_headers include/polly/Config/config.h"
 
 cat >confcache <<\_ACEOF
@@ -3762,6 +3763,9 @@ test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
+      ac_configure_args="$ac_configure_args --with-int=imath"
+
+
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open

Modified: polly/trunk/lib/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CMakeLists.txt?rev=240657&r1=240656&r2=240657&view=diff
==============================================================================
--- polly/trunk/lib/CMakeLists.txt (original)
+++ polly/trunk/lib/CMakeLists.txt Thu Jun 25 11:50:13 2015
@@ -77,7 +77,7 @@ check_c_source_compiles("
 # Write configure result
 configure_file("External/gitversion.h.cmake" "${ISL_BINARY_DIR}/gitversion.h")
 configure_file("External/isl_config.h.cmake" "${ISL_BINARY_DIR}/isl_config.h")
-file(WRITE "${ISL_BINARY_DIR}/isl/stdint.h" "#include <stdint.h>")
+file(WRITE "${ISL_BINARY_DIR}/include/isl/stdint.h" "#include <stdint.h>")
 
 # ISL files to compile
 set (ISL_FILES