diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-06-03 17:58:31 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-06-03 17:58:31 +1000 |
commit | 67b3703da3c4a1f766b25dbe31aa2fed4a2ad656 (patch) | |
tree | 21afb72337c07cd02a416f10cacb6a8fc1998ba0 | |
parent | fcc7ff1de8db0647357a5846e4d629f4ca54a6b9 (diff) |
- (dtucker) [configure.ac] Only try gcc -std=gnu99 if LLONG_MAX isn't
defined, and check that it helps before keeping it in CFLAGS. Some old
gcc's don't set an error code when encountering an unknown value in -std.
Found and tested by tim@.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | configure.ac | 24 |
2 files changed, 22 insertions, 10 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20050603 | ||
2 | - (dtucker) [configure.ac] Only try gcc -std=gnu99 if LLONG_MAX isn't | ||
3 | defined, and check that it helps before keeping it in CFLAGS. Some old | ||
4 | gcc's don't set an error code when encountering an unknown value in -std. | ||
5 | Found and tested by tim@. | ||
6 | |||
1 | 20050602 | 7 | 20050602 |
2 | - (tim) [configure.ac] Some platforms need sys/types.h for arpa/nameser.h. | 8 | - (tim) [configure.ac] Some platforms need sys/types.h for arpa/nameser.h. |
3 | Take AC_CHECK_HEADERS test out of ultrix section. It caused other platforms | 9 | Take AC_CHECK_HEADERS test out of ultrix section. It caused other platforms |
@@ -2673,4 +2679,4 @@ | |||
2673 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2679 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2674 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2680 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2675 | 2681 | ||
2676 | $Id: ChangeLog,v 1.3810 2005/06/03 03:28:29 tim Exp $ | 2682 | $Id: ChangeLog,v 1.3811 2005/06/03 07:58:31 dtucker Exp $ |
diff --git a/configure.ac b/configure.ac index bca35a633..cd795caf4 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.272 2005/06/03 03:28:29 tim Exp $ | 1 | # $Id: configure.ac,v 1.273 2005/06/03 07:58:31 dtucker Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -77,17 +77,23 @@ fi | |||
77 | AC_SUBST(LD) | 77 | AC_SUBST(LD) |
78 | 78 | ||
79 | AC_C_INLINE | 79 | AC_C_INLINE |
80 | |||
81 | AC_CHECK_DECL(LLONG_MAX, have_llong_max=1, , [#include <limits.h>]) | ||
82 | |||
80 | if test "$GCC" = "yes" || test "$GCC" = "egcs"; then | 83 | if test "$GCC" = "yes" || test "$GCC" = "egcs"; then |
81 | CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized" | 84 | CFLAGS="$CFLAGS -Wall -Wpointer-arith -Wno-uninitialized" |
82 | 85 | ||
83 | # Check for -std=gnu99 support (needed for LLONG_MIN/MAX on Linux) | 86 | if test -z "$have_llong_max"; then |
84 | saved_CFLAGS="$CFLAGS" | 87 | # retry LLONG_MAX with -std=gnu99, needed on some Linuxes |
85 | CFLAGS="$CFLAGS -std=gnu99" | 88 | unset ac_cv_have_decl_LLONG_MAX |
86 | AC_MSG_CHECKING(whether cc accepts -std=gnu99 option) | 89 | saved_CFLAGS="$CFLAGS" |
87 | AC_TRY_COMPILE([], [return(0);], [AC_MSG_RESULT(yes)], | 90 | CFLAGS="$CFLAGS -std=gnu99" |
88 | [AC_MSG_RESULT(no) | 91 | AC_CHECK_DECL(LLONG_MAX, |
89 | CFLAGS="$saved_CFLAGS"], | 92 | [have_llong_max=1], |
90 | ) | 93 | [CFLAGS="$saved_CFLAGS"], |
94 | [#include <limits.h>] | ||
95 | ) | ||
96 | fi | ||
91 | fi | 97 | fi |
92 | 98 | ||
93 | AC_ARG_WITH(rpath, | 99 | AC_ARG_WITH(rpath, |