From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sat, 9 Jul 2005 09:24:40 +0000 (+0000)
Subject: * lib/depcomp: Handle "#line" markers as well as "# " markers in
X-Git-Tag: Release-1-9b~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ab8cbfbc0c06458d99a9d8bbd38cddfdbb8ab68;p=thirdparty%2Fautomake.git

* lib/depcomp: Handle "#line" markers as well as "# " markers in
"cpp" style, so it can work with newer HP compilers (for their
ia64 systems).
---

diff --git a/ChangeLog b/ChangeLog
index c8677aa11..ce505df8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-09  Zack Weinberg  <zack@codesourcery.com>  (tiny change)
+
+	* lib/depcomp: Handle "#line" markers as well as "# " markers in
+	"cpp" style, so it can work with newer HP compilers (for their
+	ia64 systems).
+
 2005-07-02  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* doc/automake.texi (Public macros) <AM_WITH_DMALLOC>: Reword to
diff --git a/THANKS b/THANKS
index 4f65f8fa0..0fc59f126 100644
--- a/THANKS
+++ b/THANKS
@@ -276,6 +276,7 @@ Werner John		john@oswf.de
 Werner Koch		wk@isil.d.shuttle.de
 William S Fulton	wsf@fultondesigns.co.uk
 Yann Droneaud		ydroneaud@meuh.eu.org
+Zack Weinberg		zack@codesourcery.com
 
 ;; Local Variables:
 ;; mode: text
diff --git a/lib/depcomp b/lib/depcomp
index 88b3a1396..04701da53 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-05-14.22
+scriptversion=2005-07-09.11
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
@@ -467,7 +467,8 @@ cpp)
   done
 
   "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
     sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"