Subject: bug#13317: automake fails make check

From: Stefano Lattarini <[email-masked]>
Date: Tue, 01 Jan 2013 01:42:54 +0100

On 12/31/2012 09:21 AM, Ronald Copley wrote:
> Log attached
Thanks.  I haven't looked at it in detail yet, but a cursory look has
already helped me to find and fix some latent testsuite issues (patches
for them are attached).  I hope I'll be able to look in more depth at
your report in the next days.

Best regards, and happy new year,
  Stefano
>From f2443786a7dec55f498c06b8b207751aa06368cf Mon Sep 17 00:00:00 2001
Message-Id: <f2443786a[email-masked]>
From: Stefano Lattarini <[email-masked]>
Date: Tue, 1 Jan 2013 00:51:37 +0100
Subject: [PATCH 1/2] tests: fix bug in pkg-config-macros.sh, could cause
 spurious SKIPs

Issue spotted perusing the testsuite logs reported in bug#13317.

* t/pkg-config-macros.sh: Don't use (uninitialized) '$dir' where '$d'
should have been used instead.  Set IFS to ':' before looping on the
$PATH expansion.  Fix typo: 'alocal' instead of 'aclocal'.  These
issues were causing the location in PATH of the 'pkg-config' program
not to be found even when the program was present.
* THANKS: Update.

Signed-off-by: Stefano Lattarini <[email-masked]>
---
 THANKS                 | 1 +
 t/pkg-config-macros.sh | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/THANKS b/THANKS
index 1ff7c08..5fa307d 100644
--- a/THANKS
+++ b/THANKS
@@ -337,6 +337,7 @@ Robert Collins                  [email-masked]
 Robert Swafford                 [email-masked]
 Roberto Bagnara                 [email-masked]
 Roman Fietze                    [email-masked]
+Ronald Copley                   [email-masked]
 Ronald Landheer                 [email-masked]
 Roumen Petrov                   [email-masked]
 Russ Allbery                    [email-masked]
diff --git a/t/pkg-config-macros.sh b/t/pkg-config-macros.sh
index ec8b381..5069c08 100755
--- a/t/pkg-config-macros.sh
+++ b/t/pkg-config-macros.sh
@@ -48,9 +48,10 @@ XT_ACLOCAL_PATH=/usr/local/share/aclocal:/usr/share/aclocal
 
 # Find the location of the pkg-config executable.
 oIFS=$IFS dir=
+IFS=:
 for d in $PATH; do
   IFS=$oIFS
-  if test -f $dir/pkg-config || test -f $dir/pkg-config.exe; then
+  if test -f $d/pkg-config || test -f $d/pkg-config.exe; then
     dir=$d
     break
   fi
@@ -61,7 +62,7 @@ IFS=$oIFS
 # where the corresponding pkg.m4 might be installed.
 if test -n "$dir"; then
   # Only support standard installation layouts.
-  XT_ACLOCAL_PATH=${dir%/bin}/share/alocal:$XT_ACLOCAL_PATH
+  XT_ACLOCAL_PATH=${dir%/bin}/share/aclocal:$XT_ACLOCAL_PATH
 fi
 
 XT_ACLOCAL_PATH=$XT_ACLOCAL_PATH${ACLOCAL_PATH+":$ACLOCAL_PATH"}
-- 
1.8.1.rc3.27.g3b73c7d

>From f87ce5b01869361bb9f1035ae9f45bbf5e76b8bc Mon Sep 17 00:00:00 2001
Message-Id: <f87ce5b01[email-masked]>
In-Reply-To: <f2443786a[email-masked]>
References: <f2443786a[email-masked]>
From: Stefano Lattarini <[email-masked]>
Date: Tue, 1 Jan 2013 01:20:49 +0100
Subject: [PATCH 2/2] tests: don't always look for a C++ compiler named 'RCC'

On MacOS X (10.8), since the file system is case-insensitive, RCC
can point to the "Resource Compiler" of the Qt4 Toolkit:

    <http://doc.qt.digia.com/4.2/rcc.html>

That mismatch causes our configure script to erroneously think that
no working C++ compiler is present, and that is thus necessary to
skip all the test cases requiring such a compiler.

So only look for a compiler named 'RCC' if the file system is
case-sensible.

Issue spotted analyzing the testsuite logs reported in bug#13317.

* configure.ac: Adjust.

Signed-off-by: Stefano Lattarini <[email-masked]>
---
 configure.ac | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a62743f..6822639 100644
--- a/configure.ac
+++ b/configure.ac
@@ -470,12 +470,14 @@ AS_IF([test x"$GCC" = x"yes"], [am_CC_is_GNU=yes], [am_CC_is_GNU=no])
 # On case-insensitive file systems (seen e.g. on Cygwin and Mac OS X)
 # we must avoid looking for 'CC', because that would be the same as
 # 'cc', and could cause $CXX to point to the C compiler, instead of
-# to a C++ compiler as expected.  See automake bugs #11893 and #10766.
+# to a C++ compiler as expected (see automake bugs #11893 and #10766).
+# Similarly, we must avoid looking for 'RCC', as that can point to the
+# Qt4 "Resource Compiler": <http://doc.qt.digia.com/4.2/rcc.html>
 if test -f /bIn/rMdIr || test -f /uSr/bIn/rMdIr; then
   # Case-insensitive file system, don't look for CC.
-  am_CC=
+  am_CC= am_RCC=
 else
-  am_CC=CC
+  am_CC=CC am_RCC=RCC
 fi
 
 # The list of C++ compilers here has been copied, pasted and edited
@@ -483,7 +485,7 @@ fi
 # Keep it in sync, or better again, find out a way to avoid this code
 # duplication.
 _AM_COMPILER_CAN_FAIL([AC_PROG_CXX(dnl
-  [aCC $am_CC FCC KCC RCC xlC_r xlC c++ cxx cc++ gpp g++])],
+  [aCC $am_CC FCC KCC $am_RCC xlC_r xlC c++ cxx cc++ gpp g++])],
   [CXX=false; _AM_SKIP_COMP_TESTS([C++])])
 
 AS_IF([test x"$GXX" = x"yes"], [am_CXX_is_GNU=yes], [am_CXX_is_GNU=no])
-- 
1.8.1.rc3.27.g3b73c7d