From 421365ab9f7c17391d7b856afd5e9e6c10ea644d Mon Sep 17 00:00:00 2001
From: Stepan Kasal <skasal@redhat.com>
Date: Fri, 4 Nov 2005 17:29:21 +0000
Subject: [PATCH] Stepan Kasal, Stefan Fiedler:         automake1{7,8,9}: apply
 aclocal-glob.patch

Index: package/base/automake/aclocal-glob.patch_automake17
===================================================================

[2005101910203503397] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6553 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 .../automake/aclocal-glob.patch_automake17    | 20 ++++++++++++++++
 .../automake/aclocal-glob.patch_automake18    | 23 +++++++++++++++++++
 .../automake/aclocal-glob.patch_automake19    | 23 +++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 package/base/automake/aclocal-glob.patch_automake17
 create mode 100644 package/base/automake/aclocal-glob.patch_automake18
 create mode 100644 package/base/automake/aclocal-glob.patch_automake19

diff --git a/package/base/automake/aclocal-glob.patch_automake17 b/package/base/automake/aclocal-glob.patch_automake17
new file mode 100644
index 000000000..0e9f8b20a
--- /dev/null
+++ b/package/base/automake/aclocal-glob.patch_automake17
@@ -0,0 +1,20 @@
+--- automake-1.7.9.orig/aclocal.in	2003-10-21 15:03:16.000000000 +0200
++++ automake-1.7.9/aclocal.in	2005-10-18 18:00:01.000000000 +0200
+@@ -208,12 +208,11 @@
+ 	    # Ignore '#' lines.
+ 	    next if /^#/;
+ 	    # strip off newlines and end-of-line comments
+-	    s/\s*\#.*$//;
+-	    chomp ($contents=$_);
+-	    if (-d $contents )
+-	    {
+-		push (@dirlist, $contents);
+-	    }
++	    s/\s*\#.*$//; chomp;
++	    foreach my $dir (glob)
++	      {
++		push (@dirlist, $dir) if -d $dir;
++	      }
+ 	}
+ 	close (DEFAULT_DIRLIST);
+     }
diff --git a/package/base/automake/aclocal-glob.patch_automake18 b/package/base/automake/aclocal-glob.patch_automake18
new file mode 100644
index 000000000..2e6b16cb3
--- /dev/null
+++ b/package/base/automake/aclocal-glob.patch_automake18
@@ -0,0 +1,23 @@
+diff -dur automake-1.8.5/aclocal.in automake-1.8.5-p/aclocal.in
+--- automake-1.8.5/aclocal.in	2004-04-10 19:15:32.000000000 +0200
++++ automake-1.8.5-p/aclocal.in	2005-10-18 22:41:26.000000000 +0200
+@@ -640,12 +640,11 @@
+ 	  # Ignore '#' lines.
+ 	  next if /^#/;
+ 	  # strip off newlines and end-of-line comments
+-	  s/\s*\#.*$//;
+-	  chomp ($contents=$_);
+-	  if (-d $contents )
+-	    {
+-	      push (@dirlist, $contents);
+-	    }
++	    s/\s*\#.*$//; chomp;
++	    foreach my $dir (glob)
++	      {
++		push (@dirlist, $dir) if -d $dir;
++	      }
+ 	}
+       close (DEFAULT_DIRLIST);
+     }
+Nur in automake-1.8.5-p: aclocal.in~.
+Nur in automake-1.8.5-p: aclocal.in.rej.
diff --git a/package/base/automake/aclocal-glob.patch_automake19 b/package/base/automake/aclocal-glob.patch_automake19
new file mode 100644
index 000000000..5738a2bac
--- /dev/null
+++ b/package/base/automake/aclocal-glob.patch_automake19
@@ -0,0 +1,23 @@
+diff -dur automake-1.9.3/aclocal.in automake-1.9.3-p/aclocal.in
+--- automake-1.9.3/aclocal.in	2004-10-10 18:10:24.000000000 +0200
++++ automake-1.9.3-p/aclocal.in	2005-10-18 22:43:23.000000000 +0200
+@@ -672,12 +672,11 @@
+ 	  # Ignore '#' lines.
+ 	  next if /^#/;
+ 	  # strip off newlines and end-of-line comments
+-	  s/\s*\#.*$//;
+-	  chomp ($contents=$_);
+-	  if (-d $contents )
+-	    {
+-	      push (@dirlist, $contents);
+-	    }
++	    s/\s*\#.*$//; chomp;
++	    foreach my $dir (glob)
++	      {
++		push (@dirlist, $dir) if -d $dir;
++	      }
+ 	}
+       close (DEFAULT_DIRLIST);
+     }
+Nur in automake-1.9.3-p: aclocal.in~.
+Nur in automake-1.9.3-p: aclocal.in.rej.