diff mbox

Fail when PPL 0.11 is not present and CLooG has been requested.

Message ID 1295377990-18603-1-git-send-email-sebpop@gmail.com
State New
Headers show

Commit Message

Sebastian Pop Jan. 18, 2011, 7:13 p.m. UTC
Hi,

With this patch, configure will fail when graphite has been requested,
and the PPL version is not usable.  Committed to the graphite branch.

Sebastian

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.
---
 ChangeLog.graphite |    6 ++++++
 configure          |   18 +++++++++++++++++-
 configure.ac       |   11 ++++++++---
 3 files changed, 31 insertions(+), 4 deletions(-)

Comments

Eric Botcazou Jan. 25, 2011, 7:58 a.m. UTC | #1
> With this patch, configure will fail when graphite has been requested,
> and the PPL version is not usable.  Committed to the graphite branch.
>
> Sebastian
>
> 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.

configure fails unconditionally on the mainline:

checking for version 0.11 (or later revision) of PPL... no
configure: error: Unable to find a usable PPL.  See config.log for details.
Richard Biener Jan. 25, 2011, 12:13 p.m. UTC | #2
On Tue, Jan 25, 2011 at 8:58 AM, Eric Botcazou <ebotcazou@adacore.com> wrote:
>> With this patch, configure will fail when graphite has been requested,
>> and the PPL version is not usable.  Committed to the graphite branch.
>>
>> Sebastian
>>
>> 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.
>
> configure fails unconditionally on the mainline:
>
> checking for version 0.11 (or later revision) of PPL... no
> configure: error: Unable to find a usable PPL.  See config.log for details.

Can you open a PR?  A ./configure without --enable-graphite should just
not enable it automatically if prerequesites are not available, not fail.

Richard.

>
> --
> Eric Botcazou
>
H.J. Lu Jan. 25, 2011, 1:02 p.m. UTC | #3
On Mon, Jan 24, 2011 at 11:58 PM, Eric Botcazou <ebotcazou@adacore.com> wrote:
>> With this patch, configure will fail when graphite has been requested,
>> and the PPL version is not usable.  Committed to the graphite branch.
>>
>> Sebastian
>>
>> 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.
>
> configure fails unconditionally on the mainline:
>
> checking for version 0.11 (or later revision) of PPL... no
> configure: error: Unable to find a usable PPL.  See config.log for details.
>

http://gcc.gnu.org/install/prerequisites.html

still says "CLooG-PPL version 0.15".
H.J. Lu Jan. 25, 2011, 1:04 p.m. UTC | #4
On Tue, Jan 25, 2011 at 5:02 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Mon, Jan 24, 2011 at 11:58 PM, Eric Botcazou <ebotcazou@adacore.com> wrote:
>>> With this patch, configure will fail when graphite has been requested,
>>> and the PPL version is not usable.  Committed to the graphite branch.
>>>
>>> Sebastian
>>>
>>> 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.
>>
>> configure fails unconditionally on the mainline:
>>
>> checking for version 0.11 (or later revision) of PPL... no
>> configure: error: Unable to find a usable PPL.  See config.log for details.
>>
>
> http://gcc.gnu.org/install/prerequisites.html
>
> still says "CLooG-PPL version 0.15".

I meant "Parma Polyhedra Library (PPL) version 0.10".
diff mbox

Patch

diff --git a/ChangeLog.graphite b/ChangeLog.graphite
index 7b319b3..28c5e6b 100644
--- a/ChangeLog.graphite
+++ b/ChangeLog.graphite
@@ -1,3 +1,9 @@ 
+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.
+
 2011-01-17  Sebastian Pop  <sebastian.pop@amd.com>
 
 	* MAINTAINERS (linear loop transforms): Removed.
diff --git a/configure b/configure
index ac55cfb..9186336 100755
--- a/configure
+++ b/configure
@@ -5811,6 +5811,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
@@ -6083,7 +6099,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 877b3b7..5020fce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1658,6 +1658,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
@@ -1671,10 +1677,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.