OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0.

Browse Source 
2013-01-14  Richard Biener  <rguenther@suse.de>

	* configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0.
	* configure: Re-generate

From-SVN: r195150
This commit is contained in:
Richard Biener 2013-01-14 15:01:13 +00:00 committed by Richard Biener
parent 7bb0199604
commit d0ad394c5e
3 changed files with 114 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-01-14 Richard Biener <rguenther@suse.de>
* configure.ac (cloog/isl): Also allow ISL 0.11.x and CLooG 0.18.0.
* configure: Re-generate
2013-01-11 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* config.sub: Update from config repo.

101
configure vendored
View File

@ -5874,6 +5874,60 @@ $as_echo "$gcc_cv_isl" >&6; }
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"
echo $CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 of ISL" >&5
$as_echo_n "checking for version 0.11 of ISL... " >&6; }
if test "${gcc_cv_isl+set}" = set; then :
$as_echo_n "(cached) " >&6
else
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.11", strlen ("isl-0.11")) != 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
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
@ -6002,6 +6056,53 @@ $as_echo "$gcc_cv_cloog" >&6; }
fi
if test "${gcc_cv_cloog}" = no ; then
if test "${ENABLE_CLOOG_CHECK}" = yes ; then
_cloog_saved_CFLAGS=$CFLAGS
_cloog_saved_LDFLAGS=$LDFLAGS
CFLAGS="${_cloog_saved_CFLAGS} ${clooginc} ${islinc} ${gmpinc}"
LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${isllibs} ${gmplib}"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.18.0 of CLooG" >&5
$as_echo_n "checking for version 0.18.0 of CLooG... " >&6; }
if test "${gcc_cv_cloog+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include "cloog/version.h"
int
main ()
{
#if CLOOG_VERSION_MAJOR != 0 \
|| CLOOG_VERSION_MINOR != 18 \
|| CLOOG_VERSION_REVISION < 0
choke me
#endif
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
gcc_cv_cloog=yes
else
gcc_cv_cloog=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_cloog" >&5
$as_echo "$gcc_cv_cloog" >&6; }
CFLAGS=$_cloog_saved_CFLAGS
LDFLAGS=$_cloog_saved_LDFLAGS
fi
fi

13
configure.ac
View File

@ -1606,8 +1606,11 @@ if test "x$with_isl" != "xno" &&
dnl Provide configure switches and initialize islinc & isllibs
dnl with user input.
ISL_INIT_FLAGS
dnl The minimal version of ISL required for Graphite.
dnl The versions of ISL that work for Graphite
ISL_CHECK_VERSION(0,10)
if test "${gcc_cv_isl}" = no ; then
ISL_CHECK_VERSION(0,11)
fi
dnl Only execute fail-action, if ISL has been requested.
ISL_IF_FAILED([
AC_MSG_ERROR([Unable to find a usable ISL. See config.log for details.])])
@ -1617,11 +1620,11 @@ if test "x$with_isl" != "xno" &&
dnl Provide configure switches and initialize clooginc & clooglibs
dnl with user input.
CLOOG_INIT_FLAGS
dnl The minimal version of CLooG required for Graphite.
dnl
dnl If we use CLooG-Legacy, the provided version information is
dnl ignored.
dnl The versions of CLooG that work for Graphite.
CLOOG_CHECK_VERSION(0,17,0)
if test "${gcc_cv_cloog}" = no ; then
CLOOG_CHECK_VERSION(0,18,0)
fi
dnl Only execute fail-action, if CLooG has been requested.
CLOOG_IF_FAILED([