From 483b5af7a619117ae6ec3435bb8689e764e928a0 Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@elliptictech.com>
Date: Fri, 29 Aug 2014 19:33:32 -0400
Subject: [PATCH] fix-gnulib: Eliminate dependency on List::Compare.

This library was hardly needed; the code is shorter without it.  Now the
script can run on a stock perl installation.
---
 scripts/fix-gnulib.pl | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 954780f..1f15078 100755
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -41,7 +41,6 @@
 # There is NO WARRANTY, to the extent permitted by law.
 
 use strict;
-use List::Compare;
 use Getopt::Long;
 
 my $output   = undef;
@@ -59,9 +58,14 @@ open STDOUT, ">", $output or die "$output: $!\n" if (defined $output);
 open STDIN,  "<", $input  or die "$input: $!\n"  if (defined $input);
 
 my $printed_header = 0;
-my (%allvars, %sourcevars);
 my @cleanfiles;
 
+# Hashes to record make variables used in the automake source.  The allvars
+# hash contains variables actually assigned in the Makefile, sourcevars
+# contains variables used as filenames.  Keys are the variable name, and
+# the value is always set to 1.
+my (%allvars, %sourcevars);
+
 sub drop {
 	undef $_;
 	next;
@@ -230,14 +234,6 @@ $(gnulib_lt_objects): $(gnulib_headers)
 EOF
 print @cleanfiles;
 
-# Some filenames are AC_SUBSTed by the Gnulib macros, and thus we need to
-# prepend lib/ if and only if they're not empty.  Unfortunately, make is not
-# powerful to do this, so we need to put this transformation into configure
-# itself by defining a new autoconf macro.
-
-my $lc = List::Compare->new('-u', '-a', \%sourcevars, \%allvars);
-my @vars = $lc->get_unique;
-
 print <<'EOF';
 if FALSE
 ], [dnl M4 code follows
@@ -260,8 +256,13 @@ done
 ])
 EOF
 
-foreach (@vars) {
-	print "$_=\${$_:+lib/\$$_}\n";
+# Some filenames are AC_SUBSTed by the Gnulib macros, and thus we need to
+# prepend lib/ if and only if they're not empty.  Unfortunately, make is not
+# powerful to do this, so we need to put this transformation into configure
+# itself by defining a new autoconf macro.
+
+foreach (keys %sourcevars) {
+	print "$_=\${$_:+lib/\$$_}\n" unless $allvars{$_};
 }
 
 print <<'EOF';
-- 
2.43.0