head 1.30; access; symbols pkgsrc-2013Q2:1.30.0.2 pkgsrc-2013Q2-base:1.30 pkgsrc-2012Q4:1.29.0.22 pkgsrc-2012Q4-base:1.29 pkgsrc-2012Q3:1.29.0.20 pkgsrc-2012Q3-base:1.29 pkgsrc-2012Q2:1.29.0.18 pkgsrc-2012Q2-base:1.29 pkgsrc-2012Q1:1.29.0.16 pkgsrc-2012Q1-base:1.29 pkgsrc-2011Q4:1.29.0.14 pkgsrc-2011Q4-base:1.29 pkgsrc-2011Q3:1.29.0.12 pkgsrc-2011Q3-base:1.29 pkgsrc-2011Q2:1.29.0.10 pkgsrc-2011Q2-base:1.29 pkgsrc-2011Q1:1.29.0.8 pkgsrc-2011Q1-base:1.29 pkgsrc-2010Q4:1.29.0.6 pkgsrc-2010Q4-base:1.29 pkgsrc-2010Q3:1.29.0.4 pkgsrc-2010Q3-base:1.29 pkgsrc-2010Q2:1.29.0.2 pkgsrc-2010Q2-base:1.29 pkgsrc-2010Q1:1.28.0.6 pkgsrc-2010Q1-base:1.28 pkgsrc-2009Q4:1.28.0.4 pkgsrc-2009Q4-base:1.28 pkgsrc-2009Q3:1.28.0.2 pkgsrc-2009Q3-base:1.28 pkgsrc-2009Q2:1.26.0.6 pkgsrc-2009Q2-base:1.26 pkgsrc-2009Q1:1.26.0.4 pkgsrc-2009Q1-base:1.26 pkgsrc-2008Q4:1.26.0.2 pkgsrc-2008Q4-base:1.26 pkgsrc-2008Q3:1.25.0.16 pkgsrc-2008Q3-base:1.25 cube-native-xorg:1.25.0.14 cube-native-xorg-base:1.25 pkgsrc-2008Q2:1.25.0.12 pkgsrc-2008Q2-base:1.25 cwrapper:1.25.0.10 pkgsrc-2008Q1:1.25.0.8 pkgsrc-2008Q1-base:1.25 pkgsrc-2007Q4:1.25.0.6 pkgsrc-2007Q4-base:1.25 pkgsrc-2007Q3:1.25.0.4 pkgsrc-2007Q3-base:1.25 pkgsrc-2007Q2:1.25.0.2 pkgsrc-2007Q2-base:1.25 pkgsrc-2007Q1:1.23.0.8 pkgsrc-2007Q1-base:1.23 pkgsrc-2006Q4:1.23.0.6 pkgsrc-2006Q4-base:1.23 pkgsrc-2006Q3:1.23.0.4 pkgsrc-2006Q3-base:1.23 pkgsrc-2006Q2:1.23.0.2 pkgsrc-2006Q2-base:1.23 pkgsrc-2006Q1:1.22.0.2 pkgsrc-2006Q1-base:1.22 pkgsrc-2005Q4:1.20.0.2 pkgsrc-2005Q4-base:1.20 pkgsrc-2005Q3:1.19.0.4 pkgsrc-2005Q3-base:1.19 pkgsrc-2005Q2:1.19.0.2 pkgsrc-2005Q2-base:1.19 pkgsrc-2005Q1:1.18.0.6 pkgsrc-2005Q1-base:1.18 pkgsrc-2004Q4:1.18.0.4 pkgsrc-2004Q4-base:1.18 pkgsrc-2004Q3:1.18.0.2 pkgsrc-2004Q3-base:1.18 pkgsrc-2004Q2:1.17.0.4 pkgsrc-2004Q2-base:1.17 pkgsrc-2004Q1:1.17.0.2 pkgsrc-2004Q1-base:1.17 pkgsrc-2003Q4:1.16.0.2 pkgsrc-2003Q4-base:1.16 netbsd-1-6-1:1.14.0.2 netbsd-1-6-1-base:1.14 netbsd-1-6:1.13.0.8 netbsd-1-6-RELEASE-base:1.13 pkgviews:1.13.0.4 pkgviews-base:1.13 buildlink2:1.13.0.2 buildlink2-base:1.13 netbsd-1-5-PATCH003:1.13 netbsd-1-5-PATCH001:1.12 netbsd-1-5-RELEASE:1.12 netbsd-1-4-PATCH003:1.12 netbsd-1-4-PATCH002:1.9 comdex-fall-1999:1.8 netbsd-1-4-PATCH001:1.8 netbsd-1-4-RELEASE:1.6 netbsd-1-3-PATCH003:1.6 netbsd-1-3-PATCH002:1.2; locks; strict; comment @# @; 1.30 date 2013.02.17.05.00.47; author dholland; state dead; branches; next 1.29; 1.29 date 2010.06.01.21.44.54; author minskim; state Exp; branches; next 1.28; 1.28 date 2009.10.07.10.56.40; author obache; state Exp; branches; next 1.27; 1.27 date 2009.08.06.04.46.04; author minskim; state Exp; branches; next 1.26; 1.26 date 2008.10.11.09.56.38; author uebayasi; state Exp; branches 1.26.6.1; next 1.25; 1.25 date 2007.06.11.13.57.18; author markd; state Exp; branches; next 1.24; 1.24 date 2007.04.22.06.55.03; author obache; state Exp; branches; next 1.23; 1.23 date 2006.06.06.16.23.17; author minskim; state Exp; branches; next 1.22; 1.22 date 2006.03.25.02.48.22; author uebayasi; state Exp; branches; next 1.21; 1.21 date 2005.12.29.13.56.51; author joerg; state Exp; branches; next 1.20; 1.20 date 2005.10.06.11.08.39; author markd; state Exp; branches; next 1.19; 1.19 date 2005.05.26.02.10.49; author markd; state Exp; branches; next 1.18; 1.18 date 2004.07.31.21.01.54; author kristerw; state Exp; branches; next 1.17; 1.17 date 2004.02.25.19.11.43; author drochner; state Exp; branches; next 1.16; 1.16 date 2003.07.06.16.10.18; author uebayasi; state Exp; branches; next 1.15; 1.15 date 2003.04.11.00.50.53; author uebayasi; state dead; branches; next 1.14; 1.14 date 2002.10.26.19.47.07; author bouyer; state Exp; branches; next 1.13; 1.13 date 2001.10.06.22.04.22; author hubertf; state Exp; branches; next 1.12; 1.12 date 2000.09.26.21.42.34; author eeh; state Exp; branches; next 1.11; 1.11 date 2000.06.24.17.03.38; author minoura; state Exp; branches; next 1.10; 1.10 date 2000.03.01.05.07.41; author minoura; state Exp; branches; next 1.9; 1.9 date 99.12.28.14.08.56; author tron; state Exp; branches; next 1.8; 1.8 date 99.06.15.13.59.15; author bad; state Exp; branches; next 1.7; 1.7 date 99.06.04.03.42.35; author mycroft; state Exp; branches; next 1.6; 1.6 date 98.09.04.02.28.53; author tron; state Exp; branches; next 1.5; 1.5 date 98.09.01.20.04.34; author mellon; state Exp; branches; next 1.4; 1.4 date 98.08.31.20.29.28; author tron; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.40.31; author agc; state Exp; branches; next 1.2; 1.2 date 98.02.22.10.06.44; author tron; state Exp; branches; next 1.1; 1.1 date 98.02.12.13.33.11; author hubertf; state Exp; branches; next ; 1.26.6.1 date 2009.09.24.11.51.47; author spz; state Exp; branches; next ; desc @@ 1.30 log @Move editors/emacs to editors/emacs23. @ text @$NetBSD: patch-ab,v 1.29 2010/06/01 21:44:54 minskim Exp $ --- work/emacs-23.2/configure.orig 2010-05-08 12:10:16.000000000 +0900 +++ configure 2010-05-12 20:32:23.000000000 +0900 @@@@ -1995,7 +1995,7 @@@@ docdir='${datadir}/emacs/${version}/etc' gamedir='${localstatedir}/games/emacs' -gameuser=games +gameuser=${GAMEOWN} @@@@ -2652,6 +2652,14 @@@@ amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;; esac ;; + ## DragonFly ports + *-*-dragonfly*) + opsys=dragonfly + case "${canonical}" in + i[3456]86-*-dragonfly*) machine=intel386 ;; + amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; + esac + ;; ## FreeBSD kernel + glibc based userland *-*-kfreebsd*gnu* ) @@@@ -9849,9 +9857,9 @@@@ window_system=nextstep with_xft=no # set up packaging dirs + if test "${EN_NS_SELF_CONTAINED}" = yes; then exec_prefix=${ns_appbindir} libexecdir=${ns_appbindir}/libexec - if test "${EN_NS_SELF_CONTAINED}" = yes; then prefix=${ns_appresdir} fi fi @ 1.29 log @Update emacs to 23.2. Patches were provided by Makoto Fujiwara in PR 43335. Excerpt from the announcement: In addition to a large number of bugfixes, Emacs 23.2 includes several new packages, such as the CEDET suite of development tools (including Semantic, a set of libraries and utilities for parsing source code, and EDE, a package for managing code projects), and a new mode for editing Javascript. The default mail composition mode is now Message mode, which provides features such as MIME handling. Many other part of Emacs have also been improved. For a more complete list of changes, see the file etc/NEWS. @ text @d1 1 a1 1 $NetBSD$ @ 1.28 log @fit for NetBSD-mips variants, do not use pmax configuration. prevent unrequisite warning messages on NetBSD-alpha (patch-ac) and NetBSD-mips variants (patch-af). fixes PR 39027. Bump PKGREVISION. @ text @d3 3 a5 3 --- configure.orig 2009-07-30 00:12:00.000000000 +0900 +++ configure @@@@ -1856,7 +1856,7 @@@@ archlibdir='${libexecdir}/emacs/${versio d14 2 a15 1 @@@@ -2406,6 +2406,15 @@@@ case "${canonical}" in a17 1 d26 1 a26 1 + d29 1 a29 15 opsys=gnu-kfreebsd @@@@ -2434,9 +2443,9 @@@@ _ACEOF case "${canonical}" in alpha*-*-netbsd*) machine=alpha ;; i[3456]86-*-netbsd*) machine=intel386 ;; - mips-*-netbsd*) machine=pmax ;; - mipsel-*-netbsd*) machine=pmax ;; - mipseb-*-netbsd*) machine=pmax ;; + mips-*-netbsd*) machine=mips ;; + mipsel-*-netbsd*) machine=mips ;; + mipseb-*-netbsd*) machine=mips ;; powerpc-*-netbsd*) machine=macppc ;; sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; @@@@ -9408,9 +9417,9 @@@@ if test "${HAVE_NS}" = yes; then d33 4 a36 5 - exec_prefix=${ns_appbindir} - libexecdir=${ns_appbindir}/libexec if test "${EN_NS_SELF_CONTAINED}" = yes; then + exec_prefix=${ns_appbindir} + libexecdir=${ns_appbindir}/libexec @ 1.27 log @Update patches for emacs-23.1. These should have been committed when emacs was updated. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2009/06/07 20:12:06 hasso Exp $ d3 3 a5 3 --- configure.orig 2009-06-04 20:29:50 +0300 +++ configure 2009-06-07 21:41:16 +0300 @@@@ -1979,7 +1979,7 @@@@ archlibdir='${libexecdir}/emacs/${versio d14 1 a14 1 @@@@ -2529,6 +2529,15 @@@@ case "${canonical}" in d30 14 a43 1 @@@@ -9605,9 +9614,9 @@@@ if test "${HAVE_NS}" = yes; then @ 1.26 log @Update emacs to 22.3. Below is a simplified etc/NEWS; see the real file for full detail! ---- * Changes in Emacs 22.3 ** Support for several obsolete platforms will be removed in the next major version of Emacs. *** Support for systems without alloca will be removed. *** Support for Sun windows will be removed. *** Support for VMS will be removed. * Incompatible Editing Changes in Emacs 22.3 ** The following input methods were removed in Emacs 22.2, but this was not advertised: danish-alt-postfix, esperanto-alt-postfix, finnish-alt-postfix, german-alt-postfix, icelandic-alt-postfix, norwegian-alt-postfix, scandinavian-alt-postfix, spanish-alt-postfix, and swedish-alt-postfix. Use the versions without "alt-", which are identical. * Installation Changes in Emacs 22.2 ** Emacs is now licensed under the GNU GPL version 3 (or later). ** Support for GNU/kFreeBSD (GNU userland and FreeBSD kernel) was added. ** Deprecated machine types and operating systems (snip) * Changes in Emacs 22.2 ** `describe-project' is renamed to `describe-gnu-project'. ** `view-todo' is renamed to `view-emacs-todo'. ** `find-name-dired' now uses -iname rather than -name for case-insensitive filesystems. ** In Image mode, whenever the displayed image is wider and/or higher than the window, the usual keys for moving the cursor cause the image to be scrolled horizontally or vertically instead. ** Emacs can use stock icons in the tool bar when compiled with Gtk+. ** Scrollbars follow the system theme on Windows XP and later. ** focus-follows-mouse defaults to nil on MS Windows. ** `bad-packages-alist' will warn about external packages that are known to cause problems in this version of Emacs. ** The values of `dired-recursive-deletes' and `dired-recursive-copies' have been changed to `top'. ** `browse-url-emacs' loads a URL into an Emacs buffer. Handy for *.el URLs. ** The command gdba has been removed as gdb works now for those cases where it was needed. ** desktop.el now detects conflicting uses of the desktop file. ** Compilation mode now correctly respects the value of `compilation-scroll-output' between invocations. ** `font-lock-comment-face' no longer differs from the default on displays with fewer than 16 colors and dark background (e.g. older xterms and the Linux console). * New Modes and Packages in Emacs 22.2 ** bibtex-style-mode helps you write BibTeX's *.bst files. ** The new package css-mode.el provides a major mode for editing CSS files. ** The new package vera-mode.el provides a major mode for editing Vera files. ** The new package verilog-mode.el provides a major mode for editing Verilog files. ** The new package socks.el implements the SOCKS v5 protocol. ** VC *** VC backends can provide completion of revision names. *** VC backends can provide extra menu entries to the "Version Control" menu. This can be used to add menu entries for backend specific functions. *** VC has some support for Mercurial (Hg). *** VC has some support for Monotone (Mtn). *** VC has some support for Bazaar (Bzr). *** VC has some support for Git. * Incompatible Lisp Changes in Emacs 22.2 ** shell.el no longer defines the aliases `dirtrack-toggle' and `dirtrack-mode' for `shell-dirtrack-mode'. * Lisp Changes in Emacs 22.2. ** Frame-local variables are deprecated and are slated for removal. ** The function invisible-p returns non-nil if the character after a specified position is invisible. ** inhibit-modification-hooks is bound to t while running modification hooks. ** New function `window-full-width-p' returns t if a window is as wide as its frame. ** The new function `image-refresh' refreshes all images associated with a given image specification. ** The new function `combine-and-quote-strings' concatenates a list of strings using a specified separator. If a string contains double quotes, they are escaped in the output. ** The new function `split-string-and-unquote' performs the inverse operation to `combine-and-quote-strings', i.e. splits a single string into a list of strings, undoing any quoting added by `combine-and-quote-strings'. (For some separator/string combinations, the original strings cannot be recovered.) @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- configure.orig 2008-10-10 10:35:49.000000000 +0900 +++ configure @@@@ -1809,7 +1809,7 @@@@ archlibdir='${libexecdir}/emacs/${versio d13 2 a14 8 # Check whether --with-gcc was given. @@@@ -3142,6 +3142,7 @@@@ _ACEOF *-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-sysv5OpenUNIX* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; *-386bsd* ) opsys=386bsd ;; + *-dragonfly* ) opsys=dragonfly ;; *-nextstep* ) opsys=nextstep ;; ## Otherwise, we'll fall through to the generic opsys code at the bottom. d16 26 @ 1.26.6.1 log @Pullup ticket 2900 - requested by jun build fix for mips Revisions pulled up: - pkgsrc/editors/emacs/distinfo by patch - pkgsrc/editors/emacs/patches/patch-ab by patch Files added: pkgsrc/editors/emacs/patches/patch-aw by patch pkgsrc/editors/emacs/patches/patch-ax by patch package revision doesn't bump because the change only impacts mips architecture, where it wouldn't properly build before. ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: jun Date: Mon Sep 21 10:10:58 UTC 2009 Modified Files: pkgsrc/editors/emacs22: distinfo Added Files: pkgsrc/editors/emacs22/patches: patch-ax Log Message: compile enable on mips ports. adviced and patches from tsutsui-san on [netbsd,09810]. tested on hpcmips-current. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs22/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/editors/emacs22/patches/patch-ax ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: jun Date: Sun Sep 13 02:12:28 UTC 2009 Modified Files: pkgsrc/editors/emacs22: Makefile distinfo pkgsrc/editors/emacs22/patches: patch-ab Log Message: change patch-ab: add mips config to configure Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs22/Makefile \ pkgsrc/editors/emacs22/distinfo cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/editors/emacs22/patches/patch-ab ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: jun Date: Sun Sep 13 01:26:34 UTC 2009 Modified Files: pkgsrc/editors/emacs22/patches: patch-aw Log Message: Fit for mips, change fix from emacs23: http://cvs.savannah.gnu.org/viewvc/emacs/configure.in?root=emacs&r1=1.602&r2=1.603 adviced by obata-san,[netbsd,09792] To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/editors/emacs22/patches/patch-aw @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.26 2008/10/11 09:56:38 uebayasi Exp $ d3 1 a3 1 --- configure.orig 2009-09-13 11:12:28.000000000 +0900 a13 13 @@@@ -2243,9 +2243,9 @@@@ _ACEOF m68k-*-netbsd*) # This is somewhat bogus. machine=hp9000s300 ;; - mips-*-netbsd*) machine=pmax ;; - mipsel-*-netbsd*) machine=pmax ;; - mipseb-*-netbsd*) machine=pmax ;; + mips-*-netbsd*) machine=mips ;; + mipsel-*-netbsd*) machine=mips ;; + mipseb-*-netbsd*) machine=mips ;; ns32k-*-netbsd*) machine=ns32000 ;; powerpc-*-netbsd*) machine=macppc ;; sparc*-*-netbsd*) machine=sparc ;; @ 1.25 log @Update emacs{,-nox11} to 22.1. update based in part on wip/emacs-current and wip/emacs22 packages. Many many changes since 21.4a. Read NEWS file for details. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.24 2007/04/22 06:55:03 obache Exp $ d3 1 a3 1 --- configure.orig 2007-05-26 00:43:29.000000000 +1200 d14 1 a14 1 @@@@ -3128,6 +3128,7 @@@@ _ACEOF @ 1.24 log @Fix build problem on i386/Darwin. Patch provided by Tom Yu in PR 36166. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.23 2006/06/06 16:23:17 minskim Exp $ d3 1 a3 1 --- configure.orig 2003-03-18 14:19:12.000000000 +0000 d5 6 a10 9 @@@@ -822,9 +822,17 @@@@ case "${canonical}" in sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; arm-*-netbsd*) machine=arm ;; + x86_64-*-netbsd*) machine=amd64 ;; + hppa-*-netbsd*) machine=hp800 ;; + shle-*-netbsd*) machine=sh3el ;; esac ;; a11 11 + ## Darwin / Mac OS X + powerpc-apple-darwin* ) + machine=powermac opsys=darwin ;; + i386-apple-darwin* ) + machine=intel386 opsys=darwin ;; ## OpenBSD ports *-*-openbsd* ) opsys=openbsd @@@@ -909,6 +917,10 @@@@ case "${canonical}" in machine=macppc opsys=gnu-linux ;; d13 4 a16 9 + x86_64-*-linux* ) + machine=amd64 opsys=gnu-linux + ;; + ## Altos 3068 m68*-altos-sysv* ) machine=altos opsys=usg5-2 @@@@ -1659,6 +1671,7 @@@@ case "${canonical}" in *-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; d18 1 a18 2 *-freebsd* ) opsys=freebsd ;; + *-dragonfly* ) opsys=dragonfly ;; a21 23 @@@@ -9124,6 +9137,22 @@@@ EOF fi +# NETBSD: NetBSD's newer run-time linker fix. +if test $opsys = netbsd; then + if test -f /usr/lib/crti.o; then + cat >> confdefs.h <<\EOF +#define HAVE_NETBSD_CRTI 1 +EOF + + fi + if test -f /usr/lib/crtn.o; then + cat >> confdefs.h <<\EOF +#define HAVE_NETBSD_CRTN 1 +EOF + + fi +fi + # Set up the CFLAGS for real compilation, so we can substitute it. CFLAGS="$REAL_CFLAGS" CPPFLAGS="$REAL_CPPFLAGS" @ 1.23 log @Make configure recognize Linux/amd64. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -822,9 +822,15 @@@@ case "${canonical}" in d18 2 d23 1 a23 1 @@@@ -909,6 +915,10 @@@@ case "${canonical}" in d34 1 a34 1 @@@@ -1659,6 +1669,7 @@@@ case "${canonical}" in d42 1 a42 1 @@@@ -9124,6 +9135,22 @@@@ EOF @ 1.22 log @Fix build on sh3el. PR pkg/33418 from Yasushi Oshima. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.21 2005/12/29 13:56:51 joerg Exp $ d3 1 a3 1 --- configure.orig 2003-03-19 02:19:12.000000000 +1200 d21 12 a32 1 @@@@ -1659,6 +1665,7 @@@@ case "${canonical}" in d40 1 a40 1 @@@@ -9124,6 +9131,22 @@@@ EOF @ 1.21 log @Create separate configuration for DragonFly. Fix errno. Based on patch from Richard Nyberg on DragonFly's user list. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.20 2005/10/06 11:08:39 markd Exp $ d5 1 a5 1 @@@@ -822,9 +822,14 @@@@ case "${canonical}" in d11 1 d21 1 a21 1 @@@@ -1659,6 +1663,7 @@@@ case "${canonical}" in d29 1 a29 1 @@@@ -9124,6 +9129,22 @@@@ EOF @ 1.20 log @A couple of patches to fix build on NetBSD/hp700. From Konrad Schroder. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.19 2005/05/26 02:10:49 markd Exp $ d24 1 a24 1 + *-dragonfly* ) opsys=freebsd ;; @ 1.19 log @Treat DragonFly as FreeBSD. From Peter Schuller in PR pkg/30225. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.18 2004/07/31 21:01:54 kristerw Exp $ d5 1 a5 1 @@@@ -822,9 +822,13 @@@@ case "${canonical}" in d10 1 @ 1.18 log @Make this build on OS X. The new files are taken from the emacs cvs repository. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- configure.orig Tue Mar 18 15:19:12 2003 +++ configure Sat Jul 31 03:56:01 2004 @@@@ -822,9 +822,13 @@@@ d19 10 a28 1 @@@@ -9123,6 +9127,22 @@@@ a29 1 fi a30 1 + d46 1 a46 1 d49 1 @ 1.17 log @make yhis compile on amd64, based on Richard Rauch's patches (PR pkg/23701) @ text @d3 3 a5 3 --- configure.orig 2003-03-18 15:19:12.000000000 +0100 +++ configure 2004-02-25 20:04:08.000000000 +0100 @@@@ -822,6 +822,7 @@@@ d13 8 a20 1 @@@@ -9124,6 +9125,22 @@@@ d23 1 a23 1 d39 1 a39 1 + a41 1 CPPFLAGS="$REAL_CPPFLAGS" @ 1.16 log @On NetBSD, link "temacs" against /usr/lib/crt{n,i}.o if they exist. Or "temacs" fails to start. (Actually, I don't understand the fact inside.) Bump revision to 2. @ text @d3 11 a13 3 --- configure.orig Sat Jun 14 12:55:08 2003 +++ configure @@@@ -9124,6 +9124,22 @@@@ @ 1.15 log @Remove old patches @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.14 2002/10/26 19:47:07 bouyer Exp $ d3 3 a5 644 --- configure.orig Mon Jun 12 22:05:56 2000 +++ configure Tue Oct 22 16:07:48 2002 @@@@ -20,6 +20,8 @@@@ ac_help="$ac_help --with-x-toolkit=KIT use an X toolkit (KIT = yes/lucid/athena/motif/no)" ac_help="$ac_help + --with-ipv6 support IPv6 stack" +ac_help="$ac_help --with-x use the X Window System" # Initialize some variables set by options. @@@@ -584,7 +586,13 @@@@ fi +# Check whether --with-ipv6 or --without-ipv6 was given. +if test "${with_ipv6+set}" = set; then + 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 echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:661: checking host system type" >&5 +echo "configure:669: checking host system type" >&5 host_alias=$host case "$host_alias" in @@@@ -718,9 +726,13 @@@@ machine=hp9000s300 ;; powerpc-apple-netbsd*) machine=macppc ;; mips-*-netbsd*) machine=pmax ;; + mipsel-*-netbsd*) machine=pmax ;; + mipsev-*-netbsd*) machine=mips ;; # HF: what else? ns32k-*-netbsd*) machine=ns32000 ;; - sparc-*-netbsd*) machine=sparc ;; + powerpc-*-netbsd*) machine=macppc ;; + sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; + arm*-*-netbsd*) machine=arm ;; esac ;; @@@@ -1613,7 +1625,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 -echo "configure:1617: checking for $ac_word" >&5 +echo "configure:1629: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -1643,7 +1655,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 -echo "configure:1647: checking for $ac_word" >&5 +echo "configure:1659: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -1694,7 +1706,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 -echo "configure:1698: checking for $ac_word" >&5 +echo "configure:1710: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -1726,7 +1738,7 @@@@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1730: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1742: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@@@ -1737,12 +1749,12 @@@@ cat > conftest.$ac_ext << EOF -#line 1741 "configure" +#line 1753 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then 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 @@@@ { 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 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1784: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1777: checking whether we are using GNU C" >&5 +echo "configure:1789: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -1782,7 +1794,7 @@@@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1798: \"$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 @@@@ -1801,7 +1813,7 @@@@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1805: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1817: checking whether ${CC-cc} accepts -g" >&5 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 @@@@ #### #undef clause to src/config.h.in for autoconf to modify. echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1885: checking whether ln -s works" >&5 +echo "configure:1897: checking whether ln -s works" >&5 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 @@@@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1906: checking how to run the C preprocessor" >&5 +echo "configure:1918: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@@@ -1917,13 +1929,13 @@@@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@@@ -1934,13 +1946,13 @@@@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@@@ -1951,13 +1963,13 @@@@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@@@ -1993,7 +2005,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 -echo "configure:1997: checking for a BSD compatible install" >&5 +echo "configure:2009: checking for a BSD compatible install" >&5 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 @@@@ # 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 -echo "configure:2054: checking for $ac_word" >&5 +echo "configure:2066: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -2082,9 +2094,9 @@@@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2086: checking for AIX" >&5 +echo "configure:2098: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:2114: checking for $ac_hdr" >&5 +echo "configure:2126: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2147,12 +2159,12 @@@@ done echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2151: checking for ANSI C header files" >&5 +echo "configure:2163: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2160,7 +2172,7 @@@@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2177,7 +2189,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 @@@@ -2195,7 +2207,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 @@@@ -2216,7 +2228,7 @@@@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@@@ -2227,7 +2239,7 @@@@ exit (0); } EOF -if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@@@ -2251,12 +2263,12 @@@@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2255: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2267: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2265,7 +2277,7 @@@@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@@@ -2286,12 +2298,12 @@@@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2290: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:2302: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2303,7 +2315,7 @@@@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@@@ -2325,12 +2337,12 @@@@ echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 -echo "configure:2329: checking for struct utimbuf" >&5 +echo "configure:2341: checking for struct utimbuf" >&5 if eval "test \"`echo '$''{'emacs_cv_struct_utimbuf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@@@ -2349,7 +2361,7 @@@@ static struct utimbuf x; x.actime = x.modtime; ; return 0; } EOF -if { (eval echo configure:2353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* emacs_cv_struct_utimbuf=yes else @@@@ -2370,12 +2382,12 @@@@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2374: checking return type of signal handlers" >&5 +echo "configure:2386: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2392,7 +2404,7 @@@@ int i; ; return 0; } EOF -if { (eval echo configure:2396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@@@ -2412,12 +2424,12 @@@@ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:2416: checking for struct timeval" >&5 +echo "configure:2428: checking for struct timeval" >&5 if eval "test \"`echo '$''{'emacs_cv_struct_timeval'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@@@ -2433,7 +2445,7 @@@@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:2437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* emacs_cv_struct_timeval=yes else @@@@ -2455,12 +2467,12 @@@@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2459: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2471: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2468,7 +2480,7 @@@@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@@@ -2489,12 +2501,12 @@@@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:2493: checking for tm_zone in struct tm" >&5 +echo "configure:2505: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@@@ -2502,7 +2514,7 @@@@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:2506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@@@ -2522,12 +2534,12 @@@@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:2526: checking for tzname" >&5 +echo "configure:2538: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@@@ -2537,7 +2549,7 @@@@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@@@ -2560,12 +2572,12 @@@@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2564: checking for working const" >&5 +echo "configure:2576: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@@@ -2636,7 +2648,7 @@@@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2640: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2652: checking whether ${MAKE-make} sets \${MAKE}" >&5 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 @@@@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:2668: checking for long file names" >&5 +echo "configure:2680: checking for long file names" >&5 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 @@@@ # 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 -echo "configure:2719: checking for X" >&5 +echo "configure:2731: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@@@ -2777,12 +2789,12 @@@@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2851,7 +2863,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@@@ -3033,7 +3045,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 -echo "configure:3037: checking the machine- and system-dependent files to find out +echo "configure:3049: 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" >&5 @@@@ -3163,12 +3175,12 @@@@ GNU_MALLOC=yes doug_lea_malloc=yes echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6 -echo "configure:3167: checking for malloc_get_state" >&5 +echo "configure:3179: checking for malloc_get_state" >&5 if eval "test \"`echo '$''{'ac_cv_func_malloc_get_state'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_malloc_get_state=yes" else @@@@ -3212,12 +3224,12 @@@@ fi echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:3216: checking for malloc_set_state" >&5 +echo "configure:3228: checking for malloc_set_state" >&5 if eval "test \"`echo '$''{'ac_cv_func_malloc_set_state'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_malloc_set_state=yes" else @@@@ -3261,12 +3273,12 @@@@ a7 64 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:3265: checking whether __after_morecore_hook exists" >&5 +echo "configure:3277: checking whether __after_morecore_hook exists" >&5 if eval "test \"`echo '$''{'emacs_cv_var___after_morecore_hook'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* emacs_cv_var___after_morecore_hook=yes else @@@@ -3323,7 +3335,7 @@@@ LIBS="$libsrc_libs $LIBS" echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:3327: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3339: checking for dnet_ntoa in -ldnet" >&5 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 @@@@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -3371,7 +3383,7 @@@@ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:3375: checking for main in -lXbsd" >&5 +echo "configure:3387: checking for main in -lXbsd" >&5 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 @@@@ ac_save_LIBS="$LIBS" LIBS="-lXbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -3408,7 +3420,7 @@@@ echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:3412: checking for cma_open in -lpthreads" >&5 +echo "configure:3424: checking for cma_open in -lpthreads" >&5 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 @@@@ ac_save_LIBS="$LIBS" LIBS="-lpthreads $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -3456,7 +3468,7 @@@@ echo $ac_n "checking for XFree86 in /usr/X386""... $ac_c" 1>&6 -echo "configure:3460: checking for XFree86 in /usr/X386" >&5 +echo "configure:3472: checking for XFree86 in /usr/X386" >&5 if test -d /usr/X386/include; then HAVE_XFREE386=yes : ${C_SWITCH_X_SITE="-I/usr/X386/include"} @@@@ -3485,9 +3497,9 @@@@ if test "${opsys}" = "gnu-linux"; then echo $ac_n "checking whether X on GNU/Linux needs -b to link""... $ac_c" 1>&6 -echo "configure:3489: checking whether X on GNU/Linux needs -b to link" >&5 +echo "configure:3501: checking whether X on GNU/Linux needs -b to link" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xlinux_first_failure=no else @@@@ -3514,7 +3526,7 @@@@ CPPFLAGS="$CPPFLAGS -b i486-linuxaout" LIBS="$LIBS -b i486-linuxaout" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xlinux_second_failure=no else @@@@ -3551,12 +3563,12 @@@@ XScreenNumberOfScreen XSetWMProtocols do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3555: checking for $ac_func" >&5 +echo "configure:3567: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@@@ -3607,12 +3619,12 @@@@ if test "${window_system}" = "x11"; then echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 -echo "configure:3611: checking X11 version 6" >&5 +echo "configure:3623: checking X11 version 6" >&5 if eval "test \"`echo '$''{'emacs_cv_x11_version_6'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@@@ -3622,7 +3634,7 @@@@ ; return 0; } EOF -if { (eval echo configure:3626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* emacs_cv_x11_version_6=yes else @@@@ -3647,12 +3659,12 @@@@ if test "${window_system}" = "x11"; then echo $ac_n "checking X11 version 5""... $ac_c" 1>&6 -echo "configure:3651: checking X11 version 5" >&5 +echo "configure:3663: checking X11 version 5" >&5 if eval "test \"`echo '$''{'emacs_cv_x11_version_5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@@@ -3662,7 +3674,7 @@@@ ; return 0; } EOF -if { (eval echo configure:3666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* emacs_cv_x11_version_5=yes else @@@@ -3690,12 +3702,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 -echo "configure:3694: checking X11 version 5 with Xaw" >&5 +echo "configure:3706: checking X11 version 5 with Xaw" >&5 if eval "test \"`echo '$''{'emacs_cv_x11_version_5_with_xaw'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@@@ -3704,7 +3716,7 @@@@ ; return 0; } EOF -if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* emacs_cv_x11_version_5_with_xaw=yes else @@@@ -3732,12 +3744,12 @@@@ if test "${USE_X_TOOLKIT}" != "none"; then echo $ac_n "checking X11 toolkit version""... $ac_c" 1>&6 -echo "configure:3736: checking X11 toolkit version" >&5 +echo "configure:3748: checking X11 toolkit version" >&5 if eval "test \"`echo '$''{'emacs_cv_x11_toolkit_version_6'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@@@ -3747,7 +3759,7 @@@@ ; return 0; } EOF -if { (eval echo configure:3751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* emacs_cv_x11_toolkit_version_6=yes else @@@@ -3777,7 +3789,7 @@@@ LIBS="-lXt $LIBS" fi echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6 -echo "configure:3781: checking for XmuConvertStandardSelection in -lXmu" >&5 +echo "configure:3793: checking for XmuConvertStandardSelection in -lXmu" >&5 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 @@@@ ac_save_LIBS="$LIBS" LIBS="-lXmu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -3823,17 +3835,64 @@@@ echo "$ac_t""no" 1>&6 fi + if test x$HAVE_X11XTR6 = xyes; then + LIBS="$LIBS -lXpm" + echo $ac_n "checking for XawPixmapsInitialize in -lXaw""... $ac_c" 1>&6 +echo "configure:3842: checking for XawPixmapsInitialize in -lXaw" >&5 +ac_lib_var=`echo Xaw'_'XawPixmapsInitialize | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lXaw $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBXPM="-lXpm" +else + echo "$ac_t""no" 1>&6 + LIBXPM="" +fi a15 2 + else + LIBXPM="" d17 3 a19 568 + LIBS="$OLDLIBS" fi if test "${USE_X_TOOLKIT}" = "MOTIF"; then echo $ac_n "checking for Motif version 2.1""... $ac_c" 1>&6 -echo "configure:3832: checking for Motif version 2.1" >&5 +echo "configure:3891: checking for Motif version 2.1" >&5 if eval "test \"`echo '$''{'emacs_cv_motif_version_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@@@ -3844,7 +3903,7 @@@@ #endif ; return 0; } EOF -if { (eval echo configure:3848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* emacs_cv_motif_version_2_1=yes else @@@@ -3864,7 +3923,7 @@@@ EOF echo $ac_n "checking for XpCreateContext in -lXp""... $ac_c" 1>&6 -echo "configure:3868: checking for XpCreateContext in -lXp" >&5 +echo "configure:3927: checking for XpCreateContext in -lXp" >&5 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 @@@@ ac_save_LIBS="$LIBS" LIBS="-lXp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -3915,12 +3974,12 @@@@ # 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 -echo "configure:3919: checking whether netdb declares h_errno" >&5 +echo "configure:3978: checking whether netdb declares h_errno" >&5 if eval "test \"`echo '$''{'emacs_cv_netdb_declares_h_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@@@ -3927,7 +3986,7 @@@@ return h_errno; ; return 0; } EOF -if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* emacs_cv_netdb_declares_h_errno=yes else @@@@ -3950,12 +4009,12 @@@@ # 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 -echo "configure:3954: checking for working alloca.h" >&5 +echo "configure:4013: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@@@ -3962,7 +4021,7 @@@@ char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:3966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@@@ -3983,12 +4042,12 @@@@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3987: checking for alloca" >&5 +echo "configure:4046: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@@@ -4048,12 +4107,12 @@@@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4052: checking whether alloca needs Cray hooks" >&5 +echo "configure:4111: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:4082: checking for $ac_func" >&5 +echo "configure:4141: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@@@ -4133,7 +4192,7 @@@@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4137: checking stack direction for C alloca" >&5 +echo "configure:4196: checking stack direction for C alloca" >&5 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 @@@@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@@@ -4185,7 +4244,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 -echo "configure:4189: checking for sqrt in -lm" >&5 +echo "configure:4248: checking for sqrt in -lm" >&5 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 @@@@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -4234,7 +4293,7 @@@@ # Check for mail-locking functions in a "mail" library echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6 -echo "configure:4238: checking for maillock in -lmail" >&5 +echo "configure:4297: checking for maillock in -lmail" >&5 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 @@@@ ac_save_LIBS="$LIBS" LIBS="-lmail $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -4275,12 +4334,12 @@@@ for ac_func in touchlock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4279: checking for $ac_func" >&5 +echo "configure:4338: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@@@ -4331,17 +4390,17 @@@@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4335: checking for $ac_hdr" >&5 +echo "configure:4394: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -4379,12 +4438,12 @@@@ utimes setrlimit setpgid getcwd shutdown strftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4383: checking for $ac_func" >&5 +echo "configure:4442: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@@@ -4436,12 +4495,12 @@@@ for ac_func in grantpt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4440: checking for $ac_func" >&5 +echo "configure:4499: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@@@ -4493,12 +4552,12 @@@@ for ac_func in getpt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4497: checking for $ac_func" >&5 +echo "configure:4556: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@@@ -4551,7 +4610,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 -echo "configure:4555: checking for tparm in -lncurses" >&5 +echo "configure:4614: checking for tparm in -lncurses" >&5 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 @@@@ ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -4601,7 +4660,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 -echo "configure:4605: checking for dgettext in -lintl" >&5 +echo "configure:4664: checking for dgettext in -lintl" >&5 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 @@@@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -4649,7 +4708,7 @@@@ echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:4653: checking whether localtime caches TZ" >&5 +echo "configure:4712: checking whether localtime caches TZ" >&5 if eval "test \"`echo '$''{'emacs_cv_localtime_cache'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -4659,7 +4718,7 @@@@ emacs_cv_localtime_cache=yes else cat > conftest.$ac_ext < #if STDC_HEADERS @@@@ -4694,7 +4753,7 @@@@ exit (0); } EOF -if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then emacs_cv_localtime_cache=no else @@@@ -4722,12 +4781,12 @@@@ if test "x$HAVE_TIMEVAL" = xyes; then echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6 -echo "configure:4726: checking whether gettimeofday can accept two arguments" >&5 +echo "configure:4785: checking whether gettimeofday can accept two arguments" >&5 if eval "test \"`echo '$''{'emacs_cv_gettimeofday_two_arguments'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* emacs_cv_gettimeofday_two_arguments=yes else @@@@ -4772,12 +4831,12 @@@@ ok_so_far=yes echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4776: checking for socket" >&5 +echo "configure:4835: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@@@ -4823,17 +4882,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 -echo "configure:4827: checking for netinet/in.h" >&5 +echo "configure:4886: checking for netinet/in.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -4859,17 +4918,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 -echo "configure:4863: checking for arpa/inet.h" >&5 +echo "configure:4922: checking for arpa/inet.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@@@ -4906,6 +4965,64 @@@@ fi +if test "x$with_ipv6" = xyes; then + for ac_func in getaddrinfo +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:4973: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } a20 23 +if { (eval echo configure:5001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done d22 1 d27 1 a27 9 @@@@ -5211,6 +5328,7 @@@@ s%@@INSTALL_DATA@@%$INSTALL_DATA%g s%@@YACC@@%$YACC%g s%@@SET_MAKE@@%$SET_MAKE%g +s%@@LIBXPM@@%$LIBXPM%g s%@@ALLOCA@@%$ALLOCA%g s%@@version@@%$version%g s%@@configuration@@%$configuration%g @ 1.14 log @Xaw may need xpm, add support for this in configure. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.13 2001/10/06 22:04:22 hubertf Exp $ @ 1.13 log @Make this build on sgimips @ text @d1 1 a1 1 $NetBSD$ d4 3 a6 2 +++ configure @@@@ -21,6 +21,9 @@@@ d9 2 d12 12 a23 2 +ac_help="$ac_help + --without-ipv6 disable IPv6 support" d25 9 d35 3 a37 3 # Initialize some variables set by options. # The variables have the same names as the options, with @@@@ -718,9 +721,13 @@@@ d42 1 a42 1 + mipseb-*-netbsd*) machine=mips ;; # HF what else? d52 813 a864 3 @@@@ -4903,6 +4910,64 @@@@ cat >> confdefs.h <<\EOF #define HAVE_AIX_SMT_EXP 1 d866 117 d985 7 d993 540 d1537 1 a1537 1 +echo "configure:4796: checking for $ac_func" >&5 d1542 1 a1542 1 +#line 4801 "configure" d1565 1 a1565 1 +if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then d1588 5 d1594 8 a1601 2 fi @ 1.12 log @Add support for NetBSD/sparc64. @ text @d3 2 a4 2 --- configure.orig Mon Jun 12 13:05:56 2000 +++ configure Tue Sep 26 14:18:05 2000 d15 1 a15 1 @@@@ -718,9 +721,12 @@@@ d20 1 d30 1 a30 1 @@@@ -4903,6 +4909,64 @@@@ @ 1.11 log @Updated to 20.7. Tests needed. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.10 2000/03/01 05:07:41 minoura Exp $ d3 2 a4 2 --- configure.orig Tue Jun 13 05:05:56 2000 +++ configure Sun Jun 18 09:18:13 2000 d21 1 d23 1 a23 1 sparc-*-netbsd*) machine=sparc ;; @ 1.10 log @Fixed the problem that it does not fallback to IPv4 after an IPv6 connection fails. Patch supplied by Love. Thank you! In addition configure script and pkgsrc Makefile is modified to be able to disable IPv6 support, looking at USE_INET6 (Makefile) and --without-ipv6 (configure). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.9 1999/12/28 14:08:56 tron Exp $ d3 2 a4 2 --- configure.orig Fri Dec 3 16:41:15 1999 +++ configure Tue Feb 29 15:36:45 2000 d15 1 a15 1 @@@@ -715,9 +718,12 @@@@ d21 1 a21 1 + powerpc-*-netbsd*) machine=powerpc ;; d28 1 a28 1 @@@@ -4690,6 +4696,64 @@@@ @ 1.9 log @Update "emacs" package to version 20.5a based on patches supplied by Minoura Makoto in PR pkg/9014. This version fixes several bugs discovered since version 20.3 and support a precompiled user startup file (".emacs.el" and ".emacs.elc"). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 1998/09/04 02:28:53 tron Exp $ d4 12 a15 2 +++ configure Fri Dec 17 15:23:49 1999 @@@@ -715,9 +715,12 @@@@ d28 65 a92 9 @@@@ -4277,7 +4280,7 @@@@ rename closedir mkdir rmdir sysinfo \ random lrand48 bcopy bcmp logb frexp fmod rint cbrt ftime res_init setsid \ strerror fpathconf select mktime euidaccess getpagesize tzset setlocale \ -utimes setrlimit setpgid getcwd shutdown strftime +utimes setrlimit setpgid getcwd shutdown strftime getaddrinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:4284: checking for $ac_func" >&5 @ 1.8 log @Make mipsel-*-netbsd* set $machine to pmax. XXX I guess there is a cleaner way to do this. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.7 1999/06/04 03:42:35 mycroft Exp $ d3 3 a5 10 --- configure.orig Mon Jul 27 04:17:07 1998 +++ configure Thu Jun 3 22:49:02 1999 @@@@ -751,12 +751,15 @@@@ opsys=netbsd case "${canonical}" in alpha*-*-netbsd*) machine=alpha ;; + arm*-*-netbsd*) machine=arm ;; i[3456]86-*-netbsd*) machine=intel386 ;; m68k-*-netbsd*) # This is somewhat bogus. d7 1 d14 1 d16 11 @ 1.7 log @I'm not going to pretend to fully grok the ELF magick, but this makes Emacs work on the macppc port. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -751,12 +751,14 @@@@ d15 1 @ 1.6 log @Lots of bug fixes: - sync package list with reality and use "mkdir -p" - add missing RCSIds - split patches - don't install texinfo documentation - avoid conflict with "xemacs" and "vim" - remove unnecessary "${WRKSRC}" - add missing info files to "${INFO}" - don't remove "share/emacs/20.3/etc/DOC-20.3.[13-9]*" (fixes PR pkg/6097) @ text @d3 12 a14 3 --- ./configure.orig Fri Aug 28 13:38:44 1998 +++ ./configure Sun Aug 16 03:48:36 1998 @@@@ -759,6 +748,7 @@@@ d16 1 a18 1 + arm*-*-netbsd*) machine=arm ;; a19 102 ;; --- /dev/null Fri Aug 28 13:20:16 1998 +++ ./src/m/arm.h Sun Aug 16 03:48:25 1998 @@@@ -0,0 +1,97 @@@@ +/* Machine description file for Acorn RISCiX machines. + Copyright (C) 1994 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. */ + + + +/* 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. We can't + * do this on the arm with gcc, since the first 4 args are in registers. */ + +#ifdef __GNUC__ +#define NO_ARG_ARRAY +#else +#undef NO_ARG_ARRAY +#endif + +/* Define WORD_MACHINE if addresses and such have + * to be corrected before they can be used as byte counts. */ + +#undef WORD_MACHINE + +/* Define how to take a char and sign-extend into an int. + On machines where char is signed, this is a no-op. */ + +/* ARM note - The RISCiX Norcroft C Compiler has ALL + non-32-bit types as unsigned */ + +#define SIGN_EXTEND_CHAR(c) (((int)(c) << 24) >> 24) + +/* 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 */ + +/* ARM note - this is done by the Norcroft compiler - symbol is `__arm' */ + +/* Use type int rather than a union, to represent Lisp_Object */ +/* This is desirable for most machines. */ + +#define NO_UNION_TYPE + +/* 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 + +/* 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. */ + +#undef CANNOT_DUMP + +#ifdef __GNUC__ + +/* Use builtin alloca. Also be sure that no other ones are tried out. */ +#define alloca __builtin_alloca +#define HAVE_ALLOCA + +#else +#define C_ALLOCA +#undef HAVE_ALLOCA +#endif /* __GNUC__ */ + +/* 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 + + +/* For the portable alloca */ +#define STACK_DIRECTION -1 @ 1.5 log @Clean things up a bit. Support arm32. Fix install failures. @ text @d1 2 @ 1.4 log @Update "emacs" package to version 20.3. @ text @d1 9 a9 12 $NetBSD$ --- lib-src/Makefile.in.orig Sun Aug 2 02:22:55 1998 +++ lib-src/Makefile.in Mon Aug 31 20:50:30 1998 @@@@ -278,7 +278,7 @@@@ if [ `(cd ${archlibdir} && /bin/pwd)` \ != `(cd ${srcdir} && /bin/pwd)` ]; then \ for file in ${SCRIPTS}; do \ - $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file; \ + $(INSTALL_SCRIPT) ${srcdir}/$$file ${archlibdir}/$$file; \ done ; \ fi d11 100 a110 19 @@@@ -286,12 +286,14 @@@@ @@echo @@echo "Installing utilities for users to run." for file in ${INSTALLABLES} ; do \ - $(INSTALL_PROGRAM) $(INSTALL_STRIP) $${file} ${bindir}/$${file} ; \ - chmod a+rx ${bindir}/$${file}; \ + if [ $${file} = emacsclient ]; then \ + $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \ + else \ + $(INSTALL_PROGRAM) $${file} ${bindir}/emacs-$${file} ; \ + fi ; \ done for file in ${INSTALLABLE_SCRIPTS} ; do \ - $(INSTALL_PROGRAM) ${srcdir}/$${file} ${bindir}/$${file} ; \ - chmod a+rx ${bindir}/$${file}; \ + $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/emacs-$${file} ; \ done uninstall: @ 1.3 log @Add NetBSD RCS Ids. @ text @d3 3 a5 3 --- lib-src/Makefile.in.orig Mon Jul 28 07:50:45 1997 +++ lib-src/Makefile.in Sat Feb 21 23:22:00 1998 @@@@ -276,7 +276,7 @@@@ d14 1 a14 1 @@@@ -284,12 +284,14 @@@@ d18 1 a18 1 - $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \ d20 5 a24 5 + if [ $${file} = emacsclient ]; then \ + $(INSTALL_PROGRAM) $${file} ${bindir}/$${file} ; \ + else \ + $(INSTALL_PROGRAM) $${file} ${bindir}/emacs-$${file} ; \ + fi ; \ @ 1.2 log @Thou shalt not clobber other packages files. @ text @d1 2 @ 1.1 log @Better handling of binary stripping and DOC file handling, based on suggestions from PR 4979 by Johnny Chi-Lung Lam . @ text @d2 1 a2 1 +++ lib-src/Makefile.in Thu Feb 12 12:00:56 1998 d12 11 a22 2 @@@@ -288,7 +288,7 @@@@ chmod a+rx ${bindir}/$${file}; \ d26 2 a27 2 + $(INSTALL_SCRIPT) ${srcdir}/$${file} ${bindir}/$${file} ; \ chmod a+rx ${bindir}/$${file}; \ d30 1 @