diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.ac | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -48,6 +48,8 @@ | |||
48 | -Wsign-compare fixes from djm. | 48 | -Wsign-compare fixes from djm. |
49 | - (dtucker) [openbsd-compat/sigact.h] Update from OpenBSD 1.2 -> 1.3. | 49 | - (dtucker) [openbsd-compat/sigact.h] Update from OpenBSD 1.2 -> 1.3. |
50 | Id and copyright sync only, there were no substantial changes we need. | 50 | Id and copyright sync only, there were no substantial changes we need. |
51 | - (dtucker) [configure.ac] Try to get the gcc version number in a way that | ||
52 | doesn't change between versions, and use a safer default. | ||
51 | 53 | ||
52 | 20051105 | 54 | 20051105 |
53 | - (djm) OpenBSD CVS Sync | 55 | - (djm) OpenBSD CVS Sync |
@@ -3290,4 +3292,4 @@ | |||
3290 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3292 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3291 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3293 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3292 | 3294 | ||
3293 | $Id: ChangeLog,v 1.3988 2005/11/10 08:43:48 dtucker Exp $ | 3295 | $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 @@ | |||
1 | # $Id: configure.ac,v 1.304 2005/11/10 03:46:49 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.305 2005/11/10 10:30:36 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -85,13 +85,14 @@ AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>]) | |||
85 | 85 | ||
86 | if test "$GCC" = "yes" || test "$GCC" = "egcs"; then | 86 | if test "$GCC" = "yes" || test "$GCC" = "egcs"; then |
87 | CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wuninitialized" | 87 | CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wuninitialized" |
88 | GCC_VER=`$CC --version` | 88 | GCC_VER=`$CC -v 2>&1 | awk '/gcc version /{print $3}'` |
89 | case $GCC_VER in | 89 | case $GCC_VER in |
90 | 1.*) ;; | 90 | 1.*) ;; |
91 | 2.8* | 2.9*) CFLAGS="$CFLAGS -Wsign-compare" ;; | 91 | 2.8* | 2.9*) CFLAGS="$CFLAGS -Wsign-compare" ;; |
92 | 2.*) ;; | 92 | 2.*) ;; |
93 | 3.*) CFLAGS="$CFLAGS -Wsign-compare" ;; | 93 | 3.*) CFLAGS="$CFLAGS -Wsign-compare" ;; |
94 | *) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign" ;; | 94 | 4.*) CFLAGS="$CFLAGS -Wsign-compare -Wno-pointer-sign" ;; |
95 | *) ;; | ||
95 | esac | 96 | esac |
96 | 97 | ||
97 | if test -z "$have_llong_max"; then | 98 | if test -z "$have_llong_max"; then |