On Tue, 3 Sep 2013, Jack Howarth wrote: > On Tue, Sep 03, 2013 at 12:04:51PM +0200, Richard Biener wrote: > > > > The following patch makes us accept ISL 0.12. > > > > Bootstrapped and tested on x86_64-unknown-linux-gnu (with using ISL 0.12), > > applied as obvious. > > Richard, > Does this also accept isl 0.12.1 as that is the current bug fix release... > > http://repo.or.cz/w/isl.git/shortlog/0e737ed0b35803685e9ebcfd8c528e00c30bbc43 > > from upstream.
Yes. > Jack > > > > > Richard. > > > > 2013-09-03 Richard Biener <rguent...@suse.de> > > > > * configure.ac: Also allow ISL 0.12. > > * configure: Regenerated. > > > > Index: configure.ac > > =================================================================== > > *** configure.ac (revision 202203) > > --- configure.ac (working copy) > > *************** if test "x$with_isl" != "xno" && > > *** 1653,1658 **** > > --- 1653,1661 ---- > > ISL_CHECK_VERSION(0,10) > > if test "${gcc_cv_isl}" = no ; then > > ISL_CHECK_VERSION(0,11) > > + if test "${gcc_cv_isl}" = no ; then > > + ISL_CHECK_VERSION(0,12) > > + fi > > fi > > dnl Only execute fail-action, if ISL has been requested. > > ISL_IF_FAILED([ > > Index: configure > > =================================================================== > > *** configure (revision 202203) > > --- configure (working copy) > > *************** $as_echo "$gcc_cv_isl" >&6; } > > *** 5965,5970 **** > > --- 5965,6019 ---- > > fi > > > > > > + if test "${gcc_cv_isl}" = no ; then > > + > > + if test "${ENABLE_ISL_CHECK}" = yes ; then > > + _isl_saved_CFLAGS=$CFLAGS > > + _isl_saved_LDFLAGS=$LDFLAGS > > + _isl_saved_LIBS=$LIBS > > + > > + CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}" > > + LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}" > > + LIBS="${_isl_saved_LIBS} -lisl" > > + > > + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.12 of > > ISL" >&5 > > + $as_echo_n "checking for version 0.12 of ISL... " >&6; } > > + if test "$cross_compiling" = yes; then : > > + gcc_cv_isl=yes > > + else > > + cat confdefs.h - <<_ACEOF >conftest.$ac_ext > > + /* end confdefs.h. */ > > + #include <isl/version.h> > > + #include <string.h> > > + int > > + main () > > + { > > + if (strncmp (isl_version (), "isl-0.12", strlen ("isl-0.12")) != 0) > > + return 1; > > + > > + ; > > + return 0; > > + } > > + _ACEOF > > + if ac_fn_c_try_run "$LINENO"; then : > > + gcc_cv_isl=yes > > + else > > + gcc_cv_isl=no > > + fi > > + rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ > > + conftest.$ac_objext conftest.beam conftest.$ac_ext > > + fi > > + > > + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_isl" >&5 > > + $as_echo "$gcc_cv_isl" >&6; } > > + > > + CFLAGS=$_isl_saved_CFLAGS > > + LDFLAGS=$_isl_saved_LDFLAGS > > + LIBS=$_isl_saved_LIBS > > + fi > > + > > + > > + fi > > fi > > > > > > -- Richard Biener <rguent...@suse.de> SUSE / SUSE Labs SUSE LINUX Products GmbH - Nuernberg - AG Nuernberg - HRB 16746 GF: Jeff Hawn, Jennifer Guild, Felix Imend