Make this compile on amd64, based on Richard Rauch's patches (PR pkg/23701)

as applied to the editors/emacs package.

4 files changed, 267 insertions, 140 deletions

diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index 377c5c3ca3d..ec1be00e033 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/27 00:53:11 heinz Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/28 20:57:48 kristerw Exp $
 
 DISTNAME=	emacs-20.7
 PKGREVISION=	2
@@ -79,6 +79,9 @@ INFO_FILES=	emacs vip viper forms gnus mh-e cl sc dired-x ediff \
 
 INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}
 
+post-extract:
+	${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m
+
 pre-install:
 	@${FIND} ${WRKSRC} -type f -name "*.orig*" -print | ${XARGS} ${RM} -f
 
diff --git a/editors/emacs20/distinfo b/editors/emacs20/distinfo
index c8b74799a41..cf71759b0e2 100644
--- a/editors/emacs20/distinfo
+++ b/editors/emacs20/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/01/13 21:58:51 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2004/02/28 20:57:48 kristerw Exp $
 
 SHA1 (emacs-20.7.tar.gz) = ef0168b927fb633bc9b14e2249431f26ff8b8452
 Size (emacs-20.7.tar.gz) = 15043428 bytes
@@ -9,7 +9,7 @@ Size (emacs-20.7-mule-4.1b.patch) = 79729 bytes
 SHA1 (emacs20-xim-20000713.diff) = 5bed39e7b8a52941f77088529566aaa3bcf06670
 Size (emacs20-xim-20000713.diff) = 21296 bytes
 SHA1 (patch-aa) = 3b3fd76c058a0a46e0458338ce4c2327a238fb3d
-SHA1 (patch-ab) = eb16c1ab30e8aac6e6877e8c0f9388961b8003b2
+SHA1 (patch-ab) = 78e013ab8adc619ec295e8bc9dc4bc133f26cf52
 SHA1 (patch-ac) = 9586951e581271664b28d5e812ee14105de508cf
 SHA1 (patch-ad) = dd21028a6360ccfb442ecced4c67717f60ea78a6
 SHA1 (patch-ae) = 7aaca5409a71f8a292ac57f828ee5ec7a07e3880
diff --git a/editors/emacs20/files/amd64.h b/editors/emacs20/files/amd64.h
new file mode 100644
index 00000000000..de4eba0b24f
--- /dev/null
+++ b/editors/emacs20/files/amd64.h
@@ -0,0 +1,131 @@
+/* machine description file for AMD x86-64.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+
+/* The following line tells the configuration script what sort of 
+   operating system this machine is likely to run.
+   USUAL-OPSYS="linux"  */
+
+#define BITS_PER_LONG           64
+#define BITS_PER_EMACS_INT      64
+
+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
+   is the most significant byte.  */
+
+#undef WORDS_BIG_ENDIAN
+
+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
+ * group of arguments and treat it as an array of the arguments.  */
+
+#define NO_ARG_ARRAY
+
+/* Define WORD_MACHINE if addresses and such have
+ * to be corrected before they can be used as byte counts.  */
+
+/* #define WORD_MACHINE  */
+
+/* Now define a symbol for the cpu type, if your compiler
+   does not define it automatically:
+   Ones defined so far include vax, m68000, ns16000, pyramid,
+   orion, tahoe, APOLLO and many others */
+/* __x86_64 defined automatically.  */
+
+/* Use type int rather than a union, to represent Lisp_Object */
+/* This is desirable for most machines.  */
+
+#define NO_UNION_TYPE
+
+/* Define the type to use.  */
+#define EMACS_INT               long
+#define EMACS_UINT              unsigned long
+#define SPECIAL_EMACS_INT
+
+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
+   the 24-bit bit field into an int.  In other words, if bit fields
+   are always unsigned.
+
+   If you use NO_UNION_TYPE, this flag does not matter.  */
+
+#define EXPLICIT_SIGN_EXTEND
+
+/* Data type of load average, as read out of kmem.  */
+
+#define LOAD_AVE_TYPE long
+
+/* Convert that into an integer that is 100 for a load average of 1.0  */
+
+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
+
+/* Define CANNOT_DUMP on machines where unexec does not work.
+   Then the function dump-emacs will not be defined
+   and temacs will do (load "loadup") automatically unless told otherwise.  */
+
+/* #define CANNOT_DUMP */
+
+/* Define VIRT_ADDR_VARIES if the virtual addresses of
+   pure and impure space as loaded can vary, and even their
+   relative order cannot be relied on.
+
+   Otherwise Emacs assumes that text space precedes data space,
+   numerically.  */
+
+#define VIRT_ADDR_VARIES  /* XXX */
+
+/* Define C_ALLOCA if this machine does not support a true alloca
+   and the one written in C should be used instead.
+   Define HAVE_ALLOCA to say that the system provides a properly
+   working alloca function and it should be used.
+   Define neither one if an assembler-language alloca
+   in the file alloca.s should be used.  */
+
+/* #define C_ALLOCA */      /* XXX */
+#define HAVE_ALLOCA
+
+/* Define NO_REMAP if memory segmentation makes it not work well
+   to change the boundary between the text section and data section
+   when Emacs is dumped.  If you define this, the preloaded Lisp
+   code will not be sharable; but that's better than failing completely.  */
+
+#define NO_REMAP  /* XXX */
+
+#define PNTR_COMPARISON_TYPE unsigned long
+
+/* On the 64 bit architecture, we can use 60 bits for addresses */
+
+#define VALBITS         60
+
+/* This definition of MARKBIT is necessary because of the comparison of
+   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
+
+#define MARKBIT         0x8000000000000000L
+
+/* Define XINT and XUINT so that they can take arguments of type int */
+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
+#define XUINT(a) ((long) (a) & VALMASK)
+
+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
+
+#define XPNTR(a) XUINT (a)
+
+/* #undef START_FILES */ /* XXX */
+/* #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o */ /* XXX */
+
+/* #undef LIB_STANDARD */                                    /* XXX */
+/* #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o */ /* XXX */
diff --git a/editors/emacs20/patches/patch-ab b/editors/emacs20/patches/patch-ab
index 5ed475d1930..38c3a76be03 100644
--- a/editors/emacs20/patches/patch-ab
+++ b/editors/emacs20/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
+$NetBSD: patch-ab,v 1.2 2004/02/28 20:57:49 kristerw Exp $
 
---- configure.orig	Mon Jun 12 22:05:56 2000
-+++ configure	Tue Oct 22 16:07:48 2002
+--- configure.orig	2000-06-12 22:05:56.000000000 +0200
++++ configure	2004-02-28 21:50:33.000000000 +0100
 @@ -20,6 +20,8 @@
  ac_help="$ac_help
    --with-x-toolkit=KIT    use an X toolkit (KIT = yes/lucid/athena/motif/no)"
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    --with-x                use the X Window System"
  
  # Initialize some variables set by options.
-@@ -584,7 +586,13 @@
+@@ -584,6 +586,12 @@
  
  fi
  
@@ -20,11 +20,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
 +  withval="$with_ipv6"
 +  :
 +fi
- 
 +
+ 
  #### Make srcdir absolute, if it isn't already.  It's important to
  #### avoid running the path through pwd unnecessary, since pwd can
- #### give you automounter prefixes, which can go away.  We do all this
 @@ -657,7 +665,7 @@
  fi
  
@@ -34,7 +33,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  
  host_alias=$host
  case "$host_alias" in
-@@ -718,9 +726,13 @@
+@@ -718,9 +726,14 @@
  			machine=hp9000s300 ;;
        powerpc-apple-netbsd*) machine=macppc ;;
        mips-*-netbsd*)	machine=pmax ;;
