|  | @@ -940,10 +940,10 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy
 | 
	
		
			
				|  |  |  #error
 | 
	
		
			
				|  |  |  #endif])], have_gcc43=yes, have_gcc43=no)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
 | 
	
		
			
				|  |  | -#if !defined(__clang__) || (__clang_major__ > 2) || (__clang_major__ == 2 && __clang_minor__ > 9)
 | 
	
		
			
				|  |  | +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [
 | 
	
		
			
				|  |  | +#if !defined(__clang__)
 | 
	
		
			
				|  |  |  #error
 | 
	
		
			
				|  |  | -#endif])], have_clang29orlower=yes, have_clang29orlower=no)
 | 
	
		
			
				|  |  | +#endif])], have_clang=yes, have_clang=no)
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    save_CFLAGS="$CFLAGS"
 | 
	
		
			
				|  |  |    CFLAGS="$CFLAGS -Wshorten-64-to-32"
 | 
	
	
		
			
				|  | @@ -980,10 +980,8 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy
 | 
	
		
			
				|  |  |      # We used to use -Wstrict-overflow=5, but that breaks us heavily under 4.3.
 | 
	
		
			
				|  |  |    fi
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -  if test x$have_gcc42 = xyes && test x$have_clang29orlower = xno; then
 | 
	
		
			
				|  |  | +  if test x$have_gcc42 = xyes && test x$have_clang = xno; then
 | 
	
		
			
				|  |  |      # These warnings break gcc 4.0.2 and clang, but work on gcc 4.2
 | 
	
		
			
				|  |  | -    # We only disable these for clang 2.9 and lower, in case they are
 | 
	
		
			
				|  |  | -    # supported in later versions.
 | 
	
		
			
				|  |  |      CFLAGS="$CFLAGS -Wnormalized=id -Woverride-init"
 | 
	
		
			
				|  |  |    fi
 | 
	
		
			
				|  |  |  
 |