summaryrefslogtreecommitdiff
path: root/recipes/autoconf
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/autoconf')
-rw-r--r--recipes/autoconf/autoconf-2.59/path_prog_fixes.patch126
-rw-r--r--recipes/autoconf/autoconf-2.61/autoconf-dont-execute-perl.patch41
-rw-r--r--recipes/autoconf/autoconf-2.61/path_prog_fixes.patch126
-rw-r--r--recipes/autoconf/autoconf-2.63/path_prog_fixes.patch126
-rw-r--r--recipes/autoconf/autoconf-native_2.59.bb2
-rw-r--r--recipes/autoconf/autoconf-native_2.61.bb1
-rw-r--r--recipes/autoconf/autoconf-native_2.63.bb1
-rw-r--r--recipes/autoconf/autoconf.inc12
-rw-r--r--recipes/autoconf/autoconf213-native_2.13.bb2
-rw-r--r--recipes/autoconf/autoconf213_2.13.bb2
-rw-r--r--recipes/autoconf/autoconf_2.57.bb2
-rw-r--r--recipes/autoconf/autoconf_2.59.bb7
-rw-r--r--recipes/autoconf/autoconf_2.61.bb8
-rw-r--r--recipes/autoconf/autoconf_2.63.bb17
14 files changed, 72 insertions, 401 deletions
diff --git a/recipes/autoconf/autoconf-2.59/path_prog_fixes.patch b/recipes/autoconf/autoconf-2.59/path_prog_fixes.patch
deleted file mode 100644
index 5f0d055a48..0000000000
--- a/recipes/autoconf/autoconf-2.59/path_prog_fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Index: autoconf-2.59/bin/autoheader.in
-===================================================================
---- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500
-+++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500
-@@ -1,8 +1,8 @@
--#! @PERL@
-+#! @bindir@/env perl
- # -*- Perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
- if 0;
-
- # autoheader -- create `config.h.in' from `configure.ac'
-Index: autoconf-2.59/bin/autom4te.in
-===================================================================
---- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500
-+++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- # autom4te - Wrapper around M4 libraries.
-@@ -87,7 +89,7 @@
- my $freeze = 0;
-
- # $M4.
--my $m4 = $ENV{"M4"} || '@M4@';
-+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
- # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
- fatal "need GNU m4 1.4 or later: $m4"
- if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
-Index: autoconf-2.59/bin/autoreconf.in
-===================================================================
---- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500
-+++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- # autoreconf - install the GNU Build System in a directory tree
-Index: autoconf-2.59/bin/autoscan.in
-===================================================================
---- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400
-+++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # autoscan - Create configure.scan (a preliminary configure.ac) for a package.
- # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
-@@ -21,7 +21,9 @@
-
- # Written by David MacKenzie <djm@gnu.ai.mit.edu>.
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- BEGIN
-Index: autoconf-2.59/bin/autoupdate.in
-===================================================================
---- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400
-+++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # autoupdate - modernize an Autoconf file.
- # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
-@@ -22,7 +22,9 @@
- # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>.
- # Rewritten by Akim Demaille <akim@freefriends.org>.
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- BEGIN
-@@ -54,7 +56,7 @@
- my @include = ('@datadir@');
- my $force = 0;
- # m4.
--my $m4 = $ENV{"M4"} || '@M4@';
-+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
-
-
- # $HELP
-Index: autoconf-2.59/bin/ifnames.in
-===================================================================
---- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400
-+++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- # ifnames - print the identifiers used in C preprocessor conditionals
diff --git a/recipes/autoconf/autoconf-2.61/autoconf-dont-execute-perl.patch b/recipes/autoconf/autoconf-2.61/autoconf-dont-execute-perl.patch
new file mode 100644
index 0000000000..c336bc57d2
--- /dev/null
+++ b/recipes/autoconf/autoconf-2.61/autoconf-dont-execute-perl.patch
@@ -0,0 +1,41 @@
+Index: autoconf-2.61/configure.ac
+===================================================================
+--- autoconf-2.61.orig/configure.ac 2006-11-17 11:04:48.000000000 -0800
++++ autoconf-2.61/configure.ac 2009-09-19 16:37:40.000000000 -0700
+@@ -106,10 +106,6 @@
+ if test "$PERL" = no; then
+ AC_MSG_ERROR([perl is not found])
+ fi
+-$PERL -e 'require 5.005_03;' || {
+- AC_MSG_ERROR([Perl 5.005_03 or better is required])
+-}
+-
+
+ ## ------- ##
+ ## Emacs. ##
+Index: autoconf-2.61/configure
+===================================================================
+--- autoconf-2.61.orig/configure 2006-11-17 11:05:17.000000000 -0800
++++ autoconf-2.61/configure 2009-09-19 16:38:13.000000000 -0700
+@@ -1557,7 +1557,7 @@
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
+- set x "$CONFIG_SITE"
++ set x $CONFIG_SITE
+ elif test "x$prefix" != xNONE; then
+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ else
+@@ -2406,12 +2406,6 @@
+ echo "$as_me: error: perl is not found" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+-$PERL -e 'require 5.005_03;' || {
+- { { echo "$as_me:$LINENO: error: Perl 5.005_03 or better is required" >&5
+-echo "$as_me: error: Perl 5.005_03 or better is required" >&2;}
+- { (exit 1); exit 1; }; }
+-}
+-
+
+ ## ------- ##
+ ## Emacs. ##
diff --git a/recipes/autoconf/autoconf-2.61/path_prog_fixes.patch b/recipes/autoconf/autoconf-2.61/path_prog_fixes.patch
deleted file mode 100644
index 5f0d055a48..0000000000
--- a/recipes/autoconf/autoconf-2.61/path_prog_fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Index: autoconf-2.59/bin/autoheader.in
-===================================================================
---- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500
-+++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500
-@@ -1,8 +1,8 @@
--#! @PERL@
-+#! @bindir@/env perl
- # -*- Perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
- if 0;
-
- # autoheader -- create `config.h.in' from `configure.ac'
-Index: autoconf-2.59/bin/autom4te.in
-===================================================================
---- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500
-+++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- # autom4te - Wrapper around M4 libraries.
-@@ -87,7 +89,7 @@
- my $freeze = 0;
-
- # $M4.
--my $m4 = $ENV{"M4"} || '@M4@';
-+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
- # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
- fatal "need GNU m4 1.4 or later: $m4"
- if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
-Index: autoconf-2.59/bin/autoreconf.in
-===================================================================
---- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500
-+++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- # autoreconf - install the GNU Build System in a directory tree
-Index: autoconf-2.59/bin/autoscan.in
-===================================================================
---- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400
-+++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # autoscan - Create configure.scan (a preliminary configure.ac) for a package.
- # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
-@@ -21,7 +21,9 @@
-
- # Written by David MacKenzie <djm@gnu.ai.mit.edu>.
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- BEGIN
-Index: autoconf-2.59/bin/autoupdate.in
-===================================================================
---- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400
-+++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # autoupdate - modernize an Autoconf file.
- # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
-@@ -22,7 +22,9 @@
- # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>.
- # Rewritten by Akim Demaille <akim@freefriends.org>.
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- BEGIN
-@@ -54,7 +56,7 @@
- my @include = ('@datadir@');
- my $force = 0;
- # m4.
--my $m4 = $ENV{"M4"} || '@M4@';
-+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
-
-
- # $HELP
-Index: autoconf-2.59/bin/ifnames.in
-===================================================================
---- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400
-+++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- # ifnames - print the identifiers used in C preprocessor conditionals
diff --git a/recipes/autoconf/autoconf-2.63/path_prog_fixes.patch b/recipes/autoconf/autoconf-2.63/path_prog_fixes.patch
deleted file mode 100644
index 5f0d055a48..0000000000
--- a/recipes/autoconf/autoconf-2.63/path_prog_fixes.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Index: autoconf-2.59/bin/autoheader.in
-===================================================================
---- autoconf-2.59.orig/bin/autoheader.in 2005-03-09 16:27:17.933878952 -0500
-+++ autoconf-2.59/bin/autoheader.in 2005-03-09 16:29:57.360642400 -0500
-@@ -1,8 +1,8 @@
--#! @PERL@
-+#! @bindir@/env perl
- # -*- Perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @bindir@/env perl -S "$0" "$@";; esac'
- if 0;
-
- # autoheader -- create `config.h.in' from `configure.ac'
-Index: autoconf-2.59/bin/autom4te.in
-===================================================================
---- autoconf-2.59.orig/bin/autom4te.in 2003-10-28 03:48:36.000000000 -0500
-+++ autoconf-2.59/bin/autom4te.in 2005-03-09 16:30:14.957967200 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- # autom4te - Wrapper around M4 libraries.
-@@ -87,7 +89,7 @@
- my $freeze = 0;
-
- # $M4.
--my $m4 = $ENV{"M4"} || '@M4@';
-+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
- # Some non-GNU m4's don't reject the --help option, so give them /dev/null.
- fatal "need GNU m4 1.4 or later: $m4"
- if system "$m4 --help </dev/null 2>&1 | grep reload-state >/dev/null";
-Index: autoconf-2.59/bin/autoreconf.in
-===================================================================
---- autoconf-2.59.orig/bin/autoreconf.in 2005-03-09 16:27:17.354966960 -0500
-+++ autoconf-2.59/bin/autoreconf.in 2005-03-09 16:31:19.572144352 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- # autoreconf - install the GNU Build System in a directory tree
-Index: autoconf-2.59/bin/autoscan.in
-===================================================================
---- autoconf-2.59.orig/bin/autoscan.in 2003-09-26 08:57:49.000000000 -0400
-+++ autoconf-2.59/bin/autoscan.in 2005-03-09 16:30:18.136483992 -0500
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # autoscan - Create configure.scan (a preliminary configure.ac) for a package.
- # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
-@@ -21,7 +21,9 @@
-
- # Written by David MacKenzie <djm@gnu.ai.mit.edu>.
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- BEGIN
-Index: autoconf-2.59/bin/autoupdate.in
-===================================================================
---- autoconf-2.59.orig/bin/autoupdate.in 2003-08-27 07:26:32.000000000 -0400
-+++ autoconf-2.59/bin/autoupdate.in 2005-03-09 16:30:19.912214040 -0500
-@@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # autoupdate - modernize an Autoconf file.
- # Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003
-@@ -22,7 +22,9 @@
- # Originally written by David MacKenzie <djm@gnu.ai.mit.edu>.
- # Rewritten by Akim Demaille <akim@freefriends.org>.
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- BEGIN
-@@ -54,7 +56,7 @@
- my @include = ('@datadir@');
- my $force = 0;
- # m4.
--my $m4 = $ENV{"M4"} || '@M4@';
-+my $m4 = $ENV{"M4"} || '@bindir@/env m4';
-
-
- # $HELP
-Index: autoconf-2.59/bin/ifnames.in
-===================================================================
---- autoconf-2.59.orig/bin/ifnames.in 2003-10-10 09:52:56.000000000 -0400
-+++ autoconf-2.59/bin/ifnames.in 2005-03-09 16:30:22.656796800 -0500
-@@ -1,8 +1,10 @@
--#! @PERL@ -w
-+#! @bindir@/env perl
- # -*- perl -*-
- # @configure_input@
-
--eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
-+use warnings;
-+
-+eval 'case $# in 0) exec @bindir@/env perl -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
- if 0;
-
- # ifnames - print the identifiers used in C preprocessor conditionals
diff --git a/recipes/autoconf/autoconf-native_2.59.bb b/recipes/autoconf/autoconf-native_2.59.bb
index aa4871e194..a2b9dfa2d0 100644
--- a/recipes/autoconf/autoconf-native_2.59.bb
+++ b/recipes/autoconf/autoconf-native_2.59.bb
@@ -1,5 +1,7 @@
require autoconf_${PV}.bb
+PR = "${INC_PR}.0"
+
DEPENDS = "m4-native gnu-config-native"
RDEPENDS_${PN} = "m4-native gnu-config-native"
diff --git a/recipes/autoconf/autoconf-native_2.61.bb b/recipes/autoconf/autoconf-native_2.61.bb
index ad6cb79445..b7480cdc11 100644
--- a/recipes/autoconf/autoconf-native_2.61.bb
+++ b/recipes/autoconf/autoconf-native_2.61.bb
@@ -1,4 +1,5 @@
require autoconf_${PV}.bb
+PR = "${INC_PR}.0"
DEPENDS = "m4-native gnu-config-native"
RDEPENDS_${PN} = "m4-native gnu-config-native"
diff --git a/recipes/autoconf/autoconf-native_2.63.bb b/recipes/autoconf/autoconf-native_2.63.bb
index ad6cb79445..b7480cdc11 100644
--- a/recipes/autoconf/autoconf-native_2.63.bb
+++ b/recipes/autoconf/autoconf-native_2.63.bb
@@ -1,4 +1,5 @@
require autoconf_${PV}.bb
+PR = "${INC_PR}.0"
DEPENDS = "m4-native gnu-config-native"
RDEPENDS_${PN} = "m4-native gnu-config-native"
diff --git a/recipes/autoconf/autoconf.inc b/recipes/autoconf/autoconf.inc
index 7761af06d7..2fa12751a1 100644
--- a/recipes/autoconf/autoconf.inc
+++ b/recipes/autoconf/autoconf.inc
@@ -4,9 +4,19 @@ LICENSE = "GPL"
HOMEPAGE = "http://www.gnu.org/software/autoconf/"
SECTION = "devel"
DEPENDS += "m4-native"
-RDEPENDS_${PN} = "m4 gnu-config"
+RDEPENDS_${PN} = "m4 perl gnu-config"
+INC_PR = "r8"
SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.bz2 \
file://program_prefix.patch;patch=1"
inherit autotools
+
+do_configure_prepend () {
+ if ${@['true', 'false'][bb.data.inherits_class('native', d)]}
+ then
+ export ac_cv_path_PERL="${ac_cv_path_PERL=${bindir}/perl}"
+ export ac_cv_path_M4="${ac_cv_path_M4=${bindir}/m4}"
+ export ac_cv_prog_gnu_m4="${ac_cv_prog_gnu_m4=yes}"
+ fi
+}
diff --git a/recipes/autoconf/autoconf213-native_2.13.bb b/recipes/autoconf/autoconf213-native_2.13.bb
index 3954ef3b16..97d441397e 100644
--- a/recipes/autoconf/autoconf213-native_2.13.bb
+++ b/recipes/autoconf/autoconf213-native_2.13.bb
@@ -7,3 +7,5 @@ S = "${WORKDIR}/autoconf-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/autoconf-${PV}"
inherit native
+PR = "${INC_PR}.0"
+
diff --git a/recipes/autoconf/autoconf213_2.13.bb b/recipes/autoconf/autoconf213_2.13.bb
index 022f696f1d..d06822c7c9 100644
--- a/recipes/autoconf/autoconf213_2.13.bb
+++ b/recipes/autoconf/autoconf213_2.13.bb
@@ -1,5 +1,5 @@
require autoconf.inc
SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz"
-PR = "r1"
EXTRA_OECONF = "--program-transform-name=s/\$/2.13/"
EXTRA_OEMAKE = 'acdatadir="${datadir}/autoconf-${PV}" infodir="${datadir}/autoconf-${PV}/info"'
+PR = "${INC_PR}.0"
diff --git a/recipes/autoconf/autoconf_2.57.bb b/recipes/autoconf/autoconf_2.57.bb
index 6c2906a362..0fc5f94b83 100644
--- a/recipes/autoconf/autoconf_2.57.bb
+++ b/recipes/autoconf/autoconf_2.57.bb
@@ -1,2 +1,2 @@
require autoconf.inc
-PR = "r1"
+PR = "${INC_PR}.0"
diff --git a/recipes/autoconf/autoconf_2.59.bb b/recipes/autoconf/autoconf_2.59.bb
index f59f8fa5c9..e9149df44c 100644
--- a/recipes/autoconf/autoconf_2.59.bb
+++ b/recipes/autoconf/autoconf_2.59.bb
@@ -1,8 +1,6 @@
require autoconf.inc
-DEPENDS += "m4-native"
-RDEPENDS_${PN} = "m4 gnu-config"
-PR = "r6"
+PR = "${INC_PR}.0"
SRC_URI += "file://autoreconf-include.patch;patch=1 \
file://autoreconf-exclude.patch;patch=1 \
@@ -12,5 +10,4 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
file://autoheader-nonfatal-warnings.patch;patch=1 \
file://sizeof_types.patch;patch=1 \
file://autoconf-x.patch;patch=1 \
- file://autoconf-sh.patch;patch=1 \
- ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+ file://autoconf-sh.patch;patch=1"
diff --git a/recipes/autoconf/autoconf_2.61.bb b/recipes/autoconf/autoconf_2.61.bb
index 6b92dc8120..53733a90f8 100644
--- a/recipes/autoconf/autoconf_2.61.bb
+++ b/recipes/autoconf/autoconf_2.61.bb
@@ -1,16 +1,14 @@
require autoconf.inc
-PR = "r1"
+PR = "${INC_PR}.1"
PARALLEL_MAKE = ""
-DEPENDS += "m4-native"
-RDEPENDS_${PN} = "m4 gnu-config"
-
SRC_URI += "file://autoreconf-include.patch;patch=1 \
file://autoreconf-exclude.patch;patch=1 \
file://autoreconf-foreign.patch;patch=1 \
file://autoreconf-gnuconfigize.patch;patch=1 \
file://autoheader-nonfatal-warnings.patch;patch=1 \
file://config-site.patch;patch=1 \
- ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+ file://autoconf-dont-execute-perl.patch;patch=1 \
+ "
diff --git a/recipes/autoconf/autoconf_2.63.bb b/recipes/autoconf/autoconf_2.63.bb
index 0230d790b1..e26c004f64 100644
--- a/recipes/autoconf/autoconf_2.63.bb
+++ b/recipes/autoconf/autoconf_2.63.bb
@@ -1,16 +1,13 @@
require autoconf.inc
+PR = "${INC_PR}.0"
+
DEFAULT_PREFERENCE = "-1"
PARALLEL_MAKE = ""
-DEPENDS += "m4-native"
-RDEPENDS_${PN} = "m4 gnu-config"
-
-SRC_URI += " \
- file://autoreconf-exclude.patch;patch=1 \
- file://autoreconf-foreign.patch;patch=1 \
- file://autoheader-nonfatal-warnings.patch;patch=1 \
- file://autoreconf-gnuconfigize.patch;patch=1 \
- file://config-site.patch;patch=1 \
- ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
+SRC_URI += "file://autoreconf-exclude.patch;patch=1 \
+ file://autoreconf-foreign.patch;patch=1 \
+ file://autoheader-nonfatal-warnings.patch;patch=1 \
+ file://autoreconf-gnuconfigize.patch;patch=1 \
+ file://config-site.patch;patch=1"