diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-10-10 23:46:47 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-10-10 23:46:47 +0000 |
| commit | 93b9209e5972c3052eedc9da9a38e6d872e373c4 (patch) | |
| tree | 7c7cb61765689997faa2fa8b02a2bcca216e1210 /configure.in | |
| parent | 97e17d817b9763cb429086abbf7e8934206b85d3 (diff) | |
| download | tor-93b9209e5972c3052eedc9da9a38e6d872e373c4.tar.gz tor-93b9209e5972c3052eedc9da9a38e6d872e373c4.zip | |
r8986@totoro: nickm | 2006-10-10 19:40:28 -0400
Make --enable-gcc-warnings work on gcc3.3, not just on gcc4.0
svn:r8686
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 47ae1ed845..31200e05d6 100644 --- a/configure.in +++ b/configure.in @@ -771,10 +771,17 @@ fi # Add some more warnings which we use in the cvs version but not in the # released versions. (Some relevant gcc versions can't handle these.) if test x$enable_gcc_warnings = xyes; then - CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2 -Winit-self -Wwrite-strings -Waggregate-return -Wmissing-declarations -Wmissing-field-initializers -Wredundant-decls -Winline -Wnested-externs" -#-Wswitch-enums? - # Add these in when you feel like fun. - CFLAGS="$CFLAGS -Wbad-function-cast -Werror -Wdeclaration-after-statement -Wold-style-definition" + AC_TRY_COMPILE([], [ +#if !defined(__GNUC__) || (__GNUC__ < 4) +#error +#endif], have_gcc4=yes, have_gcc4=no) + + CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2 -Wwrite-strings -Waggregate-return -Wmissing-declarations -Wredundant-decls -Winline -Wnested-externs -Wbad-function-cast -Werror" + + if test x$have_gcc4 = xyes ; then + # These warnings break gcc 3.3.5 and work on gcc 4.0.2 + CFLAGS="$CFLAGS -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement -Wold-style-definition" + fi fi AC_OUTPUT(Makefile tor.spec contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh) |