summaryrefslogtreecommitdiffstats
path: root/polly/lib/External/isl/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'polly/lib/External/isl/configure.ac')
-rw-r--r--polly/lib/External/isl/configure.ac18
1 files changed, 16 insertions, 2 deletions
diff --git a/polly/lib/External/isl/configure.ac b/polly/lib/External/isl/configure.ac
index df46c862477..5d7fc6954fb 100644
--- a/polly/lib/External/isl/configure.ac
+++ b/polly/lib/External/isl/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT([isl], [0.19], [isl-development@googlegroups.com])
+AC_INIT([isl], [0.20], [isl-development@googlegroups.com])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AC_SUBST(versioninfo)
-versioninfo=19:0:0
+versioninfo=20:0:1
if test "x$prefix" != "xNONE"; then
prefix_wd=`cd $prefix && pwd`
@@ -25,6 +25,17 @@ AX_CC_MAXOPT
AX_GCC_WARN_UNUSED_RESULT
AX_C___ATTRIBUTE__
+# CXX11FLAGS contains the flags (if any) added by AX_CXX_COMPILE_STDCXX_11
+# Original state of CXX and CXXCPP is preserved because CXX11FLAGS
+# is only needed for compiling interface/isl_test_cpp
+AC_SUBST(CXX11FLAGS)
+ac_save_CXX="$CXX"
+ac_save_CXXCPP="$CXXCPP"
+AX_CXX_COMPILE_STDCXX_11([noext], [optional])
+CXX11FLAGS=${CXX#$ac_save_CXX}
+CXX="$ac_save_CXX"
+CXXCPP="$ac_save_CXXCPP"
+
AC_PROG_GREP
AC_PROG_LIBTOOL
AC_PROG_SED
@@ -70,6 +81,7 @@ fi
AM_CONDITIONAL(IMATH_FOR_MP, test x$with_int = ximath -o x$with_int = ximath-32)
AM_CONDITIONAL(GMP_FOR_MP, test x$with_int = xgmp)
+AM_CONDITIONAL(HAVE_CXX11, test "x$HAVE_CXX11" = "x1")
AM_CONDITIONAL(SMALL_INT_OPT, test "x$with_int" == "ximath-32")
AS_IF([test "x$with_int" == "ximath-32"], [
AC_DEFINE([USE_SMALL_INT_OPT], [], [Use small integer optimization])
@@ -106,6 +118,8 @@ system)
;;
esac
AM_CONDITIONAL(HAVE_CLANG, test $with_clang = system)
+AM_CONDITIONAL(HAVE_CPP_ISL_H,
+ [test $with_clang = system -o -f $srcdir/include/isl/cpp.h])
AX_SET_WARNING_FLAGS
OpenPOWER on IntegriCloud