@@ -46,10 +45,11 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
 +      sparc*-*-netbsd*)	machine=sparc ;;
        vax-*-netbsd*)	machine=vax ;;
 +      arm*-*-netbsd*)	machine=arm ;;
++      x86_64-*-netbsd*)	machine=amd64 ;;
      esac
    ;;
  
-@@ -1613,7 +1625,7 @@
+@@ -1613,7 +1626,7 @@
    * ) # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -58,7 +58,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1643,7 +1655,7 @@
+@@ -1643,7 +1656,7 @@
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -67,7 +67,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1694,7 +1706,7 @@
+@@ -1694,7 +1707,7 @@
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -76,7 +76,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1726,7 +1738,7 @@
+@@ -1726,7 +1739,7 @@
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
@@ -85,7 +85,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1737,12 +1749,12 @@
+@@ -1737,12 +1750,12 @@
  
  cat > conftest.$ac_ext << EOF
  
@@ -100,7 +100,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
-@@ -1768,12 +1780,12 @@
+@@ -1768,12 +1781,12 @@
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
@@ -115,7 +115,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1782,7 +1794,7 @@
+@@ -1782,7 +1795,7 @@
    yes;
  #endif
  EOF
@@ -124,7 +124,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
-@@ -1801,7 +1813,7 @@
+@@ -1801,7 +1814,7 @@
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
@@ -133,7 +133,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1881,7 +1893,7 @@
+@@ -1881,7 +1894,7 @@
  #### #undef clause to src/config.h.in for autoconf to modify.
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
@@ -142,7 +142,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1902,7 +1914,7 @@
+@@ -1902,7 +1915,7 @@
  fi
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
@@ -151,7 +151,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -1917,13 +1929,13 @@
+@@ -1917,13 +1930,13 @@
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
@@ -167,7 +167,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -1934,13 +1946,13 @@
+@@ -1934,13 +1947,13 @@
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
@@ -183,7 +183,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -1951,13 +1963,13 @@
+@@ -1951,13 +1964,13 @@
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
@@ -199,7 +199,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -1993,7 +2005,7 @@
+@@ -1993,7 +2006,7 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
@@ -208,7 +208,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2050,7 +2062,7 @@
+@@ -2050,7 +2063,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
@@ -217,7 +217,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2082,9 +2094,9 @@
+@@ -2082,9 +2095,9 @@
  
  
  echo $ac_n "checking for AIX""... $ac_c" 1>&6
