diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2011-01-25 20:47:36 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2011-01-25 20:47:36 +0100 |
| commit | 6be7b6686fa5ad8be50dd578a05dfd0f6d478353 (patch) | |
| tree | f0b865be1687e4a9c82a04e0937540614b4f15ed | |
| parent | e4cba915b8a3faa7eada627ac25c7093cf8eb926 (diff) | |
| download | gcc-6be7b6686fa5ad8be50dd578a05dfd0f6d478353.zip gcc-6be7b6686fa5ad8be50dd578a05dfd0f6d478353.tar.gz gcc-6be7b6686fa5ad8be50dd578a05dfd0f6d478353.tar.bz2 | |
cloog.m4 (CLOOG_REQUESTED): Use $2 if --without-cloog.
* config/cloog.m4 (CLOOG_REQUESTED): Use $2 if --without-cloog.
* configure.ac: If with_ppl is no, move setting with_cloog=no
after CLOOG_REQUESTED check.
* configure: Regenerated.
From-SVN: r169249
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | config/cloog.m4 | 4 | ||||
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | configure.ac | 3 |
4 files changed, 18 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2011-01-25 Jakub Jelinek <jakub@redhat.com> + + * config/cloog.m4 (CLOOG_REQUESTED): Use $2 if --without-cloog. + * configure.ac: If with_ppl is no, move setting with_cloog=no + after CLOOG_REQUESTED check. + * configure: Regenerated. + 2011-01-25 Sebastian Pop <sebastian.pop@amd.com> * configure.ac: Call AC_MSG_ERROR when PPL 0.11 is not present and diff --git a/config/cloog.m4 b/config/cloog.m4 index e1eb9e8..ec8b46d 100644 --- a/config/cloog.m4 +++ b/config/cloog.m4 @@ -88,7 +88,9 @@ AC_DEFUN([CLOOG_REQUESTED], [ AC_REQUIRE([CLOOG_INIT_FLAGS]) - if test "x${with_cloog}" != x \ + if test "x${with_cloog}" = xno; then + $2 + elif test "x${with_cloog}" != x \ || test "x${with_cloog_include}" != x \ || test "x${with_cloog_lib}" != x ; then $1 @@ -5817,12 +5817,12 @@ fi if test "x$with_ppl" = "xno"; then - with_cloog=no - - if test "x${with_cloog}" != x \ + if test "x${with_cloog}" = xno; then + graphite_requested=no + elif test "x${with_cloog}" != x \ || test "x${with_cloog_include}" != x \ || test "x${with_cloog_lib}" != x ; then graphite_requested=yes @@ -5834,6 +5834,7 @@ if test "x$with_ppl" = "xno"; then if test "${graphite_requested}" = yes; then as_fn_error "Unable to find a usable PPL. See config.log for details." "$LINENO" 5] fi + with_cloog=no fi if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \ && test "x${with_cloog_lib}" = x && test -d ${srcdir}/cloog; then @@ -6085,7 +6086,9 @@ $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; } - if test "x${with_cloog}" != x \ + if test "x${with_cloog}" = xno; then + graphite_requested=no + elif test "x${with_cloog}" != x \ || test "x${with_cloog_include}" != x \ || test "x${with_cloog_lib}" != x ; then graphite_requested=yes diff --git a/configure.ac b/configure.ac index 620723f..890d04e 100644 --- a/configure.ac +++ b/configure.ac @@ -1688,13 +1688,12 @@ dnl Provide configure switches and initialize clooginc & clooglibs dnl with user input. CLOOG_INIT_FLAGS if test "x$with_ppl" = "xno"; then - with_cloog=no - dnl Only execute fail-action, if CLooG has been requested. CLOOG_REQUESTED([graphite_requested=yes], [graphite_requested=no]) if test "${graphite_requested}" = yes; then AC_MSG_ERROR([Unable to find a usable PPL. See config.log for details.])] fi + with_cloog=no fi if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \ && test "x${with_cloog_lib}" = x && test -d ${srcdir}/cloog; then |