package/transmission/transmission-02-fix-cxx-check-with-ccache.patch

   1 transmission: fix incorrect check of CXX when ccache is enabled
   2
   3 When ccache is enabled, the configure script is called with
   4 CXX="/path/to/ccache /path/to/cxx". The AC_PROG_CXX correctly deals with
   5 this, but the transmission-specific extra checks on CXX do not. It uses
   6 AC_CHECK_PROG, which takes the first word of CXX (ccache) only.
   7
   8 This patch removes the seemingly unneeded extra checks, and additionally
   9 replaces HAVE_CXX=yes/no with a direct check on CXX, as it is only used in
  10 one place.
  11
  12 Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
  13 Upstream-status: submitted: https://trac.transmissionbt.com/ticket/5612
  14
  15 ---
  16
  17 diff --git a/configure.ac b/configure.ac
  18 --- a/configure.ac
  19 +++ b/configure.ac
  20 @@ -69,15 +69,6 @@ AC_SUBST(LIBAPPINDICATOR_MINIMUM)
  21
  22  AC_PROG_CC
  23  AC_PROG_CXX
  24 -if test "x$CXX" != "x"; then # CXX is set...
  25 -  if test -f "$CXX"; then # maybe it's an absolute path passed in env variables...
  26 -    AC_MSG_CHECKING([for $CXX])
  27 -    HAVE_CXX="yes"
  28 -    AC_MSG_RESULT([$HAVE_CXX])
  29 -  else
  30 -    AC_CHECK_PROG([HAVE_CXX],[$CXX],[yes],[no])
  31 -  fi
  32 -fi
  33  AC_C_INLINE
  34  if test "x$GCC" = "xyes" ; then
  35
  36 @@ -216,7 +207,7 @@ AC_CHECK_LIB([rt],
  37
  38  AC_MSG_CHECKING([µTP])
  39  build_utp="no"
  40 -if test "x$HAVE_CXX" = "xyes" ; then
  41 +if test "x$CXX" != "x" ; then
  42      have_utp="yes"
  43  else
  44      have_utp="no"