Geek Gadgets 1/ADE-1.bin/ade-dist/diffutils-2.7-src.tgz/tar.out/fsf/diffutils/BeOS.diffs

Text File | 1996-09-28 | 21.3 KB | 783 lines

This patch works around current bugs in the BeOS shell that affect
configure, and also patch up some Makefile targets that are not
yet fully supported.

============================================================================

diff -rc diffutils-ref/Makefile.in diffutils/Makefile.in
*** diffutils-ref/Makefile.in    Wed May 29 07:21:09 1996
--- diffutils/Makefile.in    Fri Sep 27 22:48:14 1996
***************
*** 74,80 ****

  PROGRAMS = cmp diff diff3 sdiff

! all: $(PROGRAMS) info guide dvi ps

  COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS)

--- 74,80 ----

  PROGRAMS = cmp diff diff3 sdiff

! all: $(PROGRAMS) info guide

  COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS)

***************
*** 160,167 ****
        $(INSTALL_DATA) $$f $(infodir)/$$f; \
      done
      $(INSTALL_DATA) diff.guide $(guidedir)/diff.guide
!     $(INSTALL_DATA) diff.dvi $(dvidir)/diff.dvi
!     $(INSTALL_DATA) diff.ps $(psdir)/diff.ps

  installdirs:
      $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(guidedir) $(dvidir) $(psdir)
--- 160,167 ----
        $(INSTALL_DATA) $$f $(infodir)/$$f; \
      done
      $(INSTALL_DATA) diff.guide $(guidedir)/diff.guide
! #    $(INSTALL_DATA) diff.dvi $(dvidir)/diff.dvi
! #    $(INSTALL_DATA) diff.ps $(psdir)/diff.ps

  installdirs:
      $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(guidedir) $(dvidir) $(psdir)
diff -rc diffutils-ref/configure diffutils/configure
*** diffutils-ref/configure    Tue Sep 10 03:10:29 1996
--- diffutils/configure    Fri Sep 27 22:48:38 1996
***************
*** 618,624 ****
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
--- 618,624 ----
    yes;
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:622: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
***************
*** 676,682 ****
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
--- 676,682 ----
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:680: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
***************
*** 691,697 ****
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
--- 691,697 ----
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:695: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
***************
*** 821,827 ****
  #include <minix/config.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 821,827 ----
  #include <minix/config.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:825: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
***************
*** 911,917 ****

  ; return 0; }
  EOF