@@ -229,7 +229,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #ifdef _AIX
    yes
-@@ -2110,17 +2122,17 @@
+@@ -2110,17 +2123,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -250,7 +250,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -2147,12 +2159,12 @@
+@@ -2147,12 +2160,12 @@
  done
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
@@ -265,7 +265,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -2160,7 +2172,7 @@
+@@ -2160,7 +2173,7 @@
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
@@ -274,7 +274,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -2177,7 +2189,7 @@
+@@ -2177,7 +2190,7 @@
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
@@ -283,7 +283,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <string.h>
  EOF
-@@ -2195,7 +2207,7 @@
+@@ -2195,7 +2208,7 @@
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
@@ -292,7 +292,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -2216,7 +2228,7 @@
+@@ -2216,7 +2229,7 @@
    :
  else
    cat > conftest.$ac_ext <<EOF
@@ -301,7 +301,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -2227,7 +2239,7 @@
+@@ -2227,7 +2240,7 @@
  exit (0); }
  
  EOF
@@ -310,7 +310,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  then
    :
  else
-@@ -2251,12 +2263,12 @@
+@@ -2251,12 +2264,12 @@
  fi
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
@@ -325,7 +325,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -2265,7 +2277,7 @@
+@@ -2265,7 +2278,7 @@
  struct tm *tp;
  ; return 0; }
  EOF
@@ -334,7 +334,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    ac_cv_header_time=yes
  else
-@@ -2286,12 +2298,12 @@
+@@ -2286,12 +2299,12 @@
  fi
  
  echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
@@ -349,7 +349,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
-@@ -2303,7 +2315,7 @@
+@@ -2303,7 +2316,7 @@
  char *msg = *(sys_siglist + 1);
  ; return 0; }
  EOF
@@ -358,7 +358,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    ac_cv_decl_sys_siglist=yes
  else
