autoconf: Sync with OE (include -> requires and add AC_CHECK_TARGET_TOOL backport from 2.60)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@660 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 48 insertions, 20 deletions

diff --git a/meta/packages/autoconf/autoconf-2.59/sizeof_types.patch b/meta/packages/autoconf/autoconf-2.59/sizeof_types.patch
index 9a6e47453..30fd5c192 100644
--- a/meta/packages/autoconf/autoconf-2.59/sizeof_types.patch
+++ b/meta/packages/autoconf/autoconf-2.59/sizeof_types.patch
@@ -3,15 +3,38 @@
 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
 #
 
---- autoconf-2.59/lib/autoconf/types.m4~sizeof_types.patch	2003-05-22 08:05:14.000000000 -0400
-+++ autoconf-2.59/lib/autoconf/types.m4	2004-05-29 01:31:24.828295015 -0400
-@@ -380,32 +380,38 @@
+Index: autoconf-2.59/lib/autoconf/types.m4
+===================================================================
+--- autoconf-2.59.orig/lib/autoconf/types.m4	2003-05-22 14:05:14.000000000 +0200
++++ autoconf-2.59/lib/autoconf/types.m4	2006-08-06 02:05:02.000000000 +0200
+@@ -380,26 +380,66 @@
  # Generic checks.  #
  # ---------------- #
  
++# Backport of AC_CHECK_TARGET_TOOL from autoconf 2.60
++# AC_CHECK_TARGET_TOOL(VARIABLE, PROG-TO-CHECK-FOR, [VALUE-IF-NOT-FOUND], [PATH )
++# ------------------------------------------------------------------------
++# (Use different variables $1 and ac_ct_$1 so that cache vars don't conflict.)
++AC_DEFUN([AC_CHECK_TARGET_TOOL],
++[AC_BEFORE([$0], [AC_CANONICAL_TARGET])dnl
++AC_CHECK_PROG([$1], [$target_alias-$2], [$target_alias-$2], , [$4])
++if test -z "$ac_cv_prog_$1"; then
++  if test "$build" = "$target"; then
++    ac_ct_$1=$$1
++    AC_CHECK_PROG([ac_ct_$1], [$2], [$2], [$3], [$4])
++    $1=ac_ct_$1
++  else
++    $1="$3"
++  fi
++else
++  $1="$ac_cv_prog_$1"
++fi
++])# AC_CHECK_TARGET_TOOL
++
++
 +AC_DEFUN([AC_PROG_SIZE],
 +[
-+  AC_CHECK_TOOL(SIZE, size, :)
++  AC_CHECK_TARGET_TOOL([SIZE], [size], [size], [$PATH])
 +])
  
  # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
@@ -35,14 +58,25 @@
 -		  [AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
 +[
 +if test "$AS_TR_SH([ac_cv_type_$1])" = yes; then
-+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
-+		   [static const $1 x[[256]];])],
-+		   [
-+		     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
-+		   ],
-+		   [
-+		     AS_TR_SH([ac_cv_sizeof_$1])=0
-+		   ])
++	if test "$cross_compiling" = yes; then
++	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$3])],
++			   [extern void dummy($1); static const $1 x[[256]]; dummy(x);])],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=`$SIZE conftest.$ac_objext | tail -n 1 | $AWK '{print [$]3/256}'`
++			   ],
++			   [
++			     AS_TR_SH([ac_cv_sizeof_$1])=0
++			   ])
++	else
++		# The cast to unsigned long works around a bug in the HP C Compiler
++		# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++		# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++		# This bug is HP SR number 8606223364.
++		_AC_COMPUTE_INT([(long) (sizeof ($1))],
++			[AS_TR_SH([ac_cv_sizeof_$1])],
++			[AC_INCLUDES_DEFAULT([$3])],
++			[AC_MSG_FAILURE([cannot compute sizeof ($1), 77])])
++	fi
  else
    AS_TR_SH([ac_cv_sizeof_$1])=0
 -fi])dnl
@@ -51,9 +85,3 @@
  AC_DEFINE_UNQUOTED(AS_TR_CPP(sizeof_$1), $AS_TR_SH([ac_cv_sizeof_$1]),
  		   [The size of a `$1', as computed by sizeof.])
  ])# AC_CHECK_SIZEOF
- 
--
--
- # ---------------- #
- # Generic checks.  #
- # ---------------- #
diff --git a/meta/packages/autoconf/autoconf-native_2.59.bb b/meta/packages/autoconf/autoconf-native_2.59.bb
index 17f27bae4..92a925779 100644
--- a/meta/packages/autoconf/autoconf-native_2.59.bb
+++ b/meta/packages/autoconf/autoconf-native_2.59.bb
@@ -1,5 +1,5 @@
 SECTION = "devel"
-include autoconf_${PV}.bb
+require autoconf_${PV}.bb
 DEPENDS = "m4-native gnu-config-native"
 RDEPENDS_${PN} = "m4-native gnu-config-native"
 
diff --git a/meta/packages/autoconf/autoconf_2.59.bb b/meta/packages/autoconf/autoconf_2.59.bb
index c9cdc624a..3a5c220a4 100644
--- a/meta/packages/autoconf/autoconf_2.59.bb
+++ b/meta/packages/autoconf/autoconf_2.59.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gnu.org/software/autoconf/"
 SECTION = "devel"
 DEPENDS += "m4-native"
 RDEPENDS_${PN} = "m4 gnu-config"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
 	   file://program_prefix.patch;patch=1 \