! if { (eval echo configure:915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
--- 911,917 ----

  ; return 0; }
  EOF
! if { (eval echo configure:915: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
***************
*** 943,949 ****
  #include "confdefs.h"
  main(){return(0);}
  EOF
! { (eval echo configure:947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    ac_cv_c_cross=no
  else
--- 943,949 ----
  #include "confdefs.h"
  main(){return(0);}
  EOF
! { (eval echo configure:947: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    ac_cv_c_cross=no
  else
***************
*** 969,975 ****
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 969,975 ----
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:973: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
***************
*** 988,995 ****
  #include "confdefs.h"
  #include <string.h>
  EOF
! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "memchr" >/dev/null 2>&1; then
    :
  else
    rm -rf conftest*
--- 988,995 ----
  #include "confdefs.h"
  #include <string.h>
  EOF
! eval "$ac_cpp conftest.$ac_ext" 2>&5 >conftest.tmp
! if egrep "memchr" <conftest.tmp >/dev/null 2>&1; then
    :
  else
    rm -rf conftest*
***************
*** 1006,1013 ****
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "free" >/dev/null 2>&1; then
    :
  else
    rm -rf conftest*
--- 1006,1013 ----
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
! eval "$ac_cpp conftest.$ac_ext" 2>&5 >conftest.tmp
! if egrep "free" <conftest.tmp >/dev/null 2>&1; then
    :
  else
    rm -rf conftest*
***************
*** 1034,1040 ****
  exit (0); }

  EOF
! { (eval echo configure:1038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    :
  else
--- 1034,1040 ----
  exit (0); }

  EOF
! { (eval echo configure:1038: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    :
  else
***************
*** 1066,1072 ****
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 1066,1072 ----
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1070: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
***************
*** 1108,1114 ****
  DIR *dirp = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:1112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
--- 1108,1114 ----
  DIR *dirp = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:1112: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
***************
*** 1146,1157 ****
      builtin and then its argument prototype would still apply.  */
  char opendir();

! int main() { return 0; }
  int t() {
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:1155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1146,1157 ----
      builtin and then its argument prototype would still apply.  */
  char opendir();

! int main() { t(); return 0; }
  int t() {
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:1155: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1185,1196 ****
      builtin and then its argument prototype would still apply.  */
  char opendir();

! int main() { return 0; }
  int t() {
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 1185,1196 ----
      builtin and then its argument prototype would still apply.  */
  char opendir();

! int main() { t(); return 0; }
  int t() {
  opendir()
  ; return 0; }
  EOF
! if { (eval echo configure:1194: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
***************
*** 1245,1252 ****
  #endif

  EOF
! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "You lose" >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_header_stat_broken=yes
  else
--- 1245,1252 ----
  #endif

  EOF
! eval "$ac_cpp conftest.$ac_ext" 2>&5 >conftest.tmp
! if egrep "You lose" <conftest.tmp >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_header_stat_broken=yes
  else
***************
*** 1287,1293 ****
  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
  ; return 0; }
  EOF
! if { (eval echo configure:1291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_sys_wait_h=yes
  else
--- 1287,1293 ----
  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
  ; return 0; }
  EOF
! if { (eval echo configure:1291: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    ac_cv_header_sys_wait_h=yes
  else
***************
*** 1318,1325 ****
  #include <stdlib.h>
  #endif
  EOF
! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "pid_t" >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_type_pid_t=yes
  else
--- 1318,1325 ----
  #include <stdlib.h>
  #endif
  EOF
! eval "$ac_cpp conftest.$ac_ext" 2>&5 >conftest.tmp
! if egrep "pid_t" <conftest.tmp >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_type_pid_t=yes
  else
***************
*** 1360,1366 ****
  int i;
  ; return 0; }
  EOF
! if { (eval echo configure:1364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
  else
--- 1360,1366 ----
  int i;
  ; return 0; }
  EOF
! if { (eval echo configure:1364: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
  else
***************
*** 1394,1400 ****
      builtin and then its argument prototype would still apply.  */
  char $ac_func();

! int main() { return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
--- 1394,1400 ----
      builtin and then its argument prototype would still apply.  */
  char $ac_func();

! int main() { t(); return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
***************
*** 1408,1414 ****

  ; return 0; }
  EOF
! if { (eval echo configure:1412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 1408,1414 ----

  ; return 0; }
  EOF
! if { (eval echo configure:1412: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 1447,1453 ****
      builtin and then its argument prototype would still apply.  */
  char $ac_func();

! int main() { return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
--- 1447,1453 ----
      builtin and then its argument prototype would still apply.  */
  char $ac_func();

! int main() { t(); return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
***************
*** 1461,1467 ****

  ; return 0; }
  EOF
! if { (eval echo configure:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 1461,1467 ----

  ; return 0; }
  EOF
! if { (eval echo configure:1465: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 1491,1502 ****
  #line 1492 "configure"
  #include "confdefs.h"
  #include <alloca.h>
! int main() { return 0; }
  int t() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
! if { (eval echo configure:1500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
--- 1491,1502 ----
  #line 1492 "configure"
  #include "confdefs.h"
  #include <alloca.h>
! int main() { t(); return 0; }
  int t() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
! if { (eval echo configure:1500: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
***************
*** 1539,1550 ****
  # endif
  #endif

! int main() { return 0; }
  int t() {
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
! if { (eval echo configure:1548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    ac_cv_func_alloca=yes
  else
--- 1539,1550 ----
  # endif
  #endif

! int main() { t(); return 0; }
  int t() {
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
! if { (eval echo configure:1548: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    ac_cv_func_alloca=yes
  else
***************
*** 1588,1595 ****
  #endif

  EOF
! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "webecray" >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_os_cray=yes
  else
--- 1588,1595 ----
  #endif

  EOF
! eval "$ac_cpp conftest.$ac_ext" 2>&5 >conftest.tmp
! if egrep "webecray" <conftest.tmp >/dev/null 2>&1; then
    rm -rf conftest*
    ac_cv_os_cray=yes
  else
***************
*** 1618,1624 ****
      builtin and then its argument prototype would still apply.  */
  char $ac_func();

! int main() { return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
--- 1618,1624 ----
      builtin and then its argument prototype would still apply.  */
  char $ac_func();

! int main() { t(); return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
***************
*** 1632,1638 ****

  ; return 0; }
  EOF
! if { (eval echo configure:1636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 1632,1638 ----

  ; return 0; }
  EOF
! if { (eval echo configure:1636: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
***************
*** 1683,1689 ****
    exit (find_stack_direction() < 0);
  }
  EOF
! { (eval echo configure:1687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    ac_cv_c_stack_direction=1
  else
--- 1683,1689 ----
    exit (find_stack_direction() < 0);
  }
  EOF
! { (eval echo configure:1687: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    ac_cv_c_stack_direction=1
  else
***************
*** 1714,1720 ****
  #include <$ac_header_dirent>
  int closedir(); main() { exit(closedir(opendir(".")) != 0); }
  EOF
! { (eval echo configure:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    ac_cv_func_closedir_void=no
  else
--- 1714,1720 ----
  #include <$ac_header_dirent>
  int closedir(); main() { exit(closedir(opendir(".")) != 0); }
  EOF
! { (eval echo configure:1718: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    ac_cv_func_closedir_void=no
  else
***************
*** 1743,1749 ****
  #include <vfork.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 1743,1749 ----
  #include <vfork.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1747: \"$ac_try\") 1>&5; xxx=`(eval $ac_try 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
***************
*** 1785,1791 ****
      builtin and then its argument prototype would still apply.  */
  char vfork();

! int main() { return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
--- 1785,1791 ----
      builtin and then its argument prototype would still apply.  */
  char vfork();

! int main() { t(); return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
***************
*** 1799,1805 ****

  ; return 0; }
  EOF
! if { (eval echo configure:1803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_func_vfork=yes"
  else
--- 1799,1805 ----

  ; return 0; }
  EOF
! if { (eval echo configure:1803: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    eval "ac_cv_func_vfork=yes"
  else
***************
*** 1917,1923 ****
    }
  }
  EOF
! { (eval echo configure:1921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    ac_cv_func_vfork=yes
  else
--- 1917,1923 ----
    }
  }
  EOF
! { (eval echo configure:1921: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    ac_cv_func_vfork=yes
  else
***************
*** 1950,1956 ****
      builtin and then its argument prototype would still apply.  */
  char vprintf();

! int main() { return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
--- 1950,1956 ----
      builtin and then its argument prototype would still apply.  */
  char vprintf();

! int main() { t(); return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
***************
*** 1964,1970 ****

  ; return 0; }
  EOF
! if { (eval echo configure:1968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_func_vprintf=yes"
  else
--- 1964,1970 ----

  ; return 0; }
  EOF
! if { (eval echo configure:1968: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    eval "ac_cv_func_vprintf=yes"
  else
***************
*** 2000,2006 ****
      builtin and then its argument prototype would still apply.  */
  char _doprnt();

! int main() { return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
--- 2000,2006 ----
      builtin and then its argument prototype would still apply.  */
  char _doprnt();

! int main() { t(); return 0; }
  int t() {

  /* The GNU C library defines this for functions which it implements
***************
*** 2014,2020 ****

  ; return 0; }
  EOF
! if { (eval echo configure:2018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_func__doprnt=yes"
  else
--- 2014,2020 ----

  ; return 0; }
  EOF
! if { (eval echo configure:2018: \"$ac_link\") 1>&5; xxx=`(eval $ac_link 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    eval "ac_cv_func__doprnt=yes"
  else
***************
*** 2050,2056 ****
  struct stat s; s.st_blksize;
  ; return 0; }
  EOF
! if { (eval echo configure:2054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
--- 2050,2056 ----
  struct stat s; s.st_blksize;
  ; return 0; }
  EOF
! if { (eval echo configure:2054: \"$ac_compile\") 1>&5; xxx=`(eval $ac_compile 2>&5 ; echo $?)` ; test "$xxx" = "0" ; }; then
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
***************
*** 2088,2096 ****
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
! (set) 2>&1 |
    sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
!   >> confcache
  if cmp -s $cache_file confcache; then
    :
  else
--- 2088,2096 ----
  EOF
  # Ultrix sh set writes to stderr and can't be redirected directly,
  # and sets the high bit in the cache file unless we assign to the vars.
! (set) >cache.tmp 2>&1
    sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
!   <cache.tmp >> confcache
  if cmp -s $cache_file confcache; then
    :
  else
***************
*** 2101,2107 ****
      echo "not updating unwritable cache $cache_file"
    fi
  fi
! rm -f confcache

  trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15

--- 2101,2107 ----
      echo "not updating unwritable cache $cache_file"
    fi
  fi
! rm -f confcache cache.tmp

  trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15