1Remove the perl checks in intltool.m4.  This can find a different perl binary to
2the one that the intltool scripts will actually be using (as they hard-code a
3specific binary), for example in the intltool-native case they'll be using
4nativeperl yet this fragment can find and test the host perl.
5
6This can result in recipes failing in do_configure as intltool.m4 finds a host
7perl which doesn't have XML::Parser installed, despite the fact that intltool
8will work fine as nativeperl has XML::Parser.
9
10Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1197875)
11Signed-off-by: Ross Burton <ross.burton@intel.com>
12
13--- a/intltool.m4.orig	2013-07-02 11:22:23.000000000 -0700
14+++ b/intltool.m4	2013-07-02 11:22:32.000000000 -0700
15@@ -26,1 +26,1 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
16-# serial 42 IT_PROG_INTLTOOL
17+# serial 42.1 IT_PROG_INTLTOOL
18@@ -131,27 +131,6 @@ if test -z "$xgversion" -o -z "$mmversio
19     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
20 fi
21
22-AC_PATH_PROG(INTLTOOL_PERL, perl)
23-if test -z "$INTLTOOL_PERL"; then
24-   AC_MSG_ERROR([perl not found])
25-fi
26-AC_MSG_CHECKING([for perl >= 5.8.1])
27-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
28-if test $? -ne 0; then
29-   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
30-else
31-   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
32-   AC_MSG_RESULT([$IT_PERL_VERSION])
33-fi
34-if test "x$2" != "xno-xml"; then
35-   AC_MSG_CHECKING([for XML::Parser])
36-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
37-       AC_MSG_RESULT([ok])
38-   else
39-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
40-   fi
41-fi
42-
43 # Substitute ALL_LINGUAS so we can use it in po/Makefile
44 AC_SUBST(ALL_LINGUAS)
45
46