-@@ -2325,12 +2337,12 @@
+@@ -2325,12 +2338,12 @@
  
  
  echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
@@ -373,7 +373,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #ifdef TIME_WITH_SYS_TIME
  #include <sys/time.h>
-@@ -2349,7 +2361,7 @@
+@@ -2349,7 +2362,7 @@
  static struct utimbuf x; x.actime = x.modtime;
  ; return 0; }
  EOF
@@ -382,7 +382,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_struct_utimbuf=yes
  else
-@@ -2370,12 +2382,12 @@
+@@ -2370,12 +2383,12 @@
  fi
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
@@ -397,7 +397,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
-@@ -2392,7 +2404,7 @@
+@@ -2392,7 +2405,7 @@
  int i;
  ; return 0; }
  EOF
@@ -406,7 +406,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    ac_cv_type_signal=void
  else
-@@ -2412,12 +2424,12 @@
+@@ -2412,12 +2425,12 @@
  
  
  echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
@@ -421,7 +421,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #ifdef TIME_WITH_SYS_TIME
  #include <sys/time.h>
-@@ -2433,7 +2445,7 @@
+@@ -2433,7 +2446,7 @@
  static struct timeval x; x.tv_sec = x.tv_usec;
  ; return 0; }
  EOF
@@ -430,7 +430,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_struct_timeval=yes
  else
-@@ -2455,12 +2467,12 @@
+@@ -2455,12 +2468,12 @@
  fi
  
  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
@@ -445,7 +445,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  #include <time.h>
-@@ -2468,7 +2480,7 @@
+@@ -2468,7 +2481,7 @@
  struct tm *tp; tp->tm_sec;
  ; return 0; }
  EOF
@@ -454,7 +454,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    ac_cv_struct_tm=time.h
  else
-@@ -2489,12 +2501,12 @@
+@@ -2489,12 +2502,12 @@
  fi
  
  echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
@@ -469,7 +469,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_cv_struct_tm>
-@@ -2502,7 +2514,7 @@
+@@ -2502,7 +2515,7 @@
  struct tm tm; tm.tm_zone;
  ; return 0; }
  EOF
@@ -478,7 +478,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    ac_cv_struct_tm_zone=yes
  else
-@@ -2522,12 +2534,12 @@
+@@ -2522,12 +2535,12 @@
  
  else
    echo $ac_n "checking for tzname""... $ac_c" 1>&6
@@ -493,7 +493,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <time.h>
  #ifndef tzname /* For SGI.  */
-@@ -2537,7 +2549,7 @@
+@@ -2537,7 +2550,7 @@
  atoi(*tzname);
  ; return 0; }
  EOF
@@ -502,7 +502,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    ac_cv_var_tzname=yes
  else
-@@ -2560,12 +2572,12 @@
+@@ -2560,12 +2573,12 @@
  
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
@@ -517,7 +517,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  
  int main() {
-@@ -2614,7 +2626,7 @@
+@@ -2614,7 +2627,7 @@
  
  ; return 0; }
  EOF
@@ -526,7 +526,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    ac_cv_c_const=yes
  else
-@@ -2636,7 +2648,7 @@
+@@ -2636,7 +2649,7 @@
  
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
@@ -535,7 +535,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2664,7 +2676,7 @@
+@@ -2664,7 +2677,7 @@
  
  
  echo $ac_n "checking for long file names""... $ac_c" 1>&6
@@ -544,7 +544,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2715,7 +2727,7 @@
+@@ -2715,7 +2728,7 @@
  # Uses ac_ vars as temps to allow command line to override cache and checks.
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
@@ -553,7 +553,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  
  # Check whether --with-x or --without-x was given.
  if test "${with_x+set}" = set; then
-@@ -2777,12 +2789,12 @@
+@@ -2777,12 +2790,12 @@
  
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
@@ -568,7 +568,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -2851,7 +2863,7 @@
+@@ -2851,14 +2864,14 @@
    ac_save_LIBS="$LIBS"
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -577,7 +577,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  
  int main() {
-@@ -2858,7 +2870,7 @@
  ${x_direct_test_function}()
  ; return 0; }
  EOF
