[gtkada] gate bug

[Philippe Bertin]

Arnaud Charlet wrote:

>I think you should look at gate.in instead, since gate is a generated
>file, so doing a change to this file is not the way to go.
>
>What you should also do is make sure that 'merge' is found when configuring
>GtkAda, this should/could improve things.
>
>Arno
>  
>
I see (now). Still I'm puzzled : config.log shows merge is available :

<snip>
...
## ----------- ##
## Core tests. ##
## ----------- ##

...
configure:1371: checking for merge
configure:1402: result: true
configure:1467: checking for diff
configure:1485: found /usr/bin/diff
...
</snip>

Remark in the above output that not any of the (surely intended) output 
of configure's output between lines 1436 and 1453 is output in my 
config.log  :(
To my understanding, this is caused by the check in line 1411 of configure :
   if test x$MERGE != xtrue ; then
This should check for equality, not so ? Because @MERGE_AVAIL@ is kept 
set to False this way, but can never be set to True when not executing 
the lines between 1436 and 1453 ... which in turn is needed for gate.in

This results in my situation, where merge is available, but MERGE_AVAIL 
is kept set to False :

diff gate gate.in
81c81
< if [ "False" = "True" ]; then
---
 > if [ "@MERGE_AVAIL@" = "True" ]; then
90c90
<       true $j $gt/$j $tmp/$j 2>/dev/null
---
 >       @MERGE@ $j $gt/$j $tmp/$j 2>/dev/null
118c118
<     /usr/bin/diff -u $gt/$j $j >> $gt/gate.difs 2>/dev/null
---
 >     @DIFF@ $gt/$j $j >> $gt/gate.difs 2>/dev/null
124c124
<   if cat $gt/gate.difs | /usr/bin/patch -f > $gt/patch.out 2>&1; then
---
 >   if cat $gt/gate.difs | @PATCH@ > $gt/patch.out 2>&1; then

So I think there is some script error anyhow. I think you can confirm this ?

Kind regards,

PhB