Patchwork [23/28] Fail when PPL 0.11 is not present and CLooG has been requested.

login
register
mail settings
Submitter Sebastian Pop
Date Jan. 21, 2011, 7:27 p.m.
Message ID <1295638067-13460-24-git-send-email-sebpop@gmail.com>
Download mbox | patch
Permalink /patch/79907/
State New
Headers show

Comments

Sebastian Pop - Jan. 21, 2011, 7:27 p.m.
From: spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4>

2011-01-18  Sebastian Pop  <sebastian.pop@amd.com>

	* configure.ac: Call AC_MSG_ERROR when PPL 0.11 is not present and
	CLooG has been requested.
	* configure: Regenerated.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/graphite@168959 138bc75d-0d04-0410-961f-82ee72b054a4
---
 ChangeLog    |    6 ++++++
 configure    |   18 +++++++++++++++++-
 configure.ac |   11 ++++++++---
 3 files changed, 31 insertions(+), 4 deletions(-)

Patch

diff --git a/ChangeLog b/ChangeLog
index 78c47c6..961e92a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@ 
 2011-01-21  Sebastian Pop  <sebastian.pop@amd.com>
 
+	* configure.ac: Call AC_MSG_ERROR when PPL 0.11 is not present and
+	CLooG has been requested.
+	* configure: Regenerated.
+
+2011-01-21  Sebastian Pop  <sebastian.pop@amd.com>
+
 	* configure: Regenerated.
 	* configure.ac: Check for version 0.11 (or later revision) of PPL.
 
diff --git a/configure b/configure
index 257888b..b60d136 100755
--- a/configure
+++ b/configure
@@ -5818,6 +5818,22 @@  fi
 
 if test "x$with_ppl" = "xno"; then
   with_cloog=no
+
+
+
+
+  if test "x${with_cloog}" != x \
+    || test "x${with_cloog_include}" != x \
+    || test "x${with_cloog_lib}" != x ; then
+    graphite_requested=yes
+  else
+    graphite_requested=no
+  fi
+
+
+  if test "${graphite_requested}" = yes; then
+    as_fn_error "Unable to find a usable PPL.  See config.log for details." "$LINENO" 5]
+  fi
 fi
 if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \
   && test "x${with_cloog_lib}" = x && test -d ${srcdir}/cloog; then
@@ -6090,7 +6106,7 @@  $as_echo "$gcc_cv_cloog_ct_0_15_5" >&6; }
     && test "x${clooglibs}" = x \
     && test "x${clooginc}" = x ; then
 
-    as_fn_error "Unable to find a usable CLooG. See config.log for details." "$LINENO" 5
+    as_fn_error "Unable to find a usable CLooG.  See config.log for details." "$LINENO" 5
   fi
 
 
diff --git a/configure.ac b/configure.ac
index a497efe..620723f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1689,6 +1689,12 @@  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
 fi
 if test "x${with_cloog}" = x && test "x${with_cloog_include}" = x \
   && test "x${with_cloog_lib}" = x && test -d ${srcdir}/cloog; then
@@ -1702,10 +1708,9 @@  if test "x$with_cloog" != "xno"; then
   dnl ignored.
   CLOOG_CHECK_VERSION(0,16,1)
 
-  dnl Only execute fail-action, if CLooG has been
-  dnl requested.
+  dnl Only execute fail-action, if CLooG has been requested.
   CLOOG_IF_FAILED([
-    AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])])
+    AC_MSG_ERROR([Unable to find a usable CLooG.  See config.log for details.])])
 fi
 
 # Check for LTO support.