@@ -586,7 +585,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
  # We can link X programs with no special library path.
-@@ -3033,7 +3045,7 @@
+@@ -3033,7 +3046,7 @@
  echo "checking the machine- and system-dependent files to find out
   - which libraries the lib-src programs will want, and
   - whether the GNU malloc routines are usable" 1>&6
@@ -595,7 +594,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
   - which libraries the lib-src programs will want, and
   - whether the GNU malloc routines are usable" >&5
  
-@@ -3163,12 +3175,12 @@
+@@ -3163,12 +3176,12 @@
  GNU_MALLOC=yes
  doug_lea_malloc=yes
  echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
@@ -610,7 +609,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char malloc_get_state(); below.  */
-@@ -3191,7 +3203,7 @@
+@@ -3191,7 +3204,7 @@
  
  ; return 0; }
  EOF
@@ -619,7 +618,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_func_malloc_get_state=yes"
  else
-@@ -3212,12 +3224,12 @@
+@@ -3212,12 +3225,12 @@
  fi
  
  echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
@@ -634,7 +633,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char malloc_set_state(); below.  */
-@@ -3240,7 +3252,7 @@
+@@ -3240,7 +3253,7 @@
  
  ; return 0; }
  EOF
@@ -643,7 +642,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_func_malloc_set_state=yes"
  else
-@@ -3261,12 +3273,12 @@
+@@ -3261,19 +3274,19 @@
  fi
  
  echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
@@ -658,7 +657,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  extern void (* __after_morecore_hook)();
  int main() {
-@@ -3273,7 +3285,7 @@
  __after_morecore_hook = 0
  ; return 0; }
  EOF
@@ -667,7 +665,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_var___after_morecore_hook=yes
  else
-@@ -3323,7 +3335,7 @@
+@@ -3323,7 +3336,7 @@
  LIBS="$libsrc_libs $LIBS"
  
  echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
@@ -676,7 +674,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3331,7 +3343,7 @@
+@@ -3331,7 +3344,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-ldnet  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -685,7 +683,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -3342,7 +3354,7 @@
+@@ -3342,7 +3355,7 @@
  dnet_ntoa()
  ; return 0; }
  EOF
@@ -694,7 +692,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -3371,7 +3383,7 @@
+@@ -3371,7 +3384,7 @@
  
  
  echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
@@ -703,7 +701,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3379,7 +3391,7 @@
+@@ -3379,14 +3392,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXbsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -712,7 +710,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  
  int main() {
-@@ -3386,7 +3398,7 @@
  main()
  ; return 0; }
  EOF
@@ -721,7 +718,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -3408,7 +3420,7 @@
+@@ -3408,7 +3421,7 @@
  
  
  echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
@@ -730,7 +727,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3416,7 +3428,7 @@
+@@ -3416,7 +3429,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lpthreads  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -739,7 +736,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -3427,7 +3439,7 @@
+@@ -3427,7 +3440,7 @@
  cma_open()
  ; return 0; }
  EOF
@@ -748,7 +745,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -3456,7 +3468,7 @@
+@@ -3456,7 +3469,7 @@
  
  
  echo $ac_n "checking for XFree86 in /usr/X386""... $ac_c" 1>&6
@@ -757,7 +754,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if test -d /usr/X386/include; then
    HAVE_XFREE386=yes
    : ${C_SWITCH_X_SITE="-I/usr/X386/include"}
-@@ -3485,9 +3497,9 @@
+@@ -3485,16 +3498,16 @@
  
    if test "${opsys}" = "gnu-linux"; then
      echo $ac_n "checking whether X on GNU/Linux needs -b to link""... $ac_c" 1>&6
@@ -769,7 +766,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  
  int main() {
-@@ -3494,7 +3506,7 @@
  XOpenDisplay ("foo");
  ; return 0; }
  EOF
@@ -778,7 +774,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    xlinux_first_failure=no
  else
