From a1e158105d6519571ead5c663440afd538c3304c Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 14 Nov 2004 03:41:26 +0000 Subject: [PATCH] punt --- sys-devel/autoconf-wrapper/Manifest | 7 +- .../autoconf-wrapper/files/ac-wrapper-1.pl | 126 ------------------ 2 files changed, 3 insertions(+), 130 deletions(-) delete mode 100644 sys-devel/autoconf-wrapper/files/ac-wrapper-1.pl diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest index b347f436807a..71d68b6eb6f8 100644 --- a/sys-devel/autoconf-wrapper/Manifest +++ b/sys-devel/autoconf-wrapper/Manifest @@ -5,12 +5,11 @@ MD5 7b8db28aec7cca84de7f72f8d9c162b9 autoconf-wrapper-1.ebuild 763 MD5 bc4a1aae0dcd75aa901f9215c00ad0ed ChangeLog 612 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-autoconf-wrapper-1 0 -MD5 8561478423a4ec9456804063003735d5 files/ac-wrapper-1.pl 3844 MD5 f16270e7ef6d6bc0dfb066f06601965b files/ac-wrapper-1.sh 2684 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBltPyHTu7gpaalycRAhOWAKDUUu4qOl4cbb1b6R5v51VrIFz4iQCfQffI -bSvPeQpRfImRUnI17m/ffWQ= -=Wx20 +iD8DBQFBltQSHTu7gpaalycRArccAJ9YFeXl80KyPK9VMULETks0faxWRgCfc0io +jCRTKA7A+VWTskWvxQmOH9U= +=zLWk -----END PGP SIGNATURE----- diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-1.pl b/sys-devel/autoconf-wrapper/files/ac-wrapper-1.pl deleted file mode 100644 index 06f53ec92c7d..000000000000 --- a/sys-devel/autoconf-wrapper/files/ac-wrapper-1.pl +++ /dev/null @@ -1,126 +0,0 @@ -#!/usr/bin/perl -# -# -# Guillaume Cottenceau (gc@mandrakesoft.com) -# Abel Cheung (deaddog@deaddog.org) -# -# Copyright 2001-2002, 2004 MandrakeSoft -# -# This software may be freely redistributed under the terms of the GNU -# public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -####################################################################### -# -# Executes the correct autoconf version. -# -# - defaults to autoconf-2.59 -# - runs autoconf-2.13 only if: -# - envvar WANT_AUTOCONF_2_1 is set to `1' -# -or- -# - `configure' is already present and was generated by autoconf 2.13 -# -####################################################################### -# -# ChangeLog: -# -# * Fri May 14 2004 -# - Use autoconf 2.59 by default, unless `configure' is generated by -# autoconf 2.13, or WANT_AUTOCONF_2_1 is set. -# - WANT_AUTOCONF_2_5 has no effect now -# -# * Thu May 27 2004 -# - Almost rewrite -# - Introduce FORCE_AUTOCONF_2_5 (avoid misuse with WANT_*), which can be used -# when you want to play with fire :-) -# - More verbose and user oriented messages (gc et. al.) -# -# * Sat Jul 03 2004 -# - require autoconf2.1 and remove special error message -# - allow use of tools without configure.in or configure.ac (2.5 only) -# required for autodetection by apps - -use File::Basename qw(basename); -use strict; - -sub cat_ { local *F; open F, $_[0] or return; my @l = ; wantarray ? @l : join '', @l } - -sub errmsg { - my $dummy = 0; - my @msg = @_; - foreach (@msg) { - print STDERR (($dummy++ == 0)? "ac-wrapper: " : " ") . $_ . "\n"; - } - exit 1; -} - -errmsg ("Don't call this script directly.") if (basename("$0") eq "ac-wrapper.pl"); - -# -# go away naughty guys/gals -# -if (($ENV{WANT_AUTOCONF_2_1}) && ($ENV{FORCE_AUTOCONF_2_5})) { - errmsg ("You can only set either WANT_AUTOCONF_2_1 or FORCE_AUTOCONF_2_5,", - "but not both."); -} - -if (($ENV{WANT_AUTOCONF_2_1}) && (basename("$0") eq "autom4te")) { - errmsg ("Autoconf 2.13 doesn't contain autom4te.", - "Either unset WANT_AUTOCONF_2_1 or don't execute anything", - "that would use autom4te."); -} - -my $binary_new = "$0-2.59"; -my $binary_old = "$0-2.13"; -my $binary = $binary_new; -my $confversion = 'Undetected'; - -if ((-f "configure.ac") || (-f "configure.in")) { -# -# autodetect routine -# - if ($ENV{WANT_AUTOCONF_2_1}) { - if ((-f "configure.in") && (! -f "configure.ac")) { - $binary = $binary_old; - } else { - errmsg ("Since configure.ac is present, aclocal always use", - "autoconf 2.59, which conflicts with your choice and", - "causes error. You have two options:", - "1. Try execute command again after removing configure.ac", - "2. Don't set WANT_AUTOCONF_2_1 variable"); - } - } elsif (!($ENV{FORCE_AUTOCONF_2_5})) { - # U > [0-9] in lexicon comparison - $confversion = (cat_('configure') =~ /^# Generated (by (?:GNU )?Autoconf|automatically using autoconf version) (\S+)/m ? $2 : 'Unknown'); - - if (("$confversion" lt '2.5') && (! -f "configure.ac")) { - $binary = $binary_old; - } - } -} - -if ($ENV{WANT_ACWRAPPER_DEBUG}) { - print STDERR "ac-wrapper: DEBUG: Detected version is '$confversion'\n"; - print STDERR "ac-wrapper: DEBUG: WANT_AUTOCONF_2_1 is set\n" if ($ENV{WANT_AUTOCONF_2_1}); - print STDERR "ac-wrapper: DEBUG: FORCE_AUTOCONF_2_5 is set\n" if ($ENV{FORCE_AUTOCONF_2_5}); - print STDERR "ac-wrapper: DEBUG: will execute <$binary>\n"; -} - -# -# for further consistency -# -$ENV{WANT_AUTOCONF_2_1} = 1 if ("$binary" eq "$binary_old"); -$ENV{FORCE_AUTOCONF_2_5} = 1 if ("$binary" eq "$binary_new"); - -if (! -x "$binary") { - # this shouldn't happen - errmsg ("$binary is missing or not executable.", - "Please try emerging the correct version of autoconf."); -} - -exec $binary, @ARGV; - -errmsg ("was unable to exec $binary !?"); -- 2.26.2