2 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 15eabc51b..291bf970a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,8 @@
    -Wsign-compare fixes from djm.
  - (dtucker) [openbsd-compat/sigact.h] Update from OpenBSD 1.2 -> 1.3.
    Id and copyright sync only, there were no substantial changes we need.
+ - (dtucker) [configure.ac] Try to get the gcc version number in a way that
+   doesn't change between versions, and use a safer default.
 
 20051105
  - (djm) OpenBSD CVS Sync
@@ -3290,4 +3292,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.3988 2005/11/10 08:43:48 dtucker Exp $
+$Id: ChangeLog,v 1.3989 2005/11/10 10:30:36 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index a7b8e8000..aee387190 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.304 2005/11/10 03:46:49 dtucker Exp $
+# $Id: configure.ac,v 1.305 2005/11/10 10:30:36 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -85,13 +85,14 @@ AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>])
 
 if test "$GCC" = "yes" || test "$GCC" = "egcs"; then
         CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wuninitialized"
-        GCC_VER=`$CC --version`
+        GCC_VER=`$CC -v 2>&1 | awk '/gcc version /{print $3}'`
         case $GCC_VER in
                 1.*) ;;
                 2.8* | 2.9*) CFLAGS="$CFLAGS -Wsign-compare" ;;
                 2.*) ;;
                 3.*) CFLAGS="$CFLAGS -Wsign-compare" ;;
-                *) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign" ;;
+                4.*) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign" ;;
+                *) ;;
         esac
 
         if test -z "$have_llong_max"; then