-@@ -3514,7 +3526,7 @@
+@@ -3514,14 +3527,14 @@
        CPPFLAGS="$CPPFLAGS -b i486-linuxaout"
        LIBS="$LIBS -b i486-linuxaout"
        cat > conftest.$ac_ext <<EOF
@@ -787,7 +783,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  
  int main() {
-@@ -3521,7 +3533,7 @@
  XOpenDisplay ("foo");
  ; return 0; }
  EOF
@@ -796,7 +791,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    xlinux_second_failure=no
  else
-@@ -3551,12 +3563,12 @@
+@@ -3551,12 +3564,12 @@
  XScreenNumberOfScreen XSetWMProtocols
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -811,7 +806,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -3579,7 +3591,7 @@
+@@ -3579,7 +3592,7 @@
  
  ; return 0; }
  EOF
@@ -820,7 +815,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -3607,12 +3619,12 @@
+@@ -3607,12 +3620,12 @@
  
  if test "${window_system}" = "x11"; then
    echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
@@ -835,7 +830,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <X11/Xlib.h>
  int main() {
-@@ -3622,7 +3634,7 @@
+@@ -3622,7 +3635,7 @@
  
  ; return 0; }
  EOF
@@ -844,7 +839,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_x11_version_6=yes
  else
-@@ -3647,12 +3659,12 @@
+@@ -3647,12 +3660,12 @@
  
  if test "${window_system}" = "x11"; then
    echo $ac_n "checking X11 version 5""... $ac_c" 1>&6
@@ -859,7 +854,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <X11/Xlib.h>
  int main() {
-@@ -3662,7 +3674,7 @@
+@@ -3662,7 +3675,7 @@
  
  ; return 0; }
  EOF
@@ -868,7 +863,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_x11_version_5=yes
  else
-@@ -3690,12 +3702,12 @@
+@@ -3690,12 +3703,12 @@
  if test x"${USE_X_TOOLKIT}" = xmaybe; then
    if test x"${HAVE_X11R5}" = xyes; then
      echo $ac_n "checking X11 version 5 with Xaw""... $ac_c" 1>&6
@@ -883,7 +878,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  
  #include <X11/Intrinsic.h>
-@@ -3704,7 +3716,7 @@
+@@ -3704,7 +3717,7 @@
  
  ; return 0; }
  EOF
@@ -892,7 +887,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_x11_version_5_with_xaw=yes
  else
-@@ -3732,12 +3744,12 @@
+@@ -3732,12 +3745,12 @@
  
  if test "${USE_X_TOOLKIT}" != "none"; then
    echo $ac_n "checking X11 toolkit version""... $ac_c" 1>&6
@@ -907,7 +902,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <X11/Intrinsic.h>
  int main() {
-@@ -3747,7 +3759,7 @@
+@@ -3747,7 +3760,7 @@
  
  ; return 0; }
  EOF
@@ -916,7 +911,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_x11_toolkit_version_6=yes
  else
-@@ -3777,7 +3789,7 @@
+@@ -3777,7 +3790,7 @@
      LIBS="-lXt $LIBS"
    fi
    echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6
@@ -925,7 +920,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3785,7 +3797,7 @@
+@@ -3785,7 +3798,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXmu  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -934,7 +929,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -3796,7 +3808,7 @@
+@@ -3796,7 +3809,7 @@
  XmuConvertStandardSelection()
  ; return 0; }
  EOF
@@ -943,7 +938,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -3823,17 +3835,64 @@
+@@ -3823,17 +3836,64 @@
    echo "$ac_t""no" 1>&6
  fi
  
@@ -1010,7 +1005,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <Xm/Xm.h>
  int main() {
-@@ -3844,7 +3903,7 @@
+@@ -3844,7 +3904,7 @@
  #endif
  ; return 0; }
  EOF
@@ -1019,7 +1014,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_motif_version_2_1=yes
  else
-@@ -3864,7 +3923,7 @@
+@@ -3864,7 +3924,7 @@
  EOF
  
      echo $ac_n "checking for XpCreateContext in -lXp""... $ac_c" 1>&6
