diff --git a/ChangeLog b/ChangeLog
index 6b159e02f05..e4233e5efbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 e1eb9e83601..ec8b46d244e 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
diff --git a/configure b/configure
index b60d13672e4..b18d95d8e0f 100755
--- a/configure
+++ b/configure
@@ -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 620723f60c4..890d04e896b 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