* 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 c8677aa112bb185eba86961dd1b8e7df138e0ff0..ce505df8f6b178d9af0098c1ec8107ae0ff9ffbf 100644 (file)
--- 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 4f65f8fa026a6108b8c79bcbe35bcbc65ca7b561..0fc59f126f6ded6dc979f0e5b86da5e6035ab045 100644 (file)
--- 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 88b3a139690f882b4d27437f21cc9ab7e71664ef..04701da536f33a7c39d7bb01b87a70ae3a776df5 100755 (executable)
--- 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"