Index: configure.in
===================================================================
RCS file: /home/jeremyd/local/postgres/cvsuproot/pgsql/configure.in,v
retrieving revision 1.455
diff -c -r1.455 configure.in
*** configure.in	6 Mar 2006 17:41:43 -0000	1.455
--- configure.in	1 Apr 2006 17:43:19 -0000
***************
*** 249,260 ****
  fi
  
  if test "$GCC" = yes; then
!   CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
! 
!   # Some versions of GCC support some additional useful warning flags.
!   # Check whether they are supported, and add them to CFLAGS if so.
!   PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
!   PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
  
    # Disable strict-aliasing rules; needed for gcc 3.3+
    PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing])
--- 249,265 ----
  fi
  
  if test "$GCC" = yes; then
! AC_TRY_COMPILE([], [@%:@ifndef __INTEL_COMPILER
! choke me
! @%:@endif], [ICC=[yes]], [ICC=[no]])
!   if test "$ICC" = no; then
!     CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wpointer-arith -Winline"
! 
!     # Some versions of GCC support some additional useful warning flags.
!     # Check whether they are supported, and add them to CFLAGS if so.
!     PGAC_PROG_CC_CFLAGS_OPT([-Wdeclaration-after-statement])
!     PGAC_PROG_CC_CFLAGS_OPT([-Wendif-labels])
!   fi
  
    # Disable strict-aliasing rules; needed for gcc 3.3+
    PGAC_PROG_CC_CFLAGS_OPT([-fno-strict-aliasing])