*** compile.at.orig	Mon Feb 19 08:08:10 2001
--- compile.at	Mon May  7 09:50:22 2001
***************
*** 138,157 ****
  
  AT_SETUP([AC_PROG_CPP with warnings])
  
! AT_DATA([mycpp],
  [[#! /bin/sh
! echo noise >&2
! exec ${1+"$@"}
  ]])
  
! chmod +x mycpp
  
  _AT_CHECK_AC_MACRO(
! [[AC_PROG_CPP
  # If the preprocessor is not strict, just ignore
  test "x$ac_c_preproc_warn_flag" = xyes &&
    AC_MSG_ERROR([preprocessor has no warning option], 77)
- CPP="./mycpp $CPP"
  AC_CHECK_HEADERS(stdio.h autoconf_io.h)]])
  
  AT_CHECK_DEFINES(
--- 138,181 ----
  
  AT_SETUP([AC_PROG_CPP with warnings])
  
! AT_DATA([mycc],
  [[#! /bin/sh
! echo "Annoying copyright message" >&2
! if [ "$1" != "-E" ]; then
!   exec cc $*
! else
!   if [ "$2" = "-traditional-cpp" ]; then
!     exec cc $*
!   else
!     exec /lib/cpp ${1+"$@"}
!   fi
! fi
  ]])
  
! chmod +x mycc
  
+ # We go through the following contortions, in order to
+ #   have the configure script go down the same codepaths
+ #   as it would during a normal CPP selection check.  If
+ #   we explicitly set CPP, it goes down a different codepath.
+ OPATH=$PATH
+ PATH=.:$PATH
+ OLDCC=$CC
+ CC=mycc
+ export CC
+ 
  _AT_CHECK_AC_MACRO(
! [[# Ignore if /lib/cpp doesn't work...
! if AC_TRY_COMMAND([/lib/cpp </dev/null >&2]); then :; else
!   AC_MSG_ERROR([/lib/cpp preprocessor doesn't work], 77)
! fi
! AC_PROG_CPP
! # The test $CC compiler should have been selected.
! test "$CPP" != "mycc -E" &&
!   AC_MSG_ERROR([error messages on stderr cause the preprocessor selection to fail])
  # If the preprocessor is not strict, just ignore
  test "x$ac_c_preproc_warn_flag" = xyes &&
    AC_MSG_ERROR([preprocessor has no warning option], 77)
  AC_CHECK_HEADERS(stdio.h autoconf_io.h)]])
  
  AT_CHECK_DEFINES(
***************
*** 158,163 ****
--- 182,194 ----
  [/* #undef HAVE_AUTOCONF_IO_H */
  #define HAVE_STDIO_H 1
  ])
+ 
+ PATH=$OPATH
+ if test "$OLDCC" == "" ; then
+   unset CC
+ else
+   CC=$OLDCC
+ fi
  
  AT_CLEANUP