2 files changed, 5 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2cead3c87..82771c359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
    configure parameters, platform and platform features to the development
    team, which will allow (among other things) better targetting of testing.
    It's entirely voluntary and is off be default. ok djm@
+ - (dtucker) [survey.sh.in] Remove any blank lines from the output of
+   ccver-v and ccver-V.
 
 20041220
  - (dtucker) [ssh-rand-helper.c] Fall back to command-based seeding if reading
@@ -1967,4 +1969,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3607 2005/01/18 01:05:18 dtucker Exp $
+$Id: ChangeLog,v 1.3608 2005/01/18 01:45:42 dtucker Exp $
diff --git a/survey.sh.in b/survey.sh.in
index 6a0c08df4..4123b6d12 100644
--- a/survey.sh.in
+++ b/survey.sh.in
@@ -55,9 +55,9 @@ echo "ldflags: $LDFLAGS"
 echo
 echo "libs: $LIBS"
 echo
-echo "ccver-v: `$CC -v 2>&1`"
+echo "ccver-v: `$CC -v 2>&1 | sed '/^[ \t]*$/d'`"
 echo
-echo "ccver-V: `$CC -V 2>&1`"
+echo "ccver-V: `$CC -V 2>&1 | sed '/^[ \t]*$/d'`"
 echo
 echo "cppdefines:"
 ${CPP} -dM - </dev/null