@@ -1028,7 +1023,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_lib_var=`echo Xp'_'XpCreateContext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3872,7 +3931,7 @@
+@@ -3872,7 +3932,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lXp  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1037,7 +1032,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -3883,7 +3942,7 @@
+@@ -3883,7 +3943,7 @@
  XpCreateContext()
  ; return 0; }
  EOF
@@ -1046,7 +1041,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -3915,12 +3974,12 @@
+@@ -3915,19 +3975,19 @@
  
  # If netdb.h doesn't declare h_errno, we must declare it by hand.
  echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
@@ -1061,7 +1056,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
-@@ -3927,7 +3986,7 @@
  return h_errno;
  ; return 0; }
  EOF
@@ -1070,7 +1064,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_netdb_declares_h_errno=yes
  else
-@@ -3950,12 +4009,12 @@
+@@ -3950,19 +4010,19 @@
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
@@ -1085,7 +1079,6 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
-@@ -3962,7 +4021,7 @@
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
@@ -1094,7 +1087,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
-@@ -3983,12 +4042,12 @@
+@@ -3983,12 +4043,12 @@
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
@@ -1109,7 +1102,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -4016,7 +4075,7 @@
+@@ -4016,7 +4076,7 @@
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
@@ -1118,7 +1111,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
-@@ -4048,12 +4107,12 @@
+@@ -4048,12 +4108,12 @@
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
@@ -1133,7 +1126,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -4078,12 +4137,12 @@
+@@ -4078,12 +4138,12 @@
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -1148,7 +1141,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -4106,7 +4165,7 @@
+@@ -4106,7 +4166,7 @@
  
  ; return 0; }
  EOF
@@ -1157,7 +1150,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -4133,7 +4192,7 @@
+@@ -4133,7 +4193,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
@@ -1166,7 +1159,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4141,7 +4200,7 @@
+@@ -4141,7 +4201,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
@@ -1175,7 +1168,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -4160,7 +4219,7 @@
+@@ -4160,7 +4220,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
@@ -1184,7 +1177,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  then
    ac_cv_c_stack_direction=1
  else
-@@ -4185,7 +4244,7 @@
+@@ -4185,7 +4245,7 @@
  # fmod, logb, and frexp are found in -lm on most systems.
  # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
  echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
@@ -1193,7 +1186,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4193,7 +4252,7 @@
+@@ -4193,7 +4253,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1202,7 +1195,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -4204,7 +4263,7 @@
+@@ -4204,7 +4264,7 @@
  sqrt()
  ; return 0; }
  EOF
@@ -1211,7 +1204,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4234,7 +4293,7 @@
+@@ -4234,7 +4294,7 @@
  
  # Check for mail-locking functions in a "mail" library
  echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
@@ -1220,7 +1213,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4242,7 +4301,7 @@
+@@ -4242,7 +4302,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lmail  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1229,7 +1222,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -4253,7 +4312,7 @@
+@@ -4253,7 +4313,7 @@
  maillock()
  ; return 0; }
  EOF
@@ -1238,7 +1231,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4275,12 +4334,12 @@
+@@ -4275,12 +4335,12 @@
  	     for ac_func in touchlock
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -1253,7 +1246,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -4303,7 +4362,7 @@
+@@ -4303,7 +4363,7 @@
  
  ; return 0; }
  EOF
@@ -1262,7 +1255,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -4331,17 +4390,17 @@
+@@ -4331,17 +4391,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -1283,7 +1276,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -4379,12 +4438,12 @@
+@@ -4379,12 +4439,12 @@
  utimes setrlimit setpgid getcwd shutdown strftime
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -1298,7 +1291,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -4407,7 +4466,7 @@
+@@ -4407,7 +4467,7 @@
  
  ; return 0; }
  EOF
@@ -1307,7 +1300,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -4436,12 +4495,12 @@
+@@ -4436,12 +4496,12 @@
  for ac_func in grantpt
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -1322,7 +1315,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -4464,7 +4523,7 @@
+@@ -4464,7 +4524,7 @@
  
  ; return 0; }
  EOF
@@ -1331,7 +1324,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -4493,12 +4552,12 @@
+@@ -4493,12 +4553,12 @@
  for ac_func in getpt
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
@@ -1346,7 +1339,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -4521,7 +4580,7 @@
+@@ -4521,7 +4581,7 @@
  
  ; return 0; }
  EOF
@@ -1355,7 +1348,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -4551,7 +4610,7 @@
+@@ -4551,7 +4611,7 @@
  # It's better to believe a function is not available
  # than to expect to find it in ncurses.
  echo $ac_n "checking for tparm in -lncurses""... $ac_c" 1>&6
@@ -1364,7 +1357,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_lib_var=`echo ncurses'_'tparm | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4559,7 +4618,7 @@
+@@ -4559,7 +4619,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1373,7 +1366,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -4570,7 +4629,7 @@
+@@ -4570,7 +4630,7 @@
  tparm()
  ; return 0; }
  EOF
@@ -1382,7 +1375,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4601,7 +4660,7 @@
+@@ -4601,7 +4661,7 @@
  # Solaris requires -lintl if you want strerror (which calls dgettext)
  # to return localized messages.
  echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6
@@ -1391,7 +1384,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4609,7 +4668,7 @@
+@@ -4609,7 +4669,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
@@ -1400,7 +1393,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -4620,7 +4679,7 @@
+@@ -4620,7 +4680,7 @@
  dgettext()
  ; return 0; }
  EOF
@@ -1409,7 +1402,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -4649,7 +4708,7 @@
+@@ -4649,7 +4709,7 @@
  
  
  echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
@@ -1418,7 +1411,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  if eval "test \"`echo '$''{'emacs_cv_localtime_cache'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -4659,7 +4718,7 @@
+@@ -4659,7 +4719,7 @@
  emacs_cv_localtime_cache=yes
  else
    cat > conftest.$ac_ext <<EOF
@@ -1427,7 +1420,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  #include <time.h>
  #if STDC_HEADERS
-@@ -4694,7 +4753,7 @@
+@@ -4694,7 +4754,7 @@
    exit (0);
  }
  EOF
@@ -1436,7 +1429,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  then
    emacs_cv_localtime_cache=no
  else
-@@ -4722,12 +4781,12 @@
+@@ -4722,12 +4782,12 @@
  
  if test "x$HAVE_TIMEVAL" = xyes; then
  echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6
@@ -1451,7 +1444,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  
  #ifdef TIME_WITH_SYS_TIME
-@@ -4749,7 +4808,7 @@
+@@ -4749,7 +4809,7 @@
  
  ; return 0; }
  EOF
@@ -1460,7 +1453,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    emacs_cv_gettimeofday_two_arguments=yes
  else
-@@ -4772,12 +4831,12 @@
+@@ -4772,12 +4832,12 @@
  
  ok_so_far=yes
  echo $ac_n "checking for socket""... $ac_c" 1>&6
@@ -1475,7 +1468,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char socket(); below.  */
-@@ -4800,7 +4859,7 @@
+@@ -4800,7 +4860,7 @@
  
  ; return 0; }
  EOF
@@ -1484,7 +1477,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
    rm -rf conftest*
    eval "ac_cv_func_socket=yes"
  else
-@@ -4823,17 +4882,17 @@
+@@ -4823,17 +4883,17 @@
  if test $ok_so_far = yes; then
    ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
@@ -1505,7 +1498,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -4859,17 +4918,17 @@
+@@ -4859,17 +4919,17 @@
  if test $ok_so_far = yes; then
    ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
@@ -1526,7 +1519,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -4906,6 +4965,64 @@
+@@ -4906,6 +4966,64 @@
  
  fi
  
@@ -1591,7 +1584,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2003/04/11 00:31:45 uebayasi Exp $
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
  
-@@ -5211,6 +5328,7 @@
+@@ -5211,6 +5329,7 @@
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@YACC@%$YACC%g
  s%@SET_MAKE@%$SET_MAKE%g