--- emacs21-21.4a+1.orig/debian/bin/info/install-info +++ emacs21-21.4a+1/debian/bin/info/install-info @@ -0,0 +1,5 @@ +#!/bin/sh + +# Dummy script to fool emacs install into thinking it did something useful. + +exit 0 --- emacs21-21.4a+1.orig/debian/control +++ emacs21-21.4a+1/debian/control @@ -0,0 +1,92 @@ +Source: emacs21 +Section: editors +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Rob Browning +Uploaders: Jerome Marant +Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt, debhelper (>= 4), libxaw7-dev, sharutils +Standards-Version: 3.7.2 + +Package: emacs +Section: editors +Priority: optional +Architecture: all +Depends: emacs21 | emacs21-nox +Provides: emacsen, editor, info-browser, mail-reader, news-reader +Description: The GNU Emacs editor (metapackage) + GNU Emacs is the extensible self-documenting text editor. + This is a metapackage which will always depend on the latest Emacs + release. + +Package: emacs-nox +Architecture: all +Depends: emacs21-nox +Description: The GNU Emacs editor (without X support) + This package will always depend on the current emacs package compiled + without support for X. + +Package: emacs-el +Architecture: all +Depends: emacs21-el +Description: GNU Emacs LISP (.el) files + This package will always depend on the current elisp sources. + +Package: emacs21 +Section: editors +Priority: optional +Architecture: any +Depends: emacs21-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: emacsen, editor, info-browser, mail-reader, news-reader +Suggests: emacs21-common-non-dfsg +Conflicts: emacs21-nox, w3-el +Replaces: emacs21-nox +Description: The GNU Emacs editor + GNU Emacs is the extensible self-documenting text editor. + +Package: emacs21-nox +Section: editors +Priority: optional +Architecture: any +Depends: emacs21-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: emacs21, editor, emacsen, info-browser, mail-reader, news-reader +Suggests: emacs21-common-non-dfsg +Conflicts: emacs21, w3-el +Replaces: emacs21 +Description: The GNU Emacs editor (without X support) + GNU Emacs is the extensible self-documenting text editor. + This package contains a version of Emacs compiled without support for X. + +Package: emacs21-bin-common +Section: editors +Priority: optional +Architecture: any +Depends: emacs21-common (= ${Source-Version}), ${shlibs:Depends} +Replaces: emacs21 (<< 21.2-4), emacs21-common (<< 21.3+1-4) +Description: The GNU Emacs editor's shared, architecture dependent files + GNU Emacs is the extensible self-documenting text editor. + This package contains the architecture dependent infrastructure + that's shared by emacs21 and emacs21-nox. + +Package: emacs21-common +Section: editors +Priority: optional +Architecture: all +Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends} +Suggests: emacs21-el, emacs21-common-non-dfsg +Conflicts: emacs21-el (<< ${Source-Version}), w3-el +Replaces: emacs21 (<< 21.2-4) +Description: The GNU Emacs editor's shared, architecture independent infrastructure + GNU Emacs is the extensible self-documenting text editor. + This package contains the architecture independent infrastructure + that's shared by emacs21 and emacs21-nox. + +Package: emacs21-el +Section: editors +Priority: optional +Architecture: all +Depends: emacs21-common (= ${Source-Version}) +Replaces: emacs21 (<< 21.2-4) +Description: GNU Emacs LISP (.el) files + GNU Emacs is the extensible self-documenting text editor. + This package contains the elisp sources for the convenience of users, + saving space in the main package for small systems. --- emacs21-21.4a+1.orig/debian/emacsVER-common.prerm +++ emacs21-21.4a+1/debian/emacsVER-common.prerm @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ +INFOFILES="@INFOFILES@" + +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ] +then + rm -f /usr/doc/@PKG_NAME@ +fi + +for file in ${INFOFILES} +do + install-info --quiet --remove-exactly emacs-${MAJOR}/${file} || true +done + +# emacsen-common/emacs-remove used to be here. + +(rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null && \ + rmdir /usr/local/share/emacs/${FULL} 2>/dev/null) || true + +#DEBHELPER# --- emacs21-21.4a+1.orig/debian/emacsVER-bin-common.postinst +++ emacs21-21.4a+1/debian/emacsVER-bin-common.postinst @@ -0,0 +1,31 @@ +#!/bin/sh -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ +INFOFILES="@INFOFILES@" +ALTERNATIVES="@ALTERNATIVES@" + +PRIORITY=24 + +# update-alternatives on things that collide with xemacs, other editors +for i in ctags etags emacsclient +do + update-alternatives \ + --install /usr/bin/$i $i /usr/bin/$i.emacs${MAJOR} ${PRIORITY} \ + --slave /usr/share/man/man1/$i.1.gz $i.1.gz \ + /usr/share/man/man1/$i.1emacs${MAJOR}.gz +done + +for i in ${ALTERNATIVES} +do + test $i = ctags && continue + test $i = etags && continue + test $i = emacs && continue + test $i = emacsclient && continue + update-alternatives --install /usr/bin/$i $i /usr/bin/$i.emacs${MAJOR} \ + ${PRIORITY} +done + +#DEBHELPER# + --- emacs21-21.4a+1.orig/debian/rules +++ emacs21-21.4a+1/debian/rules @@ -0,0 +1,910 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# This file is licensed under the terms of the Gnu Public License. +# With the one additional provision that Ian Jackson's name may not be +# removed from the file. + +# Copyright 1994,1995 Ian Jackson +# Copyright 1998-2005 Rob Browning +# Copyright 2004-2005 J閞鬽e Marant + +# Originally copied from the GNU Hello Debian rules file (1.3). +# Modified for emacs by Mark Eichin . +# Debhelper support added via one of Joey Hess' example files. +# See the debian/changelog for further historical information. + +# TODO: +# +# Figure out what happened to fns-*.elc +# Should we set defaults for things like xsupport at the top here? +# Deal with build_binary_pkg and continue integration. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +SHELL := /bin/bash + +quilt := QUILT_PATCHES=debian/patches quilt + +deb_trash := + +# For now we assume that emacs' versioning scheme is always +# MAJOR.MINORtinyrev where MAJOR and MINOR are integers and tinyrev is +# an optional lowercase letter (or letters). We also assume that +# upstream uses a numbering scheme that sorts in a "Debian friendly" +# way. So far that's always been true. If it becomes false, some of +# the values below will have to be set manually. + +# At the moment, we try to make it so that a "debian/rules clean" will +# get you back to the same state you were in before "debian/rules +# build". With the original upstream source that's somewhat tricky +# because they ship the .elc files, but we need to re-build them when +# we patch the corresponding .el files. This is further complicated +# by the fact that any of these .el files may have macros, and if +# those are changed, then any other .el files that use those macros +# must also be recompiled. Over the years, we've tried various ways +# to handle this problem, originally by trying to keep track of which +# files need to be recompiled and only recompiling those, then later +# by just re-building all the .elc files with "make bootstrap". In +# either case, if you don't want to have diff bloat, you have to do +# something to keep track of the original .elc files so you can +# restore them during make clean. + +# All of this was a lot of work, and was using quite a bit of +# unnecessary storage both in the .orig.tar.gz and during the package +# build. So in order to avoid this, and to dramatically simplify +# things, we now just remove the .elc files from the upstream +# distribution whenever we create the debian .orig.tar.gz file for a +# given upstream release. Since were always clobbering all of the +# .elc files during the package build anyway, this shouldn't be any +# great loss, and it also means that "debian/rules clean" now needs to +# be little more than a "make distclean" followed by a purge of all +# the remaining .elc files. + +# NOTE -- emacs doesn't respect .elc files in VPATH build. They're +# modified in srcdir, not builddir. We don't worry about this because +# it shouldn't affect our builds ATM, but if we ever have more than +# one emacs configuration which could produce differing .elc files, +# we'll need to be careful. We'll probably have to build completely +# separate packages from completely separate source trees. + +# In order to keep the autofiles up to date, but avoid any alterations +# outside of ./debian, we keep the changes made by running a new +# autoconf, etc. in patches/autofiles.diff. This patch can be +# automatically regenerated by running "debian/rules autofiles-sync", +# and this patch should always be maintained as the last one in the +# patch series. + +# Note that we use quilt to handle the debian patches. One of the +# biggest differences between quilt and say dpatch is that you have to +# explicitly "quilt add" a file to a patch before you edit it. See +# "man quilt" for details.. + +# If the source tree ever ends up in an untenable "can't go forward, +# can't go back" state with respect to patching, you can always start +# over by just moving the current debian directory to a newly unpacked +# orig.tar.gz tree. Note that f you were in the process of editing a +# patch, you will lose those edits, but shouldn't lose anything else. +# This process just reverts all of the upstream files and abandons the +# volatile "what's been done to the current tree" state that quilt +# maintains in ./.pc. All of the actual patches are stored in +# debian/patches and should be unharmed. + +###################################################################### +# Important top-level targets: +# +# check-vars - displays how the version number has been parsed. +# buildpackage - build binary packages via dpkg-buildpackage w/suitable args +# prepare-release - prepare and check debs for upload. +# autofiles-sync - force a new autofiles.diff to be generated. +# +###################################################################### + +# The name of the Debian source package +src_name := $(shell dpkg-parsechangelog | egrep '^Source:') +src_name := $(shell echo $(src_name) | perl -pe 's/Source:\s+//o') + +# The version from the changelog (i.e. 20.5-1) +debian_ver := $(shell dpkg-parsechangelog | egrep '^Version:') +debian_ver := $(shell echo $(debian_ver) | perl -pe 's/Version:\s+//o') +# The Debian revision (i.e. the 1 from 20.5-1) +# Always everything after the last '-' +debian_rev := $(shell echo $(debian_ver) | perl -pe 's/.*-//o') + +# The official upstream version defined by emacs-version in lisp/version.el. +# The extraction method matches the code in the upstream configure.in. +nominal_ver := $(shell grep 'defconst[ ]*emacs-version' lisp/version.el \ + | sed -e 's/^[^"]*"\([^"]*\)".*$$/\1/') + +# This must be the version that's actually used at runtime for things +# like load-path. It may not be the same as the upstream version +# (i.e. when you have upstream 20.5a, the functional version may still +# be 20.5), so sometimes we may have to do this by hand. +runtime_ver := $(shell echo $(nominal_ver) | perl -pe 's/[a-z]+$$//o') + +major_ver := $(shell echo $(runtime_ver) | perl -pe 's/\..*$$//o') +minor_ver := $(shell echo $(runtime_ver) | perl -pe 's/^[^.]*\.//o') + +# version for the debian source, i.e. if the upstream is 21.3, this +# might be 21.3, or it might be 21.3+1 if we've had to have more than +# one re-release of the upstream source. Rare, but it happens... +# Always everything before the last '-' +debsrc_ver := $(shell echo $(debian_ver) | perl -pe 's/-[^-]+$$//o') + +# upstream version - the actual upstream version, i.e. 21.4a, minus any +foo +upstream_ver := $(shell echo $(debsrc_ver) | perl -pe 's/\+[^+]+$$//o') + +deb_orig_tgz := $(src_name)_$(debsrc_ver).orig.tar.gz +# name of the orig_tgz unpack directory +deb_orig_tgz_dir := emacs-$(runtime_ver) + +###################################################################### +# Customizable variables + +# May differ from emacs version, i.e. 21.4 instead of 21.4a. +upstream_leim_ver := 21.4 + +# The flavor (i.e. emacs21) currently matches the source package name. +flavor := $(src_name) + +bin_priority := 24 + +###################################################################### + +# Should these be exported like this (as autotools-dev recommends for +# the two vars below) or not? +export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +export DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) + +# As recommended by /usr/share/doc/autotools-dev/README.Debian.gz. +# Handle cross-compiling and don't make ./configure guess. +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) + +LDFLAGS := -g +CFLAGS := -DDEBIAN -g -fno-stack-protector + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else # not noopt + ifeq (m68k,$(DEB_HOST_ARCH)) + # fix problem with newer versions of gcc on m68k + # -O2 causes a build failure (broken byte compiler) + CFLAGS += -O1 + else # neq (m68k,$(DEB_HOST_ARCH)) + CFLAGS += -O2 + endif # neq (m68k,$(DEB_HOST_ARCH)) +endif # not noopt + +target := $(DEB_HOST_GNU_TYPE) +movemail_bin := usr/lib/emacs/$(runtime_ver)/$(target)/movemail + +# These files may be modified in the *source* tree during the build. +# Wonder if we could patch emacs to copy/use these files to/from the +# build tree... +protected_files := config.sub config.guess lisp/loaddefs.el + +# Info files that are going to show up in the main dir. +main_dir_info_files := \ + dired-x \ + efaq + +# These files must always exist, i.e. can't ever be cleaned. +persistent_autogen_files := debian/control debian/copyright + +nonpersistent_autogen_files := debian/$(flavor)-common.README.Debian + +debpkgfiles := $(persistent_autogen_files) $(nonpersistent_autogen_files) + +# Build directories +pkgdir_common := $(CURDIR)/debian/$(flavor)-common +pkgdir_bin_common := $(CURDIR)/debian/$(flavor)-bin-common +pkgdir_x := $(CURDIR)/debian/$(flavor) +pkgdir_nox := $(CURDIR)/debian/$(flavor)-nox +pkgdir_el := $(CURDIR)/debian/$(flavor)-el + +local_lpath := /etc/$(flavor):/etc/emacs +local_lpath := $(local_lpath):/usr/local/share/emacs/$(runtime_ver)/site-lisp +local_lpath := $(local_lpath):/usr/local/share/emacs/site-lisp +local_lpath := $(local_lpath):/usr/share/emacs/$(runtime_ver)/site-lisp +local_lpath := $(local_lpath):/usr/share/emacs/site-lisp + +# This shouldn't be needed as of 20.3 +local_lpath := $(local_lpath):/usr/share/emacs/$(runtime_ver)/leim + +define checkroot + test root = "`whoami`" +endef + +define checkdir + @if ! test -s debian/patches/autofiles.diff; \ + then \ + echo; \ + echo "The Debian autofiles patch is not available."; \ + echo "Please run this command:"; \ + echo " debian/rules autofiles-sync"; \ + echo; \ + false; \ + fi + dpkg-parsechangelog > /dev/null + dh_testdir debian/emacsVER.postinst + @if ! test -f src/emacs.c; \ + then \ + echo; \ + echo -n "The upstream source does not appear to be available."; \ + echo " Please put the contents"; \ + echo -n "of $(deb_orig_tgz) into the"; \ + echo " current directory."; \ + echo; \ + false; \ + fi +endef + +define build_cmd + $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \ + prefix=/usr \ + sharedstatedir=/var/lib \ + libexecdir=/usr/lib \ + infodir=/usr/share/info \ + manext=.1$(flavor) \ + locallisppath=$(local_lpath) +endef + +emacs_inst = (cd debian/$(1) && \ + PATH=$(CURDIR)/debian/bin/info:$(PATH) $(MAKE) install \ + debepkgdir=$(2) \ + prefix=$(2)/usr \ + sharedstatedir=$(2)/var/lib \ + libexecdir=$(2)/usr/lib \ + infodir=$(2)/usr/share/info/emacs-$(major_ver) \ + mandir=$(2)/usr/share/man \ + manext=.1$(flavor) \ + locallisppath=$(local_lpath)) + +define patch + cd etc && uudecode $(CURDIR)/debian/replacement/yow.lines.uu + $(quilt) push -a +endef + +define unpatch + test -z "$$($(quilt) applied)" || $(quilt) pop -a + rm -f etc/yow.lines + rm -f debian/stamp/patch + rm -rf .pc +endef + +define cleanup_all + # distclean goes first so we clean using patched code + rm -f debian/stamp/setup + rm -f debian/stamp/{configure,configure-x,configure-nox} + rm -f debian/stamp/build + -$(MAKE) distclean + cd info && rm -f $$(ls | grep -v COPYING) + dh_clean + $(unpatch) + # now clean up bits in the source tree that the above didn't handle + find -name "*.elc" | xargs --no-run-if-empty rm + if [ -e debian/protected-files.tgz ]; then \ + tar xzpf debian/protected-files.tgz; \ + fi + rm -f debian/protected-files.tgz + # now clean up everything else (mostly ./debian related stuff) + find -name '*~' | xargs --no-run-if-empty rm -f + rm -f debian/substvars + rm -f $(nonpersistent_autogen_files) + rm -rf \ + debian/build-x \ + debian/build-nox \ + debian/tmp-alt-list \ + debian/files* + rm -rf debian/*.tmp + rm -rf $(deb_trash) + rm -rf .pc + test ! -e debian/stamp || rmdir debian/stamp +endef + +define update_debian_autofiles_quilt + $(cleanup_all) + # Make sure autofiles.diff exists, otherwise patching will fail. + if ! test -e debian/patches/autofiles.diff; \ + then \ + touch debian/patches/autofiles.diff; \ + fi; + $(patch) + test "$$($(quilt) top)" = autofiles.diff + $(quilt) pop + mkdir -p debian/tmp-autofiles/old + tar cpSf - --exclude ./debian --exclude ./.pc . \ + | tar -C debian/tmp-autofiles/old -xpSf - + cp -a debian/tmp-autofiles/old debian/tmp-autofiles/new + # rm aclocal.m4 so it doesn't confuse newer autoconfs, but touch it + # so ./Makefile won't be upset if it's not recreated (b/c not needed). + cd debian/tmp-autofiles/new && rm -f aclocal.m4 + cd debian/tmp-autofiles/new && touch aclocal.m4 + cd debian/tmp-autofiles/new && aclocal + cd debian/tmp-autofiles/new && autoconf + cd debian/tmp-autofiles/new && rm -rf autom4te.cache + cd debian/tmp-autofiles && diff -ruN old new > new.diff; \ + test $$? -eq 1 + $(quilt) import -f -P autofiles.diff debian/tmp-autofiles/new.diff + $(quilt) header -r autofiles.diff < debian/autofiles-diff-header + $(patch) + $(cleanup_all) +endef +deb_trash += debian/tmp-autofiles + +# If we ever need it, we can create a copy that doesn't assume ./debian/ +define deb_sub + perl -p \ + -e "s|\@PKG_NAME\@|$(pkg_name)|go;" \ + -e "s|\@MAJOR_VERSION\@|$(major_ver)|go;" \ + -e "s|\@MINOR_VERSION\@|$(minor_ver)|go;" \ + -e "s|\@FULL_VERSION\@|$(runtime_ver)|go;" \ + -e "s|\@PACKAGE_VERSION\@|$(debian_ver)|go;" \ + -e "s|\@DEBIAN_REV\@|$(deb_rev)|go;" \ + -e "s|\@NOMINAL_VERSION\@|$(nominal_ver)|go;" \ + -e "s|\@UPSTREAM_VERSION\@|$(upstream_ver)|go;" \ + -e "s|\@UPSTREAM_LEIM_VERSION\@|$(upstream_leim_ver)|go;" \ + -e "s|\@DEBSRC_VERSION\@|$(debsrc_ver)|go;" \ + -e "s|\@DEB_FLAVOR\@|$(flavor)|go;" \ + -e "s|\@INFOFILES\@|$(main_dir_info_files)|go;" \ + -e "s|\@X_SUPPORT\@|$(xsupport)|go;" \ + -e "s|\@BIN_PRIORITY\@|$(bin_priority)|go;" \ + -e "s|\@MOVEMAIL_BIN\@|$(movemail_bin)|go;" \ + < debian/$(1) > debian/$(2) +endef + +check-vars: + @echo "upstream_ver: $(upstream_ver)" + @echo "debian_ver: $(debian_ver)" + @echo "debsrc_ver: $(debsrc_ver)" + @echo "debian_rev: $(debian_rev)" + @echo "nominal_ver: $(nominal_ver)" + @echo "runtime_ver: $(runtime_ver)" + @echo "major_ver: $(major_ver)" + @echo "minor_ver: $(minor_ver)" +.PHONY: check-vars + +.PHONY: check-diff +check-diff: clean + $(checkdir) + test -r ../$(deb_orig_tgz) + rm -rf debian/tmp-diff && mkdir debian/tmp-diff + cd debian/tmp-diff && tar xzpSf ../../../$(deb_orig_tgz) + cd debian/tmp-diff && mv $(deb_orig_tgz_dir) orig + + mkdir debian/tmp-diff/new + tar cpf - --exclude './debian' --exclude './.pc' . \ + | (cd debian/tmp-diff/new && tar xpf -) + + @echo + @echo "########################################" + @echo "### Diffs outside ./debian" + @cd debian/tmp-diff && diff -ruN orig new + @echo "########################################" + @echo "### Empty file list differences" + @diff -u \ + <(cd debian/tmp-diff/orig && find -size 0) \ + <(cd debian/tmp-diff/new && find -size 0) \ + > debian/tmp-diff/empty-files.diff || test $$? -eq 1 + @cat debian/tmp-diff/empty-files.diff + @test ! -s debian/tmp-diff/empty-files.diff || false + @echo "########################################" + @rm -rf debian/tmp-diff + +deb_trash += debian/tmp-diff + + +buildpackage: + $(checkdir) + dpkg-buildpackage -D -us -uc -rfakeroot -i'\.git|\.pc' +.PHONY: buildpackage + +prepare-release: + $(checkdir) + # don't want to be root -- using fakeroot below. + # also, stacking fakeroots seems to cause trouble generating diff. + @test "`whoami`" != root || \ + (echo "please run prepare-release as a normal user (not root)"; \ + false) + # check for any uncommitted changes + @if test $$(cd debian && git-diff-files | wc -c) -ne 0; \ + then \ + read -p "Uncommitted changes. Continue? [y/n] "; \ + if test "$${REPLY}" != y; \ + then \ + false; \ + fi; \ + fi + # TODO: make sure we actually installed the binary. + # TODO: run tests (use a check target?) + @read -p "Regenerate autofiles.diff? [y/n] "; \ + if test "$${REPLY}" == y; \ + then \ + $(MAKE) -f debian/rules autofiles-sync; \ + else \ + true; \ + fi + $(MAKE) -f debian/rules clean + $(MAKE) -f debian/rules buildpackage + test -f ../$(src_name)_$(debian_ver).diff.gz + @if [ $$(zgrep '^---' \ + ../$(src_name)_$(debian_ver).diff.gz \ + | grep -v /debian/ | wc -c) -ne 0 ]; \ + then \ + echo "Diffs outside debian/ found, please fix and retry."; \ + echo "This probably means either something wasn't cleaned"; \ + echo "properly, or you need to do some work in debian/patches."; \ + false; \ + else \ + echo "Everything looks OK. Ready for release."; \ + echo "Don't forget to run debsign if needed."; \ + fi +.PHONY: prepare-release + + +# we don't sync this automatically on clean because it's expensive and +# should only be done by a maintainer with time to deal with any mess +# it might create. +autofiles-sync: + $(update_debian_autofiles_quilt) +.PHONY: autofiles-sync + +debian-sync: $(persistent_autogen_files) + +.PHONY: force-debian-sync debian-sync + +debian/$(flavor)-common.README.Debian: \ + debian/emacsVER-common.README debian/patches/*.diff debian/patches/series + cd debian && \ + csplit -s -f emacsVER-common.README. \ + emacsVER-common.README '/@@PATCH_LIST_HERE@@/' + cp debian/emacsVER-common.README.00 debian/emacsVER-common.README.tmp + for p in $$($(quilt) series); do $(quilt) header $$p; done \ + >> debian/emacsVER-common.README.tmp + tail -n +2 \ + < debian/emacsVER-common.README.01 \ + >> debian/emacsVER-common.README.tmp + mv debian/emacsVER-common.README.tmp $@ + +deb_trash += debian/emacsVER-common.README.tmp +deb_trash += debian/emacsVER-common.README.00 +deb_trash += debian/emacsVER-common.README.01 + +debian/%: debian/%.in debian/changelog + $(call deb_sub,$(notdir $<),$(notdir $@)) + +debian/protected-files.tgz: + tar czpSf debian/protected-files.tgz.tmp $(protected_files) + mv debian/protected-files.tgz.tmp $@ + +debian/stamp/patch: debian/protected-files.tgz + $(checkdir) + $(patch) + # Work around quilt's use of patch -E. + # This will have to be changed if/when upstream changes aclocal.m4 use. + touch --reference configure.in aclocal.m4 + mkdir -p $(dir $@) && touch $@ + +debian/stamp/setup: debian/stamp/patch + $(checkdir) + cp /usr/share/misc/config.sub . + cp /usr/share/misc/config.guess . + find debian/bin -type f | xargs chmod 775 + mkdir -p $(dir $@) && touch $@ + +confflags += --prefix=/usr +confflags += --sharedstatedir=/var/lib +confflags += --libexecdir=/usr/lib +confflags += --localstatedir=/var/lib +confflags += --infodir=/usr/share/info +confflags += --mandir=/usr/share/man +confflags += --with-pop=yes + +configure: debian/stamp/configure +.PHONY: configure + +debian/stamp/configure: debian/stamp/configure-x debian/stamp/configure-nox + mkdir -p debian/stamp && touch $@ + +debian/stamp/configure-x: confflags += --with-x=yes +debian/stamp/configure-x: confflags += --with-x-toolkit=athena +debian/stamp/configure-x: BUILDDIR := debian/build-x + +# For those who prefer the old-style non-toolkit scrollbars, just +# uncomment this line, and re-build. The resulting emacsXY package +# will have the old scrollbars. +# +#debian/stamp/configure-x: confflags += --without-toolkit-scroll-bars + +debian/stamp/configure-nox: confflags += --with-x=no +debian/stamp/configure-nox: BUILDDIR := debian/build-nox + +debian/stamp/configure-%: debian/stamp/setup + $(checkdir) + rm -rf $(BUILDDIR) + mkdir $(BUILDDIR) + cd $(BUILDDIR) && CFLAGS="$(CFLAGS)" ../../configure $(confflags) + # Because paths-force is called in configure, but configure + # doesn't support --locallisppath (do we still need this?) + (cd $(BUILDDIR) && $(build_cmd) epaths-force) + mkdir -p debian/stamp && touch $@ + +build: debian/stamp/build +.PHONY: build + +debian/stamp/build: debian/stamp/configure + $(checkdir) + cd debian/build-x && $(build_cmd) + cd debian/build-nox && $(build_cmd) +# # rebuild the info pages (in case we've changed the .texi files) +# cd debian/build-nox/info && \ +# rm -f `ls | grep -v COPYING | grep -v dir | grep -v CVS` +# cd debian/build-nox/man && make + mkdir -p debian/stamp && touch $@ + +define debinst_indep + dh_testdir -p$(1) + dh_testroot -p$(1) + dh_installchangelogs -p$(1) + dh_installdocs -p$(1) + dh_link -p$(1) + dh_strip -p$(1) + dh_compress -p$(1) + dh_fixperms -p$(1) + dh_installdeb -p$(1) + dh_shlibdeps -p$(1) + dh_gencontrol -p$(1) + dh_md5sums -p$(1) + dh_builddeb -p$(1) +endef + +define debinst_bin + $(checkdir) + dh_testdir -p$(1) + dh_testroot -p$(1) + dh_installinfo -p$(1) + # handle http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=337215 + perl -wpi -e 's/\\Q//gmo; s/\\E//gmo' debian/$(1).postinst.debhelper + dh_installman -p$(1) + dh_installchangelogs -p$(1) + dh_installdocs -p$(1) + dh_installexamples -p$(1) + # dh_install -p$(1) + dh_installmenu -p$(1) + dh_link -p$(1) + dh_strip -p$(1) + dh_compress -p$(1) + dh_fixperms -p$(1) -X$(movemail_bin) + dh_installdeb -p$(1) + dh_shlibdeps -p$(1) + dh_gencontrol -p$(1) + dh_md5sums -p$(1) + dh_builddeb -p$(1) +endef + +################################################## +# emacs +.PHONY: binary-dummy +binary-dummy: pkg_name := emacs +binary-dummy: debian/stamp/build $(debpkgfiles) + $(checkroot) + $(checkdir) + dh_clean -k + $(call debinst_indep,$(pkg_name)) + # create emacs-nox and emacs-el as well here + $(call debinst_indep,emacs-nox) + $(call debinst_indep,emacs-el) + +################################################## +# emacsXY-el +.PHONY: binary-el +binary-el: pkg_name := $(flavor)-el +binary-el: xsupport := x +binary-el: debian/stamp/build $(debpkgfiles) + $(checkroot) + $(checkdir) + dh_clean -k + + rm -rf $(pkgdir_el) $(pkgdir_el).tmp + $(call emacs_inst,build-x,$(pkgdir_el).tmp) + + # $(flavor)-el files (move all the .el files that have + # a corresponding .elc file to the $(flavor)-el package) + install -d $(pkgdir_el) + (cd $(pkgdir_el).tmp && \ + find -name "*.elc" | perl -pe 's/\.elc$$/\.el/o' | \ + tar cpf - --files-from -) | \ + (cd $(pkgdir_el) && tar xpf -) + + rm -rf $(pkgdir_el).tmp + $(call deb_sub,emacsVER-el.prerm,$(flavor)-el.prerm) + $(call debinst_indep,$(flavor)-el) + +deb_trash += debian/$(flavor)-el.prerm + +################################################## +# emacsXY-common +.PHONY: binary-common +binary-common: pkg_name := $(flavor)-common +binary-common: xsupport := x +binary-common: debian/stamp/build $(debpkgfiles) + $(checkroot) + $(checkdir) + dh_clean -k + rm -rf $(pkgdir_common) + install -d $(pkgdir_common) + $(call emacs_inst,build-x,$(pkgdir_common)) + + rm -f debian/$(flavor)-common.links + + # remove stuff that should only be in the binary packages + rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/DOC-$(runtime_ver).1 + rm -r $(pkgdir_common)/usr/bin + rm -r $(pkgdir_common)/usr/lib + + # make sure /usr/local dir doesn't exist in pkg. + rmdir $(pkgdir_common)/usr/local/share/emacs/site-lisp + rmdir $(pkgdir_common)/usr/local/share/emacs/$(runtime_ver)/site-lisp + rmdir $(pkgdir_common)/usr/local/share/emacs/$(runtime_ver) + rmdir $(pkgdir_common)/usr/local/share/emacs + rmdir $(pkgdir_common)/usr/local/share + rmdir $(pkgdir_common)/usr/local + + # So any test pkgs I build from CVS will be OK -- emacs' build system + # accidentally installs CVS dirs in a few places. + rm -rf $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/leim/ja-dic/CVS + rm -rf $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/leim/quail/CVS + + # manpages + install -m 0644 etc/emacsclient.1 \ + $(pkgdir_common)/usr/share/man/man1/emacsclient.1$(flavor) + + perl -pi -e "s|man1/etags\\.1|man1/etags\\.1$(flavor)|" \ + $(pkgdir_common)/usr/share/man/man1/ctags.1$(flavor) + find $(pkgdir_common)/usr/share/man -type f | xargs gzip -9v + + # lisp path directories + install -d $(pkgdir_common)/etc/$(flavor)/site-start.d + install -d $(pkgdir_common)/usr/share/$(flavor)/ + + # The version-specific site-lisp dir, say emacs/21.1/site-lisp, needs + # to be in share/$(flavor) so that as we upgrade from 21.1 to 21.2, etc., + # add-on package bits don't get left behind. + mv $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/site-lisp \ + $(pkgdir_common)/usr/share/$(flavor) + + echo \ + usr/share/$(flavor)/site-lisp \ + usr/share/emacs/$(runtime_ver)/site-lisp \ + >> debian/$(flavor)-common.links + + cd $(pkgdir_common) && \ + find -name "*.elc" | perl -pe 's/\.elc$$/\.el/o' | xargs rm + + # This is a duplicate of the file in $(flavor)/site-lisp + rm $(pkgdir_common)/usr/share/emacs/site-lisp/subdirs.el + + install -d $(pkgdir_common)/usr/share/doc/$(flavor)-common + + echo \ + usr/share/emacs/$(runtime_ver)/etc \ + usr/share/doc/$(flavor)-common/etc \ + >> debian/$(flavor)-common.links + + cp debian/gnu-32x32.xpm \ + $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/gnu-32x32.xpm + + # info files + # Mangle menu entries for subdir. + chmod 755 debian/mangle-info + for f in $(main_dir_info_files); \ + do \ + DEBIAN_INFO_PREFIX=emacs-$(major_ver) \ + debian/mangle-info \ + $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/$$f; \ + done + + # Install replacements for non-free files that can be reached + # through C-h + for f in DISTRIB THE-GNU-PROJECT ; do \ + sed -e "s/@FILE@/$$f/g" \ + -e "s/@MAJOR_VERSION@/$(major_ver)/g" \ + $(CURDIR)/debian/missing-file.dfsg > \ + $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/$$f.dfsg ; \ + done + + $(call deb_sub,emacsVER-common.docs,$(flavor)-common.docs) + $(call deb_sub,emacsVER-common.postinst,$(flavor)-common.postinst) + $(call deb_sub,emacsVER-common.prerm,$(flavor)-common.prerm) + + $(call debinst_indep,$(flavor)-common) + +deb_trash += debian/$(flavor)-common.docs +deb_trash += debian/$(flavor)-common.links +deb_trash += debian/$(flavor)-common.postinst +deb_trash += debian/$(flavor)-common.prerm + +define build_binary_pkg + rm -f debian/$(pkg_name).links + install -d debian/$(pkgdir) + install -d debian/$(pkgdir)/usr/bin/ + mv debian/$(pkgdir).tmp/usr/bin/emacs-* \ + debian/$(pkgdir)/usr/bin/emacs$(major_ver)-$(xsupport) + + echo \ + usr/bin/emacs$(major_ver)-$(xsupport) \ + usr/bin/$(flavor) \ + >> debian/$(pkg_name).links + + install -d debian/$(pkgdir)/usr/share/emacs/$(runtime_ver)/etc/ + + mv \ + debian/$(pkgdir).tmp/usr/share/emacs/$(runtime_ver)/etc/DOC-$(runtime_ver).1 \ + debian/$(pkgdir)/usr/share/emacs/$(runtime_ver)/etc/ + + # move files to the build directory + install -d debian/$(pkgdir)/usr/lib/emacs/$(runtime_ver)/$(target)/ + mv debian/$(pkgdir).tmp/usr/lib/emacs/$(runtime_ver)/$(target)/fns-*.el \ + debian/$(pkgdir)/usr/lib/emacs/$(runtime_ver)/$(target)/ + + # rename fns-*.el and elc files + cd debian/$(pkgdir)/usr/lib/emacs/$(runtime_ver)/$(target)/ \ + && test `ls fns-*.el | wc -l` -eq 1 \ + && mv fns-*.el \ + `echo fns-*.el | perl -pe 's/^fns-(.*)\.el$$/fns-$$1-$(xsupport).el/ or die;'` +# cd debian/$(pkgdir)/usr/lib/emacs/$(runtime_ver)/$(target)/ \ +# && test `ls fns-*.elc | wc -l` -eq 1 \ +# && mv fns-*.elc \ +# `echo fns-*.elc | perl -pe 's/^fns-(.*)\.elc$$/fns-$$1-$(xsupport).elc/ or die;'` + + rm -rf debian/$(pkgdir).tmp + + # /usr/bin files + test -f debian/$(pkgdir)/usr/bin/emacs$(major_ver)-$(xsupport) + + # Can this just be a symlink to the emacsXY-common's doc dir? + # /usr/share/doc/emacs$(major_ver) directory + install -d debian/$(pkgdir)/usr/share/doc/$(pkg_name) + + $(call deb_sub,emacsVER.README,$(pkg_name).README.Debian) + $(call deb_sub,emacsVER.menu,$(pkg_name).menu) + $(call deb_sub,emacsVER.postinst,$(pkg_name).postinst) + $(call deb_sub,emacsVER.prerm,$(pkg_name).prerm) + $(call deb_sub,emacsVER.postrm,$(pkg_name).postrm) + + # FIXME: this is wrong for -nox + $(call deb_sub,emacsVER.desktop,$(pkg_name).desktop) + + if test "$(xsupport)" = x; \ + then \ + install -d debian/$(pkgdir)/usr/share/applications; \ + install -m 0644 debian/emacs$(major_ver).desktop \ + debian/$(pkgdir)/usr/share/applications; \ + fi + + $(call debinst_bin,$(pkg_name)) + +endef + +# Would it be better if we were just explicit here? +define binpkg_trash + $(addprefix debian/$(1),.README.Debian .desktop .links .menu \ + .postinst .prerm .postrm) +endef + +deb_trash += $(call binpkg_trash,$(flavor)) +deb_trash += $(call binpkg_trash,$(flavor)-nox) + +################################################## +# emacsXY-nox +# We install, grab the bits we need, and then delete the tree +# to save diskspace. (Do we actually need to run install -- can we +# grab the files from the build tree instead?) +.PHONY: binary-nox +binary-nox: pkg_name := $(flavor)-nox +binary-nox: pkgdir := $(flavor)-nox +binary-nox: xsupport := nox +binary-nox: debian/stamp/build $(debpkgfiles) + $(checkroot) + $(checkdir) + dh_clean -k + rm -rf debian/$(pkgdir) debian/$(pkgdir).tmp + $(call emacs_inst,build-nox,$(CURDIR)/debian/$(pkgdir).tmp) + $(build_binary_pkg) + +################################################## +# emacsXY +# We install, grab the bits we need, and then delete the tree +# to save diskspace. (Do we actually need to run install -- can we +# grab the files from the build tree instead?) +.PHONY: binary-x +binary-x: pkg_name := $(flavor) +binary-x: pkgdir := $(flavor) +binary-x: xsupport := x +binary-x: debian/stamp/build $(debpkgfiles) + $(checkroot) + $(checkdir) + dh_clean -k + rm -rf debian/$(pkgdir) debian/$(pkgdir).tmp + $(call emacs_inst,build-x,$(CURDIR)/debian/$(pkgdir).tmp) + $(build_binary_pkg) + +################################################## +# emacsXY-bin-common +.PHONY: binary-bin-common +binary-bin-common: pkg_name := $(flavor)-bin-common +binary-bin-common: pkgdir := $(flavor)-bin-common +binary-bin-common: debian/stamp/build $(debpkgfiles) + $(checkroot) + $(checkdir) + dh_clean -k + rm -rf debian/$(pkgdir) debian/$(pkgdir).tmp + $(call emacs_inst,build-x,$(CURDIR)/debian/$(pkgdir).tmp) + + install -d debian/$(pkgdir) + install -d debian/$(pkgdir)/usr + mv debian/$(pkgdir).tmp/usr/bin debian/$(pkgdir)/usr/ + mv debian/$(pkgdir).tmp/usr/lib debian/$(pkgdir)/usr/ + rm -rf debian/$(pkgdir).tmp + + # remove stuff that should only be in the binary packages + # make sure it's only one file + test -f debian/$(pkgdir)/usr/bin/emacs-* + rm debian/$(pkgdir)/usr/bin/emacs-* + rm debian/$(pkgdir)/usr/bin/emacs + cd debian/$(pkgdir)/usr/lib/emacs/$(runtime_ver)/$(target)/ \ + && test `ls fns-*.el | wc -l | cut -d ' ' -f 1` -eq 1 \ + && rm fns-*.el + + cd debian/$(pkgdir)/usr/bin && ls > ../../../tmp-alt-list + + for file in `cat debian/tmp-alt-list | grep -v 'emacs$$'`; \ + do \ + mv debian/$(pkgdir)/usr/bin/$${file} \ + debian/$(pkgdir)/usr/bin/$${file}.$(flavor); \ + done + + # /usr/share/doc/$(flavor) directory + install -d debian/$(pkgdir)/usr/share/doc/$(flavor)-bin-common/ + + $(call deb_sub,emacsVER.README,$(pkg_name).README.Debian) + $(call deb_sub,emacsVER-bin-common.postinst,$(pkg_name).postinst) + $(call deb_sub,emacsVER-bin-common.prerm,$(pkg_name).prerm) + $(call deb_sub,emacsVER-bin-common.postrm,$(pkg_name).postrm) + + perl -pi -e 's/\n/ /gmo;' debian/tmp-alt-list + perl -w -p -i \ + -e "s|\@ALTERNATIVES\@|`cat debian/tmp-alt-list`|go;" \ + \ + debian/$(pkg_name).postinst \ + debian/$(pkg_name).prerm \ + debian/$(pkg_name).postrm + + # Set up movemail (after dpkg-shlibdeps to avoid fakeroot sgid problem) + chown root.mail debian/$(pkgdir)/$(movemail_bin) + chmod g+s debian/$(pkgdir)/$(movemail_bin) + + $(call debinst_bin,$(pkg_name)) + +deb_trash += debian/$(flavor)-bin-common.README.Debian +deb_trash += debian/$(flavor)-bin-common.postinst +deb_trash += debian/$(flavor)-bin-common.prerm +deb_trash += debian/$(flavor)-bin-common.postrm + +binary-indep: binary-dummy binary-el binary-common + +binary-arch: binary-x binary-nox binary-bin-common + +binary: binary-indep binary-arch + +clean: debian-sync + $(checkdir) + $(cleanup_all) + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false + +.PHONY: binary binary-arch binary-indep clean --- emacs21-21.4a+1.orig/debian/emacsVER.preinst +++ emacs21-21.4a+1/debian/emacsVER.preinst @@ -0,0 +1,8 @@ +#!/bin/sh -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ + +#DEBHELPER# + --- emacs21-21.4a+1.orig/debian/changelog +++ emacs21-21.4a+1/debian/changelog @@ -0,0 +1,1197 @@ +emacs21 (21.4a+1-2ubuntu1.1) feisty-security; urgency=low + + * SECURITY UPDATE: fix potential DoS with specially crafted images + * added debian/patches/security-CVE-2007-2833.diff + * References + CVE-2007-2833 + http://www.debian.org/security/2007/dsa-1316 + + -- Jamie Strandboge Fri, 24 Aug 2007 22:31:10 -0400 + +emacs21 (21.4a+1-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - libpng3-dev -> libpng12->dev + - add "emacs-nox", "emacs-el" metapackage + - Add -fno-stack-protector to CFLAGS to stop crashing so much. + - Place desktop file in the Programming menu, where it's more likely to + be looked for. + + -- Michael Vogt Tue, 12 Dec 2006 18:07:44 +0100 + +emacs21 (21.4a+1-2) unstable; urgency=low + + * Make both emacs21 and emacs21-nox packages suggest non-DFSG + packages and fix erroneous emacs21-common dependency on it + [J茅r么me Marant] + - debian/control.in + - debian/control + + * Grab yow mode from the CVS trunk so it is now compatible with yow.lines + replacement which also comes from the CVS trunk. + (closes: #395501) [J茅r么me Marant] + - debian/patches/yow-mode-from-cvs.diff: new patch. + - debian/patches/series: updated. + + * Properly handle ldapsearch output from OpenLDAP version 2 and above. + Thanks to both Joshua Judson Rosen and + Henrik Holmboe . + (closes: #381484) [J茅r么me Marant] + - debian/patches/ldapsearch-output.diff: new patch. + - debian/patches/series: updated. + + * Mention license of both emacs.1 and etags.1 manpages and add a copy of + the GFDL to the copyright file (closes: #396875) [J茅r么me Marant] + - debian/copyright.in + - debian/copyright: re-generated. + + * Fix generation of emacs21-common README.Debian. [rlb] + + -- Rob Browning Sat, 2 Dec 2006 11:45:44 -0800 + +emacs21 (21.4a+1-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable. Remaining changes: + - libpng3-dev -> libpng12->dev + - add "emacs-nox", "emacs-el" metapackage + - Add -fno-stack-protector to CFLAGS to stop crashing so much. + - Place desktop file in the Programming menu, where it's more likely to + be looked for. + + -- Michael Vogt Fri, 24 Nov 2006 10:18:10 +0100 + +emacs21 (21.4a+1-1) unstable; urgency=low + + * In accordance with the recent General Resolution + (http://www.debian.org/vote/2006/vote_001), move all non-DFSG files to + new packages that will be included in Debian's non-free section. The + debian/dfsg-splitter script has been used to split the upstream + archive. (closes: #207932) [rlb] + - debian/control.in + - debian/copyright.in + - debian/dfsg-splitter + - debian/emacs-common.README + - debian/patches/handle-dfsg-split.diff + - debian/patches/series + - debian/replacement/yow.lines.uu + - debian/rules + - debian/missing-file.dfsg: new template file used to generate + replacements for non-free files normally accessible through C-h + key bindings. Those files will be displayed if the original + ones are not available. + + * Acknowledge NMU. Thanks Marc Brockschmidt + (Closes: #381452) [J茅r么me Marant] + + * Separate mipsel from mips autodetection in configure.in [J茅r么me Marant] + - debian/patches/arch-mipsel.diff: update. + + * Split mips and mipsel ports into two separate patches [J茅r么me Marant] + - debian/patches/arch-mips.diff: new file. Add mips-specific code + from arch-mipsel+mips.diff patch + - debian/patches/arch-mipsel.diff: add mipsel-specific code from + arch-mipsel+mips.diff patch + - debian/patches/arch-mipsel+mips.diff: remove. + + * Bump Standards-Version to 3.7.2 [J茅r么me Marant] + - debian/control.in + + * Add a new dummy `emacs' package which depends on the latest + Emacs release (closes: #82687) + - debian/control.in: added new entry for `emacs' package. + - debian/control: re-generated. + - debian/emacs.*: renamed to debian/emacsVER.* + - debian/emacs-*.*: renamed to debian/emacsVER-*.* + - debian/rules: changed accordingly. + + * Remove erroneous semicolon character when reading XBM files. + Thanks to Jochen Voss . + (closes: #392651) [J茅r么me Marant] + - debian/patches/xbm-read-erroneous-semicolon.diff: new file. + - debian/patches/series: updated. + + * Properly point to README.Debian.gz from Emacs NEWS file. + Thanks to Per Bojsen . + (closes: #389063) [J茅r么me Marant] + - debian/patches/misc-unseparated.diff: updated. + + -- Rob Browning Wed, 25 Oct 2006 00:40:34 -0700 + +emacs21 (21.4a-6.2) unstable; urgency=low + + * Non-maintainer brown paper bag release. + * Apply patch from 21.4a-6.1 properly, somehow quilt hates me. + + -- Marc 'HE' Brockschmidt Wed, 27 Sep 2006 08:30:33 +0200 + +emacs21 (21.4a-6.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/arch-mipsel+mips.diff: + Add patch from Max Kellermann (updated by + Thiemo Seufer ) to fix segfaults on mips + and mipsel. Thanks for the hard work! (Closes: #381452) + + -- Marc 'HE' Brockschmidt Wed, 27 Sep 2006 00:13:30 +0200 + +emacs21 (21.4a-6ubuntu2) edgy; urgency=low + + * Add -fno-stack-protector to CFLAGS to stop crashing so much. + Malone: #56782 + + -- Tollef Fog Heen Fri, 15 Sep 2006 09:56:31 +0200 + +emacs21 (21.4a-6ubuntu1) edgy; urgency=low + + * Merge from debian unstable, remaining changes: + - libpng3-dev -> libpng12->dev + + -- Scott James Remnant Mon, 10 Jul 2006 17:20:38 +0100 + +emacs21 (21.4a-6) unstable; urgency=low + + * When we create an empty aclocal.m4 after patching (to get around + quilt's use of patch -E), make the timestamp match the timestamp of + configure.in, so that we won't accidentally re-run autoconf given the + dependency in Makefile.in. [rlb]. + - debian/rules + + -- Rob Browning Sun, 14 May 2006 15:24:35 -0700 + +emacs21 (21.4a-5) unstable; urgency=low + + * Don't include dpatch.make in debian/rules since the package no longer + depends on dpatch. Thanks to Romain Francoise + . (closes: #367177) [rlb] + - debian/rules + + -- Rob Browning Sun, 14 May 2006 10:18:04 -0700 + +emacs21 (21.4a-4) unstable; urgency=low + + * Migrate from dpatch to quilt and update generation of README. [rlb] + - debian/README.in + - debian/rules + - debian/control.in + - debian/patches/* + + * Change occurrence of "find ... -perm +u+x" to "find ... -perm /u+x". + The former is no longer handled the way it used to be, and *doesn't* + find all files with execute permission. Thanks to Fran莽ois Fleuret + for pointing out the initial problem. [rlb] + - debian/rules + + * Replace $(pwd) with $(CURDIR) in debian/rules. + - debian/rules + + * Remove PACKAGE variable. + - debian/rules + + * Arrange DEB_ vars as recommended by + /usr/share/doc/autotools-dev/README.Debian.gz and do the same with + DEB_HOST_ARCH and DEB_HOST_GNU_CPU. [rlb] + - debian/rules + + * Use DEB_HOST_GNU_TYPE for the value of target rather than + DEB_BUILD_GNU_TYPE. [rlb] + - debian/rules + + * Add $(src_name) and $(flavor) and use them. [rlb] + - debian/rules + + * Remove show-upstream-diffs target (use check-diff instead). [rlb] + - debian/rules + + * Rename orig_tgz and orig_tgz_dir variables to deb_orig_tgz and + deb_orig_tgz_dir. [rlb] + - debian/rules + + * Lowercase local makefile variable names. [rlb] + - debian/rules + + * Migrate to debhelper (while consulting J茅r么me Marant's work on + emacs-snapshot). There may still be a bit to do. [rlb] + - debian/rules + - debian/changelog + - debian/compat + - debian/control + - debian/control.in + - debian/emacs-bin-common.postinst + - debian/emacs-bin-common.postrm + - debian/emacs-bin-common.prerm + - debian/emacs-common.README + - debian/emacs-common.docs + - debian/emacs-common.postinst + - debian/emacs-common.prerm + - debian/emacs-el.prerm + - debian/emacs.README + - debian/emacs.menu + - debian/emacs.postinst + - debian/emacs.postrm + - debian/emacs.preinst + - debian/emacs.prerm + - debian/rules + - debian/README.binpkg.in (moved to debian/emacs.README) + - debian/README.in (moved to debian/emacs-common.README) + - debian/build-binary-pkg (removed - now handled in debian/rules) + - debian/menu.in (moved to debian/emacs.menu) + + * Change nominal_ver computation to match code in configure.in. [rlb] + - debian/rules + + * Add libxaw7-dev dependency to make sure we get that instead of + libxaw8-dev. Thanks to Tollef Fog Heen . + (closes: #365597) [rlb] + - debian/control.in + + * Apply an upstream patch to fix an mmap related Hurd build problem. + Thanks to Michael Banck . (closes: #347554) [rlb] + - debian/patches/series + - debian/patches/hurd-mmap.diff + + -- Rob Browning Sat, 13 May 2006 16:24:05 -0700 + +emacs21 (21.4a-3ubuntu2) dapper; urgency=low + + * Place in the Programming menu, where it's more likely to be looked + for. Ubuntu: #36416. + + -- Scott James Remnant Thu, 18 May 2006 01:48:39 +0100 + +emacs21 (21.4a-3ubuntu1) dapper; urgency=low + + * debian/control.in: libpng3-dev -> libpng12-dev, libpng3-dev is going away. + + -- Martin Pitt Thu, 23 Feb 2006 12:18:27 +0100 + +emacs21 (21.4a-3) unstable; urgency=low + + * Disable support for the ppc64 architecture: the patch breaks the + powerpc support and does not work on ppc64 any more anyway. + (closes: #329459) [J茅r么me Marant] + - debian/patches/00list: disable arch-ppc64 patch. + - debian/patches/autofiles.dpatch: regenerated. + + -- Rob Browning Sun, 2 Oct 2005 19:00:13 -0700 + +emacs21 (21.4a-2) unstable; urgency=low + + * Apply patch applying modifiers to multibyte-char keys. Thanks to + Martin Stjernholm (closes: #309963) [J茅r么me Marant] + - debian/patches/multibyte-char-key-modifiers.dpatch: new file. + - debian/00list: updated. + + * Apply patch supporting the ppc64 architecture. This is a slightly + modified patch derived from the Emacs CVS mainline. + (closes: #300368) [J茅r么me Marant] + - debian/patches/arch-ppc64.patch: new file. + - debian/00list: updated. + + * Add real dependency as an alternative to the libtiff-dev build + dependency in order for the build to be deterministic. + (closes: #311074) [J茅r么me Marant] + - debian/control.in: add libtiff4-dev as alternative libtiff-dev + build dependency. + - debian/control: regenerated. + + * Bump Standards-Version to 3.6.2. [J茅r么me Marant] + - debian/control.in + - debian/control: regenerated. + + * Use the "kitchen sink" bitmap icon when iconifying the Emacs window. + (closes: #309930) [J茅r么me Marant] + - debian/menu.in: pass the `-i' option to the command launching Emacs + under X11. + - debian/emacs.desktop: likewise. + + * Work around bug in Xorg which makes AltGr incorrectly recognized. + This patch has been backported from Emacs CVS trunk. [J茅r么me Marant] + - debian/patches/xorg-altgr-fix.dpatch: new file. + - debian/00list: updated. + + * Apply patch preventing an infinite loop in whitespace.el if kill-read-only + is set to t. Thanks to Romain Francoise + (closes: #273123) [J茅r么me Marant] + - debian/patches/whitespace-readonly-infloop.dpatch: new file. + - debian/00list: updated. + + -- Rob Browning Sat, 17 Sep 2005 23:39:52 -0700 + +emacs21 (21.4a-1) unstable; urgency=medium + + * New upstream release. (closes: #294313) [J茅r么me Marant] + - debian/patches/movemail-pop-fmt-vulnerability.dpatch: removed since + it has been applied upstream. + + * Apply patch from Romain Francoise making PCL-CVS + compliant with recent versions of CVS. (closes: #291221) [J茅r么me Marant] + - debian/patches/pcl-cvs-format.dpatch: new file. + - debian/00list: updated. + - debian/control: tightened dependency on dpatch (>= 2.0.9). + + * Add MIME type to desktop file. (closes: #296618) [J茅r么me Marant] + - debian/emacs.desktop: added MimeType entry. + + * Apply patch supporting the AMD64 architecture. This is a slightly + modified patch derived from the Emacs CVS mainline. Thanks to + Goswin von Brederlow and + amd64 porters. (closes: #248796) [J茅r么me Marant] + - debian/patches/arch-amd64.patch: new file. + - debian/00list: updated. + + * Hard code leim version in copyright.in for now. with 21.4a the emacs + tar.gz name changed, but the leim archive name didn't. [rlb] + - debian/copyright.in + - debian/copyright + + * Remove prebuild target from debian/rules. Instead, just issue + instructions to the user. [rlb] + - debian/rules + + * Fix invocation of wc -l when counting fns-*.el files. [rlb] + - debian/rules + + * Use dpatch for the autotool related diff rather than generating and + applying a diff manually. What was the debian/autofiles.diff is now + handled via debian/patches/autofiles.dpatch. Also, we no longer try + to automatically generate the diff when needed. Instead, the diff + must be generated manually via "debian/rules autofiles-sync". + + The earlier approach was broken because dpatch files that + autofiles.diff depended on could end up later in the Debian diff (and + hence have newer timestamps). This would cause an unexpected run of + aclocal, etc. and break the buildds. If we ever want to re-automate + generation of the autofiles diff, we'll need to use dpatch md5 sigs + (or similar) rather than timestamps. (closes: #297796) [rlb] + - debian/autofiles.diff: removed + - debian/patches/00list: added autofiles + - debian/patches/autofiles.dpatch: new + - debian/rules: updated + + -- Rob Browning Tue, 15 Mar 2005 11:00:04 -0600 + +emacs21 (21.3+1-9) unstable; urgency=high + + * Modify debian/rules to support using an arch source repository and an + archive arrangement somewhat similar to, but not compatible with + arch-buildpackage's. [rlb] + - debian/rules + + * Applied patch to fix mailspool pop format string vulnerability + (CAN-2005-0100). [rlb] + Thanks to Max Vozeler . + - debian/patches/movemail-pop-fmt-vulnerability.dpatch + + -- Rob Browning Thu, 3 Feb 2005 21:02:03 -0600 + +emacs21 (21.3+1-8) unstable; urgency=medium + + * Apply patch allowing Emacs to properly interpret logo keys as Meta + rather than Meta+Super+Hyper. This problem has been showing up since + latest XFree86 and Xorg introducted `fake keys'. + Thanks to Denis Barbier + (closes: #255286, #274103) [J茅r么me Marant] + - debian/patches/xfree86-4.3-modifiers.dpatch: new file + - debian/patches/00list: updated. + + * Apply patch fixing long-standing memory leak in decode-coding-region + and similar routines. Thanks to Florian Weimer . + (closes: #273919) [J茅r么me Marant] + - debian/patches/coding-region-leak.dpatch: new file. + - debian/patches/00list: updated. + + * Apply patch tightening permissions of local backup copies of remote + files. Thanks to Michael Albinus . + (closes: #274427) [J茅r么me Marant] + - debian/patches/remote-files-permissions.dpatch: new file. + - debian/patches/00list: updated. + + -- Rob Browning Sat, 16 Oct 2004 11:10:32 -0500 + +emacs21 (21.3+1-7) unstable; urgency=medium + + * set recompile against libtiff4-dev and upload with + urgency=medium. (closes: #262828) [rlb] + - debian/changelog + + -- Rob Browning Tue, 3 Aug 2004 11:34:43 -0500 + +emacs21 (21.3+1-6) unstable; urgency=low + + * fix debian/README rendering problem. [rlb] + + * Stop provinding www-browser since the w3-el-e21 package provides it + now. [J茅r么me Marant] + - debian/control.in: remove www-browser provides for emacs and + emacs-nox. + - debian/control: synced. + + * Fixed installation of .desktop entry. [J茅r么me Marant] + - debian/build-binary-pkg: fixed typo. + + * Set value of the auto-save-file-name-transforms variable at run-time + in order to override its build-time value. + (closes: #160615, #167295, #175346, #241826, #250676, #178792) + [J茅r么me Marant] + - debian/patches/startup-auto-save-file-name-transforms.dpatch: new file. + - debian/patches/00list: updated. + + * Add Python byte-compiled file extensions to completion-ignore-extensions + variable. (closes: #177276) [J茅r么me Marant] + - debian/patches/python-completion-ignored-extensions.dpatch: new file. + - debian/patches/00list: updated. + + * Fixed removal of alternatives + (closes: #251822, #206901, #241820, #163034) [J茅r么me Marant] + - debian/emacs-bin-common.prerm + + * Add a slave alternative for "editor" manpage. + Thanks to Daniel Kraft . (closes: #255639) [J茅r么me Marant] + - debian/emacs.postinst + + * Apply a 2003-06-21 patch from upstream CVS to fix a non-interactive + signal handling problem that could cause Emacs to die prematurely as + the result of a SIGIO or SIGHUP. (closes: #253887) [rlb] + - debian/patches/fix-batch-mode-signal-handling.dpatch + - debian/patches/00list + + * Add warning message to prepare-release explaining that you have to run + it as a normal user (not root). [rlb] + - debian/rules + + -- Rob Browning Mon, 26 Jul 2004 10:27:10 -0500 + +emacs21 (21.3+1-5) unstable; urgency=low + + * Apply patch allowing emacsclient to handle ALTERNATE_EDITOR properly + when the command is run without any parameter [J茅r么me Marant] + (closes: #219658) + - debian/patches/emacsclient-alternate-editor.dpatch: new file. + + * Provide the `editor' virtual package. [J茅r么me Marant] + (closes: #66243, #90154, #158807) + - debian/control.in: emacs and emacs-nox now provide the `editor' + virtual package. + - debian/control: synchronized with debian/control.in. + - debian/emacs.postinst: adding an `editor' alternative with a priority + of 0 as discussed in + http://lists.debian.org/debian-policy/2000/debian-policy-200006/msg00122.html + - debian/emacs.prerm: removing the `editor' alternative on package + removal. + + * Added automatic switching to UTF-8 encoding when editing the debian + changelog file. [J茅r么me Marant] + - debian/changelog: added Emacs local variables forcing coding + to UTF-8. + + * Fix handling of menu entry for text version of Emacs [J茅r么me Marant] + (closes: #221171) + - debian/menu.in: call the text version of emacs with the `-nw' + parameter. + + * Install the emacsclient manpage [J茅r么me Marant] (closes: #222767) + - debian/build-common-pkg: install missing emacsclient manpage. + - debian/emacs-common.postinst: install alternative for emacsclient + manpage. + + * Install .desktop entry in order to make Emacs easy to start in + both GNOME and KDE. Thanks to Adam C Powell IV + [J茅r么me Marant] (closes: #233711) + - emacs.desktop: new template file for desktop entries + - debian/rules: generate desktop file from emacs.desktop template + and install it for emacs21. + + * test -n "${major_ver}" in a few places so that we don't accidentally + generate bad output files from our .in files. [rlb] + - debian/rules + + * truncate aclocal.m4 during autofiles-sync so that old bits won't kill new + autoconf run. Also ignore autom4te.cache when generating + autofiles.diff. [rlb] + - debian/rules + + * fix bug in prepare-release autodiff prompt handling. [rlb] + - debian/rules + + * update configure.in for newer autoconf versions. [rlb] + - autoconf-updates.dpatch + + * add an emacsXY-bin-common package containing all the architecture + specific bits, so that emacsXY-common can be architecture independent. + This should save many megabytes * architectures in the debian pool. + [rlb] (closes: #232888, #233345) + - debian/rules: move some build-* code from debian/ scripts to rules + and adjust to build emacsXY-bin-common. + - debian/emacs-common.postinst debian/emacs-common.prerm: some code + moved to new emacs-bin-common scripts. + - debian/emacs-common.postrm: deleted. + - debian/emacs-bin-common.postinst: new file. + - debian/emacs-bin-common.prerm: new file. + - debian/emacs-bin-common.postrm: new file. + - debian/build-common-pkg: deleted - code now in debian/rules. + - debian/build--pkg: deleted - code now in debian/rules. + - debian/emacs-el.postinst: deleted - was empty. + - debian/control.in: add emacsXY-bin-common and adjust other entries. + - debian/fix-debian-scripts: deleted - no longer used. + - debian/build-binary-pkg: adjusted to handle more of the common code. + + * Add support for linux 2.6 to ACPI in lisp/battery.el. Thanks to + Mario Lang [J茅r么me Marant] (closes: #228658) + - debian/patches/battery-acpi-support.dpatch: updated. + + * Generate md5sums file for every package [J茅r么me Marant] (closes: #22590) + - debian/rules: generate md5sums file just before building packages. + - debian/build-binary-pkg: likewise. + + * no point in byte-compiling fns-*.el according to upstream authors + (closes: #189277) + + * fix configure args (--build alone doesn't seem to work anymore). [rlb] + - debian/rules + + * re-enable gif support via libungif. [rlb] + - debian/rules + + * re-enable toolkit scrollbars, but make it really easy for people to + disable them in debian/rules. Search for + --without-toolkit-scrollbars. [rlb] + - debian/rules + - debian/README.in + + * fix problem with upgrades by adding emacs21-common (<< 21.3+1-4) to + Replaces for the common packages. [rlb] + - debian/control.in + - debian/control + + -- Rob Browning Tue, 6 Apr 2004 18:07:38 -0500 + +emacs21 (21.3+1-4) unstable; urgency=medium + + * debian/changelog: converted to UTF-8 as per Policy. [J茅r么me Marant] + * debian/control.in: + - Bumped Standards-Version to 3.6.1. [J茅r么me Marant] + - Added versioned build-dependency on dpatch >= 1.23 since this version + no longer requires numerial prefixes to dpatches. [J茅r么me Marant] + * debian/patches/*.dpatch: removed numerical prefix since the patch order + is specified in debian/patches/00list. [J茅r么me Marant] + * debian/patches/hurd-libio-glibc.dpatch: new patch allowing Emacs + to be built on Hurd systems using a libio-based glibc. + Thanks to Markus Brinkmann . + (closes: #143220) [J茅r么me Marant] + * debian/patches/battery-acpi-support.dpatch: new patch adding ACPI + support to lisp/battery.el. Thanks to Mario Lang . + (closes: #208812) [J茅r么me Marant] + * debian/patches/scroll-margin.dpatch: new patch preventing emacs + to hang with a non-0 scroll-margin set. + (closes: #175658) [J茅r么me Marant] + * debian/patches/save-buffer.dpatch: new patch fixing a bug which + makes a file being removed when the coding system of its buffer + has changed and saving the changes was canceled. + (closes: #194171) [J茅r么me Marant] + * debian/patches/00list: updated with respect to new patches. + [J茅r么me Marant] + * debian/menu.in: + - Added hints to menu entries. (closes: #144282) [J茅r么me Marant] + - Changed titles for both text and X11 entries in order to + differenciate them. (closes: #197527, #188598) [J茅r么me Marant] + * debian/patches/browse-url.dpatch: + - Updated patch fixing a wrong call to galeon. Thanks to + Mikael Hedin . (closes: #208206) [J茅r么me Marant] + - Updated patch fixing browse-url's invocation of Mozilla. + Thanks to Jeff Sheinberg , + Martin Pool and KATO Kazuyoshi . + (closes: #148408, #216067) [J茅r么me Marant] + * Use -O1 rather than -O2 on m68k. Fixes a build failure (looks like a + broken byte compiler) with newer versions of gcc. (closes: #207580) + + -- Rob Browning Fri, 31 Oct 2003 00:00:10 -0600 + +emacs21 (21.3+1-3) unstable; urgency=low + + * create debian/stmap it doesn't exist. (closes: #210802) + + -- Rob Browning Sat, 13 Sep 2003 14:49:18 -0500 + +emacs21 (21.3+1-2) unstable; urgency=low + + * add back accidentally removed dpatch Build-Depends. (closes: #210627) + + -- Rob Browning Fri, 12 Sep 2003 10:30:21 -0500 + +emacs21 (21.3+1-1) unstable; urgency=low + + * repackage without .elc files since we regenerate all of them anyway. + This will save space, and will also allow us to use dpatch in a + straightforward way. + * modify debian/rules computation of version numbers to handle + (i.e. ignore) the +1 in 21.3+1. + * rework to use dpatch and to patch/unpatch the debian source in-place + rather than using a debian/build-src copy of the whole source tree. + * incorporated patch (500-detect-coding-iso2022.dpatch) to fix raw-text + coding problem. Thanks to Kenichi Handa . + (closes: #198736) + + -- Rob Browning Thu, 11 Sep 2003 23:15:44 -0500 + +emacs21 (21.3-2) unstable; urgency=low + + * Compile --without-toolkit-scroll-bars for now (my pref, and to avoid + xaw3d issues for the moment). + * Update copyright to reflect documentation licenses. (closes: #161500) + + -- Rob Browning Wed, 13 Aug 2003 08:53:35 -0500 + +emacs21 (21.3-1) unstable; urgency=low + + * new upstream version. + + -- Rob Browning Wed, 23 Apr 2003 13:16:06 -0500 + +emacs21 (21.2-6) unstable; urgency=low + + * changed sort behavior for x-vs-no-x fix in cus-dep.el based on + suggestion from Matt Kraai . (closes: #166139) + * finish breaking up most of the debian/patch/* files. + * set up automatic generation for autofiles.diff which contains all the + diffs to automatically generated files and is applied after all of the + debian/patch/*.diff files. + * add an apply-patches-upto command so it's easier to create partially + patched trees for editing. + + -- Rob Browning Thu, 6 Feb 2003 18:12:41 -0600 + +emacs21 (21.2-5) unstable; urgency=low + + * fix bug in rules and binary-pkg generation. (closes: #164770) + * fix problem with config.sub and config.guess updates. (closes: #164763) + * time to stop creating the /usr/doc symlinks... + + -- Rob Browning Tue, 15 Oct 2002 16:34:52 -0500 + +emacs21 (21.2-4) unstable; urgency=low + + * create debian/patches/ and start migrating to represent + changes as patches against the upstream source. Don't edit the main + tree anymore. + * rework tree and packaging to have emacs21-common, emacs21, and + emacs21-nox packages with emacs21-common containing nearly all the + data. + + -- Rob Browning Sat, 12 Oct 2002 15:09:37 -0500 + +emacs21 (21.2-3) unstable; urgency=low + + * Update emacs21-nox package description. + + -- Rob Browning Wed, 29 May 2002 14:04:57 -0500 + +emacs21 (21.2-2) unstable; urgency=low + + * fix control file priorities to match overrides. + * fix rules to handle autotools more correctly. See + /usr/share/doc/autotools-dev/README.Debian.gz for details. + (closes: #139998) + * firewall, headless box, and anti-X users everywhere rejoice! + Introducing emacs21-nox package :> + + -- Rob Browning Tue, 28 May 2002 12:09:48 -0500 + +emacs21 (21.2-1) unstable; urgency=low + + * new upstream release. + * move outline of Debian specific Emacs changes to + /usr/share/doc/*/README.Debian.gz.x + + -- Rob Browning Fri, 22 Mar 2002 11:41:17 -0600 + +emacs21 (21.1-9) unstable; urgency=low + + * fix control.in to use ${Source-Version}. (closes: #138994) + + -- Rob Browning Mon, 18 Mar 2002 21:54:47 -0600 + +emacs21 (21.1-8) unstable; urgency=low + + * Fix .texi problems with upstream patch. (closes: #138236) + + -- Rob Browning Sun, 17 Mar 2002 11:58:59 -0600 + +emacs21 (21.1-7) unstable; urgency=high + + * fix vc-path to be correct for a Debian system. (closes: #120079) + * re-add lost hppa and s390 patches. (closes: #107251) + + -- Rob Browning Thu, 6 Dec 2001 14:10:45 -0600 + +emacs21 (21.1-6) unstable; urgency=medium + + * modify order in browse-url.el. + * added upstream iso-acc.el patch to fix accent bug. (closes: #119852) + * fix ppc nocombreloc bug with upstream patch. (closes: #117557) + + -- Rob Browning Tue, 4 Dec 2001 08:43:38 -0600 + +emacs21 (21.1-5) unstable; urgency=low + + * Run autoconf to remove stale ppc code. (closes: #119189) + * Write new browse-url.el code with support for galeon and to default to + searching for a suitable browser, free browsers first. (closes: #116822) + + -- Rob Browning Tue, 13 Nov 2001 09:51:31 -0600 + +emacs21 (21.1-4) unstable; urgency=low + + * Really fix alternatives problem this time. + + -- Rob Browning Fri, 9 Nov 2001 10:24:49 -0600 + +emacs21 (21.1-3) unstable; urgency=low + + * Fix but in grep in postinst. (closes: #117251, #117256, #117415, #118792) + * Remove vestigal ppc bits and add upstream patch for ppc nocombreloc + problem. (closes: #117557) + * fix bug in upstream-files.tar handling. + * don't configure gif support until our libungif is new enough. See bug + #117729. + * Fix manpage to list correct default window size. (closes: #118641) + + -- Rob Browning Thu, 8 Nov 2001 21:15:20 -0600 + +emacs21 (21.1-2) unstable; urgency=low + + * change to priority optional. + * use xaw3d scrollbars after checking upstream preferences. + (closes: #116831, #116911, #116638) + * added some build-depends. (closes: #116981) + * fixed typo in NEWS. (closes: #116814) + * fixed alternatives bug in postinst/prerm for emacsclient (closes: #116915) + + -- Rob Browning Thu, 25 Oct 2001 16:02:45 -0500 + +emacs21 (21.1-1) unstable; urgency=low + + * New emacs21 packages. Many changes -- reviewed all Debian files. + + -- Rob Browning Thu, 18 Oct 2001 17:28:03 -0500 + +emacs20 (20.7-10) unstable; urgency=medium + + * Add arch header for mipsel and fix configure.in and + configure. (closes: #103959) + + -- Rob Browning Mon, 23 Jul 2001 09:23:06 -0500 + +emacs20 (20.7-9) unstable; urgency=low + + * Added more Build-Depends. (closes: #101832) + * Disable ralloc on Hurd. Thanks to Robert Bihlmeyer + . (closes: #101926) + + -- Rob Browning Tue, 10 Jul 2001 12:48:22 -0500 + +emacs20 (20.7-8) unstable; urgency=low + + * Added ia64 patches from Bdale Garbee for ia64.h. + (closes: #90518) + * Added Build-Depends on mailx for now (though this is *wrong* for the + long run -- I need to fix my fakemail handling). + (closes: #95903, #96761) + * Fix fakeroot sgid problem (move movemail chmod +s in debian/rules). + * Remove emacs' overzealous dir.gz file. + * Shrink gnu.xpm to 32x32 and make it the menu icon. (closes: #20253, #21310) + * Update manpage to not refer to kitchen sink anymore -- though with + emacs21, we're going to move back to using whatever they choose. + (closes: #81682) + + -- Rob Browning Wed, 13 Jun 2001 23:56:16 -0500 + +emacs20 (20.7-7) unstable; urgency=low + + * Fixed reftex-info problem. (closes: #44837). + * Fix install-strip target in Makefile.in. Thanks to + Kalle Olavi Niemitalo . (closes: #51348) + + -- Rob Browning Sat, 5 May 2001 23:50:50 -0500 + +emacs20 (20.7-6) unstable; urgency=low + + * Fix improper usage of dpkg-statoverride and make sure movemail is set + up right. (closes: #95953) + * Fix bad manpage location in postinst update-alternatives call. + * Fix bad .so in ctags manpage (closes: #88231, #45317, #65017, #74570) + + -- Rob Browning Sat, 5 May 2001 09:47:40 -0500 + +emacs20 (20.7-5) unstable; urgency=low + + * configure.in: add detection of CONF_MAIL_PROGRAM_NAME. + * lib-src/fakemail.c: use CONF_MAIL_PROGRAM_NAME when appropriate + (closes: #72103) -- need to forward upstream. + * Add "modified by Debian" clause to (emacs-version) at RMS's request. + * Start Debian modifications section in copyright file as per policy. + * Add build fixes for hurd (closes: #78461). Changes suggested by + Marcus.Brinkmann@ruhr-uni-bochum.de. Thanks. + * Switch from Debian sendmail.el hack to Francesco's suggestion of + setting mail-from-style to 'system-default by default at startup + (closes: #35128). This allows the user to override when desired in + the normal way. This should be discussed with the upstream + maintainers. They may be amenable to making this the default on + Debian systems. + * add dependency on dpkg (>= 1.9.0) for new install-info. + * info pages should finally work right (or at least closer to right). + They're now installed in /usr/share/info/emacs-20/ under their normal + names, and install-info can add the appropriate (emacs-20/emacs), + etc. entries to /usr/share/info/dir. This hopefully closes a bunch of + old bugs. + (closes: #64994, #64512, #64025, #62155, #59332, #51163, #40443) + * No more files in /usr/doc. (closes: #91454, #63768) + * /usr/man moved to /usr/share/man. (closes: #91149) + * This should be fixed, in addition we've switched to dpkg-statoverride + (closes: #73007) + * /usr/share/info/dir.gz should be gone. + (closes: #75594, #68551, #65012) + + -- Rob Browning Sun, 29 Apr 2001 22:03:33 -0500 + +emacs20 (20.7-4) unstable frozen; urgency=low + + * Upload to unstable *and* frozen since this fixes outstanding grave + bugs. + + -- Rob Browning Thu, 27 Jul 2000 16:21:15 -0500 + +emacs20 (20.7-3) unstable; urgency=low + + * Change code to rebuild *all* the install tree .elc files at build + time. This should fix the grave problems with gnus trashing mail at + the expense of more CPU at build time. + + -- Rob Browning Wed, 19 Jul 2000 20:27:27 -0500 + +emacs20 (20.7-2) frozen unstable; urgency=low + + * Revert to setting debian-emacs-flavor in startup.el as per recent + flip-flop in debian-emacs-policy :< This was a *tiny* source change, + and definitely has to go into frozen - too much breaks otherwise. + + -- Rob Browning Tue, 20 Jun 2000 11:31:29 -0500 + +emacs20 (20.7-1) frozen unstable; urgency=low + + * New upstream bug-fix version. Fixes security bugs, among others. + * Removed some now redundant Debian patches. + + -- Rob Browning Sat, 17 Jun 2000 12:59:48 -0500 + +emacs20 (20.6-3) unstable frozen; urgency=medium + + * Temp fix for alpha corruption problem in cm/src.h + src/termcap.c, src/terminfo.c, and src/sysdep.c (forwarded bug 63993). + + -- Rob Browning Mon, 12 Jun 2000 18:55:22 -0500 + +emacs20 (20.6-2) frozen unstable; urgency=low + + * Make sure info files get registered after /usr/share migration. + + -- Rob Browning Fri, 12 May 2000 15:30:02 -0500 + +emacs20 (20.6-1) frozen unstable; urgency=low + + * Let emacsen-common handle setting debian-emacs-flavor and modify + "Depends:" accordingly. + * Maintainer release of 20.6 - fixes same issues as 20.6-0.1, so it + should go into frozen. + * Move info files to /usr/share/info. + * Make sure .elc files for .el files we've modified are *always* rebuilt. + * Add new unexelf.c from Gerd Moellmann . Without this, + emacs20 will *not* build on either frozen or unstable x86 machines. + + -- Rob Browning Fri, 12 May 2000 11:00:33 -0500 + +emacs20 (20.6-0.1) frozen unstable; urgency=low + + * Non-maintainer release. + * New upstream bug fix release (closes:#60931). + * ARM support merged upstream. + * Add security patches from RUS-CERT posting on BugTraq. + * postinst: Use 2775 as directory permissions in /usr/local (closes:#59919) + + -- Joel Klecker Wed, 26 Apr 2000 11:26:28 -0700 + +emacs20 (20.5a-2) unstable; urgency=low + + * Check in a bogus modification to all the .el files that we modified + before 20.5a so that new .elc files with our changes will be generated + when we build. This must be done every time an upstream change is + merged in. + + -- Rob Browning Tue, 28 Dec 1999 19:51:14 -0600 + +emacs20 (20.5a-1) unstable; urgency=high + + * Upstream version number is just fine (20.5a *is* newer than 20.5). + Switch to use it. + + -- Rob Browning Wed, 22 Dec 1999 11:12:44 -0600 + +emacs20 (20.4.pre20.5a-1) unstable; urgency=high + + * New upstream version, including some Y2K fixes. + * Use weird version to avoid epochs. This is upstream 20.5a. + + -- Rob Browning Wed, 22 Dec 1999 00:16:52 -0600 + +emacs20 (20.4-3) unstable; urgency=low + + * Fix mistake in this file. Fix bug number in architecture + dependency "closes" in last revision. + * Powerpc configure.in patch from Susumu OSAWA . + (Should close bug 48997, but marked forwarded instead until patch is + resolved upstream.) + * Jargon problems apparently fixed. (closes: #31103 #37030) + * Gnus printing problems apparently fixed (closes: #20760) + * Fix manpage to refer to more accurate Debian file locations. + (closes: #35267) + * cperl-mode problem apparently fixed. (closes: #46739) + * Fix build stripping problem (use INSTALL_STRIP=-s rather than + INSTALL_PROGRAM="install -s"). + + -- Rob Browning Sat, 4 Dec 1999 19:24:07 -0600 + +emacs20 (20.4-2) unstable; urgency=low + + * Modify mail-spool-directory/movemail patch in preparation for upstream + inclusion. + * Fix architecture dependency. (closes: #48997) + + -- Rob Browning Fri, 12 Nov 1999 17:59:01 -0600 + +emacs20 (20.4-1) unstable; urgency=low + + * New upstream version. + * I decided to go ahead and get this out without the major overhaul + that's coming, but I'm going to be working more tightly the core + upstream developers from now on, so there will be some more + substantial changes soon, including getting rid of more Debianisms and + double checking all our current patches. + * Fix movemail liblockfile detection to be non-Debian specific + (currently working out the appropriate upstream patch (see etc/NEWS)). + * Fix emacs to support a --with-mail-spool-directory configure option and to + automagically detect the right answer most of the time without it + (currently working out the appropriate upstream patch (see etc/NEWS)). + * Add the lisp-level variable mail-spool-directory which always contains + the location of the mail spool, and hack movemail, nnmail, rmail, and + friends to use it (currently working out the appropriate upstream + patch (see etc/NEWS)) . + * hexl-mode bug fixed upstream. (closes: #21762) + + -- Rob Browning Sat, 30 Oct 1999 13:24:39 -0500 + +emacs20 (20.3-11) unstable; urgency=low + + * Fix liblockfile version skew. (closes: #43803 #45123) + + -- Rob Browning Thu, 23 Sep 1999 13:27:00 -0500 + +emacs20 (20.3-10) unstable; urgency=low + + * Restructure debian/rules to build -el in binary-indep + (closes: #26761) + * Add emacsclient.1 manpage submitted ages ago. (closes: #22463) + * Handle duplicate DOC files (closes: #27668) + * Switch to gnu icon from old B&W drippy sink (closes: #33260) + + -- Rob Browning Tue, 6 Jul 1999 23:21:44 -0500 + +emacs20 (20.3-9) unstable; urgency=low + + * Added HURD patch from Marcus Brinkmann . + (closes: #38571). + * Backed out (global-set-key [delete] 'delete-char) modification + (Ref: #26366). This is too controversial (think cross-platform) + and needs to be resolved by the Debian Keyboard Czar in concert with + others. For now we revert to the upstream behavior... + * Add /usr/share/info to info search path (closes: #38285). + + -- Rob Browning Fri, 11 Jun 1999 00:43:51 -0500 + +emacs20 (20.3-8) unstable; urgency=low + + * Added patch to emacs.c from Wolfram Gloger + to fix exit segfaults. + (closes: #37745) + * Fixed suidregister inconsistency between postinst and postrm + (closes #36845) + + -- Rob Browning Sun, 30 May 1999 14:38:51 -0500 + +emacs20 (20.3-7) unstable frozen; urgency=low + + * Needed to go to frozen too: --print-architecture was an important + bug. Should be OK since other fixes since -5 are minor and + important. + * Add conflict with w3-el (as per Ben Pfaff's + request). (closes: #30413). + * Undo broken (and unneeded) "fix" for suidregister call in postrm. + + -- Rob Browning Thu, 28 Jan 1999 14:49:27 -0600 + +emacs20 (20.3-6) unstable; urgency=low + + * Use --print-installation-architecture rather than --print-architecture + (closes: #28177). + * Remove "#undef SIGIO" from m/arm.h as indicated by David Welton + (closes: #31279). + * Fix call to suidunregister (I didn't realize that it can't take + multiple file arguments) (closes: #21243 #26886). + + -- Rob Browning Wed, 27 Jan 1999 11:50:14 -0600 + +emacs20 (20.3-5) frozen unstable; urgency=low + + * Added NetWinder patches (closes: #28277). (Thanks to David Welton) + * Rebuilt emacs20-el so the versions coincide. In the future, people + need to be sure to build *both* binary packages when doing a + non-maintainer binary release. (This fix justifies inclusion into + frozen). + + -- Rob Browning Sun, 1 Nov 1998 20:14:36 -0600 + +emacs20 (20.3-4) unstable; urgency=low + + * Fix gnus to default to /var/spool/mail rather than /usr/spool/mail for + mailbox locations (closes: #21364). + + -- Rob Browning Sat, 17 Oct 1998 14:28:45 -0500 + +emacs20 (20.3-3) unstable; urgency=low + + * Fixed leim. All the input methods should work now (closes: #27398). + * Made (global-set-key [delete] 'delete-char) the default (closes: #26366). + * Fix ownership on emacs20-el files (closes: #27398). + + -- Rob Browning Tue, 13 Oct 1998 16:57:51 -0500 + +emacs20 (20.3-2) unstable; urgency=low + + * Added 20.2 patches for powerpc. I omitted the patches to the + following files because it looks like equivalent fixes have already + made it into 20.3. If anyone who understands that code better knows + differently, please let me know. The rest of the patches applied + cleanly. + src/callproc.c.rej + src/dired.c.rej + src/fileio.c.rej + src/process.c.rej + src/regex.c.rej + I also modified src/m/powerpc.h to fix problems calling the ldscript. + + -- Rob Browning Mon, 7 Sep 1998 18:20:41 -0500 + +emacs20 (20.3-1) unstable; urgency=low + + * New upstream version. + * Modify all the debian/* stuff to automatically track version changes. + * Major changes to info page handling. Emacs20 info is now integrated into + the main info page. This was the best way I could think of to handle + cross references, etc. without major source changes. + * Locked emacs20-el and emacs20 package versions together with dependencies. + * Add info direntries for widget, info, and customize. + * Fix handling of /usr/local/share (which was badly broken). + * Turn stripping back on. It appears to work. + + -- Rob Browning Tue, 1 Sep 1998 11:44:04 -0500 + +emacs20 (20.2-9) unstable; urgency=low + + * Fixes for leim problems (closes: #25536). Thanks to + Junio Hamano + * update-elc now made executable (closes: #25899). Thanks to + Junio Hamano + * Fix problem with package including dirs in /usr/local/share + (closes: #23431). + + -- Rob Browning Sat, 22 Aug 1998 11:45:16 -0500 + +emacs20 (20.2-8) unstable; urgency=low + + * Regenerate .elc files for .el files we've modified. I didn't realize + that some of the .elc files were in the upstream tar file. Hope this + doesn't break anything. We haven't been using our sendmail and + message modifications until now. (closes: #21079). + * Fix i386ism in debian scripts use "dpkg --print-architecture" + instead. (closes: #20548). + * Fixed reference in README.add-on-package-maintainers + (closes: #23445) + * Fix some alpha problems (closes: #21834). + * Had to add Replaces: emacs20 to emacs20-el to fix problem with + copyright files being in the wrong package (closes: #21531). + + -- Rob Browning Fri, 7 Aug 1998 20:39:59 -0500 + +emacs20 (20.2-7) frozen unstable; urgency=low + + * Changed emacs20-el from standard to optional. + * Fixed broken postrm (release critical) (closes: #24236) + * Don't strip emacs binary (strip is broken see binutils #23153). + * Since we can't strip, don't compile or link with "-g". + + -- Rob Browning Thu, 16 Jul 1998 16:58:04 -0500 + +emacs20 (20.2-6) frozen unstable; urgency=low + + * Gack. Fix reject due to changed .tar.gz file (./leim added to tar). + + -- Rob Browning Wed, 8 Apr 1998 14:04:54 -0500 + +emacs20 (20.2-5) frozen unstable; urgency=low + + * Make sure to preserve timestamps on .el files in emacs20-el + (closes: #20274) + * Add leim support for alternate input methods. May close several + bugs. + + -- Rob Browning Sun, 5 Apr 1998 10:38:20 -0500 + +emacs20 (20.2-4) frozen unstable; urgency=low + + * Added copright file to emacs20-el package (closes: #19300) + * suidmanager doesn't understand symbolic perms + (closes: #18448, #19213) + + -- Rob Browning Fri, 13 Mar 1998 13:01:07 -0600 + +emacs20 (20.2-3) unstable; urgency=low + + * Fixed problem with permissions on /usr/share/emacs/20.2/site-lisp/ + (closes: #18717) + + -- Rob Browning Mon, 2 Mar 1998 12:02:33 -0600 + +emacs20 (20.2-2) unstable; urgency=low + + * fixed bad menu line (closes: #18362). + + -- Rob Browning Thu, 19 Feb 1998 10:52:58 -0600 + +emacs20 (20.2-2) unstable; urgency=low + + * Explicit dependency on liblockfile0 until bug is fixed + (closes #18186) + * added lisp/site-lisp.el to fix info path problem (closes #18190) + + -- Rob Browning Sat, 14 Feb 1998 19:19:09 -0600 + +emacs20 (20.2-1) unstable; urgency=low + + * movemail no longer suid -- not needed. + * start from scratch with emacs-20.2 source and old emacs-19.34 and + xemacs patches. + + -- Rob Browning Tue, 16 Dec 1997 01:20:27 -0600 + +Local Variables: +coding: utf-8 +End: + --- emacs21-21.4a+1.orig/debian/README.add-on-package-maintainers +++ emacs21-21.4a+1/debian/README.add-on-package-maintainers @@ -0,0 +1,2 @@ +Please see /usr/share/doc/emacsen-common/debian-emacs-policy.gz for +information on how to properly structure your emacs add-on packages. --- emacs21-21.4a+1.orig/debian/emacsVER.README +++ emacs21-21.4a+1/debian/emacsVER.README @@ -0,0 +1,3 @@ + +Please see /usr/share/doc/emacs@MAJOR_VERSION@-common/ as the primary +documentation directory. --- emacs21-21.4a+1.orig/debian/emacsVER.desktop +++ emacs21-21.4a+1/debian/emacsVER.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Encoding=UTF-8 +Name=Emacs @MAJOR_VERSION@ (X11) +GenericName=Emacs +Comment=GNU Emacs @MAJOR_VERSION@ Text Editor +Exec=/usr/bin/emacs@MAJOR_VERSION@ -i +TryExec=emacs@MAJOR_VERSION@ +Terminal=false +Type=Application +Icon=/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm +Categories=Application;Development; +MimeType=text/plain --- emacs21-21.4a+1.orig/debian/copyright.in +++ emacs21-21.4a+1/debian/copyright.in @@ -0,0 +1,448 @@ +-*-text-*- + +This package was debianized by Rob Browning on +Tue, 16 Dec 1997 00:05:45 -0600. + +The source is a combination of the following files: + + prep.ai.mit.edu:/pub/gnu/emacs/emacs-@UPSTREAM_VERSION@.tar.gz + prep.ai.mit.edu:/pub/gnu/emacs/leim-@UPSTREAM_LEIM_VERSION@.tar.gz + +Please see /usr/share/doc/@DEB_FLAVOR@-common/README.Debian.gz for a +description of the Debian specific differences from the upstream +version. + +As mentioned there, some files (including some of the Emacs +documentation) have been removed from this package because their +licenses do not appear to satisfy the requirements of the Debian Free +Software Guidelines (DFSG). See http://www.debian.org/social_contract. + +In particular, some of the info pages are covered under the GNU Free +Documentation License (GFDL), which Debian has decided does not +satisfy the DFSG in cases where "Invariant Sections" are specified +(this includes front and back cover texts). See this Debian General +Resolution on the topic: http://www.debian.org/vote/2006/vote_001. + +Some other files have been removed because their license only allows +verbatim copying, or because there was some other question. + +Copyright: + + Emacs itself is licensed under the terms of the GNU General Public + License (GPL). See the file /usr/share/common-licenses/GPL for more + information. + + man/dired-x.texi is licensed as follows: + + Copyright (C) 1993, 1994, 2001 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission + notice are preserved on all copies. + + Permission is granted to copy and distribute modified versions + of this manual under the conditions for verbatim copying, + provided that the entire resulting derived work is distributed + under the terms of a permission notice identical to this one. + + Permission is granted to copy and distribute translations of + this manual into another language, under the above conditions + for modified versions, except that this permission notice may be + stated in a translation approved by the Free Software + Foundation. + + The file used to create this is called dired-x.texi, but the + original work that was altered to make that file was called + dired.texi written by Sebastian Kremer. + + Permission is granted to process this file through TeX and print + the results, provided the printed document carries copying + permission notice identical to this one except for the removal + of this paragraph (this paragraph not being relevant to the + printed manual). + + man/faq.texi is licensed as follows: + + Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner + Copyright (C) 1992,1993 Steven Byrnes + Copyright (C) 1990,1991,1992 Joseph Brian Wells + + This list of frequently asked questions about GNU Emacs with + answers ("FAQ") may be translated into other languages, + transformed into other formats (e.g. Texinfo, Info, WWW, WAIS), + and updated with new information. + + The same conditions apply to any derivative of the FAQ as apply + to the FAQ itself. Every copy of the FAQ must include this + notice or an approved translation, information on who is + currently maintaining the FAQ and how to contact them (including + their e-mail address), and information on where the latest + version of the FAQ is archived (including FTP information). + + The FAQ may be copied and redistributed under these conditions, + except that the FAQ may not be embedded in a larger literary + work unless that work itself allows free copying and + redistribution. + + Both etc/emacs.1 and etc/etags.1 are licensed under the terms of the + GNU Free Documentation License , Version 1.1 or any later version + published by the Free Software Foundation; with no Invariant Sections, + with no Front-Cover Texts, and no Back-Cover Texts. + +---------------------------------------------------------------------- + + GNU Free Documentation License + Version 1.1, March 2000 + + Copyright (C) 2000 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +written document "free" in the sense of freedom: to assure everyone +the effective freedom to copy and redistribute it, with or without +modifying it, either commercially or noncommercially. Secondarily, +this License preserves for the author and publisher a way to get +credit for their work, while not being considered responsible for +modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work that contains a +notice placed by the copyright holder saying it can be distributed +under the terms of this License. The "Document", below, refers to any +such manual or work. Any member of the public is a licensee, and is +addressed as "you". + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall subject +(or to related matters) and contains nothing that could fall directly +within that overall subject. (For example, if the Document is in part a +textbook of mathematics, a Secondary Section may not explain any +mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, whose contents can be viewed and edited directly and +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup has been designed to thwart or discourage +subsequent modification by readers is not Transparent. A copy that is +not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML designed for human modification. Opaque formats include +PostScript, PDF, proprietary formats that can be read and edited only +by proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML produced by some word processors for output +purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no other +conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies of the Document numbering more than 100, +and the Document's license notice requires Cover Texts, you must enclose +the copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a publicly-accessible computer-network location containing a complete +Transparent copy of the Document, free of added material, which the +general network-using public has access to download anonymously at no +charge using public-standard network protocols. If you use the latter +option, you must take reasonably prudent steps, when you begin +distribution of Opaque copies in quantity, to ensure that this +Transparent copy will remain thus accessible at the stated location +until at least one year after the last time you distribute an Opaque +copy (directly or through your agents or retailers) of that edition to +the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to give +them a chance to provide you with an updated version of the Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has less than five). +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section entitled "History", and its title, and add to + it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. In any section entitled "Acknowledgements" or "Dedications", + preserve the section's title, and preserve in the section all the + substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section as "Endorsements" + or to conflict in title with any Invariant Section. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections entitled "History" +in the various original documents, forming one section entitled +"History"; likewise combine any sections entitled "Acknowledgements", +and any sections entitled "Dedications". You must delete all sections +entitled "Endorsements." + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other documents +released under this License, and replace the individual copies of this +License in the various documents with a single copy that is included in +the collection, provided that you follow the rules of this License for +verbatim copying of each of the documents in all other respects. + +You may extract a single document from such a collection, and distribute +it individually under this License, provided you insert a copy of this +License into the extracted document, and follow this License in all +other respects regarding verbatim copying of that document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, does not as a whole count as a Modified Version +of the Document, provided no compilation copyright is claimed for the +compilation. Such a compilation is called an "aggregate", and this +License does not apply to the other self-contained works thus compiled +with the Document, on account of their being thus compiled, if they +are not themselves derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one quarter +of the entire aggregate, the Document's Cover Texts may be placed on +covers that surround only the Document within the aggregate. +Otherwise they must appear on covers around the whole aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License provided that you also include the +original English version of this License. In case of a disagreement +between the translation and the original English version of this +License, the original English version will prevail. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document except +as expressly provided for under this License. Any other attempt to +copy, modify, sublicense or distribute the Document is void, and will +automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions +of the GNU Free Documentation License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. See +http://www.gnu.org/copyleft/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation; + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have no Invariant Sections, write "with no Invariant Sections" +instead of saying which ones are invariant. If you have no +Front-Cover Texts, write "no Front-Cover Texts" instead of +"Front-Cover Texts being LIST"; likewise for Back-Cover Texts. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. --- emacs21-21.4a+1.orig/debian/emacsVER.menu +++ emacs21-21.4a+1/debian/emacsVER.menu @@ -0,0 +1,15 @@ +?package(@PKG_NAME@):\ + needs="X11"\ + section="Apps/Editors"\ + title="Emacs @MAJOR_VERSION@ (X11)"\ + command="/usr/bin/emacs@MAJOR_VERSION@ -i"\ + icon="/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm"\ + hints="Text" + +?package(@PKG_NAME@):\ + needs="text"\ + section="Apps/Editors"\ + title="Emacs @MAJOR_VERSION@ (text)"\ + command="/usr/bin/emacs@MAJOR_VERSION@ -nw"\ + icon="/usr/share/emacs/@FULL_VERSION@/etc/gnu-32x32.xpm"\ + hints="Text" --- emacs21-21.4a+1.orig/debian/compat +++ emacs21-21.4a+1/debian/compat @@ -0,0 +1 @@ +4 --- emacs21-21.4a+1.orig/debian/mangle-info +++ emacs21-21.4a+1/debian/mangle-info @@ -0,0 +1,17 @@ +#!/usr/bin/perl -w -i + +use English; +use strict; + +$RS = undef; + +my $prefix = $ENV{"DEBIAN_INFO_PREFIX"}; + +my $x = <>; +if(!($x =~ m/^(\s*START-INFO-DIR-ENTRY\s+\*\s*[^:]+:\s*)\(([^\)]+)\)/mo)) { + die "Couldn't find START-INFO-DIR-ENTRY."; +} + +print ${PREMATCH}; +print "$1($prefix/$2)"; +print ${POSTMATCH}; --- emacs21-21.4a+1.orig/debian/dfsg-splitter +++ emacs21-21.4a+1/debian/dfsg-splitter @@ -0,0 +1,141 @@ +#!/bin/bash + +set -e +set -x + +# Usage: put the relevant emacs and leim tar.gz files into the current +# directory and run the script. The resulting two orig.tar.gz files +# will be placed into a new ./split-tmp directory. + +emacs_version="21.4a" +emacs_major="21" +emacs_dir="emacs-21.4" +leim_version="21.4" +deb_src_rev=1 + +non_main_dir="${emacs_dir}-non-dfsg" + +if ! test root = "`whoami`" +then + echo Use fakeroot. + exit 1 +fi + +if test -e split-tmp +then + echo "./split-tmp already exists - aborting" + exit 1 +fi + +mkdir ./split-tmp +pushd split-tmp + +umask 002 + +tar xzf "../emacs-${emacs_version}.tar.gz" +tar xzf "../leim-${leim_version}.tar.gz" + +find "${emacs_dir}" -name "*.elc" -exec rm {} + +find "${emacs_dir}"/info -type f -not -name "COPYING" -exec rm {} + + +mkdir "${non_main_dir}" + +function move_to_non_main_dir() +{ + pushd "${emacs_dir}" + cp -a --parents "$1" "../${non_main_dir}/" + rm "$1" + popd +} + +function copy_to_non_main_dir() +{ + pushd "${emacs_dir}" + cp -a --parents "$1" "../${non_main_dir}/" + popd +} + +function remove_from_main_dir() +{ + pushd "${emacs_dir}" + rm "$1" + popd +} + +# assumes someone has already copied file to non-main dir +function move_to_main_dir() +{ + pushd "${non_main_dir}" + cp -a --parents "$1" "../${emacs_dir}/" + rm "$1" + popd +} + +# assumes someone has already copied file to non-main dir +function copy_to_main_dir() +{ + pushd "${non_main_dir}" + cp -a --parents "$1" "../${emacs_dir}/" + popd +} + + + +# So both sides will have a copy (at the very least, version.el refers to it). +copy_to_non_main_dir "etc/COPYING" + +# verbatim dist only +move_to_non_main_dir "etc/CENSORSHIP" +move_to_non_main_dir "etc/copying.paper" +move_to_non_main_dir "etc/LINUX-GNU" +move_to_non_main_dir "etc/THE-GNU-PROJECT" +move_to_non_main_dir "etc/WHY-FREE" +move_to_non_main_dir "etc/DISTRIB" +move_to_non_main_dir "etc/GNU" + +# no modifications (moved to go with docs) +move_to_non_main_dir "etc/gfdl.1" + +# reprinted with permissions or copyright mentioned +# no modification mention +move_to_non_main_dir "etc/INTERVIEW" +move_to_non_main_dir "etc/MOTIVATION" + +# Assuming modification not allowed by default (emails, etc.) +move_to_non_main_dir "etc/COOKIES" +move_to_non_main_dir "etc/JOKES" + +# Replaced upstream -- we have the replacement in ./debian/replacement. +remove_from_main_dir "etc/yow.lines" + +# This is used via debian/rules to track the nominal_ver. +copy_to_non_main_dir "lisp/version.el" + +# man files which appear to be compatible with the DFSG +dfsg_man_files=" + dired-x.texi + faq.texi" + +pushd "${emacs_dir}" +mkdir ../"${non_main_dir}"/man +mv man/* ../"${non_main_dir}"/man/ +popd + +# want these files in both archives, so put them back +copy_to_main_dir "man/ChangeLog" +copy_to_main_dir "man/Makefile.in" + +for f in ${dfsg_man_files} +do + move_to_main_dir "man/$f" +done + +GZIP=-9v tar czpSf \ + "emacs${emacs_major}_${emacs_version}+${deb_src_rev}.orig.tar.gz" \ + "${emacs_dir}" + +GZIP=-9v tar czpSf \ + "emacs${emacs_major}-non-dfsg_${emacs_version}+${deb_src_rev}.orig.tar.gz" \ + "${emacs_dir}"-non-dfsg + +exit 0 --- emacs21-21.4a+1.orig/debian/gnu-32x32.xpm +++ emacs21-21.4a+1/debian/gnu-32x32.xpm @@ -0,0 +1,59 @@ +/* XPM */ +static char * gnu_32x32_xpm[] = { +"32 32 24 1", +" c None", +". c #000000", +"+ c #7F7F7F", +"@ c #CCCCCC", +"# c #0000FF", +"$ c #FFFF00", +"% c #007F7F", +"& c #333333", +"* c #B2B2B2", +"= c #FFFFFF", +"- c #7F007F", +"; c #00FF00", +"> c #00007F", +", c #7F7F00", +"' c #191919", +") c #FF0000", +"! c #007F00", +"~ c #666667", +"{ c #E5E5E5", +"] c #00FFFF", +"^ c #FF00FF", +"/ c #4C4C4C", +"( c #999999", +"_ c #7F0000", +" ", +" _ ", +" _ ", +" __ ", +" _ _ __ ", +" _ __ ____ __ ", +" __ ___________ __ ", +" __ _____________ ___ ", +" ___ _______________ ____ ", +" ___ ______+(/+(~/~(+/&_&_ ", +" ___ _____+++@==@((@{@@@~~ ", +" _________++*=={{@@++*@*{==( ", +" ________(+(~+*@@*@@+~ ~+ ", +" _______(@+(~{=*+*@@@+/ ", +" ___~{{/*/*##*(+@@@(/ ", +" _@==(+{+*#/@/+@@@*/ ", +" +=@~/~=+@===*{@@@@*~ ", +" +*//~+***=*++{@@@@@~/ ", +" /++(**~@=({{{@@@@(/ ", +" ~*~((((*@{===@@@@@( ", +" /+@(/~{(*=*{==={@@(~ ", +" /~@@+(*@+(*+*/~~*(/_/ ", +" /+@@~*~((*(+*___//_// ", +" /(@++((*~(+/&_____// ", +" /+@@++~+@/*//____&/ ", +" /*@(~++(+///&___&/ ", +" /+@@@+*~~*(//___// ", +" /+*@@(*/@+///_&/ ", +" //(@@@+~/ /// ", +" /~@@// ", +" /~ ", +" "}; --- emacs21-21.4a+1.orig/debian/autofiles-diff-header +++ emacs21-21.4a+1/debian/autofiles-diff-header @@ -0,0 +1,3 @@ +* The autoconf related files have been updated. + Patch: autofiles.dpatch + Author: N/A (automatically generated) --- emacs21-21.4a+1.orig/debian/emacsVER.postinst +++ emacs21-21.4a+1/debian/emacsVER.postinst @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ + +update-alternatives \ + --install /usr/bin/emacs emacs \ + /usr/bin/emacs${MAJOR}-@X_SUPPORT@ @BIN_PRIORITY@ \ + --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \ + /usr/share/man/man1/emacs.1emacs${MAJOR}.gz + +update-alternatives \ + --install /usr/bin/editor editor \ + /usr/bin/emacs${MAJOR} 0 \ + --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ + /usr/share/man/man1/emacs.1emacs${MAJOR}.gz + +# emacsen-common registration. +/usr/lib/emacsen-common/emacs-install emacs${MAJOR} + +#DEBHELPER# + --- emacs21-21.4a+1.orig/debian/control.in +++ emacs21-21.4a+1/debian/control.in @@ -0,0 +1,91 @@ +Source: emacs@MAJOR_VERSION@ +Section: editors +Priority: optional +Maintainer: Rob Browning +Uploaders: Jerome Marant +Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff4-dev | libtiff-dev, xaw3dg-dev, libpng12-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), quilt, debhelper (>= 4), libxaw7-dev, sharutils +Standards-Version: 3.7.2 + +Package: emacs +Section: editors +Priority: optional +Architecture: all +Depends: emacs@MAJOR_VERSION@ | emacs@MAJOR_VERSION@-nox +Provides: emacsen, editor, info-browser, mail-reader, news-reader +Description: The GNU Emacs editor (metapackage) + GNU Emacs is the extensible self-documenting text editor. + This is a metapackage which will always depend on the latest Emacs + release. + +Package: emacs-nox +Architecture: all +Depends: emacs@MAJOR_VERSION@-nox +Description: The GNU Emacs editor (without X support) + This package will always depend on the current emacs package compiled + without support for X. + +Package: emacs-el +Architecture: all +Depends: emacs@MAJOR_VERSION@-el +Description: GNU Emacs LISP (.el) files + This package will always depend on the current elisp sources. + +Package: emacs@MAJOR_VERSION@ +Section: editors +Priority: optional +Architecture: any +Depends: emacs@MAJOR_VERSION@-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: emacsen, editor, info-browser, mail-reader, news-reader +Suggests: emacs@MAJOR_VERSION@-common-non-dfsg +Conflicts: emacs@MAJOR_VERSION@-nox, w3-el +Replaces: emacs@MAJOR_VERSION@-nox +Description: The GNU Emacs editor + GNU Emacs is the extensible self-documenting text editor. + +Package: emacs@MAJOR_VERSION@-nox +Section: editors +Priority: optional +Architecture: any +Depends: emacs@MAJOR_VERSION@-bin-common (= ${Source-Version}), ${shlibs:Depends} +Provides: emacs@MAJOR_VERSION@, editor, emacsen, info-browser, mail-reader, news-reader +Suggests: emacs@MAJOR_VERSION@-common-non-dfsg +Conflicts: emacs@MAJOR_VERSION@, w3-el +Replaces: emacs@MAJOR_VERSION@ +Description: The GNU Emacs editor (without X support) + GNU Emacs is the extensible self-documenting text editor. + This package contains a version of Emacs compiled without support for X. + +Package: emacs@MAJOR_VERSION@-bin-common +Section: editors +Priority: optional +Architecture: any +Depends: emacs@MAJOR_VERSION@-common (= ${Source-Version}), ${shlibs:Depends} +Replaces: emacs21 (<< 21.2-4), emacs21-common (<< 21.3+1-4) +Description: The GNU Emacs editor's shared, architecture dependent files + GNU Emacs is the extensible self-documenting text editor. + This package contains the architecture dependent infrastructure + that's shared by emacs@MAJOR_VERSION@ and emacs@MAJOR_VERSION@-nox. + +Package: emacs@MAJOR_VERSION@-common +Section: editors +Priority: optional +Architecture: all +Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends} +Suggests: emacs@MAJOR_VERSION@-el, emacs@MAJOR_VERSION@-common-non-dfsg +Conflicts: emacs@MAJOR_VERSION@-el (<< ${Source-Version}), w3-el +Replaces: emacs21 (<< 21.2-4) +Description: The GNU Emacs editor's shared, architecture independent infrastructure + GNU Emacs is the extensible self-documenting text editor. + This package contains the architecture independent infrastructure + that's shared by emacs@MAJOR_VERSION@ and emacs@MAJOR_VERSION@-nox. + +Package: emacs@MAJOR_VERSION@-el +Section: editors +Priority: optional +Architecture: all +Depends: emacs@MAJOR_VERSION@-common (= ${Source-Version}) +Replaces: emacs@MAJOR_VERSION@ (<< 21.2-4) +Description: GNU Emacs LISP (.el) files + GNU Emacs is the extensible self-documenting text editor. + This package contains the elisp sources for the convenience of users, + saving space in the main package for small systems. --- emacs21-21.4a+1.orig/debian/emacsVER-bin-common.prerm +++ emacs21-21.4a+1/debian/emacsVER-bin-common.prerm @@ -0,0 +1,27 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ +INFOFILES="@INFOFILES@" +ALTERNATIVES="@ALTERNATIVES@" + +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ] +then + rm -f /usr/doc/@PKG_NAME@ +fi + +# update-alternatives on things that collide with xemacs, other editors +if [ "$1" != "upgrade" ] +then + for i in ${ALTERNATIVES} + do + test $i = emacs && continue + update-alternatives --remove $i /usr/bin/$i.emacs${MAJOR} + done +fi + +#DEBHELPER# + --- emacs21-21.4a+1.orig/debian/emacsclient-plus +++ emacs21-21.4a+1/debian/emacsclient-plus @@ -0,0 +1,31 @@ +#!/usr/bin/perl + +# If there is an Emacs server, runs emacsclient. +# Otherwise, launches Emacs. +# Only for systems with Berkeley sockets (like Debian GNU/Linux). + +$real_emacsclient = "/usr/bin/emacsclient"; +$socket_prefix = "esrv"; +$id = `id --user`; +chomp $id; +$socket_dir = "/tmp/"; +$hostname = `hostname`; +chomp $hostname; + +if (-S "$socket_dir$socket_prefix$id-$hostname") { + exec ("$real_emacsclient " . join (" ", @ARGV)); + die "Cannot run $real_emacsclient: $!"; +} +else { + if ($ENV{'DISPLAY'}) { + system "emacs &"; + # Wait the server (Emacs is slow) + sleep 2; + exec ("$real_emacsclient " . join (" ", @ARGV)); + die "Cannot run $real_emacsclient: $!"; + } + else { + exec ("emacs " . join (" ", @ARGV)); + die "Cannot run emacs: $!"; + } +} --- emacs21-21.4a+1.orig/debian/missing-file.dfsg +++ emacs21-21.4a+1/debian/missing-file.dfsg @@ -0,0 +1,10 @@ + +The file that would normally be displayed here (@FILE@) has been moved +to the emacs@MAJOR_VERSION@-common-non-dfsg package because its +license does not appear to be compatible with the Debian Free Software +Guidelines (DFSG). Please see +/usr/share/doc/emacs@MAJOR_VERSION@-common/copyright for more +information. + +Please install @FILE@ from Debian's non-free distribution if you would +like for Emacs to display the original file. --- emacs21-21.4a+1.orig/debian/replacement/yow.lines.uu +++ emacs21-21.4a+1/debian/replacement/yow.lines.uu @@ -0,0 +1,12 @@ +begin 640 yow.lines +M02!D871A(&)A2!Q=6]T871I;VYS("AF2X*2&%V92!&54XA"@`*66]W(2`@3&5G86QL>2UI;7!O +K + Added-by: Rob Browning + Status: new + +diff -urNad /home/rlb/deb/emacs/trunk-21/configure.in trunk-21/configure.in +--- /home/rlb/deb/emacs/trunk-21/configure.in 2004-02-21 21:05:44.000000000 -0600 ++++ trunk-21/configure.in 2004-02-22 10:01:39.000000000 -0600 +@@ -26,6 +26,7 @@ + AC_PREREQ(2.8)dnl + AC_INIT(src/lisp.h) + AC_CONFIG_HEADER(src/config.h:src/config.in) ++AC_CONFIG_LIBOBJ_DIR(src) + + lispdir='${datadir}/emacs/${version}/lisp' + locallisppath='${datadir}/emacs/${version}/site-lisp:'\ +@@ -2037,12 +2038,8 @@ + if test "${with_kerberos5+set}" = set; then + AC_CHECK_HEADERS(krb5.h) + else +- AC_CHECK_HEADERS(des.h,, +- AC_CHECK_HEADERS(kerberosIV/des.h,, +- AC_CHECK_HEADERS(kerberos/des.h))) +- AC_CHECK_HEADERS(krb.h,, +- AC_CHECK_HEADERS(kerberosIV/krb.h,, +- AC_CHECK_HEADERS(kerberos/krb.h))) ++ AC_CHECK_HEADERS([des.h kerberosIV/des.h kerberos/des.h], break) ++ AC_CHECK_HEADERS([krb.h kerberosIV/krb.h kerberos/krb.h], break) + fi + AC_CHECK_HEADERS(com_err.h) + fi +@@ -2326,7 +2323,7 @@ + # the C preprocessor to some helpful value like 1, or maybe the empty + # string. Needless to say consequent macro substitutions are less + # than conducive to the makefile finding the correct directory. +-undefs="`echo $top_srcdir $configuration $canonical | ++undefs="`echo $ac_top_srcdir $configuration $canonical | + sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ + -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g' \ + `" +@@ -2350,7 +2347,7 @@ + sed -e '1,/start of cpp stuff/d'\ + -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ + < Makefile.c > junk.c +- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ ++ $CPP $undefs -I. -I$ac_top_srcdir/src $CPPFLAGS junk.c | \ + sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c + cat junk1.c junk2.c > Makefile.new + rm -f junk.c junk1.c junk2.c +@@ -2366,7 +2363,7 @@ + sed -e '1,/start of cpp stuff/d'\ + -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ + < Makefile.c > junk.c +- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ ++ $CPP $undefs -I. -I$ac_top_srcdir/src $CPPFLAGS junk.c | \ + sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c + cat junk1.c junk2.c > Makefile.new + rm -f junk.c junk1.c junk2.c +@@ -2374,9 +2371,9 @@ + mv -f Makefile.new Makefile + ) + +-if test ! -f src/.gdbinit && test -f $top_srcdir/src/.gdbinit; then ++if test ! -f src/.gdbinit && test -f $ac_top_srcdir/src/.gdbinit; then + echo creating src/.gdbinit +- echo source $top_srcdir/src/.gdbinit > src/.gdbinit ++ echo source $ac_top_srcdir/src/.gdbinit > src/.gdbinit + fi + + # This is how we know whether to re-run configure in certain cases. --- emacs21-21.4a+1.orig/debian/patches/coding-region-leak.diff +++ emacs21-21.4a+1/debian/patches/coding-region-leak.diff @@ -0,0 +1,96 @@ +* A memory leak in decode-coding-region and similar routines has been fixed. + Patch: coding-region-leak.diff + Author: Kenichi Handa and Florian Weimer + Status: has been incorporated upstream + Date: Fri, 8 Oct 2004 23:13:59 +0200 + + A long-standing memory leak in decode-coding-region and similar + routines has been fixed. + +diff -urNad /home/fw/debian/tmp/emacs21-21.3+1/src/callproc.c emacs21-21.3+1/src/callproc.c +--- /home/fw/debian/tmp/emacs21-21.3+1/src/callproc.c 2002-07-09 02:02:36.000000000 +0200 ++++ emacs21-21.3+1/src/callproc.c 2004-09-30 09:44:42.000000000 +0200 +@@ -790,6 +790,8 @@ + { + detect_coding (&process_coding, bufptr, nread); + if (process_coding.composing != COMPOSITION_DISABLED) ++ /* We have not yet allocated the composition ++ data because the coding type was undecided. */ + coding_allocate_composition_data (&process_coding, PT); + } + if (process_coding.cmp_data) +diff -urNad /home/fw/debian/tmp/emacs21-21.3+1/src/coding.c emacs21-21.3+1/src/coding.c +--- /home/fw/debian/tmp/emacs21-21.3+1/src/coding.c 2003-03-16 23:06:55.000000000 +0100 ++++ emacs21-21.3+1/src/coding.c 2004-09-30 09:44:42.000000000 +0200 +@@ -5489,8 +5489,11 @@ + coding_allocate_composition_data (coding, from); + } + +- /* Try to skip the heading and tailing ASCIIs. */ +- if (coding->type != coding_type_ccl) ++ /* Try to skip the heading and tailing ASCIIs. We can't skip them ++ if we must run CCL program or there are compositions to ++ encode. */ ++ if (coding->type != coding_type_ccl ++ && (! coding->cmp_data || coding->cmp_data->used == 0)) + { + int from_byte_orig = from_byte, to_byte_orig = to_byte; + +@@ -5506,6 +5509,7 @@ + if (!replace) + /* We must record and adjust for this new text now. */ + adjust_after_insert (from, from_byte_orig, to, to_byte_orig, len); ++ coding_free_composition_data (coding); + return 0; + } + +@@ -6106,12 +6110,16 @@ + coding_save_composition (coding, from, to, str); + + /* Try to skip the heading and tailing ASCIIs. */ +- if (coding->type != coding_type_ccl) ++ if (coding->type != coding_type_ccl ++ && (! coding->cmp_data || coding->cmp_data->used == 0)) + { + SHRINK_CONVERSION_REGION (&from, &to_byte, coding, XSTRING (str)->data, + 1); + if (from == to_byte) +- return (nocopy ? str : Fcopy_sequence (str)); ++ { ++ coding_free_composition_data (coding); ++ return (nocopy ? str : Fcopy_sequence (str)); ++ } + shrinked_bytes = from + (STRING_BYTES (XSTRING (str)) - to_byte); + } + +diff -urNad /home/fw/debian/tmp/emacs21-21.3+1/src/fileio.c emacs21-21.3+1/src/fileio.c +--- /home/fw/debian/tmp/emacs21-21.3+1/src/fileio.c 2003-02-04 11:52:40.000000000 +0100 ++++ emacs21-21.3+1/src/fileio.c 2004-09-30 09:44:42.000000000 +0200 +@@ -4087,7 +4087,7 @@ + if (how_much < 0) + { + xfree (conversion_buffer); +- ++ coding_free_composition_data (&coding); + if (how_much == -1) + error ("IO error reading %s: %s", + XSTRING (orig_filename)->data, emacs_strerror (errno)); +@@ -4109,6 +4109,7 @@ + if (bufpos == inserted) + { + xfree (conversion_buffer); ++ coding_free_composition_data (&coding); + emacs_close (fd); + specpdl_ptr--; + /* Truncate the buffer to the size of the file. */ +diff -urNad /home/fw/debian/tmp/emacs21-21.3+1/src/process.c emacs21-21.3+1/src/process.c +--- /home/fw/debian/tmp/emacs21-21.3+1/src/process.c 2003-03-16 23:06:56.000000000 +0100 ++++ emacs21-21.3+1/src/process.c 2004-09-30 09:44:42.000000000 +0200 +@@ -3347,6 +3347,7 @@ + object = XPROCESS (proc)->encoding_buf; + encode_coding (coding, (char *) buf, XSTRING (object)->data, + len, STRING_BYTES (XSTRING (object))); ++ coding_free_composition_data (coding); + len = coding->produced; + buf = XSTRING (object)->data; + if (temp_buf) --- emacs21-21.4a+1.orig/debian/patches/detect-coding-iso2022.diff +++ emacs21-21.4a+1/debian/patches/detect-coding-iso2022.diff @@ -0,0 +1,39 @@ +* Emacs should no longer silently modify a binary file when instructed not to. + Patch: detect-coding-iso2022.diff + Provided-by: Kenichi Handa + Added-by: Rob Browning + Status: backported from upstream fix of 2002-07-26 + + Emacs should no longer modify a binary file when told to use a + raw-text or no-conversion for the encoding during a save. + +diff -urNad /home/rlb/deb/emacs21/trunk/src/coding.c trunk/src/coding.c +--- /home/rlb/deb/emacs21/trunk/src/coding.c 2003-09-09 17:28:48.000000000 -0500 ++++ trunk/src/coding.c 2003-09-11 22:16:16.000000000 -0500 +@@ -1359,6 +1359,7 @@ + while (mask && src < src_end) + { + ONE_MORE_BYTE_CHECK_MULTIBYTE (c, multibytep); ++ retry: + switch (c) + { + case ISO_CODE_ESC: +@@ -1556,6 +1557,8 @@ + && mask & CODING_CATEGORY_MASK_ISO_8_2) + { + int i = 1; ++ ++ c = -1; + while (src < src_end) + { + ONE_MORE_BYTE_CHECK_MULTIBYTE (c, multibytep); +@@ -1568,6 +1571,9 @@ + mask &= ~CODING_CATEGORY_MASK_ISO_8_2; + else + mask_found |= CODING_CATEGORY_MASK_ISO_8_2; ++ if (c >= 0) ++ /* This means that we have read one extra byte. */ ++ goto retry; + } + } + break; --- emacs21-21.4a+1.orig/debian/patches/fix-x-vs-no-x-diffs.diff +++ emacs21-21.4a+1/debian/patches/fix-x-vs-no-x-diffs.diff @@ -0,0 +1,90 @@ +* Building --with-x=yes and --with-x=no creates very few differences now. + Patch: fix-x-vs-no-x-diffs.diff + Author: Rob Browning + Applied-by: Rob Browning + + Eliminate as many differences between --with-x=yes and --with-x=no + versions of emacs as possible, and accommodate the rest. + (The patch was written in consulatation with emacs-devel.) + + Make sure that the DOC files generated with and without X, + i.e. --with-x=yes and --with-x=no, are the same. + + Make sure that cus-dep.el generation doesn't fail by fixing some + problems with a couple of defcustom forms. Without the fix, the + computation of custom-where in cus-dep.el fails because the defcustom + eval fails. The gnus-art.el fix does copy/paste the value of + gnus-article-compface-xbm from gnus-ems to gnus-art. This doesn't + look like it should hurt anything, but it'd be better to fix this + "right" in the long term. + + Sort the custom-group entries in cus-dep before generating + custom-loads so the output doesn't differ from run-to-run. + + Add a tag so that we can insert our own name for the fns-*.el file + into help.el at package build time. fns-*.el is the only difference + remaining, and we just allow two versions, fns-*-x.el and fns-*-nox.el + and arrange for help.el to load the right one. + +diff -ru 0/lisp/scroll-bar.el 1/lisp/scroll-bar.el +--- 0/lisp/scroll-bar.el 2002-09-15 17:14:25.000000000 -0500 ++++ 1/lisp/scroll-bar.el 2002-09-15 17:15:39.000000000 -0500 +@@ -99,6 +99,7 @@ + (const left) + (const right)) + :group 'frames ++ :initialize 'custom-initialize-default + :set 'set-scroll-bar-mode-1) + + ;; We just set scroll-bar-mode, but that was the default. +diff -ru 0/lisp/gnus/gnus-art.el 1/lisp/gnus/gnus-art.el +--- 0/lisp/gnus/gnus-art.el 2002-03-22 11:03:55.000000000 -0600 ++++ 1/lisp/gnus/gnus-art.el 2002-09-15 16:42:46.000000000 -0500 +@@ -207,7 +207,10 @@ + (if (and (fboundp 'image-type-available-p) + (image-type-available-p 'xbm)) + 'gnus-article-display-xface +- (if gnus-article-compface-xbm ++ (if (or (and (boundp 'gnus-article-compface-xbm) ++ gnus-article-compface-xbm) ++ (eq 0 (string-match "#define" ++ (shell-command-to-string "uncompface -X")))) + "{ echo '/* Width=48, Height=48 */'; uncompface; } | display -" + "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | \ + display -")) +--- 0/lisp/cus-dep.el 2002-07-30 20:15:40.000000000 -0500 ++++ 1/lisp/cus-dep.el 2002-09-15 18:20:53.000000000 -0500 +@@ -35,7 +35,7 @@ + "Batch function to extract custom dependencies from .el files. + Usage: emacs -batch -l ./cus-dep.el -f custom-make-dependencies DIRS" + (let ((enable-local-eval nil) +- (all-subdirs command-line-args-left) ++ (all-subdirs (sort command-line-args-left 'string<)) + (start-directory default-directory)) + (get-buffer-create " cus-dep temp") + (set-buffer " cus-dep temp") +@@ -86,6 +86,10 @@ + (let ((members (get symbol 'custom-group)) + item where found) + (when members ++ ;; So x and no-x builds won't differ. ++ (setq members ++ (sort (copy-sequence members) ++ (lambda (x y) (string< (car x) (car y))))) + (while members + (setq item (car (car members)) + members (cdr members) +--- 0/lisp/help.el 2001-10-21 20:26:01.000000000 -0500 ++++ 1/lisp/help.el 2002-09-19 23:29:30.000000000 -0500 +@@ -612,7 +612,10 @@ + ;; fns-XX.YY.ZZ.el does not work on DOS filesystem. + (if (eq system-type 'ms-dos) + "fns.el" +- (format "fns-%s.el" emacs-version)) ++ ;; Modified for Debian to support x and nox parallel installs. ++ (format "fns-%s-%s.el" ++ emacs-version ++ (or (and (featurep 'x-toolkit) "x") "nox"))) + exec-directory) + ;; The file name fns-%s.el already has a .el extension. + nil nil t) --- emacs21-21.4a+1.orig/debian/patches/handle-dfsg-split.diff +++ emacs21-21.4a+1/debian/patches/handle-dfsg-split.diff @@ -0,0 +1,319 @@ +* Files apparently incompatible with the DFSG have been removed. + + A number of files have been removed from this package because their + licenses are not compatible with the Debian Free Software Guidelines + (DFSG), or because it wasn't completely clear that their licenses + are compatible. + + In particular, all of the files which are covered under the GFDL and + have invariant sections have been removed in accordance with this + General Resolution: http://www.debian.org/vote/2006/vote_001. + + The files that have been removed, but still appear to be + distributable, have been moved to packages in Debian's non-free + section. + + Patch: handle-dfsg-split.diff + Author: Rob Browning + Added-by: Rob Browning + Status: new + +Index: main/Makefile.in +=================================================================== +--- main.orig/Makefile.in 2006-10-11 08:55:53.794888494 +0200 ++++ main/Makefile.in 2006-10-11 09:00:38.190818472 +0200 +@@ -430,7 +430,7 @@ + chmod a+r ${infodir}/dir); \ + fi; \ + cd ${srcdir}/info ; \ +- for f in ada-mode* autotype* ccmode* cl* dired-x* ebrowse* ediff* efaq* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* speedbar* vip* widget* woman*; do \ ++ for f in dired-x* efaq*; do \ + (cd $${thisdir}; \ + ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ + chmod a+r ${infodir}/$$f); \ +@@ -440,7 +440,7 @@ + thisdir=`/bin/pwd`; \ + if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ + then \ +- for f in ada-mode autotype ccmode cl dired-x ebrowse ediff efaq emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman; do \ ++ for f in dired-x efaq; do \ + (cd $${thisdir}; \ + ${INSTALL_INFO} --info-dir=${infodir} ${infodir}/$$f); \ + done; \ +@@ -448,7 +448,7 @@ + -chmod -R a+r ${datadir}/emacs ${COPYDESTS} ${infodir} + thisdir=`/bin/pwd`; \ + cd ${srcdir}/etc; \ +- for page in emacs etags ctags gfdl ; do \ ++ for page in emacs etags ctags ; do \ + (cd $${thisdir}; \ + ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \ + chmod a+r ${man1dir}/$${page}${manext}); \ +@@ -506,7 +506,7 @@ + done + (cd ${archlibdir} && rm -f fns-*) + -rm -rf ${libexecdir}/emacs/${version} +- (cd ${infodir} && rm -f cl* ada-mode* autotype* ccmode* ebrowse* efaq* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* vip*) ++ (cd ${infodir} && rm -f efaq* dired-x*) + (cd ${man1dir} && rm -f emacs.1 etags.1 ctags.1) + (cd ${bindir} && rm -f emacs-${version} $(EMACS)) + +Index: main/man/Makefile.in +=================================================================== +--- main.orig/man/Makefile.in 2006-10-11 08:58:06.765133186 +0200 ++++ main/man/Makefile.in 2006-10-11 09:06:14.595936591 +0200 +@@ -32,20 +32,10 @@ + + # The makeinfo program is part of the Texinfo distribution. + MAKEINFO = makeinfo +-INFO_TARGETS = ../info/emacs ../info/ccmode ../info/cl \ +- ../info/dired-x ../info/ediff ../info/forms ../info/gnus \ +- ../info/info ../info/message ../info/mh-e ../info/reftex \ +- ../info/sc ../info/vip ../info/viper ../info/widget \ +- ../info/efaq ../info/ada-mode ../info/autotype \ +- ../info/idlwave ../info/eudc ../info/ebrowse ../info/pcl-cvs \ +- ../info/woman ../info/emacs-mime ../info/eshell \ +- ../info/speedbar +-DVI_TARGETS = emacs.dvi cc-mode.dvi cl.dvi dired-x.dvi \ +- ediff.dvi forms.dvi gnus.dvi message.dvi mh-e.dvi \ +- reftex.dvi sc.dvi vip.dvi viper.dvi widget.dvi faq.dvi \ +- ada-mode.dvi autotype.dvi idlwave.dvi eudc.dvi ebrowse.dvi \ +- pcl-cvs.dvi woman.dvi emacs-mime.dvi eshell.dvi \ +- speedbar.dvi ++INFO_TARGETS = ../info/dired-x ../info/efaq ++ ++DVI_TARGETS = dired-x.dvi faq.dvi ++ + INFOSOURCES = info.texi + + # The following rule does not work with all versions of `make'. +@@ -56,50 +46,6 @@ + TEXI2DVI = texi2dvi + ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" + +-EMACSSOURCES= \ +- ${srcdir}/emacs.texi \ +- ${srcdir}/doclicense.texi \ +- ${srcdir}/screen.texi \ +- ${srcdir}/commands.texi \ +- ${srcdir}/entering.texi \ +- ${srcdir}/basic.texi \ +- ${srcdir}/mini.texi \ +- ${srcdir}/m-x.texi \ +- ${srcdir}/help.texi \ +- ${srcdir}/mark.texi \ +- ${srcdir}/killing.texi \ +- ${srcdir}/regs.texi \ +- ${srcdir}/display.texi \ +- ${srcdir}/search.texi \ +- ${srcdir}/fixit.texi \ +- ${srcdir}/files.texi \ +- ${srcdir}/buffers.texi \ +- ${srcdir}/windows.texi \ +- ${srcdir}/frames.texi \ +- ${srcdir}/mule.texi \ +- ${srcdir}/major.texi \ +- ${srcdir}/indent.texi \ +- ${srcdir}/text.texi \ +- ${srcdir}/programs.texi \ +- ${srcdir}/building.texi \ +- ${srcdir}/maintaining.texi \ +- ${srcdir}/abbrevs.texi \ +- ${srcdir}/picture.texi \ +- ${srcdir}/sending.texi \ +- ${srcdir}/rmail.texi \ +- ${srcdir}/dired.texi \ +- ${srcdir}/calendar.texi \ +- ${srcdir}/misc.texi \ +- ${srcdir}/custom.texi \ +- ${srcdir}/trouble.texi \ +- ${srcdir}/cmdargs.texi \ +- ${srcdir}/anti.texi \ +- ${srcdir}/macos.texi \ +- ${srcdir}/msdog.texi \ +- ${srcdir}/gnu.texi \ +- ${srcdir}/glossary.texi \ +- ${srcdir}/ack.texi +- + info: $(INFO_TARGETS) + + dvi: $(DVI_TARGETS) +@@ -113,146 +59,16 @@ + # the @setfilename directive in info.texi, which is required for + # the Texinfo distribution. + +-../info/info: ${INFOSOURCES} +- cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@ +- +-info.dvi: ${INFOSOURCES} +- $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi +- +-../info/emacs: ${EMACSSOURCES} +- cd $(srcdir); $(MAKEINFO) emacs.texi +- +-emacs.dvi: ${EMACSSOURCES} +- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs.texi +- +-../info/ccmode: cc-mode.texi +- cd $(srcdir); $(MAKEINFO) cc-mode.texi +-cc-mode.dvi: cc-mode.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi +- +-../info/ada-mode: ada-mode.texi +- cd $(srcdir); $(MAKEINFO) ada-mode.texi +-ada-mode.dvi: ada-mode.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi +- +-../info/pcl-cvs: pcl-cvs.texi +- cd $(srcdir); $(MAKEINFO) pcl-cvs.texi +-pcl-cvs.dvi: pcl-cvs.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi +- +-../info/eshell: eshell.texi +- cd $(srcdir); $(MAKEINFO) eshell.texi +-eshell.dvi: eshell.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi +- +-../info/cl: cl.texi +- cd $(srcdir); $(MAKEINFO) cl.texi +-cl.dvi: cl.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi +- + ../info/dired-x: dired-x.texi + cd $(srcdir); $(MAKEINFO) dired-x.texi + dired-x.dvi: dired-x.texi + $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi + +-../info/ediff: ediff.texi +- cd $(srcdir); $(MAKEINFO) ediff.texi +-ediff.dvi: ediff.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi +- +-../info/forms: forms.texi +- cd $(srcdir); $(MAKEINFO) forms.texi +-forms.dvi: forms.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi +- +-../info/gnus: gnus.texi +- cd $(srcdir); $(MAKEINFO) gnus.texi +-gnus.dvi: gnus.texi +- sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi +- $(ENVADD) $(TEXI2DVI) gnustmp.texi +- cp gnustmp.dvi $*.dvi +- rm gnustmp.* +- +-../info/message: message.texi +- cd $(srcdir); $(MAKEINFO) message.texi +-message.dvi: message.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi +- +-../info/mh-e: mh-e.texi +- cd $(srcdir); $(MAKEINFO) mh-e.texi +-mh-e.dvi: mh-e.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi +- +-../info/reftex: reftex.texi +- cd $(srcdir); $(MAKEINFO) reftex.texi +-reftex.dvi: reftex.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi +- +-../info/sc: sc.texi +- cd $(srcdir); $(MAKEINFO) sc.texi +-sc.dvi: sc.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi +- +-../info/vip: vip.texi +- cd $(srcdir); $(MAKEINFO) vip.texi +-vip.dvi: vip.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi +- +-../info/viper: viper.texi +- cd $(srcdir); $(MAKEINFO) viper.texi +-viper.dvi: viper.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi +- +-../info/widget: widget.texi +- cd $(srcdir); $(MAKEINFO) widget.texi +-widget.dvi: widget.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi +- + ../info/efaq: faq.texi + cd $(srcdir); $(MAKEINFO) faq.texi + faq.dvi: faq.texi + $(ENVADD) $(TEXI2DVI) ${srcdir}/faq.texi + +-../etc/GNU: gnu1.texi gnu.texi +- cd $(srcdir) && makeinfo --no-headers -o ../etc/GNU gnu1.texi +- +-../info/autotype: autotype.texi +- cd $(srcdir); $(MAKEINFO) autotype.texi +-autotype.dvi: autotype.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi +- +-# This is produced with --no-split to avoid making files whose +-# names clash on DOS 8+3 filesystems +-../info/idlwave: idlwave.texi +- cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi +-idlwave.dvi: idlwave.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi +- +-../info/eudc: eudc.texi +- cd $(srcdir); $(MAKEINFO) eudc.texi +-eudc.dvi: eudc.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi +- +-../info/ebrowse: ebrowse.texi +- cd $(srcdir); $(MAKEINFO) ebrowse.texi +-ebrowse.dvi: ebrowse.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi +- +-../info/woman: woman.texi +- cd $(srcdir); $(MAKEINFO) woman.texi +-woman.dvi: woman.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi +- +-../info/speedbar: speedbar.texi +- cd $(srcdir); $(MAKEINFO) speedbar.texi +-speedbar.dvi: speedbar.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi +- +-../info/emacs-mime: emacs-mime.texi +- cd $(srcdir); $(MAKEINFO) emacs-mime.texi +-emacs-mime.dvi: emacs-mime.texi +- $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi +- + mostlyclean: + rm -f *.log *.cp *.fn *.ky *.pg *.vr core *.tp *.core gnustmp.* + +--- emacs21-21.4a+1.orig/lisp/help.el 2006-10-08 13:34:07.064035924 +0200 ++++ emacs21-21.4a+1/lisp/help.el 2006-10-08 13:34:22.663546709 +0200 +@@ -413,11 +413,19 @@ + ;; So keyboard macro definitions are documented correctly + (fset 'defining-kbd-macro (symbol-function 'start-kbd-macro)) + ++(defun debian-expand-file-name-dfsg (file) ++ "Convert filename NAME to absolute by the means of expand-file-name. ++Then, if the file does not exists, append `.dfsg' to the filename." ++ (let ((file (expand-file-name file data-directory))) ++ (if (file-exists-p file) ++ file ++ (concat file ".dfsg")))) ++ + (defun describe-distribution () + "Display info on how to obtain the latest version of GNU Emacs." + (interactive) + (find-file-read-only +- (expand-file-name "DISTRIB" data-directory))) ++ (debian-expand-file-name-dfsg "DISTRIB"))) + + (defun describe-copying () + "Display info on how you may redistribute copies of GNU Emacs." +@@ -430,7 +438,7 @@ + "Display info on the GNU project." + (interactive) + (find-file-read-only +- (expand-file-name "THE-GNU-PROJECT" data-directory)) ++ (debian-expand-file-name-dfsg "THE-GNU-PROJECT")) + (goto-char (point-min))) + + (defun describe-no-warranty () --- emacs21-21.4a+1.orig/debian/patches/bzero-and-have-stdlib.diff +++ emacs21-21.4a+1/debian/patches/bzero-and-have-stdlib.diff @@ -0,0 +1,65 @@ +* HAVE_STDLIB_H checks have been added and deprecated functions avoided. + Patch: bzero-and-have-stdlib.diff + Author: Rob Browning + Added-by: Rob Browning + + * Calls to memset, memcmp, and memmove have replaced bzero, bcmp, and bcopy. + Status: sent-upstream, pending (all but mem* fixes already fixed upstream) + + #defines have been added to arrange for Emacs to use memset, + memcmp, and memmove instead of bzero, bcmp, and bcopy. + + * Some missing HAVE_STDLIB_H checks have been added. + Status: sent-upstream, pending + +--- emacs21-21.2.orig/src/config.in ++++ emacs21-21.2/src/config.in +@@ -531,6 +538,10 @@ + #endif + #ifdef HAVE_STDLIB_H + #include ++/* Don't use deprecated functions. */ ++#define bzero(data, size) memset(data, '\0', size) ++#define bcmp memcmp ++#define bcopy(a,b,c) memmove(b,a,c) + #endif + #endif + +--- emacs21-21.2.orig/lib-src/yow.c ++++ emacs21-21.2/lib-src/yow.c +@@ -10,6 +10,7 @@ + * With dynamic memory allocation. + */ + ++#include "config.h" + #include + #include + #include <../src/epaths.h> /* For PATH_DATA. */ +@@ -33,7 +34,9 @@ + &res;}) + #endif + ++#ifndef HAVE_STDLIB_H /* config.h includes stdlib. */ + char *malloc(), *realloc(); ++#endif + + void yow(); + void setup_yow(); +--- emacs21-21.2.orig/lib-src/cvtmail.c ++++ emacs21-21.2/lib-src/cvtmail.c +@@ -33,11 +33,14 @@ + * Author: Larry Kolodney, 1985 + */ + +- ++#include "config.h" + #include + ++#ifndef HAVE_STDLIB_H /* config.h includes stdlib. */ + char *malloc (); + char *realloc (); ++#endif ++ + char *getenv (); + + char *xmalloc (); --- emacs21-21.4a+1.orig/debian/patches/arch-mips.diff +++ emacs21-21.4a+1/debian/patches/arch-mips.diff @@ -0,0 +1,267 @@ +* Support for the mips architecture has been added. + Patch: arch-mips.diff + Provided-by: Max Kellermann + Added-by: Marc 'HE' Brockschmidt + Status: appears to be incorporated upstream + +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ emacs21-21.4a/mips.ld 2006-09-24 16:17:03.000000000 +0100 +@@ -0,0 +1,244 @@ ++/* Work around a design flaw in emacs: emacs assumes the data section ++begins on address 0x10000000, which was true up to binutils version ++2.16, but the binutils 2.17 default linker script does not use this ++alignment anymore. ++ ++This is actually a patched version of the file ++/usr/lib/ldscripts/elf32btsmip.x from binutils 2.17-2. It makes the ++data section begin at 0x10000000. ++ ++- 2006/09/17 Max Kellermann */ ++ ++/* Default linker script, for normal executables */ ++OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", ++ "elf32-tradlittlemips") ++OUTPUT_ARCH(mips) ++ENTRY(__start) ++SEARCH_DIR("/usr/mips-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); ++SECTIONS ++{ ++ /* Read-only sections, merged into text segment: */ ++ PROVIDE (__executable_start = 0x0400000); . = 0x0400000 + 52 + 8*32; ++ .interp : { *(.interp) } ++ .reginfo : { *(.reginfo) } ++ .dynamic : { *(.dynamic) } ++ .hash : { *(.hash) } ++ .dynsym : { *(.dynsym) } ++ .dynstr : { *(.dynstr) } ++ .gnu.version : { *(.gnu.version) } ++ .gnu.version_d : { *(.gnu.version_d) } ++ .gnu.version_r : { *(.gnu.version_r) } ++ .rel.init : { *(.rel.init) } ++ .rela.init : { *(.rela.init) } ++ .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } ++ .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } ++ .rel.fini : { *(.rel.fini) } ++ .rela.fini : { *(.rela.fini) } ++ .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } ++ .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } ++ .rel.data.rel.ro : { *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*) } ++ .rela.data.rel.ro : { *(.rela.data.rel.ro* .rela.gnu.linkonce.d.rel.ro.*) } ++ .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } ++ .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } ++ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } ++ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } ++ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } ++ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } ++ .rel.ctors : { *(.rel.ctors) } ++ .rela.ctors : { *(.rela.ctors) } ++ .rel.dtors : { *(.rel.dtors) } ++ .rela.dtors : { *(.rela.dtors) } ++ .rel.got : { *(.rel.got) } ++ .rela.got : { *(.rela.got) } ++ .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) } ++ .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } ++ .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) } ++ .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) } ++ .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) } ++ .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } ++ .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) } ++ .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } ++ .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } ++ .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } ++ .rel.plt : { *(.rel.plt) } ++ .rela.plt : { *(.rela.plt) } ++ .init : ++ { ++ KEEP (*(.init)) ++ } =0 ++ .plt : { *(.plt) } ++ .text : ++ { ++ _ftext = . ; ++ *(.text .stub .text.* .gnu.linkonce.t.*) ++ KEEP (*(.text.*personality*)) ++ /* .gnu.warning sections are handled specially by elf32.em. */ ++ *(.gnu.warning) ++ *(.mips16.fn.*) *(.mips16.call.*) ++ } =0 ++ .fini : ++ { ++ KEEP (*(.fini)) ++ } =0 ++ PROVIDE (__etext = .); ++ PROVIDE (_etext = .); ++ PROVIDE (etext = .); ++ .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } ++ .rodata1 : { *(.rodata1) } ++ .sdata2 : ++ { ++ *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) ++ } ++ .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } ++ .eh_frame_hdr : { *(.eh_frame_hdr) } ++ .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) } ++ .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) } ++ /* Adjust the address for the data segment. We want to adjust up to ++ the same address within the page on the next page up. */ ++ . = ALIGN (0x10000000); . = DATA_SEGMENT_ALIGN (0x40000, 0x1000); ++ /* Exception handling */ ++ .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) } ++ .gcc_except_table : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) } ++ /* Thread Local Storage sections */ ++ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } ++ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } ++ .preinit_array : ++ { ++ PROVIDE_HIDDEN (__preinit_array_start = .); ++ KEEP (*(.preinit_array)) ++ PROVIDE_HIDDEN (__preinit_array_end = .); ++ } ++ .init_array : ++ { ++ PROVIDE_HIDDEN (__init_array_start = .); ++ KEEP (*(SORT(.init_array.*))) ++ KEEP (*(.init_array)) ++ PROVIDE_HIDDEN (__init_array_end = .); ++ } ++ .fini_array : ++ { ++ PROVIDE_HIDDEN (__fini_array_start = .); ++ KEEP (*(.fini_array)) ++ KEEP (*(SORT(.fini_array.*))) ++ PROVIDE_HIDDEN (__fini_array_end = .); ++ } ++ .ctors : ++ { ++ /* gcc uses crtbegin.o to find the start of ++ the constructors, so we make sure it is ++ first. Because this is a wildcard, it ++ doesn't matter if the user does not ++ actually link against crtbegin.o; the ++ linker won't look for a file to match a ++ wildcard. The wildcard also means that it ++ doesn't matter which directory crtbegin.o ++ is in. */ ++ KEEP (*crtbegin*.o(.ctors)) ++ /* We don't want to include the .ctor section from ++ the crtend.o file until after the sorted ctors. ++ The .ctor section from the crtend file contains the ++ end of ctors marker and it must be last */ ++ KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors)) ++ KEEP (*(SORT(.ctors.*))) ++ KEEP (*(.ctors)) ++ } ++ .dtors : ++ { ++ KEEP (*crtbegin*.o(.dtors)) ++ KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors)) ++ KEEP (*(SORT(.dtors.*))) ++ KEEP (*(.dtors)) ++ } ++ .jcr : { KEEP (*(.jcr)) } ++ .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) } ++ . = DATA_SEGMENT_RELRO_END (0, .); ++ .data : ++ { ++ _fdata = . ; ++ *(.data .data.* .gnu.linkonce.d.*) ++ KEEP (*(.gnu.linkonce.d.*personality*)) ++ SORT(CONSTRUCTORS) ++ } ++ .data1 : { *(.data1) } ++ . = .; ++ _gp = ALIGN(16) + 0x7ff0; ++ .got : { *(.got.plt) *(.got) } ++ /* We want the small data sections together, so single-instruction offsets ++ can access them all, and initialized data all before uninitialized, so ++ we can shorten the on-disk segment size. */ ++ .sdata : ++ { ++ *(.sdata .sdata.* .gnu.linkonce.s.*) ++ } ++ .lit8 : { *(.lit8) } ++ .lit4 : { *(.lit4) } ++ _edata = .; PROVIDE (edata = .); ++ __bss_start = .; ++ _fbss = .; ++ .sbss : ++ { ++ *(.dynsbss) ++ *(.sbss .sbss.* .gnu.linkonce.sb.*) ++ *(.scommon) ++ } ++ .bss : ++ { ++ *(.dynbss) ++ *(.bss .bss.* .gnu.linkonce.b.*) ++ *(COMMON) ++ /* Align here to ensure that the .bss section occupies space up to ++ _end. Align after .bss to ensure correct alignment even if the ++ .bss section disappears because there are no input sections. ++ FIXME: Why do we need it? When there is no .bss section, we don't ++ pad the .data section. */ ++ . = ALIGN(. != 0 ? 32 / 8 : 1); ++ } ++ . = ALIGN(32 / 8); ++ . = ALIGN(32 / 8); ++ _end = .; PROVIDE (end = .); ++ . = DATA_SEGMENT_END (.); ++ /* Stabs debugging sections. */ ++ .stab 0 : { *(.stab) } ++ .stabstr 0 : { *(.stabstr) } ++ .stab.excl 0 : { *(.stab.excl) } ++ .stab.exclstr 0 : { *(.stab.exclstr) } ++ .stab.index 0 : { *(.stab.index) } ++ .stab.indexstr 0 : { *(.stab.indexstr) } ++ .comment 0 : { *(.comment) } ++ /* DWARF debug sections. ++ Symbols in the DWARF debugging sections are relative to the beginning ++ of the section so we begin them at 0. */ ++ /* DWARF 1 */ ++ .debug 0 : { *(.debug) } ++ .line 0 : { *(.line) } ++ /* GNU DWARF 1 extensions */ ++ .debug_srcinfo 0 : { *(.debug_srcinfo) } ++ .debug_sfnames 0 : { *(.debug_sfnames) } ++ /* DWARF 1.1 and DWARF 2 */ ++ .debug_aranges 0 : { *(.debug_aranges) } ++ .debug_pubnames 0 : { *(.debug_pubnames) } ++ /* DWARF 2 */ ++ .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } ++ .debug_abbrev 0 : { *(.debug_abbrev) } ++ .debug_line 0 : { *(.debug_line) } ++ .debug_frame 0 : { *(.debug_frame) } ++ .debug_str 0 : { *(.debug_str) } ++ .debug_loc 0 : { *(.debug_loc) } ++ .debug_macinfo 0 : { *(.debug_macinfo) } ++ /* SGI/MIPS DWARF 2 extensions */ ++ .debug_weaknames 0 : { *(.debug_weaknames) } ++ .debug_funcnames 0 : { *(.debug_funcnames) } ++ .debug_typenames 0 : { *(.debug_typenames) } ++ .debug_varnames 0 : { *(.debug_varnames) } ++ .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) } ++ .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) } ++ .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) } ++ .mdebug.abiN32 : { KEEP(*(.mdebug.abiN32)) } ++ .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) } ++ .mdebug.abiO64 : { KEEP(*(.mdebug.abiO64)) } ++ .mdebug.eabi32 : { KEEP(*(.mdebug.eabi32)) } ++ .mdebug.eabi64 : { KEEP(*(.mdebug.eabi64)) } ++ .gcc_compiled_long32 : { KEEP(*(.gcc_compiled_long32)) } ++ .gcc_compiled_long64 : { KEEP(*(.gcc_compiled_long64)) } ++ /DISCARD/ : { *(.note.GNU-stack) } ++} +--- emacs21-21.4a.orig/src/m/mips.h 2006-09-24 16:18:20.000000000 +0100 ++++ emacs21-21.4a/src/m/mips.h 2006-09-24 16:19:47.000000000 +0100 +@@ -135,7 +135,12 @@ + #define TEXT_START 0x00400000 + #define DATA_START 0x10000000 + #define DATA_SEG_BITS 0x10000000 ++#ifdef THIS_IS_MAKEFILE ++#define LD_SWITCH_MACHINE -T "../../../mips.ld" ++#else ++#define LD_SWITCH_MACHINE -T "../../mips.ld" ++#endif + #else /* not __linux__ */ + #define TEXT_START 0x400000 + #define DATA_START 0x800000 --- emacs21-21.4a+1.orig/debian/patches/arch-s390.diff +++ emacs21-21.4a+1/debian/patches/arch-s390.diff @@ -0,0 +1,146 @@ +* Support for the s390 architecture has been added. + Patch: arch-s390.diff + Provided-by: Jochen =?iso-8859-1?Q?R=F6hrig?= + Date: Tue, 31 Jul 2001 15:18:38 UTC. + Added-by: Rob Browning + Status: appears to be incorporated upstream + +diff -urNad /home/rlb/deb/emacs21/trunk/configure.in trunk/configure.in +--- /home/rlb/deb/emacs21/trunk/configure.in 2003-09-11 01:04:22.000000000 -0500 ++++ trunk/configure.in 2003-09-11 01:04:46.000000000 -0500 +@@ -623,6 +623,10 @@ + machine=ibmrt-aix opsys=usg5-2-2 + ;; + ++ s390*-*-linux-gnu* ) ++ machine=s390 opsys=gnu-linux ++ ;; ++ + ## Integrated Solutions `Optimum V' + m68*-isi-bsd4.2* ) + machine=isi-ov opsys=bsd4-2 +diff -urNad /home/rlb/deb/emacs21/trunk/src/m/s390.h trunk/src/m/s390.h +--- /home/rlb/deb/emacs21/trunk/src/m/s390.h 1969-12-31 18:00:00.000000000 -0600 ++++ trunk/src/m/s390.h 2003-09-11 01:04:46.000000000 -0500 +@@ -0,0 +1,121 @@ ++/* machine description file template. ++ Copyright (C) 1985, 1986 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="" */ ++ ++/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word ++ is the most significant byte. */ ++ ++#define 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 */ ++ ++/* __s390__ defined already */ ++ ++/* 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 ++ ++/* 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 ++ ++/* 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 */ ++#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 */ ++ ++/* Some really obscure 4.2-based systems (like Sequent DYNIX) ++ * do not support asynchronous I/O (using SIGIO) on sockets, ++ * even though it works fine on tty's. If you have one of ++ * these systems, define the following, and then use it in ++ * config.h (or elsewhere) to decide when (not) to use SIGIO. ++ * ++ * You'd think this would go in an operating-system description file, ++ * but since it only occurs on some, but not all, BSD systems, the ++ * reasonable place to select for it is in the machine description ++ * file. ++ */ ++ ++/* #define NO_SOCK_SIGIO */ ++ ++/* After adding support for a new system, modify the large case ++ statement in the `configure' script to recognize reasonable ++ configuration names, and add a description of the system to ++ `etc/MACHINES'. ++ ++ If you've just fixed a problem in an existing configuration file, ++ you should also check `etc/MACHINES' to make sure its descriptions ++ of known problems in that configuration should be updated. */ --- emacs21-21.4a+1.orig/debian/patches/fix-batch-mode-signal-handling.diff +++ emacs21-21.4a+1/debian/patches/fix-batch-mode-signal-handling.diff @@ -0,0 +1,38 @@ +* A problem with non-interactive signal handling has been fixed. + Patch: fix-batch-mode-signal-handling.diff + Added-by: Rob Browning + Status: patch backported from upstream + + An upstream patch from 2003-06-21 was backported to fix Bug#253887. + Under certain conditions running "emacs --batch ... < /dev/null" + would trigger a process exit via SIGIO or SIGHUP. + +diff -urNad /home/rlb/deb/emacs/trunk-21/src/keyboard.c trunk-21/src/keyboard.c +--- /home/rlb/deb/emacs/trunk-21/src/keyboard.c 2003-09-09 17:26:14.000000000 -0500 ++++ trunk-21/src/keyboard.c 2004-07-18 17:10:35.000000000 -0500 +@@ -6186,7 +6186,12 @@ + /* ??? Is it really right to send the signal just to this process + rather than to the whole process group? + Perhaps on systems with FIONREAD Emacs is alone in its group. */ +- kill (getpid (), SIGHUP); ++ { ++ if (! noninteractive) ++ kill (getpid (), SIGHUP); ++ else ++ n_to_read = 0; ++ } + if (n_to_read == 0) + return 0; + if (n_to_read > sizeof cbuf) +diff -urNad /home/rlb/deb/emacs/trunk-21/src/process.c trunk-21/src/process.c +--- /home/rlb/deb/emacs/trunk-21/src/process.c 2003-09-09 17:28:35.000000000 -0500 ++++ trunk-21/src/process.c 2004-07-18 17:11:21.000000000 -0500 +@@ -2734,7 +2734,7 @@ + but select says there is input. */ + + if (XINT (read_kbd) && interrupt_input +- && keyboard_bit_set (&Available)) ++ && keyboard_bit_set (&Available) && ! noninteractive) + kill (getpid (), SIGIO); + #endif + --- emacs21-21.4a+1.orig/debian/patches/python-completion-ignored-extensions.diff +++ emacs21-21.4a+1/debian/patches/python-completion-ignored-extensions.diff @@ -0,0 +1,23 @@ +* Emacs now ignores python byte-compiled files by default. + Patch: python-completion-ignored-extensions.diff + Added-by: Jerome Marant + Date: Sun, 6 Jun 2004 14:18:42 +0200 + Status: has been incorporated upstream + + The completion-ignored-extensions variable now includes the + extensions for Python byte-compiled files. + +diff -urNad /home/jerome/pkg/emacs21/svn/emacs21/lisp/bindings.el emacs21/lisp/bindings.el +--- /home/jerome/pkg/emacs21/svn/emacs21/lisp/bindings.el 2004-06-06 14:10:54.000000000 +0200 ++++ emacs21/lisp/bindings.el 2004-06-06 14:10:54.000000000 +0200 +@@ -446,7 +446,9 @@ + ;; Texinfo-related + ".toc" ".log" ".aux" + ".cp" ".fn" ".ky" ".pg" ".tp" ".vr" +- ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs"))) ++ ".cps" ".fns" ".kys" ".pgs" ".tps" ".vrs" ++ ;; Python byte-compiled ++ ".pyc" ".pyo"))) + + ;; Packages should add to this list appropriately when they are + ;; loaded, rather than listing everything here. --- emacs21-21.4a+1.orig/debian/patches/scroll-margin.diff +++ emacs21-21.4a+1/debian/patches/scroll-margin.diff @@ -0,0 +1,23 @@ +* A non-0 scroll-margin setting should no longer hang Emacs. + Patch: scroll-margin.diff + Added-by: Jerome Marant + Date: Sat, 18 Oct 2003 14:53:26 +0200 + Status: has been incorporated upstream + +diff -urNad /home/jerome/pkg/emacs21/svn/emacs21/src/window.c emacs21/src/window.c +--- /home/jerome/pkg/emacs21/svn/emacs21/src/window.c 2003-10-01 19:59:18.000000000 +0200 ++++ emacs21/src/window.c 2003-10-18 12:21:17.000000000 +0200 +@@ -4124,7 +4124,12 @@ + in the scroll margin at the top. */ + move_it_to (&it, PT, -1, -1, -1, MOVE_TO_POS); + while (it.current_y < this_scroll_margin) +- move_it_by_lines (&it, 1, 1); ++ { ++ int prev = it.current_y; ++ move_it_by_lines (&it, 1, 1); ++ if (prev == it.current_y) ++ break; ++ } + SET_PT_BOTH (IT_CHARPOS (it), IT_BYTEPOS (it)); + } + else if (n < 0) --- emacs21-21.4a+1.orig/debian/patches/battery-acpi-support.diff +++ emacs21-21.4a+1/debian/patches/battery-acpi-support.diff @@ -0,0 +1,167 @@ +* Support for ACPI has been added to battery.el. + Patch: battery-acpi-support.diff + Provided-by: Mario Lang + Date: Fri, 26 Sep 2003 15:30:43 +0200 + Added-by: Jerome Marant + Status: appears to be incorporated upstream + +diff -urNad /home/jerome/pkg/emacs21/svn/emacs/lisp/battery.el emacs/lisp/battery.el +--- /home/jerome/pkg/emacs21/svn/emacs/lisp/battery.el 2003-09-26 19:57:43.000000000 +0200 ++++ emacs/lisp/battery.el 2003-09-28 17:19:22.000000000 +0200 +@@ -42,7 +42,10 @@ + (defcustom battery-status-function + (cond ((and (eq system-type 'gnu/linux) + (file-readable-p "/proc/apm")) +- 'battery-linux-proc-apm)) ++ 'battery-linux-proc-apm) ++ ((and (eq system-type 'gnu/linux) ++ (file-directory-p "/proc/acpi/battery")) ++ 'battery-linux-proc-acpi)) + "*Function for getting battery status information. + The function has to return an alist of conversion definitions. + Its cons cells are of the form +@@ -56,7 +59,9 @@ + + (defcustom battery-echo-area-format + (cond ((eq battery-status-function 'battery-linux-proc-apm) +- "Power %L, battery %B (%p%% load, remaining time %t)")) ++ "Power %L, battery %B (%p%% load, remaining time %t)") ++ ((eq battery-status-function 'battery-linux-proc-acpi) ++ "Power %L, battery %B at %r (%p%% load, remaining time %t)")) + "*Control string formatting the string to display in the echo area. + Ordinary characters in the control string are printed as-is, while + conversion specifications introduced by a `%' character in the control +@@ -70,7 +75,9 @@ + + (defcustom battery-mode-line-format + (cond ((eq battery-status-function 'battery-linux-proc-apm) +- " [%b%p%%]")) ++ " [%b%p%%]") ++ ((eq battery-status-function 'battery-linux-proc-acpi) ++ " [%b%p%%,%d癈]")) + "*Control string formatting the string to display in the mode line. + Ordinary characters in the control string are printed as-is, while + conversion specifications introduced by a `%' character in the control +@@ -217,6 +224,122 @@ + (cons ?h (or (and hours (number-to-string hours)) "N/A")) + (cons ?t (or remaining-time "N/A"))))) + ++ ++;;; `/proc/acpi/' interface for Linux. ++ ++(defun battery-linux-proc-acpi () ++ "Get ACPI status information from Linux kernel. ++This function works only with the new `/proc/acpi/' format introduced ++in Linux version 2.4.20 and 2.6.0. ++ ++The following %-sequences are provided: ++%c Current capacity (mAh) ++%B Battery status (verbose) ++%b Battery status, empty means high, `-' means low, ++ `!' means critical, and `+' means charging ++%d Temperature (in degrees Celsius) ++%L AC line status (verbose) ++%p battery load percentage ++%m Remaining time in minutes ++%h Remaining time in hours ++%t Remaining time in the form `h:min'" ++ (let (capacity design-capacity rate rate-type charging-state warn low ++ minutes hours) ++ ;; ACPI provides information about each battery present in the system in ++ ;; a separate subdirectory. We are going to merge the available ++ ;; information together since displaying for a variable amount of ++ ;; batteries seems overkill for format-strings. ++ (mapc ++ (lambda (dir) ++ (with-temp-buffer ++ (battery-insert-file-contents (expand-file-name "state" dir)) ++ (when (re-search-forward "present: +yes$" nil t) ++ (and (re-search-forward "charging state: +\\(.*\\)$" nil t) ++ (or (null charging-state) (string= charging-state ++ "unknown")) ++ ;; On most multi-battery systems, most of the time only one ++ ;; battery is "charging"/"discharging", the others are ++ ;; "unknown". ++ (setq charging-state (match-string 1))) ++ (when (re-search-forward "present rate: +\\([0-9]+\\) \\(m[AW]\\)$" ++ nil t) ++ (setq rate (+ (or rate 0) (string-to-int (match-string 1))) ++ rate-type (or (and rate-type ++ (if (string= rate-type (match-string 2)) ++ rate-type ++ (error ++ "Inconsistent rate types (%s vs. %s)" ++ rate-type (match-string 2)))) ++ (match-string 2)))) ++ (when (re-search-forward "remaining capacity: +\\([0-9]+\\) m[AW]h$" ++ nil t) ++ (setq capacity ++ (+ (or capacity 0) (string-to-int (match-string 1)))))) ++ (goto-char (point-max)) ++ (battery-insert-file-contents (expand-file-name "info" dir)) ++ (when (re-search-forward "present: +yes$" nil t) ++ (when (re-search-forward "design capacity: +\\([0-9]+\\) m[AW]h$" ++ nil t) ++ (setq design-capacity (+ (or design-capacity 0) ++ (string-to-int (match-string 1))))) ++ (when (re-search-forward "design capacity warning: +\\([0-9]+\\) m[AW]h$" ++ nil t) ++ (setq warn (+ (or warn 0) (string-to-int (match-string 1))))) ++ (when (re-search-forward "design capacity low: +\\([0-9]+\\) m[AW]h$" ++ nil t) ++ (setq low (+ (or low 0) ++ (string-to-int (match-string 1)))))))) ++ (directory-files "/proc/acpi/battery/" t "BAT")) ++ (and capacity rate ++ (setq minutes (if (zerop rate) 0 ++ (floor (* (/ (float (if (string= charging-state ++ "charging") ++ (- design-capacity capacity) ++ capacity)) rate) 60))) ++ hours (/ minutes 60))) ++ (list (cons ?c (or (and capacity (number-to-string capacity)) "N/A")) ++ (cons ?L (or (when (file-exists-p "/proc/acpi/ac_adapter/AC/state") ++ (with-temp-buffer ++ (battery-insert-file-contents ++ "/proc/acpi/ac_adapter/AC/state") ++ (when (re-search-forward "state: +\\(.*\\)$" nil t) ++ (match-string 1)))) ++ "N/A")) ++ (cons ?d (or (when (file-exists-p ++ "/proc/acpi/thermal_zone/THRM/temperature") ++ (with-temp-buffer ++ (battery-insert-file-contents ++ "/proc/acpi/thermal_zone/THRM/temperature") ++ (when (re-search-forward ++ "temperature: +\\([0-9]+\\) C$" nil t) ++ (match-string 1)))) ++ (when (file-exists-p ++ "/proc/acpi/thermal_zone/THM/temperature") ++ (with-temp-buffer ++ (battery-insert-file-contents ++ "/proc/acpi/thermal_zone/THM/temperature") ++ (when (re-search-forward ++ "temperature: +\\([0-9]+\\) C$" nil t) ++ (match-string 1)))) ++ "N/A")) ++ (cons ?r (or (and rate (concat (number-to-string rate) " " ++ rate-type)) "N/A")) ++ (cons ?B (or charging-state "N/A")) ++ (cons ?b (or (and (string= charging-state "charging") "+") ++ (and low (< capacity low) "!") ++ (and warn (< capacity warn) "-") ++ "")) ++ (cons ?h (or (and hours (number-to-string hours)) "N/A")) ++ (cons ?m (or (and minutes (number-to-string minutes)) "N/A")) ++ (cons ?t (or (and minutes ++ (format "%d:%02d" hours (- minutes (* 60 hours)))) ++ "N/A")) ++ (cons ?p (or (and design-capacity capacity ++ (number-to-string ++ (floor (/ capacity ++ (/ (float design-capacity) 100))))) ++ "N/A"))))) ++ + + ;;; Private functions. + --- emacs21-21.4a+1.orig/debian/patches/arch-hppa.diff +++ emacs21-21.4a+1/debian/patches/arch-hppa.diff @@ -0,0 +1,88 @@ +* Support for the hppa architecture has been added. + Patch: arch-hppa.diff + Provided-by: LaMont Jones + Added-by: Rob Browning + Status: appears to be incorporated upstream + +--- emacs21-21.2.orig/configure.in ++++ emacs21-21.2/configure.in +@@ -552,6 +552,9 @@ + hppa*-*-nextstep* ) + machine=hp800 opsys=nextstep + ;; ++ hppa*-*-linux-gnu* ) ++ machine=hp800 opsys=gnu-linux ++ ;; + + ## Orion machines + orion-orion-bsd* ) +--- emacs21-21.2.orig/src/m/hp800.h ++++ emacs21-21.2/src/m/hp800.h +@@ -85,7 +85,7 @@ + #define bcmp memcmp + #endif + +-#ifdef __hpux ++#if defined(__hpux) || defined(__linux__) + /* 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, +@@ -94,6 +94,15 @@ + # define hp9000s800 + #endif + ++#ifdef __linux__ ++/* 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) ++#else + /* Data type of load average, as read out of kmem. */ + + #define LOAD_AVE_TYPE double +@@ -101,7 +110,7 @@ + /* Convert that into an integer that is 100 for a load average of 1.0 */ + + #define LOAD_AVE_CVT(x) ((int) (x * 100.0)) +- ++#endif + + /* Define CANNOT_DUMP on machines where unexec does not work. + Then the function dump-emacs will not be defined +@@ -116,6 +125,7 @@ + Otherwise Emacs assumes that text space precedes data space, + numerically. */ + ++#ifdef __hpux + #define VIRT_ADDR_VARIES + + /* Define C_ALLOCA if this machine does not support a true alloca +@@ -134,6 +144,9 @@ + + #define DATA_START 0x40000000 + #define TEXT_START 0x00000000 ++#else ++#define HAVE_ALLOCA ++#endif + + #define STACK_DIRECTION 1 + +@@ -147,6 +160,7 @@ + /* This machine requires completely different unexec code + which lives in a separate file. Specify the file name. */ + ++#ifdef __hpux + #define UNEXEC unexhp9k800.o + + #define LIBS_MACHINE +@@ -179,5 +193,5 @@ + + #define index strchr + #define rindex strrchr +- +-#endif /* __hpux */ ++#endif ++#endif --- emacs21-21.4a+1.orig/debian/patches/xbm-read-erroneous-semicolon.diff +++ emacs21-21.4a+1/debian/patches/xbm-read-erroneous-semicolon.diff @@ -0,0 +1,20 @@ +* Remove erroneous semicolon character when reading XBM files + Patch: xbm-read-erroneous-semicolon.diff + Provided-by: Jerome Marant + Added-by: Jerome Marant + Date: Mon, 16 Oct 2006 17:35:25 +0200 + Status: has been incorporated upstream + +Index: emacs21-21.4a+1/src/xfns.c +=================================================================== +--- emacs21-21.4a+1.orig/src/xfns.c 2006-10-16 17:22:09.322903834 +0200 ++++ emacs21-21.4a+1/src/xfns.c 2006-10-16 17:23:55.987962891 +0200 +@@ -6743,7 +6743,7 @@ + expect_ident ("define"); + expect (XBM_TK_IDENT); + +- if (LA1 == XBM_TK_NUMBER); ++ if (LA1 == XBM_TK_NUMBER) + { + char *p = strrchr (buffer, '_'); + p = p ? p + 1 : buffer; --- emacs21-21.4a+1.orig/debian/patches/arch-mipsel.diff +++ emacs21-21.4a+1/debian/patches/arch-mipsel.diff @@ -0,0 +1,296 @@ +* Support for the mipsel architecture has been added. + Patch: arch-mipsel.diff + Provided-by: Ryan Murray + Max Kellermann + Thiemo Seufer + Added-by: Rob Browning + Status: appears to be incorporated upstream + +diff -urNad /home/rlb/deb/emacs21/trunk/configure.in trunk/configure.in +--- /home/rlb/deb/emacs21/trunk/configure.in 2003-09-11 01:12:30.000000000 -0500 ++++ trunk/configure.in 2003-09-11 01:12:32.000000000 -0500 +@@ -1048,10 +1048,15 @@ + ;; + + ## Mips Linux-based GNU system +- mips-*-linux-gnu* | mipsel-*-linux-gnu* ) ++ mips-*-linux-gnu* ) + machine=mips opsys=gnu-linux + ;; + ++ ## Mipsel Linux-based GNU system ++ mipsel-*-linux-gnu* ) ++ machine=mipsel opsys=gnu-linux ++ ;; ++ + ## UXP/DS + sparc-fujitsu-sysv4* ) + machine=sparc opsys=uxpds +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ emacs21-21.4a/mipsel.ld 2006-09-24 16:17:03.000000000 +0100 +@@ -0,0 +1,244 @@ ++/* Work around a design flaw in emacs: emacs assumes the data section ++begins on address 0x10000000, which was true up to binutils version ++2.16, but the binutils 2.17 default linker script does not use this ++alignment anymore. ++ ++This is actually a patched version of the file ++/usr/lib/ldscripts/elf32ltsmip.x from binutils 2.17-2. It makes the ++data section begin at 0x10000000. ++ ++- 2006/09/17 Max Kellermann */ ++ ++/* Default linker script, for normal executables */ ++OUTPUT_FORMAT("elf32-tradlittlemips", "elf32-tradlittlemips", ++ "elf32-tradbigmips") ++OUTPUT_ARCH(mipsel) ++ENTRY(__start) ++SEARCH_DIR("/usr/mipsel-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib"); ++SECTIONS ++{ ++ /* Read-only sections, merged into text segment: */ ++ PROVIDE (__executable_start = 0x0400000); . = 0x0400000 + 52 + 8*32; ++ .interp : { *(.interp) } ++ .reginfo : { *(.reginfo) } ++ .dynamic : { *(.dynamic) } ++ .hash : { *(.hash) } ++ .dynsym : { *(.dynsym) } ++ .dynstr : { *(.dynstr) } ++ .gnu.version : { *(.gnu.version) } ++ .gnu.version_d : { *(.gnu.version_d) } ++ .gnu.version_r : { *(.gnu.version_r) } ++ .rel.init : { *(.rel.init) } ++ .rela.init : { *(.rela.init) } ++ .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } ++ .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } ++ .rel.fini : { *(.rel.fini) } ++ .rela.fini : { *(.rela.fini) } ++ .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } ++ .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } ++ .rel.data.rel.ro : { *(.rel.data.rel.ro* .rel.gnu.linkonce.d.rel.ro.*) } ++ .rela.data.rel.ro : { *(.rela.data.rel.ro* .rela.gnu.linkonce.d.rel.ro.*) } ++ .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } ++ .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } ++ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } ++ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } ++ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } ++ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } ++ .rel.ctors : { *(.rel.ctors) } ++ .rela.ctors : { *(.rela.ctors) } ++ .rel.dtors : { *(.rel.dtors) } ++ .rela.dtors : { *(.rela.dtors) } ++ .rel.got : { *(.rel.got) } ++ .rela.got : { *(.rela.got) } ++ .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) } ++ .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } ++ .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) } ++ .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) } ++ .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) } ++ .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } ++ .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) } ++ .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } ++ .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } ++ .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } ++ .rel.plt : { *(.rel.plt) } ++ .rela.plt : { *(.rela.plt) } ++ .init : ++ { ++ KEEP (*(.init)) ++ } =0 ++ .plt : { *(.plt) } ++ .text : ++ { ++ _ftext = . ; ++ *(.text .stub .text.* .gnu.linkonce.t.*) ++ KEEP (*(.text.*personality*)) ++ /* .gnu.warning sections are handled specially by elf32.em. */ ++ *(.gnu.warning) ++ *(.mips16.fn.*) *(.mips16.call.*) ++ } =0 ++ .fini : ++ { ++ KEEP (*(.fini)) ++ } =0 ++ PROVIDE (__etext = .); ++ PROVIDE (_etext = .); ++ PROVIDE (etext = .); ++ .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } ++ .rodata1 : { *(.rodata1) } ++ .sdata2 : ++ { ++ *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) ++ } ++ .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } ++ .eh_frame_hdr : { *(.eh_frame_hdr) } ++ .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) } ++ .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) } ++ /* Adjust the address for the data segment. We want to adjust up to ++ the same address within the page on the next page up. */ ++ . = ALIGN (0x10000000); . = DATA_SEGMENT_ALIGN (0x40000, 0x1000); ++ /* Exception handling */ ++ .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) } ++ .gcc_except_table : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) } ++ /* Thread Local Storage sections */ ++ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } ++ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } ++ .preinit_array : ++ { ++ PROVIDE_HIDDEN (__preinit_array_start = .); ++ KEEP (*(.preinit_array)) ++ PROVIDE_HIDDEN (__preinit_array_end = .); ++ } ++ .init_array : ++ { ++ PROVIDE_HIDDEN (__init_array_start = .); ++ KEEP (*(SORT(.init_array.*))) ++ KEEP (*(.init_array)) ++ PROVIDE_HIDDEN (__init_array_end = .); ++ } ++ .fini_array : ++ { ++ PROVIDE_HIDDEN (__fini_array_start = .); ++ KEEP (*(.fini_array)) ++ KEEP (*(SORT(.fini_array.*))) ++ PROVIDE_HIDDEN (__fini_array_end = .); ++ } ++ .ctors : ++ { ++ /* gcc uses crtbegin.o to find the start of ++ the constructors, so we make sure it is ++ first. Because this is a wildcard, it ++ doesn't matter if the user does not ++ actually link against crtbegin.o; the ++ linker won't look for a file to match a ++ wildcard. The wildcard also means that it ++ doesn't matter which directory crtbegin.o ++ is in. */ ++ KEEP (*crtbegin*.o(.ctors)) ++ /* We don't want to include the .ctor section from ++ the crtend.o file until after the sorted ctors. ++ The .ctor section from the crtend file contains the ++ end of ctors marker and it must be last */ ++ KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors)) ++ KEEP (*(SORT(.ctors.*))) ++ KEEP (*(.ctors)) ++ } ++ .dtors : ++ { ++ KEEP (*crtbegin*.o(.dtors)) ++ KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors)) ++ KEEP (*(SORT(.dtors.*))) ++ KEEP (*(.dtors)) ++ } ++ .jcr : { KEEP (*(.jcr)) } ++ .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) } ++ . = DATA_SEGMENT_RELRO_END (0, .); ++ .data : ++ { ++ _fdata = . ; ++ *(.data .data.* .gnu.linkonce.d.*) ++ KEEP (*(.gnu.linkonce.d.*personality*)) ++ SORT(CONSTRUCTORS) ++ } ++ .data1 : { *(.data1) } ++ . = .; ++ _gp = ALIGN(16) + 0x7ff0; ++ .got : { *(.got.plt) *(.got) } ++ /* We want the small data sections together, so single-instruction offsets ++ can access them all, and initialized data all before uninitialized, so ++ we can shorten the on-disk segment size. */ ++ .sdata : ++ { ++ *(.sdata .sdata.* .gnu.linkonce.s.*) ++ } ++ .lit8 : { *(.lit8) } ++ .lit4 : { *(.lit4) } ++ _edata = .; PROVIDE (edata = .); ++ __bss_start = .; ++ _fbss = .; ++ .sbss : ++ { ++ *(.dynsbss) ++ *(.sbss .sbss.* .gnu.linkonce.sb.*) ++ *(.scommon) ++ } ++ .bss : ++ { ++ *(.dynbss) ++ *(.bss .bss.* .gnu.linkonce.b.*) ++ *(COMMON) ++ /* Align here to ensure that the .bss section occupies space up to ++ _end. Align after .bss to ensure correct alignment even if the ++ .bss section disappears because there are no input sections. ++ FIXME: Why do we need it? When there is no .bss section, we don't ++ pad the .data section. */ ++ . = ALIGN(. != 0 ? 32 / 8 : 1); ++ } ++ . = ALIGN(32 / 8); ++ . = ALIGN(32 / 8); ++ _end = .; PROVIDE (end = .); ++ . = DATA_SEGMENT_END (.); ++ /* Stabs debugging sections. */ ++ .stab 0 : { *(.stab) } ++ .stabstr 0 : { *(.stabstr) } ++ .stab.excl 0 : { *(.stab.excl) } ++ .stab.exclstr 0 : { *(.stab.exclstr) } ++ .stab.index 0 : { *(.stab.index) } ++ .stab.indexstr 0 : { *(.stab.indexstr) } ++ .comment 0 : { *(.comment) } ++ /* DWARF debug sections. ++ Symbols in the DWARF debugging sections are relative to the beginning ++ of the section so we begin them at 0. */ ++ /* DWARF 1 */ ++ .debug 0 : { *(.debug) } ++ .line 0 : { *(.line) } ++ /* GNU DWARF 1 extensions */ ++ .debug_srcinfo 0 : { *(.debug_srcinfo) } ++ .debug_sfnames 0 : { *(.debug_sfnames) } ++ /* DWARF 1.1 and DWARF 2 */ ++ .debug_aranges 0 : { *(.debug_aranges) } ++ .debug_pubnames 0 : { *(.debug_pubnames) } ++ /* DWARF 2 */ ++ .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) } ++ .debug_abbrev 0 : { *(.debug_abbrev) } ++ .debug_line 0 : { *(.debug_line) } ++ .debug_frame 0 : { *(.debug_frame) } ++ .debug_str 0 : { *(.debug_str) } ++ .debug_loc 0 : { *(.debug_loc) } ++ .debug_macinfo 0 : { *(.debug_macinfo) } ++ /* SGI/MIPS DWARF 2 extensions */ ++ .debug_weaknames 0 : { *(.debug_weaknames) } ++ .debug_funcnames 0 : { *(.debug_funcnames) } ++ .debug_typenames 0 : { *(.debug_typenames) } ++ .debug_varnames 0 : { *(.debug_varnames) } ++ .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) } ++ .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) } ++ .mdebug.abi32 : { KEEP(*(.mdebug.abi32)) } ++ .mdebug.abiN32 : { KEEP(*(.mdebug.abiN32)) } ++ .mdebug.abi64 : { KEEP(*(.mdebug.abi64)) } ++ .mdebug.abiO64 : { KEEP(*(.mdebug.abiO64)) } ++ .mdebug.eabi32 : { KEEP(*(.mdebug.eabi32)) } ++ .mdebug.eabi64 : { KEEP(*(.mdebug.eabi64)) } ++ .gcc_compiled_long32 : { KEEP(*(.gcc_compiled_long32)) } ++ .gcc_compiled_long64 : { KEEP(*(.gcc_compiled_long64)) } ++ /DISCARD/ : { *(.note.GNU-stack) } ++} +diff -urNad /home/rlb/deb/emacs21/trunk/src/m/mipsel.h trunk/src/m/mipsel.h +--- /home/rlb/deb/emacs21/trunk/src/m/mipsel.h 1969-12-31 18:00:00.000000000 -0600 ++++ trunk/src/m/mipsel.h 2003-09-11 01:12:32.000000000 -0500 +@@ -0,0 +1,17 @@ ++/* machine description file for Mipsel (mips little endian). */ ++ ++#include "mips.h" ++ ++/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word ++ is the most significant byte. */ ++ ++#undef WORDS_BIG_ENDIAN ++ ++#ifdef __linux__ ++#undef LD_SWITCH_MACHINE ++#ifdef THIS_IS_MAKEFILE ++#define LD_SWITCH_MACHINE -T "../../../mipsel.ld" ++#else ++#define LD_SWITCH_MACHINE -T "../../mipsel.ld" ++#endif ++#endif /* __linux__ */ --- emacs21-21.4a+1.orig/debian/patches/save-buffer.diff +++ emacs21-21.4a+1/debian/patches/save-buffer.diff @@ -0,0 +1,67 @@ +* Files shouldn't be wrongfully deleted on occasion while trying to quit. + Patch: save-buffer.diff + Added-by: Jerome Marant + Date: Sun, 26 Oct 2003 17:48:46 +0100 + Status: has been incorporated upstream + + Emacs should no longer wrongfully delete a file when the user + changes the coding system of a buffer, then tries to save the + buffer, then receives a warning that the buffer cannot be safely + encoded, and then finally cancels the save and exits emacs without + saving that buffer. + +diff -urNad /home/jerome/pkg/emacs21/svn/emacs21/lisp/files.el emacs21/lisp/files.el +--- /home/jerome/pkg/emacs21/svn/emacs21/lisp/files.el 2003-10-01 20:01:28.000000000 +0200 ++++ emacs21/lisp/files.el 2003-10-26 17:45:31.000000000 +0100 +@@ -2207,7 +2207,8 @@ + (copy-file real-file-name backupname t t))) + ;; rename-file should delete old backup. + (rename-file real-file-name backupname t) +- (setq setmodes (file-modes backupname))) ++ (setq setmodes ++ (cons (file-modes backupname) backupname))) + (file-error + ;; If trouble writing the backup, write it in ~. + (setq backupname (expand-file-name +@@ -2682,7 +2683,7 @@ + (nthcdr 10 (file-attributes buffer-file-name))) + (if setmodes + (condition-case () +- (set-file-modes buffer-file-name setmodes) ++ (set-file-modes buffer-file-name (car setmodes)) + (error nil)))) + ;; If the auto-save file was recent before this command, + ;; delete it now. +@@ -2760,7 +2761,8 @@ + ;; Since we have created an entirely new file + ;; and renamed it, make sure it gets the + ;; right permission bits set. +- (setq setmodes (file-modes buffer-file-name)) ++ (setq setmodes (or setmodes (cons (file-modes buffer-file-name) ++ buffer-file-name))) + ;; We succeeded in writing the temp file, + ;; so rename it. + (rename-file tempname buffer-file-name t)) +@@ -2770,10 +2772,18 @@ + ;; (setmodes is set) because that says we're superseding. + (cond ((and tempsetmodes (not setmodes)) + ;; Change the mode back, after writing. +- (setq setmodes (file-modes buffer-file-name)) +- (set-file-modes buffer-file-name (logior setmodes 128)))) +- (write-region (point-min) (point-max) +- buffer-file-name nil t buffer-file-truename))) ++ (setq setmodes (cons (file-modes buffer-file-name) buffer-file-name)) ++ (set-file-modes buffer-file-name (logior (car setmodes) 128)))) ++ (let (success) ++ (unwind-protect ++ (progn ++ (write-region (point-min) (point-max) ++ buffer-file-name nil t buffer-file-truename) ++ (setq success t)) ++ ;; If we get an error writing the new file, and we made ++ ;; the backup by renaming, undo the backing-up. ++ (and setmodes (not success) ++ (rename-file (cdr setmodes) buffer-file-name)))))) + setmodes)) + + (defun save-some-buffers (&optional arg pred) --- emacs21-21.4a+1.orig/debian/patches/misc-unseparated.diff +++ emacs21-21.4a+1/debian/patches/misc-unseparated.diff @@ -0,0 +1,235 @@ +* The following miscellaneous changes have been made. + Patch: misc-unseparated.diff + + * Some documentation references to /usr/local/ have been changed to /usr. + + * Emacs runs debian-startup. + + Emacs runs debian-startup during the startup process unless + site-run-file is false. + + * The default for message-sendmail-f-is-evil has been changed to t. + + This is correct for Debian systems where we know the MTA should be + trusted. + + * mail-from-style changed from 'angles to 'system-default by default. + + * debian-emacs-flavor is a global variable bound to 'emacs21. + Author: Rob Browning + + * Info-default-directory-list includes /usr/share/info/emacs-MAJOR + Author: Rob Browning + + Info-default-directory-list was modified to reflect the install + location of the info files. This location allows multiple emacsen + to coexist on the same Debian system. + + * The build process was modified to accommodate Debian packaging. + Author: Rob Browning + + Emacs has to be able to install into a directory that will not be + the eventual run directory without embedding the install directory + in any of the resulting files. + +diff -urNad /home/rlb/deb/emacs21/trunk/Makefile.in trunk/Makefile.in +--- /home/rlb/deb/emacs21/trunk/Makefile.in 2003-09-11 01:16:07.000000000 -0500 ++++ trunk/Makefile.in 2003-09-11 01:16:53.000000000 -0500 +@@ -474,11 +474,16 @@ + $(srcdir)/mkinstalldirs ${datadir}; \ + chmod a+r ${datadir};\ + fi ++ test "${debepkgdir}" + $(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \ + ${bindir} ${docdir} ${libexecdir} \ + ${datadir}/emacs/site-lisp \ + ${datadir}/emacs/${version}/site-lisp \ +- `echo ${locallisppath} | sed 's/:/ /g'` ++ `echo ${debepkgdir}${locallisppath} | sed 's|:| ${debepkgdir}|g'` ++ ++# debepkgdir (above) is set in debian/rules ++ ++# `echo debian/tmp-emacs${locallisppath} | sed 's/:/ debian\/tmp-emacs/g'` + + ### Delete all the installed files that the `install' target would + ### create (but not the noninstalled files such as `make all' would +diff -urNad /home/rlb/deb/emacs21/trunk/etc/NEWS trunk/etc/NEWS +--- /home/rlb/deb/emacs21/trunk/etc/NEWS 2003-09-11 01:16:07.000000000 -0500 ++++ trunk/etc/NEWS 2003-09-11 01:16:53.000000000 -0500 +@@ -6,6 +6,11 @@ + For older news, see the file ONEWS + + ++* Debian specific changes to Emacs ++ ++Please see /usr/share/doc/emacs21-common/README.Debian.gz. ++ ++ + * Installation changes in Emacs 21.3 + + ** Support for GNU/Linux on little-endian MIPS and on IBM S390 has +diff -urNad /home/rlb/deb/emacs21/trunk/etc/emacs.1 trunk/etc/emacs.1 +--- /home/rlb/deb/emacs21/trunk/etc/emacs.1 2003-09-11 01:16:07.000000000 -0500 ++++ trunk/etc/emacs.1 2003-09-11 01:16:53.000000000 -0500 +@@ -169,7 +169,7 @@ + window in reverse video. + .TP + .B \-i +-Use the "kitchen sink" bitmap icon when iconifying the ++Use the Emacs icon when iconifying the + .I Emacs + window. + .TP +@@ -221,7 +221,7 @@ + .IR X (1) + for more information. + The width and height are specified in characters; the default is 80 by +-24. ++40. + .PP + .TP 8 + .BI \-fg " color" +@@ -411,29 +411,29 @@ + manual is also included in the Emacs source distribution. + .PP + .SH FILES +-/usr/local/info - files for the Info documentation browser ++/usr/info - files for the Info documentation browser + (a subsystem of Emacs) to refer to. Currently not much of Unix + is documented here, but the complete text of the Emacs reference + manual is included in a convenient tree structured form. + +-/usr/local/share/emacs/$VERSION/src - C source files and object files ++/usr/share/emacs/$VERSION/src - C source files and object files + +-/usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files ++/usr/share/emacs/$VERSION/lisp - Lisp source files and compiled files + that define most editing commands. Some are preloaded; + others are autoloaded from this directory when used. + +-/usr/local/share/emacs/$VERSION/etc - various programs that are used with ++/usr/share/emacs/$VERSION/etc - various programs that are used with + GNU Emacs, and some files of information. + +-/usr/local/share/emacs/$VERSION/etc/DOC.* - contains the documentation ++/usr/share/emacs/$VERSION/etc/DOC.* - contains the documentation + strings for the Lisp primitives and preloaded Lisp functions + of GNU Emacs. They are stored here to reduce the size of + Emacs proper. + +-/usr/local/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs ++/usr/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs + vs. other versions of Emacs. + .br +-/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering ++/usr/share/emacs/$VERSION/etc/SERVICE lists people offering + various services to assist users of GNU Emacs, including education, + troubleshooting, porting and customization. + .br +@@ -441,7 +441,7 @@ + programs in the Emacs Lisp extension language, which has not yet been fully + documented. + +-/usr/local/com/emacs/lock - holds lock files that are made for all ++/usr/com/emacs/lock - holds lock files that are made for all + files being modified in Emacs, to prevent simultaneous modification + of one file by two users. + +@@ -468,7 +468,7 @@ + Send requests to be added to mailing lists to the special list + info-gnu-emacs-request@prep.ai.mit.edu (or the corresponding UUCP + address). For more information about Emacs mailing lists, see the +-file /usr/local/emacs/etc/MAILINGLISTS. Bugs tend actually to be ++file /usr/emacs/etc/MAILINGLISTS. Bugs tend actually to be + fixed if they can be isolated, so it is in your interest to report + them in such a way that they can be easily reproduced. + .PP +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el trunk/lisp/gnus/message.el +--- /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el 2003-09-11 01:16:07.000000000 -0500 ++++ trunk/lisp/gnus/message.el 2003-09-11 01:16:53.000000000 -0500 +@@ -402,9 +402,14 @@ + (const use) + (const ask))) + +-(defcustom message-sendmail-f-is-evil nil +- "*Non-nil means don't add \"-f username\" to the sendmail command line. +-Doing so would be even more evil than leaving it out." ++;; message-sendmail-f-is-evil is nil here in the upstream source, but ++;; sendmail works right under Debian Linux, so we want t. [was ++;; orignally reported for emacs 19 as debian#7051] ++(defcustom message-sendmail-f-is-evil t ++ "*Non-nil means don't add \"-f username\" to the sendmail command ++line, because adding it would be more evil than leaving it out. Under ++Debian/GNU/Linux, sendmail works right, so it should be safe for this ++to be set to true." + :group 'message-sending + :type 'boolean) + +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el trunk/lisp/mail/sendmail.el +--- /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el 2003-09-11 01:16:07.000000000 -0500 ++++ trunk/lisp/mail/sendmail.el 2003-09-11 01:16:53.000000000 -0500 +@@ -43,7 +43,7 @@ + :group 'mail) + + ;;;###autoload +-(defcustom mail-from-style 'angles "\ ++(defcustom mail-from-style 'system-default "\ + *Specifies how \"From:\" fields look. + + If `nil', they contain just the return address like: +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/site-init.el trunk/lisp/site-init.el +--- /home/rlb/deb/emacs21/trunk/lisp/site-init.el 1969-12-31 18:00:00.000000000 -0600 ++++ trunk/lisp/site-init.el 2003-09-11 01:16:53.000000000 -0500 +@@ -0,0 +1,3 @@ ++(setq Info-default-directory-list ++ ;; the command line info doesn't seem to need this, but emacs does. ++ (append Info-default-directory-list '("/usr/share/info/emacs-21/"))) +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/startup.el trunk/lisp/startup.el +--- /home/rlb/deb/emacs21/trunk/lisp/startup.el 2003-09-11 01:16:07.000000000 -0500 ++++ trunk/lisp/startup.el 2003-09-11 01:16:53.000000000 -0500 +@@ -339,6 +339,10 @@ + + (defvar normal-top-level-add-subdirs-inode-list nil) + ++(defconst debian-emacs-flavor 'emacs21 ++ "A symbol representing the particular debian flavor of emacs running. ++Something like 'emacs20, 'xemacs20, etc.") ++ + (defun normal-top-level-add-subdirs-to-load-path () + "Add all subdirectories of current directory to `load-path'. + More precisely, this uses only the subdirectories whose names +@@ -848,8 +852,18 @@ + ;; Run the site-start library if it exists. The point of this file is + ;; that it is run before .emacs. There is no point in doing this after + ;; .emacs; that is useless. +- (if site-run-file +- (load site-run-file t t)) ++ ;; (if site-run-file ++ ;; (load site-run-file t t)) ++ ++ ;; Debian version of site-start. ++ (if site-run-file ++ (progn ++ ;; Load all the debian package snippets. ++ ;; It's in here because we want -q to kill it too. ++ (if (load "debian-startup" t t nil) ++ (debian-startup debian-emacs-flavor)) ++ ;; Now the normal site file... ++ (load site-run-file t t nil))) + + ;; Sites should not disable this. Only individuals should disable + ;; the startup message. +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el trunk/lisp/vc-hooks.el +--- /home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el 2003-09-11 01:16:07.000000000 -0500 ++++ trunk/lisp/vc-hooks.el 2003-09-11 01:16:53.000000000 -0500 +@@ -54,8 +54,8 @@ + :group 'vc) + + (defcustom vc-path +- (if (file-directory-p "/usr/sccs") +- '("/usr/sccs") ++ (if (file-directory-p "/usr/lib/cssc") ++ '("/usr/lib/cssc") + nil) + "*List of extra directories to search for version control commands." + :type '(repeat directory) --- emacs21-21.4a+1.orig/debian/patches/xfree86-4.3-modifiers.diff +++ emacs21-21.4a+1/debian/patches/xfree86-4.3-modifiers.diff @@ -0,0 +1,72 @@ +* Emacs should treat logo keys as Meta with newer XFree86 and Xorg releases. + Patch: xfree86-4.3-modifers.diff + Author: Denis Barbier + Date: Fri, 8 Oct 2004 22:37:15 +0200 + Status: has been applied upstream + + Emacs should now properly interpret logo keys as Meta rather than + Meta+Super+Hyper. This became a problem after recent XFree86 and + Xorg releases introducted `fake keys'. + +--- emacs-21.3+1.orig/src/xterm 2004-09-14 19:06:11.000000000 +0200 ++++ emacs-21.3+1/src/xterm.c 2004-09-16 22:23:24.000000000 +0200 +@@ -6380,8 +6380,11 @@ + Alt keysyms are on. */ + { + int row, col; /* The row and column in the modifier table. */ ++ int found_alt_or_meta; + + for (row = 3; row < 8; row++) ++ { ++ found_alt_or_meta = 0; + for (col = 0; col < mods->max_keypermod; col++) + { + KeyCode code +@@ -6403,33 +6406,44 @@ + { + case XK_Meta_L: + case XK_Meta_R: ++ found_alt_or_meta = 1; + dpyinfo->meta_mod_mask |= (1 << row); + break; + + case XK_Alt_L: + case XK_Alt_R: ++ found_alt_or_meta = 1; + dpyinfo->alt_mod_mask |= (1 << row); + break; + + case XK_Hyper_L: + case XK_Hyper_R: +- dpyinfo->hyper_mod_mask |= (1 << row); ++ if (!found_alt_or_meta) ++ dpyinfo->hyper_mod_mask |= (1 << row); ++ code_col = syms_per_code; ++ col = mods->max_keypermod; + break; + + case XK_Super_L: + case XK_Super_R: +- dpyinfo->super_mod_mask |= (1 << row); ++ if (!found_alt_or_meta) ++ dpyinfo->super_mod_mask |= (1 << row); ++ code_col = syms_per_code; ++ col = mods->max_keypermod; + break; + + case XK_Shift_Lock: + /* Ignore this if it's not on the lock modifier. */ +- if ((1 << row) == LockMask) ++ if (!found_alt_or_meta && ((1 << row) == LockMask)) + dpyinfo->shift_lock_mask = LockMask; ++ code_col = syms_per_code; ++ col = mods->max_keypermod; + break; + } + } + } + } ++ } + } + + /* If we couldn't find any meta keys, accept any alt keys as meta keys. */ --- emacs21-21.4a+1.orig/debian/patches/hurd-mmap.diff +++ emacs21-21.4a+1/debian/patches/hurd-mmap.diff @@ -0,0 +1,48 @@ +* An mmap related Hurd build problem has been fixed. + Patch: hurd-mmap.diff + Provided-by: Michael Banck + Author: Richard M. Stallman + Added-by: Rob Browning + Date: Sat May 13 16:08:44 PDT 2006 + Status: has been incorporated upstream + + Upstream ChangeLog entries: + + 2002-04-30 Richard M. Stallman + + * s/gnu.h [emacs]: Include stdio.h. + (GNU_LIBRARY_PENDING_OUTPUT_COUNT): New definition, conditional. + + 2002-05-05 Richard M. Stallman + + * s/gnu.h [DOUG_LEA_MALLOC] (REL_ALLOC): Undefine it. + +Index: main/src/s/gnu.h +=================================================================== +--- main.orig/src/s/gnu.h 2006-05-13 15:55:55.000000000 -0700 ++++ main/src/s/gnu.h 2006-05-13 16:00:02.000000000 -0700 +@@ -60,6 +60,11 @@ + #undef BSD_PGRPS + #define GETPGRP_NO_ARG + ++/* Use mmap directly for allocating larger buffers. */ ++#ifdef DOUG_LEA_MALLOC ++#undef REL_ALLOC ++#endif ++ + #define HAVE_WAIT_HEADER + #define WAIT_USE_INT + #define HAVE_UNION_WAIT +@@ -87,3 +92,12 @@ + #endif + + #define NARROWPROTO 1 ++ ++#ifdef emacs ++#include /* Get the definition of _IO_STDIO_H. */ ++#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) ++/* new C libio names */ ++#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ ++ ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base) ++#endif /* !_IO_STDIO_H */ ++#endif /* emacs */ --- emacs21-21.4a+1.orig/debian/patches/movemail-mailspool.diff +++ emacs21-21.4a+1/debian/patches/movemail-mailspool.diff @@ -0,0 +1,396 @@ +* Several mail program, spool, and locking adjustments have been made. + Patch: movemail-mailspool.diff + Author: Rob Browning + Added-by: Rob Browning + + * The detection of the program "mail" has been enhanced. + + We have added CONF_MAIL_PROGRAM_NAME to configure.in and use it in + fakemail.c. Either via this variable, or via a #define in an arch + specific file, we now insist that this var be defined, and abort + compilation otherwise. We use #error, which is probably not + portable, so we need a better solution long term. This fix + repairs a nasty bug where on sparc-linux-gnu at least, + MAIL_PROGRAM_NAME pointed to /bin/mail, which didn't exist, and + fakemail failed silently, losing mail. In the long run, though, + fakemail should be fixed to find the mail program at runtime, and + do something smarter if/when detection fails. + + * The location of the mail spool has been centralized. + + [ This modification is currently only available in the Debian + source, but the upstream authors and I are in the process of + working out the appropriate upstream patch. + + Please do *NOT* use mail-spool-directory in any public code + until and unless this variable makes it into the upstream + source. ] + + Determination of the location of the mail spool has now been + centralized. There is a new lisp-level variable + mail-spool-directory that should always contain the location of + the mail spool (normally a directory like /usr/spool/mail). + + There is a related configure option --with-mail-spool-directory + that allows you to override the default mail spool location + detected, if any, at configure time. The proper setting for a + particular architecture may also be set in src/s/*.h with + SYSTEM_MAIL_SPOOL_DIRECTORY, but note that + --with-mail-spool-directory always takes precedence. + + At the C level, the mail spool directory is available from + lib-src/mailspool.h which provides a MAIL_SPOOL_DIRECTORY + definition. + + nnmail, rmail, and movemail have all been modified to respect this + new arrangement. + + * Mailbox locking improved and brought into line with Debian policy. + + [ This modification is currently only available in the Debian + source, but the upstream authors and I are in the process of + working out the appropriate upstream patch. ] + + Configure now looks for liblockfile before libmail (liblockfile is + a free software replacement for libmail). Either library, if + found, is propagated to the movemail (lib-src) Makefile through + the MOVEMAIL_LOCK_LIBS variable. + + Also MAIL_USE_FLOCK is disabled since it is wrong for a Debian + system. + +diff -urNad /home/rlb/deb/emacs21/trunk/configure.in trunk/configure.in +--- /home/rlb/deb/emacs21/trunk/configure.in 2003-09-11 01:15:10.000000000 -0500 ++++ trunk/configure.in 2003-09-11 01:15:14.000000000 -0500 +@@ -59,6 +59,9 @@ + AC_ARG_WITH(hesiod, + [ --with-hesiod support Hesiod to get the POP server host], + [AC_DEFINE(HESIOD)]) ++AC_ARG_WITH(mail-spool-directory, ++[ --with-mail-spool-directory=DIR system mail spool is DIR], ++[AC_DEFINE_UNQUOTED(USE_MAIL_SPOOL_DIRECTORY,"${withval}")]) + dnl This should be the last --with option, because --with-x is + dnl added later on when we find the path of X, and it's best to + dnl keep them together visually. +@@ -1963,29 +1966,62 @@ + # On HPUX 9.01, -lm does not contain logb, so check for sqrt. + AC_CHECK_LIB(m, sqrt) + +-# Check for mail-locking functions in a "mail" library +-AC_CHECK_LIB(mail, maillock) +-dnl Debian, at least: +-dnl AC_CHECK_LIB(lockfile, maillock, [AC_DEFINE(HAVE_LIBMAIL)]) +-AC_CHECK_LIB(lockfile, maillock) +-# If we have the shared liblockfile, assume we must use it for mail +-# locking (e.g. Debian). If we couldn't link against liblockfile +-# (no liblockfile.a installed), ensure that we don't need to. +-if test "$ac_cv_lib_lockfile_maillock" = no; then +- dnl This works for files generally, not just executables. +- dnl Should we look elsewhere for it? Maybe examine /etc/ld.so.conf? +- AC_CHECK_PROG(liblockfile, liblockfile.so, yes, no, +- /usr/lib:/lib:/usr/local/lib:$LD_LIBRARY_PATH) +- if test $ac_cv_prog_liblockfile = yes; then +- AC_MSG_ERROR([Shared liblockfile found but can't link against it. +-This probably means that movemail could lose mail. +-There may be a \`development' package to install containing liblockfile.]) +- else AC_DEFINE(LIBMAIL, -llockfile) +- fi +- else : ++# Check for mail-locking functions in a "mail" library Check for ++# lockfile first, a free replacement for -lmail. We use AC_CHECK_LIB ++# for touchlock because we don't want to have to put the lock libs ++# into LIBS and AC_CHECK_FUNCS would require that. ++ ++AC_CHECK_LIB(lockfile, maillock, ++ [ AC_DEFINE(HAVE_LIBMAIL) ++ MOVEMAIL_LOCK_LIBS="-llockfile" ++ AC_CHECK_LIB(lockfile, touchlock, AC_DEFINE(HAVE_TOUCHLOCK)) ++ AC_CHECK_HEADERS(maillock.h)], ++ [ AC_CHECK_LIB(mail, maillock, ++ [ AC_DEFINE(HAVE_LIBMAIL) ++ MOVEMAIL_LOCK_LIBS="-lmail" ++ AC_CHECK_LIB(mail, touchlock, AC_DEFINE(HAVE_TOUCHLOCK)) ++ AC_CHECK_FUNCS(touchlock) ++ AC_CHECK_HEADERS(maillock.h)])]) ++ ++ ++# Tests borrowed (and slightly rearranged) from old paths.el ++# rmail-spool-directory tests. They should be in the order most ++# likely to get the right answer. You can always override them on the ++# system level in src/s/* and on a one-shot basis with ++# --with-mail-spool-directory. ++ ++AC_MSG_CHECKING(for mail spool location) ++if test "${with_mail_spool+set}" = set; then ++ AC_MSG_RESULT(${with_mail_spool}) ++elif test -d /var/mail/; then ++ AC_DEFINE_UNQUOTED(CONF_MAIL_SPOOL_DIRECTORY, "/var/mail") ++ AC_MSG_RESULT("/var/mail") ++elif test -d /var/spool/mail/; then ++ AC_DEFINE_UNQUOTED(CONF_MAIL_SPOOL_DIRECTORY, "/var/spool/mail") ++ AC_MSG_RESULT("/var/spool/mail") ++elif test -d /usr/mail/; then ++ AC_DEFINE_UNQUOTED(CONF_MAIL_SPOOL_DIRECTORY, "/usr/mail") ++ AC_MSG_RESULT("/usr/mail") ++elif test -d /usr/spool/mail/; then ++ AC_DEFINE_UNQUOTED(CONF_MAIL_SPOOL_DIRECTORY, "/usr/spool/mail") ++ AC_MSG_RESULT("/usr/spool/mail") ++else ++ AC_MSG_RESULT(not found) ++fi ++ ++# Find the location of "mail". This is critical for fakemail at ++# least. before fakemail would silently fail if this was wrong, so ++# insist on finding it. ++AC_MSG_CHECKING(for mail binary) ++if test -x /bin/mail; then ++ AC_DEFINE_UNQUOTED(CONF_MAIL_PROGRAM_NAME, "/bin/mail") ++ AC_MSG_RESULT("/bin/mail") ++elif test -x /usr/bin/mail; then ++ AC_DEFINE_UNQUOTED(CONF_MAIL_PROGRAM_NAME, "/usr/bin/mail") ++ AC_MSG_RESULT("/usr/bin/mail") ++else ++ AC_MSG_ERROR(could not find mail binary) + fi +-AC_CHECK_FUNCS(touchlock) +-AC_CHECK_HEADERS(maillock.h) + + AC_CHECK_FUNCS(gethostname getdomainname dup2 \ + rename closedir mkdir rmdir sysinfo \ +@@ -2234,6 +2270,7 @@ + AC_SUBST(machfile) + AC_SUBST(opsysfile) + AC_SUBST(GETLOADAVG_LIBS) ++AC_SUBST(MOVEMAIL_LOCK_LIBS) + + AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "${canonical}") + AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}") +diff -urNad /home/rlb/deb/emacs21/trunk/lib-src/Makefile.in trunk/lib-src/Makefile.in +--- /home/rlb/deb/emacs21/trunk/lib-src/Makefile.in 2003-09-11 01:14:26.000000000 -0500 ++++ trunk/lib-src/Makefile.in 2003-09-11 01:15:13.000000000 -0500 +@@ -222,11 +222,10 @@ + # endif + #endif + +-LIBS_MOVE=$(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) $(HESIODLIB) ++MOVEMAIL_LOCK_LIBS=@MOVEMAIL_LOCK_LIBS@ + +-#ifdef HAVE_LIBMAIL +-LIBS_MAIL=-lmail +-#endif ++LIBS_MOVE=$(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRLIB) \ ++ $(HESIODLIB) $(MOVEMAIL_LOCK_LIBS) + + LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC + +diff -urNad /home/rlb/deb/emacs21/trunk/lib-src/fakemail.c trunk/lib-src/fakemail.c +--- /home/rlb/deb/emacs21/trunk/lib-src/fakemail.c 2003-09-11 01:14:26.000000000 -0500 ++++ trunk/lib-src/fakemail.c 2003-09-11 01:15:13.000000000 -0500 +@@ -126,7 +126,11 @@ + #define INITIAL_LINE_SIZE 200 + + #ifndef MAIL_PROGRAM_NAME +-#define MAIL_PROGRAM_NAME "/bin/mail" ++#ifdef CONF_MAIL_PROGRAM_NAME ++#define MAIL_PROGRAM_NAME CONF_MAIL_PROGRAM_NAME ++#else ++#error "MAIL_PROGRAM_NAME must be defined" ++#endif + #endif + + static char *my_name; +diff -urNad /home/rlb/deb/emacs21/trunk/lib-src/mailspool.h trunk/lib-src/mailspool.h +--- /home/rlb/deb/emacs21/trunk/lib-src/mailspool.h 1969-12-31 18:00:00.000000000 -0600 ++++ trunk/lib-src/mailspool.h 2003-09-11 01:15:14.000000000 -0500 +@@ -0,0 +1,46 @@ ++/* mailspool.h -- record the location of the mail spool in MAIL_SPOOL_DIRECTORY ++ Copyright (C) 1986, 1992, 1993, 1994, 1996 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. */ ++ ++#ifndef _MAILSPOOL_H ++#define _MAILSPOOL_H 1 ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++#define NO_SHORTNAMES /* Tell config not to load remap.h */ ++#include <../src/config.h> ++ ++/* Final determination of mail spool location. */ ++#ifdef USE_MAIL_SPOOL_DIRECTORY ++#define MAIL_SPOOL_DIRECTORY USE_MAIL_SPOOL_DIRECTORY ++#elif defined(SYSTEM_MAIL_SPOOL_DIRECTORY) ++#define MAIL_SPOOL_DIRECTORY SYSTEM_MAIL_SPOOL_DIRECTORY ++#elif defined(MAILDIR) ++#define MAIL_SPOOL_DIRECTORY MAILDIR ++#elif defined(CONF_MAIL_SPOOL_DIRECTORY) ++#define MAIL_SPOOL_DIRECTORY CONF_MAIL_SPOOL_DIRECTORY ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* mailspool.h */ +diff -urNad /home/rlb/deb/emacs21/trunk/lib-src/movemail.c trunk/lib-src/movemail.c +--- /home/rlb/deb/emacs21/trunk/lib-src/movemail.c 2003-09-11 01:14:26.000000000 -0500 ++++ trunk/lib-src/movemail.c 2003-09-11 01:15:14.000000000 -0500 +@@ -54,6 +54,8 @@ + * + */ + ++#include "mailspool.h" ++ + #define NO_SHORTNAMES /* Tell config not to load remap.h */ + #include + #include +@@ -129,15 +131,12 @@ + #endif + + #if !defined (MAIL_USE_SYSTEM_LOCK) && !defined (MAIL_USE_MMDF) && \ +- defined (HAVE_LIBMAIL) && defined (HAVE_MAILLOCK_H) ++ defined (HAVE_LIBMAIL) && defined (HAVE_MAILLOCK_H) && \ ++ defined (MAIL_SPOOL_DIRECTORY) + #include +-/* We can't use maillock unless we know what directory system mail +- files appear in. */ +-#ifdef MAILDIR + #define MAIL_USE_MAILLOCK + static char *mail_spool_name (); + #endif +-#endif + + #ifndef errno + extern int errno; +@@ -575,7 +574,7 @@ + + fname++; + +- if (stat (MAILDIR, &stat1) < 0) ++ if (stat (MAIL_SPOOL_DIRECTORY, &stat1) < 0) + return NULL; + + indir = (char *) xmalloc (fname - inname + 1); +diff -urNad /home/rlb/deb/emacs21/trunk/lisp/paths.el trunk/lisp/paths.el +--- /home/rlb/deb/emacs21/trunk/lisp/paths.el 2003-09-11 01:14:26.000000000 -0500 ++++ trunk/lisp/paths.el 2003-09-11 01:15:13.000000000 -0500 +@@ -140,24 +140,7 @@ + :group 'rmail + :version "21.1") + +-(defconst rmail-spool-directory +- (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration) +- "/usr/spool/mail/") +- ;; On The Bull DPX/2 /usr/spool/mail is used although +- ;; it is usg-unix-v. +- ((string-match "^m68k-bull-sysv3" system-configuration) +- "/usr/spool/mail/") +- ;; SVR4 and recent BSD are said to use this. +- ;; Rather than trying to know precisely which systems use it, +- ;; let's assume this dir is never used for anything else. +- ((file-exists-p "/var/mail") +- "/var/mail/") +- ;; Many GNU/Linux systems use this name. +- ((file-exists-p "/var/spool/mail") +- "/var/spool/mail/") +- ((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix)) +- "/usr/mail/") +- (t "/usr/spool/mail/")) ++(defconst rmail-spool-directory mail-spool-directory + "Name of directory used by system mailer for delivering new mail. + Its name should end with a slash.") + +diff -urNad /home/rlb/deb/emacs21/trunk/src/callproc.c trunk/src/callproc.c +--- /home/rlb/deb/emacs21/trunk/src/callproc.c 2003-09-11 01:14:26.000000000 -0500 ++++ trunk/src/callproc.c 2003-09-11 01:15:13.000000000 -0500 +@@ -25,6 +25,8 @@ + #include + #include + ++#include "../lib-src/mailspool.h" ++ + #ifndef USE_CRT_DLL + extern int errno; + #endif +@@ -113,6 +115,8 @@ + + Lisp_Object Vprocess_environment; + ++Lisp_Object Vmail_spool_directory; ++ + #ifdef DOS_NT + Lisp_Object Qbuffer_file_type; + #endif /* DOS_NT */ +@@ -1630,6 +1634,19 @@ + The environment which Emacs inherits is placed in this variable\n\ + when Emacs starts."); + ++ DEFVAR_LISP ("mail-spool-directory", &Vmail_spool_directory, ++ "Location of the system mail spool.\n\ ++This is normally a directory like \"usr/spool/mail\". This is\n\ ++currently a Debian extension. Please do NOT use this in public code\n\ ++until/unless it makes it upstream."); ++#ifdef MAIL_SPOOL_DIRECTORY ++ Vmail_spool_directory = ++ Ffile_name_as_directory (build_string (MAIL_SPOOL_DIRECTORY)); ++#else ++ Vmail_spool_directory = Qnil; ++#endif ++ ++ + #ifndef VMS + defsubr (&Scall_process); + defsubr (&Sgetenv_internal); +diff -urNad /home/rlb/deb/emacs21/trunk/src/config.in trunk/src/config.in +--- /home/rlb/deb/emacs21/trunk/src/config.in 2003-09-11 01:15:10.000000000 -0500 ++++ trunk/src/config.in 2003-09-11 01:15:13.000000000 -0500 +@@ -222,6 +222,13 @@ + #undef HAVE_MAILLOCK_H + #undef HAVE_TOUCHLOCK + ++/* Mail spool information from the configure process. See lib-src/mailspool.h */ ++#undef USE_MAIL_SPOOL_DIRECTORY ++#undef CONF_MAIL_SPOOL_DIRECTORY ++ ++/* Mail spool information from the configure process. See lib-src/fakemail.c */ ++#undef CONF_MAIL_PROGRAM_NAME ++ + #undef HAVE_ALLOCA_H + + #undef HAVE_DEV_PTMX +diff -urNad /home/rlb/deb/emacs21/trunk/src/s/gnu-linux.h trunk/src/s/gnu-linux.h +--- /home/rlb/deb/emacs21/trunk/src/s/gnu-linux.h 2003-09-11 01:14:26.000000000 -0500 ++++ trunk/src/s/gnu-linux.h 2003-09-11 01:15:13.000000000 -0500 +@@ -130,7 +130,14 @@ + programs. I assume that most people are using newer mailers that + have heard of flock. Change this if you need to. */ + +-#define MAIL_USE_FLOCK ++/* On Debian/GNU/Linux systems, configure gets the right answers, and ++ that means *NOT* using flock. Using flock is guaranteed to be the ++ wrong thing. See Debian Policy for details. */ ++#ifdef DEBIAN ++# undef MAIL_USE_FLOCK ++#else ++# define MAIL_USE_FLOCK ++#endif + + /* Define CLASH_DETECTION if you want lock files to be written + so that Emacs can tell instantly when you try to modify --- emacs21-21.4a+1.orig/debian/patches/arch-amd64.diff +++ emacs21-21.4a+1/debian/patches/arch-amd64.diff @@ -0,0 +1,157 @@ +* Support for the AMD64 architecture has been added. + Patch: arch-amd64.diff + Provided-by: Goswin von Brederlow + Added-by: Jerome Marant + Date: Thu, 05 Aug 2004 14:06:32 +0200 + Status: has been incorporated upstream + +diff -urNad emacs21-21.3+1/configure.in /tmp/dpep.7W4lLC/emacs21-21.3+1/configure.in +--- emacs21-21.3+1/configure.in 2003-03-16 23:06:05.000000000 +0100 ++++ /tmp/dpep.7W4lLC/emacs21-21.3+1/configure.in 2005-03-12 14:41:42.787845968 +0100 +@@ -1060,6 +1060,11 @@ + machine=f301 opsys=uxpv + ;; + ++ ## AMD x86-64 Linux-based GNU system ++ x86_64-*-linux-gnu* ) ++ machine=amdx86-64 opsys=gnu-linux ++ ;; ++ + * ) + unported=yes + ;; +diff -urNad emacs21-21.3+1/src/m/amdx86-64.h /tmp/dpep.7W4lLC/emacs21-21.3+1/src/m/amdx86-64.h +--- emacs21-21.3+1/src/m/amdx86-64.h 1970-01-01 01:00:00.000000000 +0100 ++++ /tmp/dpep.7W4lLC/emacs21-21.3+1/src/m/amdx86-64.h 2005-03-12 14:41:42.789845664 +0100 +@@ -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 */ ++ ++/* 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 ++#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 */ ++ ++#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 ++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o ++ ++#undef LIB_STANDARD ++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o --- emacs21-21.4a+1.orig/debian/patches/arch-ppc64.diff +++ emacs21-21.4a+1/debian/patches/arch-ppc64.diff @@ -0,0 +1,53 @@ +* Support for the ppc64 (powerpc64) architecture has been added. + Patch: arch-ppc64.diff + Provided-by: Jerome Marant + Added-by: Jerome Marant + Date: Sun, 1 May 2005 15:01:13 +0200 + Status: has been incorporated upstream + +diff -urNad emacs21-21.4a/configure.in /tmp/dpep.HHmGHE/emacs21-21.4a/configure.in +--- emacs21-21.4a/configure.in 2005-05-01 14:24:47.769683616 +0200 ++++ /tmp/dpep.HHmGHE/emacs21-21.4a/configure.in 2005-05-01 14:56:03.818480848 +0200 +@@ -278,11 +278,6 @@ + machine=arm opsys=gnu-linux + ;; + +- ppc-*-linux | \ +- powerpc-*-linux* ) +- machine=macppc opsys=gnu-linux +- ;; +- + ## Altos 3068 + m68*-altos-sysv* ) + machine=altos opsys=usg5-2 +diff -urNad emacs21-21.4a/src/m/macppc.h /tmp/dpep.HHmGHE/emacs21-21.4a/src/m/macppc.h +--- emacs21-21.4a/src/m/macppc.h 2001-10-23 08:43:33.000000000 +0200 ++++ /tmp/dpep.HHmGHE/emacs21-21.4a/src/m/macppc.h 2005-05-01 14:55:48.356831376 +0200 +@@ -95,11 +95,16 @@ + + #ifdef LINUX + #define LINKER $(CC) -nostdlib +-#define LD_SWITCH_MACHINE -Xlinker -m -Xlinker elf32ppc + /* s/gnu-linux.h defines this to `-z nocombreloc' which does not work here + because prefix-args is not used. */ + #undef LD_SWITCH_SYSTEM_TEMACS + #define LD_SWITCH_MACHINE_TEMACS -Xlinker -znocombreloc ++#ifdef _ARCH_PPC64 ++#undef START_FILES ++#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o ++#undef LIB_STANDARD ++#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o ++#endif + #endif + + #if 0 /* This breaks things on PPC GNU/Linux ecept for Yellowdog, +@@ -113,3 +118,9 @@ + #endif + #endif + #endif /* 0 */ ++ ++#ifdef _ARCH_PPC64 ++#ifndef _LP64 ++#define _LP64 ++#endif ++#endif --- emacs21-21.4a+1.orig/debian/patches/yow-mode-from-cvs.diff +++ emacs21-21.4a+1/debian/patches/yow-mode-from-cvs.diff @@ -0,0 +1,81 @@ +* Yow and cookie1 modes from CVS trunk. These are necessary in order to + be able to read the yow.lines replacement which comes from the CVS + trunk as well. + Patch: yow-mode-from-cvs.diff + Added-by: Jerome Marant + Date: Fri, 27 Oct 2006 19:55:36 +0200 + Status: has been incorporated upstream + +Index: emacs21-21.4a+1/lisp/play/cookie1.el +=================================================================== +--- emacs21-21.4a+1.orig/lisp/play/cookie1.el 2006-10-27 19:24:50.012779300 +0200 ++++ emacs21-21.4a+1/lisp/play/cookie1.el 2006-10-27 19:26:05.378697124 +0200 +@@ -73,7 +73,7 @@ + is read in, display STARTMSG at beginning of load, ENDMSG at end." + (let ((cookie-vector (cookie-snarf phrase-file startmsg endmsg))) + (shuffle-vector cookie-vector) +- (aref cookie-vector 1))) ++ (aref cookie-vector 0))) + + ;;;###autoload + (defun cookie-insert (phrase-file &optional count startmsg endmsg) +Index: emacs21-21.4a+1/lisp/play/yow.el +=================================================================== +--- emacs21-21.4a+1.orig/lisp/play/yow.el 2006-10-27 19:24:41.665009929 +0200 ++++ emacs21-21.4a+1/lisp/play/yow.el 2006-10-27 19:25:42.687324028 +0200 +@@ -1,6 +1,7 @@ + ;;; yow.el --- quote random zippyisms + +-;; Copyright (C) 1993, 1994, 1995, 2000 Free Software Foundation, Inc. ++;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, ++;; 2005, 2006 Free Software Foundation, Inc. + + ;; Maintainer: FSF + ;; Author: Richard Mlynarik +@@ -20,8 +21,8 @@ + + ;; 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. ++;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++;; Boston, MA 02110-1301, USA. + + ;;; Commentary: + +@@ -49,13 +50,13 @@ + (defconst yow-after-load-message "I have SEEN the CONSING!!") + + ;;;###autoload +-(defun yow (&optional insert) ++(defun yow (&optional insert display) + "Return or display a random Zippy quotation. With prefix arg, insert it." +- (interactive "P") ++ (interactive "P\np") + (let ((yow (cookie yow-file yow-load-message yow-after-load-message))) + (cond (insert + (insert yow)) +- ((not (interactive-p)) ++ ((not display) + yow) + (t + (message "%s" yow))))) +@@ -101,7 +102,8 @@ + (while l + (princ (car l)) + (setq l (cdr l)) +- (and l (princ "\n\n")))))))) ++ (and l (princ "\n\n"))) ++ (print-help-return-message)))))) + matches)) + + +@@ -119,7 +121,7 @@ + (switch-to-buffer "*doctor*") + (sit-for 0) + (while (not (input-pending-p)) +- (insert-string (yow)) ++ (insert (yow)) + (sit-for 0) + (doctor-ret-or-read 1) + (doctor-ret-or-read 1))) --- emacs21-21.4a+1.orig/debian/patches/series +++ emacs21-21.4a+1/debian/patches/series @@ -0,0 +1,36 @@ +yow-mode-from-cvs.diff +xbm-read-erroneous-semicolon.diff +handle-dfsg-split.diff +autoconf-updates.diff +misc-unseparated.diff +arch-hppa.diff +arch-mips.diff +arch-mipsel.diff +arch-s390.diff +fix-batch-mode-signal-handling.diff +browse-url.diff +bzero-and-have-stdlib.diff +detect-coding-iso2022.diff +movemail-mailspool.diff +version-mention-debian.diff +hurd-libio-glibc.diff +hurd-mmap.diff +battery-acpi-support.diff +scroll-margin.diff +save-buffer.diff +emacsclient-alternate-editor.diff +startup-auto-save-file-name-transforms.diff +python-completion-ignored-extensions.diff +xfree86-4.3-modifiers.diff +coding-region-leak.diff +remote-files-permissions.diff +pcl-cvs-format.diff +arch-amd64.diff +#arch-ppc64.diff +multibyte-char-key-modifiers.diff +xorg-altgr-fix.diff +whitespace-readonly-infloop.diff +fix-x-vs-no-x-diffs.diff +ldapsearch-output.diff +autofiles.diff +security-CVE-2007-2833.diff --- emacs21-21.4a+1.orig/debian/patches/emacsclient-alternate-editor.diff +++ emacs21-21.4a+1/debian/patches/emacsclient-alternate-editor.diff @@ -0,0 +1,31 @@ +* The emacsclient command now respects ALTERNATE_EDITOR when appropriate. + Patch: emacsclient-alternate-editor.diff + Applied-by: Jerome Marant + Date: Sun, 25 Jan 2004 21:00:29 +0100 + Status: has been applied upstream + + The emacsclient command will now take the ALTERNATE_EDITOR + environment variable into account properly when the command is run + without any parameter. + +diff -urNad /home/jerome/pkg/emacs21/svn/emacs21/lib-src/emacsclient.c emacs21/lib-src/emacsclient.c +--- /home/jerome/pkg/emacs21/svn/emacs21/lib-src/emacsclient.c 2004-01-25 19:45:54.000000000 +0100 ++++ emacs21/lib-src/emacsclient.c 2004-01-25 19:46:31.000000000 +0100 +@@ -75,6 +75,8 @@ + int argc; + char **argv; + { ++ alternate_editor = getenv ("ALTERNATE_EDITOR"); ++ + while (1) + { + int opt = getopt_long (argc, argv, +@@ -82,8 +84,6 @@ + + if (opt == EOF) + break; +- +- alternate_editor = getenv ("ALTERNATE_EDITOR"); + + switch (opt) + { --- emacs21-21.4a+1.orig/debian/patches/security-CVE-2007-2833.diff +++ emacs21-21.4a+1/debian/patches/security-CVE-2007-2833.diff @@ -0,0 +1,41 @@ +* fix for CVE-2007-2833 + Patch: security-2007-2833.diff + Provided-by: Jamie Strandboge + Applied-by: Jamie Strandboge + Date: Fri, 24 Aug 2007 22:30:38 -0400 + +diff -urNad emacs21-21.4a+1.orig/src/xfns.c emacs21-21.4a+1/src/xfns.c +--- emacs21-21.4a+1.orig/src/xfns.c 2002-12-06 12:05:35.000000000 -0500 ++++ emacs21-21.4a+1/src/xfns.c 2007-08-24 22:17:17.000000000 -0400 +@@ -9805,8 +9805,17 @@ + return 0; + } + +- width = img->width = max (gif->SWidth, gif->Image.Left + gif->Image.Width); +- height = img->height = max (gif->SHeight, gif->Image.Top + gif->Image.Height); ++ image_top = gif->SavedImages[ino].ImageDesc.Top; ++ image_left = gif->SavedImages[ino].ImageDesc.Left; ++ image_width = gif->SavedImages[ino].ImageDesc.Width; ++ image_height = gif->SavedImages[ino].ImageDesc.Height; ++ ++ width = img->width = max (gif->SWidth, ++ max (gif->Image.Left + gif->Image.Width, ++ image_left + image_width)); ++ height = img->height = max (gif->SHeight, ++ max (gif->Image.Top + gif->Image.Height, ++ image_top + image_height)); + + /* Create the X image and pixmap. */ + if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) +@@ -9839,11 +9848,6 @@ + requires more than can be done here (see the gif89 spec, + disposal methods). Let's simply assume that the part + not covered by a sub-image is in the frame's background color. */ +- image_top = gif->SavedImages[ino].ImageDesc.Top; +- image_left = gif->SavedImages[ino].ImageDesc.Left; +- image_width = gif->SavedImages[ino].ImageDesc.Width; +- image_height = gif->SavedImages[ino].ImageDesc.Height; +- + for (y = 0; y < image_top; ++y) + for (x = 0; x < width; ++x) + XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f)); --- emacs21-21.4a+1.orig/debian/patches/startup-auto-save-file-name-transforms.diff +++ emacs21-21.4a+1/debian/patches/startup-auto-save-file-name-transforms.diff @@ -0,0 +1,26 @@ +* The value of auto-save-file-name-transforms is now set correctly at run-time. + Patch: startup-auto-save-file-name-transforms.diff + Added-by: Jerome Marant + Date: Sat, 5 Jun 2004 20:10:50 +0200 + Status: has been fixed upstream + + The value of the auto-save-file-name-transforms variable is now set + at run-time in order to override the value that was autogenerated at + build-time. + +diff -urNad /home/jerome/pkg/emacs21/svn/emacs21/lisp/startup.el emacs21/lisp/startup.el +--- /home/jerome/pkg/emacs21/svn/emacs21/lisp/startup.el 2004-06-05 15:24:51.000000000 +0200 ++++ emacs21/lisp/startup.el 2004-06-05 15:24:51.000000000 +0200 +@@ -629,6 +629,12 @@ + (setq small-temporary-file-directory + (if (eq system-type 'ms-dos) + (getenv "TMPDIR"))) ++ (setq auto-save-file-name-transforms ++ (list (list "\\`/[^/]*:\\(.+/\\)*\\(.*\\)" ++ ;; Don't put "\\2" inside expand-file-name, since ++ ;; it will be transformed to "/2" on DOS/Windows. ++ (concat (expand-file-name temporary-file-directory) ++ "\\2")))) + + ;; See if we should import version-control from the environment variable. + (let ((vc (getenv "VERSION_CONTROL"))) --- emacs21-21.4a+1.orig/debian/patches/pcl-cvs-format.diff +++ emacs21-21.4a+1/debian/patches/pcl-cvs-format.diff @@ -0,0 +1,61 @@ +* Emacs can now handle the output of newer versions of various CVS commands. + Patch: pcl-cvs-format.diff + Provded-by: Romain Francoise + Author: Stefan Monnier + Date: Mon, 24 Jan 2005 19:49:21 +0100 + Status: has been fixed upstream + +diff -urNad emacs21-21.3+1/lisp/pcvs-parse.el /tmp/dpep.SXISqR/emacs21-21.3+1/lisp/pcvs-parse.el +--- emacs21-21.3+1/lisp/pcvs-parse.el 2001-09-24 18:39:23.000000000 +0200 ++++ /tmp/dpep.SXISqR/emacs21-21.3+1/lisp/pcvs-parse.el 2005-01-24 19:15:31.000000000 +0100 +@@ -351,7 +351,7 @@ + ;; File you removed still exists. Ignore (will be noted as removed). + (cvs-match ".* should be removed and is still there$") + ;; just a note +- (cvs-match "use '.+ commit' to \\sw+ th\\sw+ files? permanently$") ++ (cvs-match "use ['`].+ commit' to \\sw+ th\\sw+ files? permanently$") + ;; [add,status] followed by a more complete status description anyway + (cvs-match "nothing known about .*$") + ;; [update] problem with patch +@@ -467,12 +467,14 @@ + :head-rev head-rev)))) + + (defun cvs-parse-commit () +- (let (path base-rev subtype) ++ (let (path file base-rev subtype) + (cvs-or + + (and +- (cvs-match "\\(Checking in\\|Removing\\) \\(.*\\);$" (path 2)) +- (cvs-match ".*,v <-- .*$") ++ (cvs-or ++ (cvs-match "\\(Checking in\\|Removing\\) \\(.*\\);$" (path 2)) ++ t) ++ (cvs-match ".*,v <-- \\(.*\\)$" (file 1)) + (cvs-or + ;; deletion + (cvs-match "new revision: delete; previous revision: \\([0-9.]*\\)$" +@@ -483,15 +485,20 @@ + ;; update + (cvs-match "new revision: \\([0-9.]*\\); previous revision: .*$" + (subtype 'COMMITTED) (base-rev 1))) +- (cvs-match "done$") ++ (cvs-or (cvs-match "done$") t) ++ ;; In cvs-1.12.9 commit messages have been changed and became ++ ;; ambiguous. More specifically, the `path' above is not given. ++ ;; We assume here that in future releases the corresponding info will ++ ;; be put into `file'. + (progn + ;; Try to remove the temp files used by VC. +- (vc-delete-automatic-version-backups (expand-file-name path)) ++ (vc-delete-automatic-version-backups (expand-file-name (or path file))) + ;; it's important here not to rely on the default directory management + ;; because `cvs commit' might begin by a series of Examining messages + ;; so the processing of the actual checkin messages might begin with + ;; a `current-dir' set to something different from "" +- (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) path 'trust ++ (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) ++ (or path file) 'trust + :base-rev base-rev))) + + ;; useless message added before the actual addition: ignored --- emacs21-21.4a+1.orig/debian/patches/00list +++ emacs21-21.4a+1/debian/patches/00list @@ -0,0 +1,29 @@ +autoconf-updates +misc-unseparated +arch-hppa +arch-mipsel +arch-s390 +fix-batch-mode-signal-handling +browse-url +bzero-and-have-stdlib +detect-coding-iso2022 +movemail-mailspool +version-mention-debian +hurd-libio-glibc +battery-acpi-support +scroll-margin +save-buffer +emacsclient-alternate-editor +startup-auto-save-file-name-transforms +python-completion-ignored-extensions +xfree86-4.3-modifiers +coding-region-leak +remote-files-permissions +pcl-cvs-format +arch-amd64 +#arch-ppc64 +multibyte-char-key-modifiers +xorg-altgr-fix +whitespace-readonly-infloop +fix-x-vs-no-x-diffs +autofiles --- emacs21-21.4a+1.orig/debian/patches/version-mention-debian.diff +++ emacs21-21.4a+1/debian/patches/version-mention-debian.diff @@ -0,0 +1,18 @@ +* The output of (version) has been modified to indicate Debian modifications. + Patch: version-mention-debian.diff + Author: Rob Browning + Added-by: Rob Browning + +--- emacs21-21.2.orig/lisp/version.el ++++ emacs21-21.2/lisp/version.el +@@ -55,8 +55,8 @@ + (interactive "P") + (let ((version-string + (format (if (not (interactive-p)) +- "GNU Emacs %s (%s%s%s)\n of %s on %s" +- "GNU Emacs %s (%s%s%s) of %s on %s") ++ "GNU Emacs %s (%s%s%s)\n of %s on %s, modified by Debian" ++ "GNU Emacs %s (%s%s%s) of %s on %s, modified by Debian") + emacs-version + system-configuration + (cond ((featurep 'motif) --- emacs21-21.4a+1.orig/debian/patches/ldapsearch-output.diff +++ emacs21-21.4a+1/debian/patches/ldapsearch-output.diff @@ -0,0 +1,40 @@ +* Properly handle ldapsearch output from OpenLDAP version 2 and above. + Patch: ldapsearch-output.diff + Provided-by: Henrik Holmboe + Added-by: Jerome Marant + Date: Tue, 17 Oct 2006 10:06:24 +0200 + Status: fixed upstream + +Index: emacs21-21.4a+1/lisp/net/ldap.el +=================================================================== +--- emacs21-21.4a+1.orig/lisp/net/ldap.el 2006-10-17 09:35:11.553434043 +0200 ++++ emacs21-21.4a+1/lisp/net/ldap.el 2006-10-17 09:39:57.049573660 +0200 +@@ -157,7 +157,7 @@ + :type '(string :tag "`ldapsearch' Program") + :group 'ldap) + +-(defcustom ldap-ldapsearch-args '("-B") ++(defcustom ldap-ldapsearch-args '("-x") + "*A list of additional arguments to pass to `ldapsearch'. + It is recommended to use the `-T' switch with Netscape's + implementation to avoid line wrapping. +@@ -587,12 +587,13 @@ + (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$") + (setq name (match-string 1) + value (match-string 3)) +- (save-excursion +- (set-buffer bufval) +- (erase-buffer) +- (insert-file-contents-literally value) +- (delete-file value) +- (setq value (buffer-substring (point-min) (point-max)))) ++ (if (string-match "^< file:///\\(.*\\)$" value) ++ (save-excursion ++ (set-buffer bufval) ++ (erase-buffer) ++ (insert-file-contents-literally value) ++ (delete-file value) ++ (setq value (buffer-substring (point-min) (point-max))))) + (setq record (cons (list name value) + record)) + (forward-line 1)) --- emacs21-21.4a+1.orig/debian/patches/remote-files-permissions.diff +++ emacs21-21.4a+1/debian/patches/remote-files-permissions.diff @@ -0,0 +1,18 @@ +* The permissions of local backup copies of remote files have been tightened. + Patch: remote-files-permissions.diff + Author: Michael Albinus + Status: has been incorporated upstream + Date: Sat, 9 Oct 2004 09:51:33 +0200 + +--- emacs21.orig/src/fileio.c 2004-10-09 09:45:43.000000000 +0200 ++++ emacs21/src/fileio.c 2004-10-09 09:46:32.000000000 +0200 +@@ -5438,6 +5438,9 @@ + && stat (XSTRING (current_buffer->filename)->data, &st) >= 0) + /* But make sure we can overwrite it later! */ + auto_save_mode_bits = st.st_mode | 0600; ++ else if (! NILP (current_buffer->filename)) ++ /* Remote files don't cooperate with stat. */ ++ auto_save_mode_bits = XINT (Ffile_modes (current_buffer->filename)) | 0600; + else + auto_save_mode_bits = 0666; + --- emacs21-21.4a+1.orig/debian/patches/multibyte-char-key-modifiers.diff +++ emacs21-21.4a+1/debian/patches/multibyte-char-key-modifiers.diff @@ -0,0 +1,26 @@ +* Modifiers are now appled to multibyte-char keys. + Patch: multibyte-char-key-modifiers.diff + Provided-by: Martin Stjernholm + Added-by: Jerome Marant + Date: Sun, 22 May 2005 22:10:48 +0200 + Status: has been incorporated upstream + +--- old/src/keyboard.c 2005-05-20 21:07:42.000000000 +0200 ++++ new/src/keyboard.c 2005-05-20 21:07:29.000000000 +0200 +@@ -4662,8 +4662,15 @@ + case multibyte_char_keystroke: + { + Lisp_Object lispy_c; ++ int c = event->code; + +- XSETFASTINT (lispy_c, event->code); ++ /* Add in the other modifier bits. The shift key was taken ++ care of by the X code. */ ++ c |= (event->modifiers ++ & (meta_modifier | alt_modifier ++ | hyper_modifier | super_modifier | ctrl_modifier)); ++ button_down_time = 0; ++ XSETFASTINT (lispy_c, c); + return lispy_c; + } + --- emacs21-21.4a+1.orig/debian/patches/hurd-libio-glibc.diff +++ emacs21-21.4a+1/debian/patches/hurd-libio-glibc.diff @@ -0,0 +1,26 @@ +* Emacs now supports a glibc based on libio (instead of stdio) on Hurd systems. + Patch: hurd-libio-glibc.diff + Author: Marcus Brinkmann + Date: Tue, 16 Apr 2002 18:55:03 -0400 + Added-by: Jerome Marant + Status: has been incorporated upstream + +diff -urNad /home/jerome/pkg/emacs21/svn/emacs/src/s/gnu.h emacs/src/s/gnu.h +--- /home/jerome/pkg/emacs21/svn/emacs/src/s/gnu.h 2003-09-26 19:50:09.000000000 +0200 ++++ emacs/src/s/gnu.h 2003-09-27 15:01:16.000000000 +0200 +@@ -64,6 +64,15 @@ + #define WAIT_USE_INT + #define HAVE_UNION_WAIT + ++#ifdef emacs ++#include /* Get the definition of _IO_STDIO_H. */ ++#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) ++/* new C libio names */ ++#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \ ++ ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base) ++#endif ++#endif ++ + /* GNU needs its own crt0, and libc defines data_start. */ + #define ORDINARY_LINK + #define DATA_START ({ extern int data_start; (char *) &data_start; }) --- emacs21-21.4a+1.orig/debian/patches/browse-url.diff +++ emacs21-21.4a+1/debian/patches/browse-url.diff @@ -0,0 +1,296 @@ +* browse-url.el has been enhanced. + Patch: browse-url.diff + Added-by: Rob Browning + + Support for mozilla has been fixed, support for galeon has been + added, and Emacs now uses free browsers by default when available, + instead of just trying netscape. + +--- emacs21-21.2.orig/lisp/net/browse-url.el ++++ emacs21-21.2/lisp/net/browse-url.el +@@ -4,7 +4,7 @@ + ;; Free Software Foundation, Inc. + + ;; Author: Denis Howe +-;; Maintainer: Dave Love ++;; Maintainer: FSF + ;; Created: 03 Apr 1995 + ;; Keywords: hypertext, hypermedia, mouse + +@@ -66,14 +66,6 @@ + ;; control but which window DO you want to control and how do you + ;; discover its id? + +-;; If using XMosaic before version 2.5, check the definition of +-;; browse-url-usr1-signal below. +-;; +- +-;; XMosaic version 2.5 introduced Common Client Interface allowing you +-;; to control mosaic through Unix sockets. +-;; +- + ;; William M. Perry's excellent "w3" WWW browser for + ;; Emacs + ;; has a function w3-follow-url-at-point, but that +@@ -90,10 +82,6 @@ + ;; Python see . Grail support in + ;; browse-url.el written by Barry Warsaw . + +-;; MMM is a semi-free WWW browser implemented in Objective Caml, an +-;; interesting impure functional programming language. See +-;; . +- + ;; Lynx is now distributed by the FSF. See also + ;; . + +@@ -226,8 +214,10 @@ + (eval-when-compile (require 'thingatpt) + (require 'term) + (require 'dired) ++ (require 'executable) + (require 'w3-auto nil t)) + ++ + (defgroup browse-url nil + "Use a web browser to look at a URL." + :prefix "browse-url-" +@@ -238,7 +228,8 @@ + (defcustom browse-url-browser-function + (if (memq system-type '(windows-nt ms-dos)) + 'browse-url-default-windows-browser +- 'browse-url-netscape) ++ 'browse-url-default-browser) ++ + "*Function to display the current buffer in a WWW browser. + This is used by the `browse-url-at-point', `browse-url-at-mouse', and + `browse-url-of-file' commands. +@@ -252,6 +243,8 @@ + (function-item :tag "Emacs W3" :value browse-url-w3) + (function-item :tag "W3 in another Emacs via `gnudoit'" + :value browse-url-w3-gnudoit) ++ (function-item :tag "Mozilla" :value browse-url-mozilla) ++ (function-item :tag "Galeon" :value browse-url-galeon) + (function-item :tag "Netscape" :value browse-url-netscape) + (function-item :tag "Mosaic" :value browse-url-mosaic) + (function-item :tag "Mosaic using CCI" :value browse-url-cci) +@@ -269,6 +262,8 @@ + :value browse-url-default-windows-browser) + (function-item :tag "GNOME invoking Mozilla" + :value browse-url-gnome-moz) ++ (function-item :tag "Default browser" ++ :value browse-url-default-browser) + (function :tag "Your own function") + (alist :tag "Regexp/function association list" + :key-type regexp :value-type function)) +@@ -300,6 +295,47 @@ + :group 'browse-url) + + ;;;###autoload ++(defcustom browse-url-browser-display nil ++ "*The X display for running the browser, if not same as Emacs'." ++ :type '(choice string (const :tag "Default" nil)) ++ :group 'browse-url) ++ ++(defcustom browse-url-mozilla-program "mozilla" ++ "The name by which to invoke Mozilla." ++ :type 'string ++ :group 'browse-url) ++ ++(defcustom browse-url-mozilla-arguments nil ++ "A list of strings to pass to Mozilla as arguments." ++ :type '(repeat (string :tag "Argument")) ++ :group 'browse-url) ++ ++(defcustom browse-url-mozilla-startup-arguments browse-url-mozilla-arguments ++ "A list of strings to pass to Mozilla when it starts up. ++Defaults to the value of `browse-url-mozilla-arguments' at the time ++`browse-url' is loaded." ++ :type '(repeat (string :tag "Argument")) ++ :group 'browse-url) ++ ++;;;###autoload ++(defcustom browse-url-galeon-program "galeon" ++ "The name by which to invoke Galeon." ++ :type 'string ++ :group 'browse-url) ++ ++(defcustom browse-url-galeon-arguments nil ++ "A list of strings to pass to Galeon as arguments." ++ :type '(repeat (string :tag "Argument")) ++ :group 'browse-url) ++ ++(defcustom browse-url-galeon-startup-arguments browse-url-galeon-arguments ++ "A list of strings to pass to Galeon when it starts up. ++Defaults to the value of `browse-url-galeon-arguments' at the time ++`browse-url' is loaded." ++ :type '(repeat (string :tag "Argument")) ++ :group 'browse-url) ++ ++;;;###autoload + (defcustom browse-url-new-window-flag nil + "*If non-nil, always open a new browser window with appropriate browsers. + Passing an interactive argument to \\[browse-url], or specific browser +@@ -308,12 +344,6 @@ + :type 'boolean + :group 'browse-url) + +-;;;###autoload +-(defcustom browse-url-netscape-display nil +- "*The X display for running Netscape, if not same as Emacs'." +- :type '(choice string (const :tag "Default" nil)) +- :group 'browse-url) +- + (defcustom browse-url-mosaic-program "xmosaic" + "The name by which to invoke Mosaic (or mMosaic)." + :type 'string +@@ -681,11 +711,11 @@ + ;; --- Netscape --- + + (defun browse-url-process-environment () +- "Set DISPLAY in the environment to the X display Netscape is running on. +-This is either the value of variable `browse-url-netscape-display' if ++ "Set DISPLAY in the environment to the X display the browser will use. ++This is either the value of variable `browse-url-browser-display' if + non-nil, or the same display as Emacs if different from the current + environment, otherwise just use the current environment." +- (let ((display (or browse-url-netscape-display (browse-url-emacs-display)))) ++ (let ((display (or browse-url-browser-display (browse-url-emacs-display)))) + (if display + (cons (concat "DISPLAY=" display) process-environment) + process-environment))) +@@ -701,6 +731,35 @@ + display))) + + ;;;###autoload ++(defun browse-url-default-browser (url &rest args) ++ "Find a suitable browser and ask it to load URL. ++Default to the URL around or before point. ++ ++When called interactively, if variable `browse-url-new-window-flag' is ++non-nil, load the document in a new window, if possible, otherwise use ++a random existing one. A non-nil interactive prefix argument reverses ++the effect of `browse-url-new-window-flag'. ++ ++When called non-interactively, optional second argument NEW-WINDOW is ++used instead of `browse-url-new-window-flag'. ++ ++The order attempted is gnome-moz-remote, Mozilla, Galeon, Netscape, ++Mosaic, IXI Mosaic, Lynx in an xterm, MMM, Konqueror, and then W3." ++ (apply ++ (cond ++ ((executable-find "gnome-moz-remote") 'browse-url-gnome-moz) ++ ((executable-find browse-url-mozilla-program) 'browse-url-mozilla) ++ ((executable-find browse-url-galeon-program) 'browse-url-galeon) ++ ((executable-find browse-url-kde-program) 'browse-url-kde) ++ ((executable-find browse-url-netscape-program) 'browse-url-netscape) ++ ((executable-find browse-url-mosaic-program) 'browse-url-mosaic) ++ ((executable-find "tellw3b") 'browse-url-iximosaic) ++ ((executable-find browse-url-xterm-program) 'browse-url-lynx-xterm) ++ ((executable-find "mmm") 'browse-url-mmm) ++ (t 'browse-url-w3)) ++ url args)) ++ ++;;;###autoload + (defun browse-url-netscape (url &optional new-window) + "Ask the Netscape WWW browser to load URL. + Default to the URL around or before point. The strings in variable +@@ -767,6 +826,50 @@ + (append browse-url-netscape-arguments + (list "-remote" command))))) + ++;;;###autoload ++(defun browse-url-mozilla (url &optional new-window) ++ "Ask the Mozilla WWW browser to load URL. ++Default to the URL around or before point. The strings in variable ++`browse-url-mozilla-arguments' are also passed to Mozilla. ++ ++When called interactively, if variable `browse-url-new-window-flag' is ++non-nil, load the document in a new Mozilla window, otherwise use a ++random existing one. A non-nil interactive prefix argument reverses ++the effect of `browse-url-new-window-flag'. ++ ++When called non-interactively, optional second argument NEW-WINDOW is ++used instead of `browse-url-new-window-flag'." ++ (interactive (browse-url-interactive-arg "URL: ")) ++ ;; URL encode any `confusing' characters in the URL. This needs to ++ ;; include at least commas; presumably also close parens. ++ (while (string-match "[,)]" url) ++ (setq url (replace-match ++ (format "%%%x" (string-to-char (match-string 0 url))) t t url))) ++ (let* ((process-environment (browse-url-process-environment)) ++ (process (apply 'start-process ++ (concat "mozilla " url) nil ++ browse-url-mozilla-program ++ (append ++ browse-url-mozilla-arguments ++ (list "-remote" ++ (concat "openurl(" ++ url ++ (if new-window ",new-window" "") ++ ")")))))) ++ (set-process-sentinel process ++ `(lambda (process change) ++ (browse-url-mozilla-sentinel process ,url))))) ++ ++(defun browse-url-mozilla-sentinel (process url) ++ "Handle a change to the process communicating with Mozilla." ++ (or (eq (process-exit-status process) 0) ++ (let* ((process-environment (browse-url-process-environment))) ++ ;; Mozilla is not running - start it ++ (message "Starting Mozilla...") ++ (apply 'start-process (concat "mozilla " url) nil ++ browse-url-mozilla-program ++ (append browse-url-mozilla-startup-arguments (list url)))))) ++ + ;; GNOME means of invoking either Mozilla or Netrape. + + (defcustom browse-url-gnome-moz-arguments '() +@@ -776,6 +880,48 @@ + :group 'browse-url) + + ;;;###autoload ++(defun browse-url-galeon (url &optional new-window) ++ "Ask the Galeon WWW browser to load URL. ++Default to the URL around or before point. The strings in variable ++`browse-url-galeon-arguments' are also passed to Galeon. ++ ++When called interactively, if variable `browse-url-new-window-flag' is ++non-nil, load the document in a new Galeon window, otherwise use a ++random existing one. A non-nil interactive prefix argument reverses ++the effect of `browse-url-new-window-flag'. ++ ++When called non-interactively, optional second argument NEW-WINDOW is ++used instead of `browse-url-new-window-flag'." ++ (interactive (browse-url-interactive-arg "URL: ")) ++ ;; URL encode any `confusing' characters in the URL. This needs to ++ ;; include at least commas; presumably also close parens. ++ (while (string-match "[,)]" url) ++ (setq url (replace-match ++ (format "%%%x" (string-to-char (match-string 0 url))) t t url))) ++ (let* ((process-environment (browse-url-process-environment)) ++ (process (apply 'start-process ++ (concat "galeon " url) nil ++ browse-url-galeon-program ++ (append ++ browse-url-galeon-arguments ++ (if new-window '("-w" "--noraise") ++ '("-x")) ++ (list url))))) ++ (set-process-sentinel process ++ `(lambda (process change) ++ (browse-url-galeon-sentinel process ,url))))) ++ ++(defun browse-url-galeon-sentinel (process url) ++ "Handle a change to the process communicating with Galeon." ++ (or (eq (process-exit-status process) 0) ++ (let* ((process-environment (browse-url-process-environment))) ++ ;; Galeon is not running - start it ++ (message "Starting Galeon...") ++ (apply 'start-process (concat "galeon " url) nil ++ browse-url-galeon-program ++ (append browse-url-galeon-startup-arguments (list url)))))) ++ ++;;;###autoload + (defun browse-url-gnome-moz (url &optional new-window) + "Ask Mozilla/Netscape to load URL via the GNOME program `gnome-moz-remote'. + Default to the URL around or before point. The strings in variable --- emacs21-21.4a+1.orig/debian/patches/xorg-altgr-fix.diff +++ emacs21-21.4a+1/debian/patches/xorg-altgr-fix.diff @@ -0,0 +1,24 @@ +* The xterm.h includes have been adjusted so that AltGr works with Xorg. + Patch: xorg-altgr-fix.diff + Provided-by: Jerome Marant + Applied-by: Jerome Marant + Date: Sun, 7 Aug 2005 19:08:21 +0200 + Status: appears to be incorporated upstream + + Xutil.h is now included after after keysym.h in xterm.h to work + around a bug in Xorg which caused AltGr to be recognised + incorrectly. + +diff -urNad --exclude=CVS --exclude=.svn ./src/xterm.h /tmp/dpep-work.K20gf1/emacs21-21.4a/src/xterm.h +--- ./src/xterm.h 2002-02-22 11:41:44.000000000 +0100 ++++ /tmp/dpep-work.K20gf1/emacs21-21.4a/src/xterm.h 2005-08-07 19:06:04.000000000 +0200 +@@ -21,8 +21,8 @@ + + #include + #include +-#include + #include ++#include + #include + #include + --- emacs21-21.4a+1.orig/debian/patches/autofiles.diff +++ emacs21-21.4a+1/debian/patches/autofiles.diff @@ -0,0 +1,26306 @@ +* The autoconf related files have been updated. + Patch: autofiles.dpatch + Author: N/A (automatically generated) +diff -ruN old/aclocal.m4 new/aclocal.m4 +--- old/aclocal.m4 2006-12-02 16:28:48.000000000 -0800 ++++ new/aclocal.m4 2006-12-02 16:28:51.000000000 -0800 +@@ -1,532 +0,0 @@ +- +-% Copyright (C) 2000, 2001 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. +- +-ifelse(_AC_VERSION_COMPARE(AC_ACVERSION, [2.14]), -1, +- +-# AC_PROG_CC_STDC +-# --------------- +-# If the C compiler in not in ANSI C mode by default, try to add an +-# option to output variable @code{CC} to make it so. This macro tries +-# various options that select ANSI C on some system or another. It +-# considers the compiler to be in ANSI C mode if it handles function +-# prototypes correctly. +-AC_DEFUN(AC_PROG_CC_STDC, +-[AC_REQUIRE([AC_PROG_CC])dnl +-AC_BEFORE([$0], [AC_C_INLINE])dnl +-AC_BEFORE([$0], [AC_C_CONST])dnl +-dnl Force this before AC_PROG_CPP. Some cpp's, eg on HPUX, require +-dnl a magic option to avoid problems with ANSI preprocessor commands +-dnl like #elif. +-dnl FIXME: can't do this because then AC_AIX won't work due to a +-dnl circular dependency. +-dnl AC_BEFORE([$0], [AC_PROG_CPP]) +-AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) +-AC_CACHE_VAL(ac_cv_prog_cc_stdc, +-[ac_cv_prog_cc_stdc=no +-ac_save_CC="$CC" +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- AC_TRY_COMPILE( +-[#include +-#include +-#include +-#include +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv;], +-[return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];], +-[ac_cv_prog_cc_stdc="$ac_arg"; break]) +-done +-CC="$ac_save_CC" +-]) +-case "x$ac_cv_prog_cc_stdc" in +- x|xno) +- AC_MSG_RESULT([none needed]) ;; +- *) +- AC_MSG_RESULT($ac_cv_prog_cc_stdc) +- CC="$CC $ac_cv_prog_cc_stdc" ;; +-esac +-])# AC_PROG_CC_STDC +- +-# AC_FUNC_MKTIME +-# -------------- +-AC_DEFUN(AC_FUNC_MKTIME, +-[AC_REQUIRE([AC_HEADER_TIME])dnl +-AC_CHECK_HEADERS(sys/time.h unistd.h) +-AC_CHECK_FUNCS(alarm) +-AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime, +-[AC_TRY_RUN( +-[/* Test program from Paul Eggert (eggert@twinsun.com) +- and Tony Leneis (tony@plaza.ds.adp.com). */ +-#if TIME_WITH_SYS_TIME +-# include +-# include +-#else +-# if HAVE_SYS_TIME_H +-# include +-# else +-# include +-# endif +-#endif +- +-#if HAVE_UNISTD_H +-# include +-#endif +- +-#if !HAVE_ALARM +-# define alarm(X) /* empty */ +-#endif +- +-/* Work around redefinition to rpl_putenv by other config tests. */ +-#undef putenv +- +-static time_t time_t_max; +- +-/* Values we'll use to set the TZ environment variable. */ +-static const char *const tz_strings[] = { +- (const char *) 0, "TZ=GMT0", "TZ=JST-9", +- "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" +-}; +-#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) +- +-/* Fail if mktime fails to convert a date in the spring-forward gap. +- Based on a problem report from Andreas Jaeger. */ +-static void +-spring_forward_gap () +-{ +- /* glibc (up to about 1998-10-07) failed this test) */ +- struct tm tm; +- +- /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" +- instead of "TZ=America/Vancouver" in order to detect the bug even +- on systems that don't support the Olson extension, or don't have the +- full zoneinfo tables installed. */ +- putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); +- +- tm.tm_year = 98; +- tm.tm_mon = 3; +- tm.tm_mday = 5; +- tm.tm_hour = 2; +- tm.tm_min = 0; +- tm.tm_sec = 0; +- tm.tm_isdst = -1; +- if (mktime (&tm) == (time_t)-1) +- exit (1); +-} +- +-static void +-mktime_test (now) +- time_t now; +-{ +- struct tm *lt; +- if ((lt = localtime (&now)) && mktime (lt) != now) +- exit (1); +- now = time_t_max - now; +- if ((lt = localtime (&now)) && mktime (lt) != now) +- exit (1); +-} +- +-static void +-irix_6_4_bug () +-{ +- /* Based on code from Ariel Faigon. */ +- struct tm tm; +- tm.tm_year = 96; +- tm.tm_mon = 3; +- tm.tm_mday = 0; +- tm.tm_hour = 0; +- tm.tm_min = 0; +- tm.tm_sec = 0; +- tm.tm_isdst = -1; +- mktime (&tm); +- if (tm.tm_mon != 2 || tm.tm_mday != 31) +- exit (1); +-} +- +-static void +-bigtime_test (j) +- int j; +-{ +- struct tm tm; +- time_t now; +- tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; +- now = mktime (&tm); +- if (now != (time_t) -1) +- { +- struct tm *lt = localtime (&now); +- if (! (lt +- && lt->tm_year == tm.tm_year +- && lt->tm_mon == tm.tm_mon +- && lt->tm_mday == tm.tm_mday +- && lt->tm_hour == tm.tm_hour +- && lt->tm_min == tm.tm_min +- && lt->tm_sec == tm.tm_sec +- && lt->tm_yday == tm.tm_yday +- && lt->tm_wday == tm.tm_wday +- && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) +- == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) +- exit (1); +- } +-} +- +-int +-main () +-{ +- time_t t, delta; +- int i, j; +- +- /* This test makes some buggy mktime implementations loop. +- Give up after 60 seconds; a mktime slower than that +- isn't worth using anyway. */ +- alarm (60); +- +- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) +- continue; +- time_t_max--; +- delta = time_t_max / 997; /* a suitable prime number */ +- for (i = 0; i < N_STRINGS; i++) +- { +- if (tz_strings[i]) +- putenv (tz_strings[i]); +- +- for (t = 0; t <= time_t_max - delta; t += delta) +- mktime_test (t); +- mktime_test ((time_t) 60 * 60); +- mktime_test ((time_t) 60 * 60 * 24); +- +- for (j = 1; 0 < j; j *= 2) +- bigtime_test (j); +- bigtime_test (j - 1); +- } +- irix_6_4_bug (); +- spring_forward_gap (); +- exit (0); +-}], +-ac_cv_func_working_mktime=yes, ac_cv_func_working_mktime=no, +-ac_cv_func_working_mktime=no)]) +-if test $ac_cv_func_working_mktime = no; then +- LIBOBJS="$LIBOBJS mktime.${ac_objext}" +-fi +-AC_SUBST(LIBOBJS)dnl +-])# AC_FUNC_MKTIME +- +-# AC_C_VOLATILE +-# ------------- +-# Note that, unlike const, #defining volatile to be the empty string can +-# actually turn a correct program into an incorrect one, since removing +-# uses of volatile actually grants the compiler permission to perform +-# optimizations that could break the user's code. So, do not #define +-# volatile away unless it is really necessary to allow the user's code +-# to compile cleanly. Benign compiler failures should be tolerated. +-AC_DEFUN(AC_C_VOLATILE, +-[AC_REQUIRE([AC_PROG_CC_STDC])dnl +-AC_CACHE_CHECK([for working volatile], ac_cv_c_volatile, +-[AC_TRY_COMPILE(,[ +-volatile int x; +-int * volatile y;], +-ac_cv_c_volatile=yes, ac_cv_c_volatile=no)]) +-if test $ac_cv_c_volatile = no; then +- AC_DEFINE(volatile,, +- [Define to empty if the keyword `volatile' does not work. +- Warning: valid code using `volatile' can become incorrect +- without. Disable with care.]) +-fi +-]) +- +-# AC_C_PROTOTYPES +-# --------------- +-# Check if the C compiler supports prototypes, included if it needs +-# options. +-AC_DEFUN(AC_C_PROTOTYPES, +-[AC_REQUIRE([AC_PROG_CC_STDC])dnl +-AC_REQUIRE([AC_PROG_CPP])dnl +-AC_MSG_CHECKING([for function prototypes]) +-if test "$ac_cv_prog_cc_stdc" != no; then +- AC_MSG_RESULT(yes) +- AC_DEFINE(PROTOTYPES, 1, +- [Define if the compiler supports function prototypes.]) +-else +- AC_MSG_RESULT(no) +-fi +-])# AC_C_PROTOTYPES +- +-dnl The following is a bit different from the prerelease autoconf at +-dnl this time since that requires extra definitions. +- +-dnl By default, many hosts won't let programs access large files; +-dnl one must use special compiler options to get large-file access to work. +-dnl For more details about this brain damage please see: +-dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html +- +-dnl Written by Paul Eggert . +- +-dnl Internal subroutine of AC_SYS_LARGEFILE. +-dnl AC_SYS_LARGEFILE_TEST_INCLUDES +-AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES, +- [[#include +- int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; +- ]]) +- +-dnl Internal subroutine of AC_SYS_LARGEFILE. +-dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY) +-AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, +- [AC_CACHE_CHECK([for $1 value needed for large files], $3, +- [$3=no +- AC_TRY_COMPILE([$5], +- [$6], +- , +- [AC_TRY_COMPILE([#define $1 $2] +-[$5] +- , +- [$6], +- [$3=$2])])]) +- if test "[$]$3" != no; then +- AC_DEFINE_UNQUOTED([$1], [$]$3, [$4]) +- fi]) +- +-AC_DEFUN(AC_SYS_LARGEFILE, +- [AC_REQUIRE([AC_PROG_CC]) +- AC_ARG_ENABLE(largefile, +- [ --disable-largefile omit support for large files]) +- if test "$enable_largefile" != no; then +- +- AC_CACHE_CHECK([for special C compiler options needed for large files], +- ac_cv_sys_largefile_CC, +- [ac_cv_sys_largefile_CC=no +- if test "$GCC" != yes; then +- # IRIX 6.2 and later do not support large files by default, +- # so use the C compiler's -n32 option if that helps. +- AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , , +- [ac_save_CC="$CC" +- CC="$CC -n32" +- AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , +- ac_cv_sys_largefile_CC=' -n32') +- CC="$ac_save_CC"]) +- fi]) +- if test "$ac_cv_sys_largefile_CC" != no; then +- CC="$CC$ac_cv_sys_largefile_CC" +- fi +- +- AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, +- ac_cv_sys_file_offset_bits, +- [Number of bits in a file offset, on hosts where this is settable.], +- AC_SYS_LARGEFILE_TEST_INCLUDES) +- AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, +- ac_cv_sys_large_files, +- [Define for large files, on AIX-style hosts.] +- AC_SYS_LARGEFILE_TEST_INCLUDES) +- fi +- ]) +- +-AC_DEFUN(AC_FUNC_FSEEKO, +- [AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1, +- ac_cv_sys_largefile_source, +- [Define to make fseeko visible on some hosts (e.g. glibc 2.2).], +- [#include ], [return !fseeko;]) +- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +- # in glibc 2.1.3, but that breaks too many other things. +- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +- +- AC_CACHE_CHECK([for fseeko], ac_cv_func_fseeko, +- [ac_cv_func_fseeko=no +- AC_TRY_LINK([#include ], +- [return fseeko && fseeko (stdin, 0, 0);], +- [ac_cv_func_fseeko=yes])]) +- if test $ac_cv_func_fseeko != no; then +- AC_DEFINE(HAVE_FSEEKO, 1, +- [Define if fseeko (and presumably ftello) exists and is declared.]) +- fi]) +- +-undefine([AC_FUNC_MMAP])dnl +-dnl The autoconf 2.13 version loses on OSF, at least, +-dnl by messing up the declaration of malloc. +-AC_DEFUN([AC_FUNC_MMAP], +-[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h) +-AC_CHECK_FUNCS(getpagesize) +-AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, +-[AC_TRY_RUN( +-[/* Thanks to Mike Haertel and Jim Avera for this test. +- Here is a matrix of mmap possibilities: +- mmap private not fixed +- mmap private fixed at somewhere currently unmapped +- mmap private fixed at somewhere already mapped +- mmap shared not fixed +- mmap shared fixed at somewhere currently unmapped +- mmap shared fixed at somewhere already mapped +- For private mappings, we should verify that changes cannot be read() +- back from the file, nor mmap's back from the file at a different +- address. (There have been systems where private was not correctly +- implemented like the infamous i386 svr4.0, and systems where the +- VM page cache was not coherent with the file system buffer cache +- like early versions of FreeBSD and possibly contemporary NetBSD.) +- For shared mappings, we should conversely verify that changes get +- propogated back to all the places they're supposed to be. +- +- Grep wants private fixed already mapped. +- The main things grep needs to know about mmap are: +- * does it exist and is it safe to write into the mmap'd area +- * how to use it (BSD variants) */ +-#include +-#include +-#include +- +-#if STDC_HEADERS || HAVE_STDLIB_H +-# include +-#else +-char *malloc (); +-#endif +-#if HAVE_UNISTD_H +-# include +-#endif +-#if HAVE_SYS_STAT_H +-# include +-#endif +- +-/* This mess was copied from the GNU getpagesize.h. */ +-#if !HAVE_GETPAGESIZE +-/* Assume that all systems that can run configure have sys/param.h. */ +-# if !HAVE_SYS_PARAM_H +-# define HAVE_SYS_PARAM_H 1 +-# endif +- +-# ifdef _SC_PAGESIZE +-# define getpagesize() sysconf(_SC_PAGESIZE) +-# else /* no _SC_PAGESIZE */ +-# if HAVE_SYS_PARAM_H +-# include +-# ifdef EXEC_PAGESIZE +-# define getpagesize() EXEC_PAGESIZE +-# else /* no EXEC_PAGESIZE */ +-# ifdef NBPG +-# define getpagesize() NBPG * CLSIZE +-# ifndef CLSIZE +-# define CLSIZE 1 +-# endif /* no CLSIZE */ +-# else /* no NBPG */ +-# ifdef NBPC +-# define getpagesize() NBPC +-# else /* no NBPC */ +-# ifdef PAGESIZE +-# define getpagesize() PAGESIZE +-# endif /* PAGESIZE */ +-# endif /* no NBPC */ +-# endif /* no NBPG */ +-# endif /* no EXEC_PAGESIZE */ +-# else /* no HAVE_SYS_PARAM_H */ +-# define getpagesize() 8192 /* punt totally */ +-# endif /* no HAVE_SYS_PARAM_H */ +-# endif /* no _SC_PAGESIZE */ +- +-#endif /* no HAVE_GETPAGESIZE */ +- +-int +-main () +-{ +- char *data, *data2, *data3; +- int i, pagesize; +- int fd; +- +- pagesize = getpagesize (); +- +- /* First, make a file with some known garbage in it. */ +- data = (char *) malloc (pagesize); +- if (!data) +- exit (1); +- for (i = 0; i < pagesize; ++i) +- *(data + i) = rand (); +- umask (0); +- fd = creat ("conftestmmap", 0600); +- if (fd < 0) +- exit (1); +- if (write (fd, data, pagesize) != pagesize) +- exit (1); +- close (fd); +- +- /* Next, try to mmap the file at a fixed address which already has +- something else allocated at it. If we can, also make sure that +- we see the same garbage. */ +- fd = open ("conftestmmap", O_RDWR); +- if (fd < 0) +- exit (1); +- data2 = (char *) malloc (2 * pagesize); +- if (!data2) +- exit (1); +- data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); +- if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, +- MAP_PRIVATE | MAP_FIXED, fd, 0L)) +- exit (1); +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data2 + i)) +- exit (1); +- +- /* Finally, make sure that changes to the mapped area do not +- percolate back to the file as seen by read(). (This is a bug on +- some variants of i386 svr4.0.) */ +- for (i = 0; i < pagesize; ++i) +- *(data2 + i) = *(data2 + i) + 1; +- data3 = (char *) malloc (pagesize); +- if (!data3) +- exit (1); +- if (read (fd, data3, pagesize) != pagesize) +- exit (1); +- for (i = 0; i < pagesize; ++i) +- if (*(data + i) != *(data3 + i)) +- exit (1); +- close (fd); +- unlink ("conftestmmap"); +- exit (0); +-}], ac_cv_func_mmap_fixed_mapped=yes, ac_cv_func_mmap_fixed_mapped=no, +-ac_cv_func_mmap_fixed_mapped=no)]) +-if test $ac_cv_func_mmap_fixed_mapped = yes; then +- AC_DEFINE(HAVE_MMAP, 1, +- [Define if you have a working `mmap' system call.]) +-fi +-])# AC_FUNC_MMAP +- +-) dnl ifelse +diff -ruN old/configure new/configure +--- old/configure 2006-12-02 16:28:48.000000000 -0800 ++++ new/configure 2006-12-02 16:29:00.000000000 -0800 +@@ -1,57 +1,717 @@ + #! /bin/sh +- + # Guess values for system-dependent variables and create Makefiles. +-# Generated automatically using autoconf version 2.13 +-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. ++# Generated by GNU Autoconf 2.60a. + # ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + # This configure script is free software; the Free Software Foundation + # gives unlimited permission to copy, distribute and modify it. ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ ++# Support unset when possible. ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# CDPATH. ++$as_unset CDPATH ++ ++ ++if test "x$CONFIG_SHELL" = x; then ++ if (eval ":") 2>/dev/null; then ++ as_have_required=yes ++else ++ as_have_required=no ++fi ++ ++ if test $as_have_required = yes && (eval ": ++(as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=\$LINENO ++ as_lineno_2=\$LINENO ++ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && ++ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } ++") 2> /dev/null; then ++ : ++else ++ as_candidate_shells= ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ case $as_dir in ++ /*) ++ for as_base in sh bash ksh sh5; do ++ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" ++ done;; ++ esac ++done ++IFS=$as_save_IFS ++ ++ ++ for as_shell in $as_candidate_shells $SHELL; do ++ # Try only shells that exist, to save several forks. ++ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && ++ { ("$as_shell") 2> /dev/null <<\_ASEOF ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++: ++_ASEOF ++}; then ++ CONFIG_SHELL=$as_shell ++ as_have_required=yes ++ if { "$as_shell" 2> /dev/null <<\_ASEOF ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++: ++(as_func_return () { ++ (exit $1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi ++ ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = "$1" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test $exitcode = 0) || { (exit 1); exit 1; } ++ ++( ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } ++ ++_ASEOF ++}; then ++ break ++fi ++ ++fi ++ ++ done ++ ++ if test "x$CONFIG_SHELL" != x; then ++ for as_var in BASH_ENV ENV ++ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ done ++ export CONFIG_SHELL ++ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} ++fi ++ ++ ++ if test $as_have_required = no; then ++ echo This script requires a shell more modern than all the ++ echo shells that I found on your system. Please install a ++ echo modern shell, or manually run the script under such a ++ echo shell if you do have one. ++ { (exit 1); exit 1; } ++fi ++ ++ ++fi ++ ++fi ++ ++ ++ ++(eval "as_func_return () { ++ (exit \$1) ++} ++as_func_success () { ++ as_func_return 0 ++} ++as_func_failure () { ++ as_func_return 1 ++} ++as_func_ret_success () { ++ return 0 ++} ++as_func_ret_failure () { ++ return 1 ++} ++ ++exitcode=0 ++if as_func_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_success failed. ++fi ++ ++if as_func_failure; then ++ exitcode=1 ++ echo as_func_failure succeeded. ++fi + +-# Defaults: +-ac_help= ++if as_func_ret_success; then ++ : ++else ++ exitcode=1 ++ echo as_func_ret_success failed. ++fi ++ ++if as_func_ret_failure; then ++ exitcode=1 ++ echo as_func_ret_failure succeeded. ++fi ++ ++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then ++ : ++else ++ exitcode=1 ++ echo positional parameters were not saved. ++fi ++ ++test \$exitcode = 0") || { ++ echo No shell found that supports shell functions. ++ echo Please tell autoconf@gnu.org about your system, ++ echo including any error possibly output before this ++ echo message ++} ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false ++fi ++ ++# Find out whether ``test -x'' works. Don't use a zero-byte file, as ++# systems may use methods other than mode bits to determine executability. ++cat >conf$$.file <<_ASEOF ++#! /bin/sh ++exit 0 ++_ASEOF ++chmod +x conf$$.file ++if test -x conf$$.file >/dev/null 2>&1; then ++ as_executable_p="test -x" ++else ++ as_executable_p=: ++fi ++rm -f conf$$.file ++ ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" ++ ++ ++ ++exec 7<&0 &1 ++ ++# Name of the host. ++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, ++# so uname gets run too. ++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` ++ ++# ++# Initializations. ++# + ac_default_prefix=/usr/local +-# Any additions from configure.in: +-ac_help="$ac_help +- --without-gcc don't use GCC to compile Emacs if GCC is found" +-ac_help="$ac_help +- --without-pop don't support POP mail retrieval with movemail" +-ac_help="$ac_help +- --with-kerberos support Kerberos-authenticated POP" +-ac_help="$ac_help +- --with-kerberos5 support Kerberos version 5 authenticated POP" +-ac_help="$ac_help +- --with-hesiod support Hesiod to get the POP server host" +-ac_help="$ac_help +- --with-x-toolkit=KIT use an X toolkit (KIT = yes/lucid/athena/motif/no)" +-ac_help="$ac_help +- --with-xpm use -lXpm for displaying XPM images" +-ac_help="$ac_help +- --with-jpeg use -ljpeg for displaying JPEG images" +-ac_help="$ac_help +- --with-tiff use -ltiff for displaying TIFF images" +-ac_help="$ac_help +- --with-gif use -lungif for displaying GIF images" +-ac_help="$ac_help +- --with-png use -lpng for displaying PNG images" +-ac_help="$ac_help +- --without-toolkit-scroll-bars +- don't use Motif or Xaw3d scroll bars" +-ac_help="$ac_help +- --without-xim don't use X11 XIM" +-ac_help="$ac_help +- --disable-largefile omit support for large files" +-ac_help="$ac_help +- --with-x use the X Window System" ++ac_clean_files= ++ac_config_libobj_dir=. ++LIBOBJS= ++cross_compiling=no ++subdirs= ++MFLAGS= ++MAKEFLAGS= ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++# Identity of this package. ++PACKAGE_NAME= ++PACKAGE_TARNAME= ++PACKAGE_VERSION= ++PACKAGE_STRING= ++PACKAGE_BUGREPORT= ++ ++ac_unique_file="src/lisp.h" ++ac_config_libobj_dir=src ++# Factoring default headers for most tests. ++ac_includes_default="\ ++#include ++#ifdef HAVE_SYS_TYPES_H ++# include ++#endif ++#ifdef HAVE_SYS_STAT_H ++# include ++#endif ++#ifdef STDC_HEADERS ++# include ++# include ++#else ++# ifdef HAVE_STDLIB_H ++# include ++# endif ++#endif ++#ifdef HAVE_STRING_H ++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H ++# include ++# endif ++# include ++#endif ++#ifdef HAVE_STRINGS_H ++# include ++#endif ++#ifdef HAVE_INTTYPES_H ++# include ++#endif ++#ifdef HAVE_STDINT_H ++# include ++#endif ++#ifdef HAVE_UNISTD_H ++# include ++#endif" ++ ++ac_subst_vars='SHELL ++PATH_SEPARATOR ++PACKAGE_NAME ++PACKAGE_TARNAME ++PACKAGE_VERSION ++PACKAGE_STRING ++PACKAGE_BUGREPORT ++exec_prefix ++prefix ++program_transform_name ++bindir ++sbindir ++libexecdir ++datarootdir ++datadir ++sysconfdir ++sharedstatedir ++localstatedir ++includedir ++oldincludedir ++docdir ++infodir ++htmldir ++dvidir ++pdfdir ++psdir ++libdir ++localedir ++mandir ++DEFS ++ECHO_C ++ECHO_N ++ECHO_T ++LIBS ++build_alias ++host_alias ++target_alias ++build ++build_cpu ++build_vendor ++build_os ++host ++host_cpu ++host_vendor ++host_os ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++ac_ct_CC ++EXEEXT ++OBJEXT ++LN_S ++CPP ++INSTALL_PROGRAM ++INSTALL_SCRIPT ++INSTALL_DATA ++YACC ++YFLAGS ++RANLIB ++GREP ++EGREP ++LIBSOUND ++SET_MAKE ++XMKMF ++ALLOCA ++LIBOBJS ++NEED_SETGID ++KMEM_GROUP ++GETLOADAVG_LIBS ++version ++configuration ++canonical ++srcdir ++lispdir ++locallisppath ++lisppath ++x_default_search_path ++etcdir ++archlibdir ++bitmapdir ++c_switch_system ++c_switch_machine ++LD_SWITCH_X_SITE ++LD_SWITCH_X_SITE_AUX ++C_SWITCH_X_SITE ++X_TOOLKIT_TYPE ++machfile ++opsysfile ++MOVEMAIL_LOCK_LIBS ++LTLIBOBJS' ++ac_subst_files='' ++ ac_precious_vars='build_alias ++host_alias ++target_alias ++CC ++CFLAGS ++LDFLAGS ++CPPFLAGS ++CPP ++YACC ++YFLAGS ++XMKMF' ++ + + # Initialize some variables set by options. ++ac_init_help= ++ac_init_version=false + # The variables have the same names as the options, with + # dashes changed to underlines. +-build=NONE +-cache_file=./config.cache ++cache_file=/dev/null + exec_prefix=NONE +-host=NONE + no_create= +-nonopt=NONE + no_recursion= + prefix=NONE + program_prefix=NONE +@@ -60,94 +720,117 @@ + silent= + site= + srcdir= +-target=NONE + verbose= + x_includes=NONE + x_libraries=NONE ++ ++# Installation directory options. ++# These are left unexpanded so users can "make install exec_prefix=/foo" ++# and all the variables that are supposed to be based on exec_prefix ++# by default will actually change. ++# Use braces instead of parens because sh, perl, etc. also accept them. ++# (The list follows the same order as the GNU Coding Standards.) + bindir='${exec_prefix}/bin' + sbindir='${exec_prefix}/sbin' + libexecdir='${exec_prefix}/libexec' +-datadir='${prefix}/share' ++datarootdir='${prefix}/share' ++datadir='${datarootdir}' + sysconfdir='${prefix}/etc' + sharedstatedir='${prefix}/com' + localstatedir='${prefix}/var' +-libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' +- +-# Initialize some other variables. +-subdirs= +-MFLAGS= MAKEFLAGS= +-SHELL=${CONFIG_SHELL-/bin/sh} +-# Maximum number of lines to put in a shell here document. +-ac_max_here_lines=12 ++docdir='${datarootdir}/doc/${PACKAGE}' ++infodir='${datarootdir}/info' ++htmldir='${docdir}' ++dvidir='${docdir}' ++pdfdir='${docdir}' ++psdir='${docdir}' ++libdir='${exec_prefix}/lib' ++localedir='${datarootdir}/locale' ++mandir='${datarootdir}/man' + + ac_prev= ++ac_dashdash= + for ac_option + do +- + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then +- eval "$ac_prev=\$ac_option" ++ eval $ac_prev=\$ac_option + ac_prev= + continue + fi + +- case "$ac_option" in +- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +- *) ac_optarg= ;; ++ case $ac_option in ++ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; ++ *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + +- case "$ac_option" in ++ case $ac_dashdash$ac_option in ++ --) ++ ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) +- bindir="$ac_optarg" ;; ++ bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) +- ac_prev=build ;; ++ ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) +- build="$ac_optarg" ;; ++ build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) +- cache_file="$ac_optarg" ;; ++ cache_file=$ac_optarg ;; + +- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ++ --config-cache | -C) ++ cache_file=config.cache ;; ++ ++ -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; +- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ +- | --da=*) +- datadir="$ac_optarg" ;; ++ -datadir=* | --datadir=* | --datadi=* | --datad=*) ++ datadir=$ac_optarg ;; ++ ++ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ ++ | --dataroo | --dataro | --datar) ++ ac_prev=datarootdir ;; ++ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ ++ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) ++ datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) +- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` ++ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then +- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } +- fi +- ac_feature=`echo $ac_feature| sed 's/-/_/g'` +- eval "enable_${ac_feature}=no" ;; ++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ { (exit 1); exit 1; }; } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ eval enable_$ac_feature=no ;; ++ ++ -docdir | --docdir | --docdi | --doc | --do) ++ ac_prev=docdir ;; ++ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) ++ docdir=$ac_optarg ;; ++ ++ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) ++ ac_prev=dvidir ;; ++ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) ++ dvidir=$ac_optarg ;; + + -enable-* | --enable-*) +- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` ++ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then +- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } +- fi +- ac_feature=`echo $ac_feature| sed 's/-/_/g'` +- case "$ac_option" in +- *=*) ;; +- *) ac_optarg=yes ;; +- esac +- eval "enable_${ac_feature}='$ac_optarg'" ;; ++ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 ++ { (exit 1); exit 1; }; } ++ ac_feature=`echo $ac_feature | sed 's/-/_/g'` ++ eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ +@@ -156,116 +839,77 @@ + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) +- exec_prefix="$ac_optarg" ;; ++ exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + +- -help | --help | --hel | --he) +- # Omit some internal or obsolete options to make the list less imposing. +- # This message is too long to be a string in the A/UX 3.1 sh. +- cat << EOF +-Usage: configure [options] [host] +-Options: [defaults in brackets after descriptions] +-Configuration: +- --cache-file=FILE cache test results in FILE +- --help print this message +- --no-create do not create output files +- --quiet, --silent do not print \`checking...' messages +- --version print the version of autoconf that created configure +-Directory and file names: +- --prefix=PREFIX install architecture-independent files in PREFIX +- [$ac_default_prefix] +- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX +- [same as prefix] +- --bindir=DIR user executables in DIR [EPREFIX/bin] +- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] +- --libexecdir=DIR program executables in DIR [EPREFIX/libexec] +- --datadir=DIR read-only architecture-independent data in DIR +- [PREFIX/share] +- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] +- --sharedstatedir=DIR modifiable architecture-independent data in DIR +- [PREFIX/com] +- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] +- --libdir=DIR object code libraries in DIR [EPREFIX/lib] +- --includedir=DIR C header files in DIR [PREFIX/include] +- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] +- --infodir=DIR info documentation in DIR [PREFIX/info] +- --mandir=DIR man documentation in DIR [PREFIX/man] +- --srcdir=DIR find the sources in DIR [configure dir or ..] +- --program-prefix=PREFIX prepend PREFIX to installed program names +- --program-suffix=SUFFIX append SUFFIX to installed program names +- --program-transform-name=PROGRAM +- run sed PROGRAM on installed program names +-EOF +- cat << EOF +-Host type: +- --build=BUILD configure for building on BUILD [BUILD=HOST] +- --host=HOST configure for HOST [guessed] +- --target=TARGET configure for TARGET [TARGET=HOST] +-Features and packages: +- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) +- --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) +- --x-includes=DIR X include files are in DIR +- --x-libraries=DIR X library files are in DIR +-EOF +- if test -n "$ac_help"; then +- echo "--enable and --with options recognized:$ac_help" +- fi +- exit 0 ;; ++ -help | --help | --hel | --he | -h) ++ ac_init_help=long ;; ++ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) ++ ac_init_help=recursive ;; ++ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) ++ ac_init_help=short ;; + + -host | --host | --hos | --ho) +- ac_prev=host ;; ++ ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) +- host="$ac_optarg" ;; ++ host_alias=$ac_optarg ;; ++ ++ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) ++ ac_prev=htmldir ;; ++ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ ++ | --ht=*) ++ htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) +- includedir="$ac_optarg" ;; ++ includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) +- infodir="$ac_optarg" ;; ++ infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) +- libdir="$ac_optarg" ;; ++ libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) +- libexecdir="$ac_optarg" ;; ++ libexecdir=$ac_optarg ;; ++ ++ -localedir | --localedir | --localedi | --localed | --locale) ++ ac_prev=localedir ;; ++ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) ++ localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ +- | --localstate | --localstat | --localsta | --localst \ +- | --locals | --local | --loca | --loc | --lo) ++ | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ +- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ +- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) +- localstatedir="$ac_optarg" ;; ++ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) ++ localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) +- mandir="$ac_optarg" ;; ++ mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c) ++ | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +@@ -279,26 +923,26 @@ + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) +- oldincludedir="$ac_optarg" ;; ++ oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) +- prefix="$ac_optarg" ;; ++ prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) +- program_prefix="$ac_optarg" ;; ++ program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) +- program_suffix="$ac_optarg" ;; ++ program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ +@@ -315,7 +959,17 @@ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) +- program_transform_name="$ac_optarg" ;; ++ program_transform_name=$ac_optarg ;; ++ ++ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) ++ ac_prev=pdfdir ;; ++ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) ++ pdfdir=$ac_optarg ;; ++ ++ -psdir | --psdir | --psdi | --psd | --ps) ++ ac_prev=psdir ;; ++ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) ++ psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) +@@ -325,7 +979,7 @@ + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) +- sbindir="$ac_optarg" ;; ++ sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ +@@ -336,58 +990,53 @@ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) +- sharedstatedir="$ac_optarg" ;; ++ sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) +- site="$ac_optarg" ;; ++ site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) +- srcdir="$ac_optarg" ;; ++ srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) +- sysconfdir="$ac_optarg" ;; ++ sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) +- ac_prev=target ;; ++ ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) +- target="$ac_optarg" ;; ++ target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + +- -version | --version | --versio | --versi | --vers) +- echo "configure generated by autoconf version 2.13" +- exit 0 ;; ++ -version | --version | --versio | --versi | --vers | -V) ++ ac_init_version=: ;; + + -with-* | --with-*) +- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` ++ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then +- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } +- fi ++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ { (exit 1); exit 1; }; } + ac_package=`echo $ac_package| sed 's/-/_/g'` +- case "$ac_option" in +- *=*) ;; +- *) ac_optarg=yes ;; +- esac +- eval "with_${ac_package}='$ac_optarg'" ;; ++ eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) +- ac_package=`echo $ac_option|sed -e 's/-*without-//'` ++ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. +- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then +- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } +- fi +- ac_package=`echo $ac_package| sed 's/-/_/g'` +- eval "with_${ac_package}=no" ;; ++ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid package name: $ac_package" >&2 ++ { (exit 1); exit 1; }; } ++ ac_package=`echo $ac_package | sed 's/-/_/g'` ++ eval with_$ac_package=no ;; + + --x) + # Obsolete; use --with-x. +@@ -398,162 +1047,700 @@ + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) +- x_includes="$ac_optarg" ;; ++ x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) +- x_libraries="$ac_optarg" ;; ++ x_libraries=$ac_optarg ;; + +- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } ++ -*) { echo "$as_me: error: unrecognized option: $ac_option ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; } + ;; + ++ *=*) ++ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` ++ # Reject names that are not valid shell variable names. ++ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && ++ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 ++ { (exit 1); exit 1; }; } ++ eval $ac_envvar=\$ac_optarg ++ export $ac_envvar ;; ++ + *) +- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then +- echo "configure: warning: $ac_option: invalid host type" 1>&2 +- fi +- if test "x$nonopt" != xNONE; then +- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } +- fi +- nonopt="$ac_option" ++ # FIXME: should be removed in autoconf 3.0. ++ echo "$as_me: WARNING: you should use --build, --host, --target" >&2 ++ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && ++ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 ++ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac + done + + if test -n "$ac_prev"; then +- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } ++ ac_option=--`echo $ac_prev | sed 's/_/-/g'` ++ { echo "$as_me: error: missing argument to $ac_option" >&2 ++ { (exit 1); exit 1; }; } + fi + +-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 ++# Be sure to have absolute directory names. ++for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ ++ datadir sysconfdir sharedstatedir localstatedir includedir \ ++ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ ++ libdir localedir mandir ++do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ [\\/$]* | ?:[\\/]* ) continue;; ++ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; ++ esac ++ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 ++ { (exit 1); exit 1; }; } ++done + +-# File descriptor usage: +-# 0 standard input +-# 1 file creation +-# 2 errors and warnings +-# 3 some systems may open it to /dev/tty +-# 4 used on the Kubota Titan +-# 6 checking for... messages and results +-# 5 compiler messages saved in config.log +-if test "$silent" = yes; then +- exec 6>/dev/null +-else +- exec 6>&1 ++# There might be people who depend on the old broken behavior: `$host' ++# used to hold the argument of --host etc. ++# FIXME: To remove some day. ++build=$build_alias ++host=$host_alias ++target=$target_alias ++ ++# FIXME: To remove some day. ++if test "x$host_alias" != x; then ++ if test "x$build_alias" = x; then ++ cross_compiling=maybe ++ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. ++ If a cross compiler is detected then cross compile mode will be used." >&2 ++ elif test "x$build_alias" != "x$host_alias"; then ++ cross_compiling=yes ++ fi + fi +-exec 5>./config.log + +-echo "\ +-This file contains any messages produced by compilers while +-running configure, to aid debugging if configure makes a mistake. +-" 1>&5 ++ac_tool_prefix= ++test -n "$host_alias" && ac_tool_prefix=$host_alias- + +-# Strip out --no-create and --no-recursion so they do not pile up. +-# Also quote any args containing shell metacharacters. +-ac_configure_args= +-for ac_arg +-do +- case "$ac_arg" in +- -no-create | --no-create | --no-creat | --no-crea | --no-cre \ +- | --no-cr | --no-c) ;; +- -no-recursion | --no-recursion | --no-recursio | --no-recursi \ +- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; +- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) +- ac_configure_args="$ac_configure_args '$ac_arg'" ;; +- *) ac_configure_args="$ac_configure_args $ac_arg" ;; +- esac +-done ++test "$silent" = yes && exec 6>/dev/null + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi + +-# confdefs.h avoids OS command line length limits that DEFS can exceed. +-rm -rf conftest* confdefs.h +-# AIX cpp loses on an empty file, so make sure it contains at least a newline. +-echo > confdefs.h +- +-# A filename unique to this package, relative to the directory that +-# configure is in, which we can look for to find out if srcdir is correct. +-ac_unique_file=src/lisp.h ++ac_pwd=`pwd` && test -n "$ac_pwd" && ++ac_ls_di=`ls -di .` && ++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ++ { echo "$as_me: error: Working directory cannot be determined" >&2 ++ { (exit 1); exit 1; }; } ++test "X$ac_ls_di" = "X$ac_pwd_ls_di" || ++ { echo "$as_me: error: pwd does not report name of working directory" >&2 ++ { (exit 1); exit 1; }; } ++ + + # Find the source files, if location was not specified. + if test -z "$srcdir"; then + ac_srcdir_defaulted=yes +- # Try the directory containing this script, then its parent. +- ac_prog=$0 +- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` +- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. ++ # Try the directory containing this script, then the parent directory. ++ ac_confdir=`$as_dirname -- "$0" || ++$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$0" : 'X\(//\)[^/]' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$0" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` + srcdir=$ac_confdir +- if test ! -r $srcdir/$ac_unique_file; then ++ if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi + else + ac_srcdir_defaulted=no + fi +-if test ! -r $srcdir/$ac_unique_file; then +- if test "$ac_srcdir_defaulted" = yes; then +- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } +- else +- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } +- fi +-fi +-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` +- +-# Prefer explicitly selected file to automatically selected ones. +-if test -z "$CONFIG_SITE"; then +- if test "x$prefix" != xNONE; then +- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" +- else +- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +- fi +-fi +-for ac_site_file in $CONFIG_SITE; do +- if test -r "$ac_site_file"; then +- echo "loading site script $ac_site_file" +- . "$ac_site_file" +- fi ++if test ! -r "$srcdir/$ac_unique_file"; then ++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." ++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 ++ { (exit 1); exit 1; }; } ++fi ++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ++ac_abs_confdir=`( ++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 ++ { (exit 1); exit 1; }; } ++ pwd)` ++# When building in place, set srcdir=. ++if test "$ac_abs_confdir" = "$ac_pwd"; then ++ srcdir=. ++fi ++# Remove unnecessary trailing slashes from srcdir. ++# Double slashes in file names in object file debugging info ++# mess up M-x gdb in Emacs. ++case $srcdir in ++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; ++esac ++for ac_var in $ac_precious_vars; do ++ eval ac_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_env_${ac_var}_value=\$${ac_var} ++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} ++ eval ac_cv_env_${ac_var}_value=\$${ac_var} + done + +-if test -r "$cache_file"; then +- echo "loading cache $cache_file" +- . $cache_file ++# ++# Report the --help message. ++# ++if test "$ac_init_help" = "long"; then ++ # Omit some internal or obsolete options to make the list less imposing. ++ # This message is too long to be a string in the A/UX 3.1 sh. ++ cat <<_ACEOF ++\`configure' configures this package to adapt to many kinds of systems. ++ ++Usage: $0 [OPTION]... [VAR=VALUE]... ++ ++To assign environment variables (e.g., CC, CFLAGS...), specify them as ++VAR=VALUE. See below for descriptions of some of the useful variables. ++ ++Defaults for the options are specified in brackets. ++ ++Configuration: ++ -h, --help display this help and exit ++ --help=short display options specific to this package ++ --help=recursive display the short help of all the included packages ++ -V, --version display version information and exit ++ -q, --quiet, --silent do not print \`checking...' messages ++ --cache-file=FILE cache test results in FILE [disabled] ++ -C, --config-cache alias for \`--cache-file=config.cache' ++ -n, --no-create do not create output files ++ --srcdir=DIR find the sources in DIR [configure dir or \`..'] ++ ++Installation directories: ++ --prefix=PREFIX install architecture-independent files in PREFIX ++ [$ac_default_prefix] ++ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX ++ [PREFIX] ++ ++By default, \`make install' will install all the files in ++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify ++an installation prefix other than \`$ac_default_prefix' using \`--prefix', ++for instance \`--prefix=\$HOME'. ++ ++For better control, use the options below. ++ ++Fine tuning of the installation directories: ++ --bindir=DIR user executables [EPREFIX/bin] ++ --sbindir=DIR system admin executables [EPREFIX/sbin] ++ --libexecdir=DIR program executables [EPREFIX/libexec] ++ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] ++ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] ++ --localstatedir=DIR modifiable single-machine data [PREFIX/var] ++ --libdir=DIR object code libraries [EPREFIX/lib] ++ --includedir=DIR C header files [PREFIX/include] ++ --oldincludedir=DIR C header files for non-gcc [/usr/include] ++ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] ++ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] ++ --infodir=DIR info documentation [DATAROOTDIR/info] ++ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] ++ --mandir=DIR man documentation [DATAROOTDIR/man] ++ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] ++ --htmldir=DIR html documentation [DOCDIR] ++ --dvidir=DIR dvi documentation [DOCDIR] ++ --pdfdir=DIR pdf documentation [DOCDIR] ++ --psdir=DIR ps documentation [DOCDIR] ++_ACEOF ++ ++ cat <<\_ACEOF ++ ++X features: ++ --x-includes=DIR X include files are in DIR ++ --x-libraries=DIR X library files are in DIR ++ ++System types: ++ --build=BUILD configure for building on BUILD [guessed] ++ --host=HOST cross-compile to build programs to run on HOST [BUILD] ++_ACEOF ++fi ++ ++if test -n "$ac_init_help"; then ++ ++ cat <<\_ACEOF ++ ++Optional Features: ++ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) ++ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --disable-largefile omit support for large files ++ ++Optional Packages: ++ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] ++ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) ++ --without-gcc don't use GCC to compile Emacs if GCC is found ++ --without-pop don't support POP mail retrieval with movemail ++ --with-kerberos support Kerberos-authenticated POP ++ --with-kerberos5 support Kerberos version 5 authenticated POP ++ --with-hesiod support Hesiod to get the POP server host ++ --with-mail-spool-directory=DIR system mail spool is DIR ++ --with-x-toolkit=KIT use an X toolkit (KIT = yes/lucid/athena/motif/no) ++ --with-xpm use -lXpm for displaying XPM images ++ --with-jpeg use -ljpeg for displaying JPEG images ++ --with-tiff use -ltiff for displaying TIFF images ++ --with-gif use -lungif for displaying GIF images ++ --with-png use -lpng for displaying PNG images ++ --without-toolkit-scroll-bars ++ don't use Motif or Xaw3d scroll bars ++ --without-xim don't use X11 XIM ++ --with-x use the X Window System ++ ++Some influential environment variables: ++ CC C compiler command ++ CFLAGS C compiler flags ++ LDFLAGS linker flags, e.g. -L if you have libraries in a ++ nonstandard directory ++ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if ++ you have headers in a nonstandard directory ++ CPP C preprocessor ++ YACC The `Yet Another C Compiler' implementation to use. Defaults to ++ the first program found out of: `bison -y', `byacc', `yacc'. ++ YFLAGS The list of arguments that will be passed by default to $YACC. ++ This script will default YFLAGS to the empty string to avoid a ++ default value of `-d' given by some make applications. ++ XMKMF Path to xmkmf, Makefile generator for X Window System ++ ++Use these variables to override the choices made by `configure' or to help ++it to find libraries and programs with nonstandard names/locations. ++ ++_ACEOF ++ac_status=$? ++fi ++ ++if test "$ac_init_help" = "recursive"; then ++ # If there are subdirs, report their specific --help. ++ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue ++ test -d "$ac_dir" || continue ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix ++ ++case $srcdir in ++ .) # We are building in place. ++ ac_srcdir=. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ++ ++ cd "$ac_dir" || { ac_status=$?; continue; } ++ # Check for guested configure. ++ if test -f "$ac_srcdir/configure.gnu"; then ++ echo && ++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive ++ elif test -f "$ac_srcdir/configure"; then ++ echo && ++ $SHELL "$ac_srcdir/configure" --help=recursive ++ else ++ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 ++ fi || ac_status=$? ++ cd "$ac_pwd" || { ac_status=$?; break; } ++ done ++fi ++ ++test -n "$ac_init_help" && exit $ac_status ++if $ac_init_version; then ++ cat <<\_ACEOF ++configure ++generated by GNU Autoconf 2.60a ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++This configure script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it. ++_ACEOF ++ exit ++fi ++cat >config.log <<_ACEOF ++This file contains any messages produced by compilers while ++running configure, to aid debugging if configure makes a mistake. ++ ++It was created by $as_me, which was ++generated by GNU Autoconf 2.60a. Invocation command line was ++ ++ $ $0 $@ ++ ++_ACEOF ++exec 5>>config.log ++{ ++cat <<_ASUNAME ++## --------- ## ++## Platform. ## ++## --------- ## ++ ++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` ++ ++/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` ++/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` ++/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` ++/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` ++ ++_ASUNAME ++ ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ echo "PATH: $as_dir" ++done ++IFS=$as_save_IFS ++ ++} >&5 ++ ++cat >&5 <<_ACEOF ++ ++ ++## ----------- ## ++## Core tests. ## ++## ----------- ## ++ ++_ACEOF ++ ++ ++# Keep a trace of the command line. ++# Strip out --no-create and --no-recursion so they do not pile up. ++# Strip out --silent because we don't want to record it for future runs. ++# Also quote any args containing shell meta-characters. ++# Make two passes to allow for proper duplicate-argument suppression. ++ac_configure_args= ++ac_configure_args0= ++ac_configure_args1= ++ac_must_keep_next=false ++for ac_pass in 1 2 ++do ++ for ac_arg ++ do ++ case $ac_arg in ++ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil) ++ continue ;; ++ *\'*) ++ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; ++ esac ++ case $ac_pass in ++ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; ++ 2) ++ ac_configure_args1="$ac_configure_args1 '$ac_arg'" ++ if test $ac_must_keep_next = true; then ++ ac_must_keep_next=false # Got value, back to normal. ++ else ++ case $ac_arg in ++ *=* | --config-cache | -C | -disable-* | --disable-* \ ++ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ ++ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ ++ | -with-* | --with-* | -without-* | --without-* | --x) ++ case "$ac_configure_args0 " in ++ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; ++ esac ++ ;; ++ -* ) ac_must_keep_next=true ;; ++ esac ++ fi ++ ac_configure_args="$ac_configure_args '$ac_arg'" ++ ;; ++ esac ++ done ++done ++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } ++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } ++ ++# When interrupted or exit'd, cleanup temporary files, and complete ++# config.log. We remove comments because anyway the quotes in there ++# would cause problems or look ugly. ++# WARNING: Use '\'' to represent an apostrophe within the trap. ++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. ++trap 'exit_status=$? ++ # Save into config.log some information that might help in debugging. ++ { ++ echo ++ ++ cat <<\_ASBOX ++## ---------------- ## ++## Cache variables. ## ++## ---------------- ## ++_ASBOX ++ echo ++ # The following way of writing the cache mishandles newlines in values, ++( ++ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ (set) 2>&1 | ++ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ sed -n \ ++ "s/'\''/'\''\\\\'\'''\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" ++ ;; #( ++ *) ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) ++ echo ++ ++ cat <<\_ASBOX ++## ----------------- ## ++## Output variables. ## ++## ----------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_vars ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ ++ if test -n "$ac_subst_files"; then ++ cat <<\_ASBOX ++## ------------------- ## ++## File substitutions. ## ++## ------------------- ## ++_ASBOX ++ echo ++ for ac_var in $ac_subst_files ++ do ++ eval ac_val=\$$ac_var ++ case $ac_val in ++ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; ++ esac ++ echo "$ac_var='\''$ac_val'\''" ++ done | sort ++ echo ++ fi ++ ++ if test -s confdefs.h; then ++ cat <<\_ASBOX ++## ----------- ## ++## confdefs.h. ## ++## ----------- ## ++_ASBOX ++ echo ++ cat confdefs.h ++ echo ++ fi ++ test "$ac_signal" != 0 && ++ echo "$as_me: caught signal $ac_signal" ++ echo "$as_me: exit $exit_status" ++ } >&5 ++ rm -f core *.core core.conftest.* && ++ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && ++ exit $exit_status ++' 0 ++for ac_signal in 1 2 13 15; do ++ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal ++done ++ac_signal=0 ++ ++# confdefs.h avoids OS command line length limits that DEFS can exceed. ++rm -f -r conftest* confdefs.h ++ ++# Predefined preprocessor variables. ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_NAME "$PACKAGE_NAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_TARNAME "$PACKAGE_TARNAME" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_VERSION "$PACKAGE_VERSION" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_STRING "$PACKAGE_STRING" ++_ACEOF ++ ++ ++cat >>confdefs.h <<_ACEOF ++#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" ++_ACEOF ++ ++ ++# Let the site file select an alternate cache file if it wants to. ++# Prefer explicitly selected file to automatically selected ones. ++if test -n "$CONFIG_SITE"; then ++ set x "$CONFIG_SITE" ++elif test "x$prefix" != xNONE; then ++ set x "$prefix/share/config.site" "$prefix/etc/config.site" + else +- echo "creating cache $cache_file" +- > $cache_file ++ set x "$ac_default_prefix/share/config.site" \ ++ "$ac_default_prefix/etc/config.site" + fi ++shift ++for ac_site_file ++do ++ if test -r "$ac_site_file"; then ++ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 ++echo "$as_me: loading site script $ac_site_file" >&6;} ++ sed 's/^/| /' "$ac_site_file" >&5 ++ . "$ac_site_file" ++ fi ++done + +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross +- +-ac_exeext= +-ac_objext=o +-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then +- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. +- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then +- ac_n= ac_c=' +-' ac_t=' ' +- else +- ac_n=-n ac_c= ac_t= ++if test -r "$cache_file"; then ++ # Some versions of bash will fail to source /dev/null (special ++ # files actually), so we avoid doing that. ++ if test -f "$cache_file"; then ++ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 ++echo "$as_me: loading cache $cache_file" >&6;} ++ case $cache_file in ++ [\\/]* | ?:[\\/]* ) . "$cache_file";; ++ *) . "./$cache_file";; ++ esac + fi + else +- ac_n= ac_c='\c' ac_t= ++ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 ++echo "$as_me: creating cache $cache_file" >&6;} ++ >$cache_file ++fi ++ ++# Check that the precious variables saved in the cache have kept the same ++# value. ++ac_cache_corrupted=false ++for ac_var in $ac_precious_vars; do ++ eval ac_old_set=\$ac_cv_env_${ac_var}_set ++ eval ac_new_set=\$ac_env_${ac_var}_set ++ eval ac_old_val=\$ac_cv_env_${ac_var}_value ++ eval ac_new_val=\$ac_env_${ac_var}_value ++ case $ac_old_set,$ac_new_set in ++ set,) ++ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,set) ++ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 ++echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ++ ac_cache_corrupted=: ;; ++ ,);; ++ *) ++ if test "x$ac_old_val" != "x$ac_new_val"; then ++ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 ++echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ++ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 ++echo "$as_me: former value: $ac_old_val" >&2;} ++ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 ++echo "$as_me: current value: $ac_new_val" >&2;} ++ ac_cache_corrupted=: ++ fi;; ++ esac ++ # Pass precious variables to config.status. ++ if test "$ac_new_set" = set; then ++ case $ac_new_val in ++ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; ++ *) ac_arg=$ac_var=$ac_new_val ;; ++ esac ++ case " $ac_configure_args " in ++ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ++ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; ++ esac ++ fi ++done ++if $ac_cache_corrupted; then ++ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 ++echo "$as_me: error: changes in the environment can compromise the build" >&2;} ++ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 ++echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} ++ { (exit 1); exit 1; }; } + fi + + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ ++ ++ac_config_headers="$ac_config_headers src/config.h:src/config.in" ++ ++ ++ + lispdir='${datadir}/emacs/${version}/lisp' + locallisppath='${datadir}/emacs/${version}/site-lisp:'\ + '${datadir}/emacs/site-lisp:${datadir}/emacs/${version}/leim' +@@ -562,124 +1749,137 @@ + archlibdir='${libexecdir}/emacs/${version}/${configuration}' + docdir='${datadir}/emacs/${version}/etc' + +-# Check whether --with-gcc or --without-gcc was given. ++ ++# Check whether --with-gcc was given. + if test "${with_gcc+set}" = set; then +- withval="$with_gcc" +- : ++ withval=$with_gcc; + fi + +-# Check whether --with-pop or --without-pop was given. ++ ++# Check whether --with-pop was given. + if test "${with_pop+set}" = set; then +- withval="$with_pop" +- if test "$withval" = yes; then +- cat >> confdefs.h <<\EOF ++ withval=$with_pop; if test "$withval" = yes; then ++ cat >>confdefs.h <<\_ACEOF + #define MAIL_USE_POP 1 +-EOF ++_ACEOF + + else : + fi + else +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define MAIL_USE_POP 1 +-EOF ++_ACEOF + + fi + +-# Check whether --with-kerberos or --without-kerberos was given. ++ ++# Check whether --with-kerberos was given. + if test "${with_kerberos+set}" = set; then +- withval="$with_kerberos" +- cat >> confdefs.h <<\EOF ++ withval=$with_kerberos; cat >>confdefs.h <<\_ACEOF + #define KERBEROS 1 +-EOF ++_ACEOF + + fi + +-# Check whether --with-kerberos5 or --without-kerberos5 was given. ++ ++# Check whether --with-kerberos5 was given. + if test "${with_kerberos5+set}" = set; then +- withval="$with_kerberos5" +- if test "${with_kerberos5+set}" = set; then ++ withval=$with_kerberos5; if test "${with_kerberos5+set}" = set; then + if test "${with_kerberos+set}" != set; then + with_kerberos=yes +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define KERBEROS 1 +-EOF ++_ACEOF + + fi + fi +-cat >> confdefs.h <<\EOF ++cat >>confdefs.h <<\_ACEOF + #define KERBEROS5 1 +-EOF ++_ACEOF + + fi + +-# Check whether --with-hesiod or --without-hesiod was given. ++ ++# Check whether --with-hesiod was given. + if test "${with_hesiod+set}" = set; then +- withval="$with_hesiod" +- cat >> confdefs.h <<\EOF ++ withval=$with_hesiod; cat >>confdefs.h <<\_ACEOF + #define HESIOD 1 +-EOF ++_ACEOF ++ ++fi ++ ++ ++# Check whether --with-mail-spool-directory was given. ++if test "${with_mail_spool_directory+set}" = set; then ++ withval=$with_mail_spool_directory; cat >>confdefs.h <<_ACEOF ++#define USE_MAIL_SPOOL_DIRECTORY "${withval}" ++_ACEOF + + fi + +-# Check whether --with-x-toolkit or --without-x-toolkit was given. ++ ++# Check whether --with-x-toolkit was given. + if test "${with_x_toolkit+set}" = set; then +- withval="$with_x_toolkit" +- case "${withval}" in ++ withval=$with_x_toolkit; case "${withval}" in + y | ye | yes ) val=athena ;; + n | no ) val=no ;; + l | lu | luc | luci | lucid ) val=lucid ;; + a | at | ath | athe | athen | athena ) val=athena ;; + m | mo | mot | moti | motif ) val=motif ;; + * ) +-{ echo "configure: error: \`--with-x-toolkit=$withval' is invalid\; ++{ { echo "$as_me:$LINENO: error: \`--with-x-toolkit=$withval' is invalid\; + this option's value should be \`yes', \`no', \`lucid', \`athena', or \`motif'. +-Currently, \`yes', \`athena' and \`lucid' are synonyms." 1>&2; exit 1; } ++Currently, \`yes', \`athena' and \`lucid' are synonyms." >&5 ++echo "$as_me: error: \`--with-x-toolkit=$withval' is invalid\; ++this option's value should be \`yes', \`no', \`lucid', \`athena', or \`motif'. ++Currently, \`yes', \`athena' and \`lucid' are synonyms." >&2;} ++ { (exit 1); exit 1; }; } + ;; + esac + with_x_toolkit=$val + + fi + +-# Check whether --with-xpm or --without-xpm was given. ++ ++# Check whether --with-xpm was given. + if test "${with_xpm+set}" = set; then +- withval="$with_xpm" +- : ++ withval=$with_xpm; + fi + +-# Check whether --with-jpeg or --without-jpeg was given. ++ ++# Check whether --with-jpeg was given. + if test "${with_jpeg+set}" = set; then +- withval="$with_jpeg" +- : ++ withval=$with_jpeg; + fi + +-# Check whether --with-tiff or --without-tiff was given. ++ ++# Check whether --with-tiff was given. + if test "${with_tiff+set}" = set; then +- withval="$with_tiff" +- : ++ withval=$with_tiff; + fi + +-# Check whether --with-gif or --without-gif was given. ++ ++# Check whether --with-gif was given. + if test "${with_gif+set}" = set; then +- withval="$with_gif" +- : ++ withval=$with_gif; + fi + +-# Check whether --with-png or --without-png was given. ++ ++# Check whether --with-png was given. + if test "${with_png+set}" = set; then +- withval="$with_png" +- : ++ withval=$with_png; + fi + +-# Check whether --with-toolkit-scroll-bars or --without-toolkit-scroll-bars was given. ++ ++# Check whether --with-toolkit-scroll-bars was given. + if test "${with_toolkit_scroll_bars+set}" = set; then +- withval="$with_toolkit_scroll_bars" +- : ++ withval=$with_toolkit_scroll_bars; + fi + +-# Check whether --with-xim or --without-xim was given. ++ ++# Check whether --with-xim was given. + if test "${with_xim+set}" = set; then +- withval="$with_xim" +- : ++ withval=$with_xim; + fi + + +@@ -707,12 +1907,18 @@ + #### Check if the source directory already has a configured system in it. + if test `pwd` != `(cd ${srcdir} && pwd)` \ + && test -f "${srcdir}/src/config.h" ; then +- echo "configure: warning: The directory tree \`${srcdir}' is being used ++ { echo "$as_me:$LINENO: WARNING: The directory tree \`${srcdir}' is being used ++ as a build directory right now; it has been configured in its own ++ right. To configure in another directory as well, you MUST ++ use GNU make. If you do not have GNU make, then you must ++ now do \`make distclean' in ${srcdir}, ++ and then run $0 again." >&5 ++echo "$as_me: WARNING: The directory tree \`${srcdir}' is being used + as a build directory right now; it has been configured in its own + right. To configure in another directory as well, you MUST + use GNU make. If you do not have GNU make, then you must + now do \`make distclean' in ${srcdir}, +- and then run $0 again." 1>&2 ++ and then run $0 again." >&2;} + + extrasub='/^VPATH[ ]*=/c\ + vpath %.c $(srcdir)\ +@@ -730,50 +1936,118 @@ + ### Canonicalize the configuration name. + + ac_aux_dir= +-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do +- if test -f $ac_dir/install-sh; then ++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do ++ if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break +- elif test -f $ac_dir/install.sh; then ++ elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break ++ elif test -f "$ac_dir/shtool"; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break + fi + done + if test -z "$ac_aux_dir"; then +- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } ++ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 ++echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} ++ { (exit 1); exit 1; }; } + fi +-ac_config_guess=$ac_aux_dir/config.guess +-ac_config_sub=$ac_aux_dir/config.sub +-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. ++ ++# These three variables are undocumented and unsupported, ++# and are intended to be withdrawn in a future Autoconf release. ++# They can cause serious problems if a builder's source tree is in a directory ++# whose full name contains unusual characters. ++ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. ++ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ++ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + + # Make sure we can run config.sub. +-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } ++$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || ++ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 ++echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} ++ { (exit 1); exit 1; }; } ++ ++{ echo "$as_me:$LINENO: checking build system type" >&5 ++echo $ECHO_N "checking build system type... $ECHO_C" >&6; } ++if test "${ac_cv_build+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_build_alias=$build_alias ++test "x$ac_build_alias" = x && ++ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` ++test "x$ac_build_alias" = x && ++ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 ++echo "$as_me: error: cannot guess build type; you must specify one" >&2;} ++ { (exit 1); exit 1; }; } ++ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} ++ { (exit 1); exit 1; }; } ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 ++echo "${ECHO_T}$ac_cv_build" >&6; } ++case $ac_cv_build in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 ++echo "$as_me: error: invalid value of canonical build" >&2;} ++ { (exit 1); exit 1; }; };; ++esac ++build=$ac_cv_build ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_build ++shift ++build_cpu=$1 ++build_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++build_os=$* ++IFS=$ac_save_IFS ++case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac ++ ++ ++{ echo "$as_me:$LINENO: checking host system type" >&5 ++echo $ECHO_N "checking host system type... $ECHO_C" >&6; } ++if test "${ac_cv_host+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "x$host_alias" = x; then ++ ac_cv_host=$ac_cv_build ++else ++ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || ++ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 ++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} ++ { (exit 1); exit 1; }; } + fi + +-echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:759: checking host system type" >&5 +- +-host_alias=$host +-case "$host_alias" in +-NONE) +- case $nonopt in +- NONE) +- if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : +- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } +- fi ;; +- *) host_alias=$nonopt ;; +- esac ;; ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 ++echo "${ECHO_T}$ac_cv_host" >&6; } ++case $ac_cv_host in ++*-*-*) ;; ++*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 ++echo "$as_me: error: invalid value of canonical host" >&2;} ++ { (exit 1); exit 1; }; };; + esac ++host=$ac_cv_host ++ac_save_IFS=$IFS; IFS='-' ++set x $ac_cv_host ++shift ++host_cpu=$1 ++host_vendor=$2 ++shift; shift ++# Remember, the first character of IFS is used to create $*, ++# except with old shells: ++host_os=$* ++IFS=$ac_save_IFS ++case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + +-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +-echo "$ac_t""$host" 1>&6 + + canonical=$host + configuration=$host_alias +@@ -1178,6 +2452,9 @@ + hppa*-*-nextstep* ) + machine=hp800 opsys=nextstep + ;; ++ hppa*-*-linux-gnu* ) ++ machine=hp800 opsys=gnu-linux ++ ;; + + ## Orion machines + orion-orion-bsd* ) +@@ -1246,6 +2523,10 @@ + machine=ibmrt-aix opsys=usg5-2-2 + ;; + ++ s390*-*-linux-gnu* ) ++ machine=s390 opsys=gnu-linux ++ ;; ++ + ## Integrated Solutions `Optimum V' + m68*-isi-bsd4.2* ) + machine=isi-ov opsys=bsd4-2 +@@ -1650,7 +2931,7 @@ + *-xenix* ) opsys=xenix ;; + *-linux-gnu* ) opsys=gnu-linux ;; + *-sco3.2v4* ) opsys=sco4 ; NON_GNU_CPP=/lib/cpp ;; +- *-sco3.2v5* ) opsys=sco5 ++ *-sco3.2v5* ) opsys=sco5 + NON_GNU_CPP=/lib/cpp + # Prevent -belf from being passed to $CPP. + # /lib/cpp does not accept it. +@@ -1670,10 +2951,15 @@ + ;; + + ## Mips Linux-based GNU system +- mips-*-linux-gnu* | mipsel-*-linux-gnu* ) ++ mips-*-linux-gnu* ) + machine=mips opsys=gnu-linux + ;; + ++ ## Mipsel Linux-based GNU system ++ mipsel-*-linux-gnu* ) ++ machine=mipsel opsys=gnu-linux ++ ;; ++ + ## UXP/DS + sparc-fujitsu-sysv4* ) + machine=sparc opsys=uxpds +@@ -1686,6 +2972,11 @@ + machine=f301 opsys=uxpv + ;; + ++ ## AMD x86-64 Linux-based GNU system ++ x86_64-*-linux-gnu* ) ++ machine=amdx86-64 opsys=gnu-linux ++ ;; ++ + * ) + unported=yes + ;; +@@ -1729,8 +3020,11 @@ + + + if test $unported = yes; then +- { echo "configure: error: Emacs hasn't been ported to \`${canonical}' systems. +-Check \`etc/MACHINES' for recognized configuration names." 1>&2; exit 1; } ++ { { echo "$as_me:$LINENO: error: Emacs hasn't been ported to \`${canonical}' systems. ++Check \`etc/MACHINES' for recognized configuration names." >&5 ++echo "$as_me: error: Emacs hasn't been ported to \`${canonical}' systems. ++Check \`etc/MACHINES' for recognized configuration names." >&2;} ++ { (exit 1); exit 1; }; } + fi + + machfile="m/${machine}.h" +@@ -1746,214 +3040,859 @@ + case ${with_gcc} in + "yes" ) CC="gcc" GCC=yes ;; + "no" ) : ${CC=cc} ;; +- * ) # Extract the first word of "gcc", so it can be a program name with args. ++ * ) ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}gcc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$CC"; then ++ ac_cv_prog_CC="$CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="${ac_tool_prefix}gcc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++CC=$ac_cv_prog_CC ++if test -n "$CC"; then ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_CC"; then ++ ac_ct_CC=$CC ++ # 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:1753: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="gcc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi ++else ++ CC="$ac_cv_prog_CC" ++fi ++ ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. ++set dummy ${ac_tool_prefix}cc; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CC="gcc" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="${ac_tool_prefix}cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + ++ ++ fi ++fi + if test -z "$CC"; then + # 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:1783: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then +- ac_prog_rejected=yes +- continue +- fi +- ac_cv_prog_CC="cc" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ++ ac_prog_rejected=yes ++ continue ++ fi ++ ac_cv_prog_CC="cc" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ + if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift +- if test $# -gt 0; then ++ if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift +- set dummy "$ac_dir/$ac_word" "$@" +- shift +- ac_cv_prog_CC="$@" ++ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi + fi + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +- if test -z "$CC"; then +- case "`uname -s`" in +- *win32* | *WIN32*) +- # 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:1834: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++fi ++if test -z "$CC"; then ++ if test -n "$ac_tool_prefix"; then ++ for ac_prog in cl.exe ++ do ++ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. ++set dummy $ac_tool_prefix$ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_CC="cl" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ + fi + fi +-CC="$ac_cv_prog_CC" ++CC=$ac_cv_prog_CC + if test -n "$CC"; then +- echo "$ac_t""$CC" 1>&6 ++ { echo "$as_me:$LINENO: result: $CC" >&5 ++echo "${ECHO_T}$CC" >&6; } + else +- echo "$ac_t""no" 1>&6 +-fi +- ;; +- esac +- fi +- test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1866: 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. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross +- +-cat > conftest.$ac_ext << EOF +- +-#line 1877 "configure" +-#include "confdefs.h" + +-main(){return(0);} +-EOF +-if { (eval echo configure:1882: \"$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 +- ac_cv_prog_cc_cross=no +- else +- ac_cv_prog_cc_cross=yes +- fi +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- ac_cv_prog_cc_works=no ++ test -n "$CC" && break ++ done + fi +-rm -fr conftest* +-ac_ext=c +-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +-ac_cpp='$CPP $CPPFLAGS' +-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +-cross_compiling=$ac_cv_prog_cc_cross +- +-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +-if test $ac_cv_prog_cc_works = no; then +- { 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:1908: 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:1913: 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 ++if test -z "$CC"; then ++ ac_ct_CC=$CC ++ for ac_prog in cl.exe ++do ++ # Extract the first word of "$ac_prog", so it can be a program name with args. ++set dummy $ac_prog; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +- ac_cv_prog_gcc=yes ++ if test -n "$ac_ct_CC"; then ++ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. + else +- ac_cv_prog_gcc=no +-fi ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_CC="$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_CC=$ac_cv_prog_ac_ct_CC ++if test -n "$ac_ct_CC"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 ++echo "${ECHO_T}$ac_ct_CC" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++ test -n "$ac_ct_CC" && break ++done ++ ++ if test "x$ac_ct_CC" = x; then ++ CC="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ CC=$ac_ct_CC ++ fi + fi + +-echo "$ac_t""$ac_cv_prog_gcc" 1>&6 ++fi ++ ++ ++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&5 ++echo "$as_me: error: no acceptable C compiler found in \$PATH ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ ++# Provide some information about the compiler. ++echo "$as_me:$LINENO: checking for C compiler version" >&5 ++ac_compiler=`set X $ac_compile; echo $2` ++{ (ac_try="$ac_compiler --version >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler --version >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -v >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -v >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++{ (ac_try="$ac_compiler -V >&5" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compiler -V >&5") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } ++ ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files a.out a.exe b.out" ++# Try to create an executable without -o first, disregard a.out. ++# It will help us diagnose broken compilers, and finding out an intuition ++# of exeext. ++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 ++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` ++# ++# List of possible output files, starting from the most likely. ++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) ++# only as a last resort. b.out is created by i960 compilers. ++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' ++# ++# The IRIX 6 linker writes into existing files which may not be ++# executable, retaining their permissions. Remove them first so a ++# subsequent execution test works. ++ac_rmfiles= ++for ac_file in $ac_files ++do ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ * ) ac_rmfiles="$ac_rmfiles $ac_file";; ++ esac ++done ++rm -f $ac_rmfiles ++ ++if { (ac_try="$ac_link_default" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link_default") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. ++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' ++# in a Makefile. We should not override ac_cv_exeext if it was cached, ++# so that the user can short-circuit this test for compilers unknown to ++# Autoconf. ++for ac_file in $ac_files '' ++do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ++ ;; ++ [ab].out ) ++ # We found the default executable, but exeext='' is most ++ # certainly right. ++ break;; ++ *.* ) ++ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; ++ then :; else ++ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ fi ++ # We set ac_cv_exeext here because the later test for it is not ++ # safe: cross compilers may not add the suffix if given an `-o' ++ # argument, so we may need to know it at that point already. ++ # Even if this section looks crufty: it has the advantage of ++ # actually working. ++ break;; ++ * ) ++ break;; ++ esac ++done ++test "$ac_cv_exeext" = no && ac_cv_exeext= + +-if test $ac_cv_prog_gcc = yes; then +- GCC=yes + else +- GCC= ++ ac_file='' + fi + +-ac_test_CFLAGS="${CFLAGS+set}" +-ac_save_CFLAGS="$CFLAGS" +-CFLAGS= +-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:1941: 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 ++{ echo "$as_me:$LINENO: result: $ac_file" >&5 ++echo "${ECHO_T}$ac_file" >&6; } ++if test -z "$ac_file"; then ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C compiler cannot create executables ++See \`config.log' for more details." >&2;} ++ { (exit 77); exit 77; }; } ++fi ++ ++ac_exeext=$ac_cv_exeext ++ ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 ++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } ++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 ++# If not cross compiling, check that we can run a simple program. ++if test "$cross_compiling" != yes; then ++ if { ac_try='./$ac_file' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ cross_compiling=no ++ else ++ if test "$cross_compiling" = maybe; then ++ cross_compiling=yes ++ else ++ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot run C compiled programs. ++If you meant to cross compile, use \`--host'. ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++ fi ++ fi ++fi ++{ echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ ++rm -f a.out a.exe conftest$ac_cv_exeext b.out ++ac_clean_files=$ac_clean_files_save ++# Check that the compiler produces executables we can run. If not, either ++# the compiler is broken, or we cross compile. ++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 ++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 ++echo "${ECHO_T}$cross_compiling" >&6; } ++ ++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 ++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ # If both `conftest.exe' and `conftest' are `present' (well, observable) ++# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will ++# work properly (i.e., refer to `conftest.exe'), while it won't with ++# `rm'. ++for ac_file in conftest.exe conftest conftest.*; do ++ test -f "$ac_file" || continue ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; ++ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` ++ break;; ++ * ) break;; ++ esac ++done ++else ++ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f conftest$ac_cv_exeext ++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 ++echo "${ECHO_T}$ac_cv_exeext" >&6; } ++ ++rm -f conftest.$ac_ext ++EXEEXT=$ac_cv_exeext ++ac_exeext=$EXEEXT ++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 ++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } ++if test "${ac_cv_objext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.o conftest.obj ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ for ac_file in conftest.o conftest.obj conftest.*; do ++ test -f "$ac_file" || continue; ++ case $ac_file in ++ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; ++ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` ++ break;; ++ esac ++done ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&5 ++echo "$as_me: error: cannot compute suffix of object files: cannot compile ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++rm -f conftest.$ac_cv_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 ++echo "${ECHO_T}$ac_cv_objext" >&6; } ++OBJEXT=$ac_cv_objext ++ac_objext=$OBJEXT ++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 ++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } ++if test "${ac_cv_c_compiler_gnu+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++#ifndef __GNUC__ ++ choke me ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_compiler_gnu=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_compiler_gnu=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ac_cv_c_compiler_gnu=$ac_compiler_gnu ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 ++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } ++GCC=`test $ac_compiler_gnu = yes && echo yes` ++ac_test_CFLAGS=${CFLAGS+set} ++ac_save_CFLAGS=$CFLAGS ++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 ++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_g+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_save_c_werror_flag=$ac_c_werror_flag ++ ac_c_werror_flag=yes ++ ac_cv_prog_cc_g=no ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_g=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ CFLAGS="" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : + else +- echo 'void f(){}' > conftest.c +-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_c_werror_flag=$ac_save_c_werror_flag ++ CFLAGS="-g" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes + else +- ac_cv_prog_cc_g=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-rm -f conftest* + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + +-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ac_c_werror_flag=$ac_save_c_werror_flag ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } + if test "$ac_test_CFLAGS" = set; then +- CFLAGS="$ac_save_CFLAGS" ++ CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" +@@ -1967,6 +3906,143 @@ + CFLAGS= + fi + fi ++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 ++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } ++if test "${ac_cv_prog_cc_c89+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_prog_cc_c89=no ++ac_save_CC=$CC ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#include ++#include ++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ ++struct buf { int x; }; ++FILE * (*rcsopen) (struct buf *, struct stat *, int); ++static char *e (p, i) ++ char **p; ++ int i; ++{ ++ return p[i]; ++} ++static char *f (char * (*g) (char **, int), char **p, ...) ++{ ++ char *s; ++ va_list v; ++ va_start (v,p); ++ s = g (p, va_arg (v,int)); ++ va_end (v); ++ return s; ++} ++ ++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has ++ function prototypes and stuff, but not '\xHH' hex character constants. ++ These don't provoke an error unfortunately, instead are silently treated ++ as 'x'. The following induces an error, until -std is added to get ++ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an ++ array size at least. It's necessary to write '\x00'==0 to get something ++ that's true only with -std. */ ++int osf4_cc_array ['\x00' == 0 ? 1 : -1]; ++ ++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters ++ inside strings and character constants. */ ++#define FOO(x) 'x' ++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; ++ ++int test (int i, double x); ++struct s1 {int (*f) (int a);}; ++struct s2 {int (*f) (double a);}; ++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); ++int argc; ++char **argv; ++int ++main () ++{ ++return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ++ ; ++ return 0; ++} ++_ACEOF ++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ ++ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" ++do ++ CC="$ac_save_CC $ac_arg" ++ rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_prog_cc_c89=$ac_arg ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext ++ test "x$ac_cv_prog_cc_c89" != "xno" && break ++done ++rm -f conftest.$ac_ext ++CC=$ac_save_CC ++ ++fi ++# AC_CACHE_VAL ++case "x$ac_cv_prog_cc_c89" in ++ x) ++ { echo "$as_me:$LINENO: result: none needed" >&5 ++echo "${ECHO_T}none needed" >&6; } ;; ++ xno) ++ { echo "$as_me:$LINENO: result: unsupported" >&5 ++echo "${ECHO_T}unsupported" >&6; } ;; ++ *) ++ CC="$CC $ac_cv_prog_cc_c89" ++ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 ++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; ++esac ++ ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + + esac + +@@ -2016,106 +4092,274 @@ + #### should make an entry in src/config.h, don't forget to add an + #### #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:2021: 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 +- rm -f conftestdata +-if ln -s X conftestdata 2>/dev/null +-then +- rm -f conftestdata +- ac_cv_prog_LN_S="ln -s" +-else +- ac_cv_prog_LN_S=ln +-fi +-fi +-LN_S="$ac_cv_prog_LN_S" +-if test "$ac_cv_prog_LN_S" = "ln -s"; then +- echo "$ac_t""yes" 1>&6 ++{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 ++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } ++LN_S=$as_ln_s ++if test "$LN_S" = "ln -s"; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 ++echo "${ECHO_T}no, using $LN_S" >&6; } + fi + +-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:2042: checking how to run the C preprocessor" >&5 ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu ++{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 ++echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= + fi + if test -z "$CPP"; then +-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ if test "${ac_cv_prog_CPP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- # This must be in double quotes, not single quotes, because CPP may get +- # substituted into the Makefile and "${CC-cc}" will confuse make. +- CPP="${CC-cc} -E" ++ # Double quotes because CPP needs to be expanded ++ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" ++ do ++ ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. + # 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:2063: \"$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 +- : ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- 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:2080: \"$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 ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then + : + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- 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:2097: \"$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 +- : ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- CPP=/lib/cpp ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ # Broken: success on invalid input. ++continue ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break + fi +-rm -f conftest* ++ ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ break + fi +-rm -f conftest* +- ac_cv_prog_CPP="$CPP" ++ ++ done ++ ac_cv_prog_CPP=$CPP ++ ++fi ++ CPP=$ac_cv_prog_CPP ++else ++ ac_cv_prog_CPP=$CPP ++fi ++{ echo "$as_me:$LINENO: result: $CPP" >&5 ++echo "${ECHO_T}$CPP" >&6; } ++ac_preproc_ok=false ++for ac_c_preproc_warn_flag in '' yes ++do ++ # Use a header file that comes with gcc, so configuring glibc ++ # with a fresh cross-compiler works. ++ # Prefer to if __STDC__ is defined, since ++ # exists even on freestanding compilers. ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. "Syntax error" is here to catch this case. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ Syntax error ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ : ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Broken: fails on valid input. ++continue ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++ ++ # OK, works on sane cases. Now check whether nonexistent headers ++ # can be detected and how. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ # Broken: success on invalid input. ++continue ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ # Passes both tests. ++ac_preproc_ok=: ++break + fi +- CPP="$ac_cv_prog_CPP" ++ ++rm -f conftest.err conftest.$ac_ext ++ ++done ++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. ++rm -f conftest.err conftest.$ac_ext ++if $ac_preproc_ok; then ++ : + else +- ac_cv_prog_CPP="$CPP" ++ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&5 ++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check ++See \`config.log' for more details." >&2;} ++ { (exit 1); exit 1; }; } + fi +-echo "$ac_t""$CPP" 1>&6 ++ ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + + # Find a good install program. We prefer a C program (faster), + # so one script is as good as another. But avoid the broken or +@@ -2124,151 +4368,410 @@ + # SunOS /usr/etc/install + # IRIX /sbin/install + # AIX /bin/install ++# AmigaOS /C/install, which installs bootblocks on floppy discs + # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag + # AFS /usr/afsws/bin/install, which mishandles nonexistent args + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# OS/2's system install, which has a completely different semantic + # ./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:2133: checking for a BSD compatible install" >&5 ++{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 ++echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } + if test -z "$INSTALL"; then +-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++if test "${ac_cv_path_install+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" +- for ac_dir in $PATH; do +- # Account for people who put trailing slashes in PATH elements. +- case "$ac_dir/" in +- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; +- *) +- # OSF1 and SCO ODT 3.0 have their own names for install. +- # Don't use installbsd from OSF since it installs stuff as root +- # by default. +- for ac_prog in ginstall scoinst install; do +- if test -f $ac_dir/$ac_prog; then ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ # Account for people who put trailing slashes in PATH elements. ++case $as_dir/ in ++ ./ | .// | /cC/* | \ ++ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ++ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ ++ /usr/ucb/* ) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ # Don't use installbsd from OSF since it installs stuff as root ++ # by default. ++ for ac_prog in ginstall scoinst install; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && +- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then ++ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : ++ elif test $ac_prog = install && ++ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then ++ # program-specific install script used by HP pwplus--don't use. ++ : + else +- ac_cv_path_install="$ac_dir/$ac_prog -c" +- break 2 ++ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" ++ break 3 + fi + fi + done +- ;; +- esac +- done +- IFS="$ac_save_IFS" ++ done ++ ;; ++esac ++done ++IFS=$as_save_IFS ++ + + fi + if test "${ac_cv_path_install+set}" = set; then +- INSTALL="$ac_cv_path_install" ++ INSTALL=$ac_cv_path_install + else +- # As a last resort, use the slow shell script. We don't cache a +- # path for INSTALL within a source directory, because that will ++ # As a last resort, use the slow shell script. Don't cache a ++ # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is +- # removed, or if the path is relative. +- INSTALL="$ac_install_sh" ++ # removed, or if the value is a relative name. ++ INSTALL=$ac_install_sh + fi + fi +-echo "$ac_t""$INSTALL" 1>&6 ++{ echo "$as_me:$LINENO: result: $INSTALL" >&5 ++echo "${ECHO_T}$INSTALL" >&6; } + + # Use test -z because SunOS4 sh mishandles braces in ${var-val}. + # It thinks the first close brace ends the variable substitution. + test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' ++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + for ac_prog in 'bison -y' byacc + do +-# Extract the first word of "$ac_prog", so it can be a program name with args. ++ # 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:2190: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_YACC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_YACC="$ac_prog" +- break +- fi +- done +- IFS="$ac_save_ifs" ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_YACC="$ac_prog" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ + fi + fi +-YACC="$ac_cv_prog_YACC" ++YACC=$ac_cv_prog_YACC + if test -n "$YACC"; then +- echo "$ac_t""$YACC" 1>&6 ++ { echo "$as_me:$LINENO: result: $YACC" >&5 ++echo "${ECHO_T}$YACC" >&6; } + else +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +-test -n "$YACC" && break ++ ++ test -n "$YACC" && break + done + test -n "$YACC" || YACC="yacc" + + if test "x$RANLIB" = x; then +- # Extract the first word of "ranlib", so it can be a program name with args. +-set dummy ranlib; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:2224: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ranlib; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_RANLIB+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="$PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_RANLIB="ranlib" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +-fi ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi + fi +-RANLIB="$ac_cv_prog_RANLIB" ++RANLIB=$ac_cv_prog_RANLIB + if test -n "$RANLIB"; then +- echo "$ac_t""$RANLIB" 1>&6 ++ { echo "$as_me:$LINENO: result: $RANLIB" >&5 ++echo "${ECHO_T}$RANLIB" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_RANLIB"; then ++ ac_ct_RANLIB=$RANLIB ++ # Extract the first word of "ranlib", so it can be a program name with args. ++set dummy ranlib; ac_word=$2 ++{ echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } ++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test -n "$ac_ct_RANLIB"; then ++ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then ++ ac_cv_prog_ac_ct_RANLIB="ranlib" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB ++if test -n "$ac_ct_RANLIB"; then ++ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 ++echo "${ECHO_T}$ac_ct_RANLIB" >&6; } ++else ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } ++fi ++ ++ if test "x$ac_ct_RANLIB" = x; then ++ RANLIB=":" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&5 ++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ++whose name does not start with the host triplet. If you think this ++configuration is useful to you, please write to autoconf@gnu.org." >&2;} ++ac_tool_warned=yes ;; ++esac ++ RANLIB=$ac_ct_RANLIB ++ fi ++else ++ RANLIB="$ac_cv_prog_RANLIB" ++fi ++ ++fi ++ ++ ++ ++{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 ++echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ # Extract the first word of "grep ggrep" to use in msg output ++if test -z "$GREP"; then ++set dummy grep ggrep; ac_prog_name=$2 ++if test "${ac_cv_path_GREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_GREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in grep ggrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue ++ # Check for GNU ac_path_GREP and select it if it is found. ++ # Check for GNU $ac_path_GREP ++case `"$ac_path_GREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'GREP' >> "conftest.nl" ++ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_GREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_GREP="$ac_path_GREP" ++ ac_path_GREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_GREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ ++GREP="$ac_cv_path_GREP" ++if test -z "$GREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ ++else ++ ac_cv_path_GREP=$GREP ++fi ++ ++ ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 ++echo "${ECHO_T}$ac_cv_path_GREP" >&6; } ++ GREP="$ac_cv_path_GREP" ++ ++ ++{ echo "$as_me:$LINENO: checking for egrep" >&5 ++echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 ++ then ac_cv_path_EGREP="$GREP -E" ++ else ++ # Extract the first word of "egrep" to use in msg output ++if test -z "$EGREP"; then ++set dummy egrep; ac_prog_name=$2 ++if test "${ac_cv_path_EGREP+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_path_EGREP_found=false ++# Loop through the user's path and test for each of PROGNAME-LIST ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_prog in egrep; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" ++ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue ++ # Check for GNU ac_path_EGREP and select it if it is found. ++ # Check for GNU $ac_path_EGREP ++case `"$ac_path_EGREP" --version 2>&1` in ++*GNU*) ++ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; ++*) ++ ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" ++ while : ++ do ++ cat "conftest.in" "conftest.in" >"conftest.tmp" ++ mv "conftest.tmp" "conftest.in" ++ cp "conftest.in" "conftest.nl" ++ echo 'EGREP' >> "conftest.nl" ++ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break ++ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ++ ac_count=`expr $ac_count + 1` ++ if test $ac_count -gt ${ac_path_EGREP_max-0}; then ++ # Best one so far, save it but keep looking for a better one ++ ac_cv_path_EGREP="$ac_path_EGREP" ++ ac_path_EGREP_max=$ac_count ++ fi ++ # 10*(2^10) chars as input seems more than enough ++ test $ac_count -gt 10 && break ++ done ++ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; ++esac ++ ++ ++ $ac_path_EGREP_found && break 3 ++ done ++done ++ ++done ++IFS=$as_save_IFS ++ ++ ++fi ++ ++EGREP="$ac_cv_path_EGREP" ++if test -z "$EGREP"; then ++ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 ++echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} ++ { (exit 1); exit 1; }; } ++fi ++ + else +- echo "$ac_t""no" 1>&6 ++ ac_cv_path_EGREP=$EGREP + fi + ++ ++ fi + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 ++echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } ++ EGREP="$ac_cv_path_EGREP" ++ ++ + +-echo $ac_n "checking for AIX""... $ac_c" 1>&6 +-echo "configure:2254: checking for AIX" >&5 +-cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for AIX... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #ifdef _AIX + yes + #endif + +-EOF ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "yes" >/dev/null 2>&1; then +- rm -rf conftest* +- echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF ++ $EGREP "yes" >/dev/null 2>&1; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++cat >>confdefs.h <<\_ACEOF + #define _ALL_SOURCE 1 +-EOF ++_ACEOF + + else +- rm -rf conftest* +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + rm -f conftest* + +@@ -2276,12 +4779,12 @@ + + #### Extract some information from the operating system and machine files. + +-echo "checking the machine- and system-dependent files to find out ++{ echo "$as_me:$LINENO: 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:2283: checking the machine- and system-dependent files to find out ++ - whether the GNU malloc routines are usable..." >&5 ++echo "$as_me: 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 ++ - whether the GNU malloc routines are usable..." >&6;} + + ### First figure out CFLAGS (which we use for running the compiler here) + ### and REAL_CFLAGS (which we use for real compilation). +@@ -2370,7 +4873,7 @@ + + #ifndef LD_SWITCH_X_SITE_AUX + #define LD_SWITCH_X_SITE_AUX +-#endif ++#endif + + configure___ ld_switch_system=LD_SWITCH_SYSTEM + configure___ ld_switch_machine=LD_SWITCH_MACHINE +@@ -2419,343 +4922,539 @@ + CPPFLAGS="$c_switch_system $c_switch_machine $CPPFLAGS" + fi + +- +- # Check whether --enable-largefile or --disable-largefile was given. ++# Check whether --enable-largefile was given. + if test "${enable_largefile+set}" = set; then +- enableval="$enable_largefile" +- : ++ enableval=$enable_largefile; + fi + +- if test "$enable_largefile" != no; then ++if test "$enable_largefile" != no; then + +- echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6 +-echo "configure:2433: checking for special C compiler options needed for large files" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_largefile_CC'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 ++echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } ++if test "${ac_cv_sys_largefile_CC+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_sys_largefile_CC=no +- if test "$GCC" != yes; then +- # IRIX 6.2 and later do not support large files by default, +- # so use the C compiler's -n32 option if that helps. +- cat > conftest.$ac_ext < +- int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; +- +-int main() { +- +-; return 0; } +-EOF +-if { (eval echo configure:2451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_save_CC="$CC" +- CC="$CC -n32" +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +- int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; +- +-int main() { +- +-; return 0; } +-EOF +-if { (eval echo configure:2469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_sys_largefile_CC=' -n32' ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++ rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +- CC="$ac_save_CC" ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ + fi +-rm -f conftest* +- fi ++ ++rm -f core conftest.err conftest.$ac_objext ++ CC="$CC -n32" ++ rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sys_largefile_CC=' -n32'; break ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ + fi + +-echo "$ac_t""$ac_cv_sys_largefile_CC" 1>&6 +- if test "$ac_cv_sys_largefile_CC" != no; then +- CC="$CC$ac_cv_sys_largefile_CC" +- fi ++rm -f core conftest.err conftest.$ac_objext ++ break ++ done ++ CC=$ac_save_CC ++ rm -f conftest.$ac_ext ++ fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 ++echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } ++ if test "$ac_cv_sys_largefile_CC" != no; then ++ CC=$CC$ac_cv_sys_largefile_CC ++ fi + +- echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6 +-echo "configure:2489: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 ++echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } ++if test "${ac_cv_sys_file_offset_bits+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ while :; do + ac_cv_sys_file_offset_bits=no +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +- int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; +- +-int main() { +- +-; return 0; } +-EOF +-if { (eval echo configure:2504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- cat > conftest.$ac_ext <&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #define _FILE_OFFSET_BITS 64 + #include +- int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1]; +- +- +-int main() { +- +-; return 0; } +-EOF +-if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_sys_file_offset_bits=64 ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sys_file_offset_bits=64; break + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ break ++done + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 ++echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } ++if test "$ac_cv_sys_file_offset_bits" != no; then + +-echo "$ac_t""$ac_cv_sys_file_offset_bits" 1>&6 +- if test "$ac_cv_sys_file_offset_bits" != no; then +- cat >> confdefs.h <>confdefs.h <<_ACEOF + #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits +-EOF ++_ACEOF + +- fi +- echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6 +-echo "configure:2542: checking for _LARGE_FILES value needed for large files" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++fi ++rm -f conftest* ++ { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 ++echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } ++if test "${ac_cv_sys_large_files+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ while :; do + ac_cv_sys_large_files=no +- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +- : ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- cat > conftest.$ac_ext <&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +- +-int main() { + +-; return 0; } +-EOF +-if { (eval echo configure:2571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_sys_large_files=1 +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-fi +-rm -f conftest* + fi + +-echo "$ac_t""$ac_cv_sys_large_files" 1>&6 +- if test "$ac_cv_sys_large_files" != no; then +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#define _LARGE_FILES 1 ++#include ++ /* Check that off_t can represent 2**63 - 1 correctly. ++ We can't simply define LARGE_OFF_T to be 9223372036854775807, ++ since some C++ compilers masquerading as C compilers ++ incorrectly reject 9223372036854775807. */ ++#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) ++ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 ++ && LARGE_OFF_T % 2147483647 == 1) ++ ? 1 : -1]; ++int ++main () ++{ + +-# Sound support for GNU/Linux and the free BSDs. +-for ac_hdr in machine/soundcard.h sys/soundcard.h soundcard.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2598: 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:2608: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sys_large_files=1; break + else +- echo "$ac_t""no" 1>&6 +-fi +-done ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-# Emulation library used on NetBSD. +-echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6 +-echo "configure:2636: checking for _oss_ioctl in -lossaudio" >&5 +-ac_lib_var=`echo ossaudio'_'_oss_ioctl | 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="-lossaudio $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 +- LIBSOUND=-lossaudio +-else +- echo "$ac_t""no" 1>&6 +-LIBSOUND= +-fi + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ break ++done ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 ++echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } ++if test "$ac_cv_sys_large_files" != no; then + ++cat >>confdefs.h <<_ACEOF ++#define _LARGE_FILES $ac_cv_sys_large_files ++_ACEOF + +-for ac_hdr in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ +- linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ +- termcap.h stdio_ext.h fcntl.h term.h strings.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2684: 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:2694: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" + fi + rm -f conftest* + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 +-fi +-done + +-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:2721: 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 <&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include + #include + #include + #include +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2734: \"$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* ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_header_stdc=yes + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_header_stdc=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_stdc=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. +-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-EOF ++ ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "memchr" >/dev/null 2>&1; then ++ $EGREP "memchr" >/dev/null 2>&1; then + : + else +- rm -rf conftest* + ac_cv_header_stdc=no + fi + rm -f conftest* +@@ -2764,16 +5463,19 @@ + + 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 <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-EOF ++ ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "free" >/dev/null 2>&1; then ++ $EGREP "free" >/dev/null 2>&1; then + : + else +- rm -rf conftest* + ac_cv_header_stdc=no + fi + rm -f conftest* +@@ -2782,168 +5484,1062 @@ + + if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. +-if test "$cross_compiling" = yes; then ++ if test "$cross_compiling" = yes; then + : + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +-int main () { int i; for (i = 0; i < 256; i++) +-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); +-exit (0); } ++#include ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif + +-EOF +-if { (eval echo configure:2801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + : + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_header_stdc=no ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_header_stdc=no + fi +-rm -fr conftest* ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + ++ + fi + fi +- +-echo "$ac_t""$ac_cv_header_stdc" 1>&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } + if test $ac_cv_header_stdc = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define STDC_HEADERS 1 +-EOF ++_ACEOF + + fi + +-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:2825: 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 +-#include +-int main() { +-struct tm *tp; +-; return 0; } +-EOF +-if { (eval echo configure:2839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_header_time=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_header_time=no +-fi +-rm -f conftest* +-fi ++# On IRIX 5.3, sys/types and inttypes.h are conflicting. + +-echo "$ac_t""$ac_cv_header_time" 1>&6 +-if test $ac_cv_header_time = yes; then +- cat >> confdefs.h <<\EOF +-#define TIME_WITH_SYS_TIME 1 +-EOF + +-fi + +-echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 +-echo "configure:2860: 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 +-/* NetBSD declares sys_siglist in unistd.h. */ +-#ifdef HAVE_UNISTD_H +-#include +-#endif +-int main() { +-char *msg = *(sys_siglist + 1); +-; return 0; } +-EOF +-if { (eval echo configure:2877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_decl_sys_siglist=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_decl_sys_siglist=no ++ ++ ++ ++ ++ ++ ++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ ++ inttypes.h stdint.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++ ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_Header=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_Header=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++ ++ ++ ++ ++for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++# Emulation library used on NetBSD. ++{ echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5 ++echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6; } ++if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lossaudio $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char _oss_ioctl (); ++int ++main () ++{ ++return _oss_ioctl (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_ossaudio__oss_ioctl=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_ossaudio__oss_ioctl=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 ++echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6; } ++if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then ++ LIBSOUND=-lossaudio ++else ++ LIBSOUND= ++fi ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ ++ linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ ++ termcap.h stdio_ext.h fcntl.h term.h strings.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ ++{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 ++echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } ++if test "${ac_cv_header_stdc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#include ++#include ++ ++int ++main () ++{ ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_header_stdc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_stdc=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ ++if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "memchr" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no ++fi ++rm -f conftest* ++ ++fi ++ ++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 <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "free" >/dev/null 2>&1; then ++ : ++else ++ ac_cv_header_stdc=no + fi + rm -f conftest* ++ ++fi ++ ++if test $ac_cv_header_stdc = yes; then ++ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. ++ if test "$cross_compiling" = yes; then ++ : ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#if ((' ' & 0x0FF) == 0x020) ++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) ++#else ++# define ISLOWER(c) \ ++ (('a' <= (c) && (c) <= 'i') \ ++ || ('j' <= (c) && (c) <= 'r') \ ++ || ('s' <= (c) && (c) <= 'z')) ++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) ++#endif ++ ++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) ++int ++main () ++{ ++ int i; ++ for (i = 0; i < 256; i++) ++ if (XOR (islower (i), ISLOWER (i)) ++ || toupper (i) != TOUPPER (i)) ++ return 2; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ : ++else ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_header_stdc=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ ++fi ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 ++echo "${ECHO_T}$ac_cv_header_stdc" >&6; } ++if test $ac_cv_header_stdc = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define STDC_HEADERS 1 ++_ACEOF ++ ++fi ++ ++{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 ++echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } ++if test "${ac_cv_header_time+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++#include ++ ++int ++main () ++{ ++if ((struct tm *) 0) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_header_time=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_time=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 ++echo "${ECHO_T}$ac_cv_header_time" >&6; } ++if test $ac_cv_header_time = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define TIME_WITH_SYS_TIME 1 ++_ACEOF ++ ++fi ++ ++{ echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5 ++echo $ECHO_N "checking whether sys_siglist is declared... $ECHO_C" >&6; } ++if test "${ac_cv_have_decl_sys_siglist+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++/* NetBSD declares sys_siglist in unistd.h. */ ++#ifdef HAVE_UNISTD_H ++# include ++#endif ++ ++ ++int ++main () ++{ ++#ifndef sys_siglist ++ char *p = (char *) sys_siglist; ++ return !p; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_sys_siglist=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_have_decl_sys_siglist=no + fi + +-echo "$ac_t""$ac_cv_decl_sys_siglist" 1>&6 +-if test $ac_cv_decl_sys_siglist = yes; then +- cat >> confdefs.h <<\EOF +-#define SYS_SIGLIST_DECLARED 1 +-EOF ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_sys_siglist" >&6; } ++if test $ac_cv_have_decl_sys_siglist = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_SYS_SIGLIST 1 ++_ACEOF ++ ++ ++else ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_SYS_SIGLIST 0 ++_ACEOF ++ + + fi + +-echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 +-echo "configure:2898: checking for sys/wait.h that is POSIX.1 compatible" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_wait_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include + #include + #ifndef WEXITSTATUS +-#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) ++# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) + #endif + #ifndef WIFEXITED +-#define WIFEXITED(stat_val) (((stat_val) & 255) == 0) ++# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) + #endif +-int main() { +-int s; +-wait (&s); +-s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; +-; return 0; } +-EOF +-if { (eval echo configure:2919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ ++int ++main () ++{ ++ int s; ++ wait (&s); ++ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_header_sys_wait_h=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_header_sys_wait_h=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_header_sys_wait_h=no + fi + +-echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } + if test $ac_cv_header_sys_wait_h = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define HAVE_SYS_WAIT_H 1 +-EOF ++_ACEOF + + fi + + +-echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 +-echo "configure:2941: checking for struct utimbuf" >&5 +-if eval "test \"`echo '$''{'emacs_cv_struct_utimbuf'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for struct utimbuf" >&5 ++echo $ECHO_N "checking for struct utimbuf... $ECHO_C" >&6; } ++if test "${emacs_cv_struct_utimbuf+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #ifdef TIME_WITH_SYS_TIME + #include + #include +@@ -2957,113 +6553,226 @@ + #ifdef HAVE_UTIME_H + #include + #endif +-int main() { ++int ++main () ++{ + static struct utimbuf x; x.actime = x.modtime; +-; return 0; } +-EOF +-if { (eval echo configure:2965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_struct_utimbuf=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_struct_utimbuf=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_struct_utimbuf=no + fi + +-echo "$ac_t""$emacs_cv_struct_utimbuf" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_struct_utimbuf" >&5 ++echo "${ECHO_T}$emacs_cv_struct_utimbuf" >&6; } + if test $emacs_cv_struct_utimbuf = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_STRUCT_UTIMBUF 1 +-EOF ++_ACEOF + + fi + +-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +-echo "configure:2986: 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 ++{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 ++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } ++if test "${ac_cv_type_signal+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include + #include +-#ifdef signal +-#undef signal +-#endif +-#ifdef __cplusplus +-extern "C" void (*signal (int, void (*)(int)))(int); +-#else +-void (*signal ()) (); +-#endif + +-int main() { +-int i; +-; return 0; } +-EOF +-if { (eval echo configure:3008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_type_signal=void +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* ++int ++main () ++{ ++return *(signal (0, 0)) (0) == 1; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_type_signal=int ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_type_signal=void + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 ++echo "${ECHO_T}$ac_cv_type_signal" >&6; } + +-echo "$ac_t""$ac_cv_type_signal" 1>&6 +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define RETSIGTYPE $ac_cv_type_signal +-EOF ++_ACEOF + + + +-echo $ac_n "checking for speed_t""... $ac_c" 1>&6 +-echo "configure:3028: checking for speed_t" >&5 +-if eval "test \"`echo '$''{'emacs_cv_speed_t'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for speed_t" >&5 ++echo $ECHO_N "checking for speed_t... $ECHO_C" >&6; } ++if test "${emacs_cv_speed_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + speed_t x = 1; +-; return 0; } +-EOF +-if { (eval echo configure:3040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_speed_t=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_speed_t=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_speed_t=no + fi + +-echo "$ac_t""$emacs_cv_speed_t" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_speed_t" >&5 ++echo "${ECHO_T}$emacs_cv_speed_t" >&6; } + if test $emacs_cv_speed_t = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_SPEED_T 1 +-EOF ++_ACEOF + + fi + +-echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 +-echo "configure:3061: checking for struct timeval" >&5 +-if eval "test \"`echo '$''{'emacs_cv_struct_timeval'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for struct timeval" >&5 ++echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6; } ++if test "${emacs_cv_struct_timeval+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #ifdef TIME_WITH_SYS_TIME + #include + #include +@@ -3074,522 +6783,990 @@ + #include + #endif + #endif +-int main() { ++int ++main () ++{ + static struct timeval x; x.tv_sec = x.tv_usec; +-; return 0; } +-EOF +-if { (eval echo configure:3082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_struct_timeval=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_struct_timeval=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_struct_timeval=no + fi + +-echo "$ac_t""$emacs_cv_struct_timeval" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_struct_timeval" >&5 ++echo "${ECHO_T}$emacs_cv_struct_timeval" >&6; } + HAVE_TIMEVAL=$emacs_cv_struct_timeval + if test $emacs_cv_struct_timeval = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_TIMEVAL 1 +-EOF ++_ACEOF + + fi + +-echo $ac_n "checking for struct exception""... $ac_c" 1>&6 +-echo "configure:3104: checking for struct exception" >&5 +-if eval "test \"`echo '$''{'emacs_cv_struct_exception'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for struct exception" >&5 ++echo $ECHO_N "checking for struct exception... $ECHO_C" >&6; } ++if test "${emacs_cv_struct_exception+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1; +-; return 0; } +-EOF +-if { (eval echo configure:3116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_struct_exception=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_struct_exception=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_struct_exception=no + fi + +-echo "$ac_t""$emacs_cv_struct_exception" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_struct_exception" >&5 ++echo "${ECHO_T}$emacs_cv_struct_exception" >&6; } + HAVE_EXCEPTION=$emacs_cv_struct_exception + if test $emacs_cv_struct_exception != yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define NO_MATHERR 1 +-EOF ++_ACEOF ++ ++fi ++ ++{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } ++if test "${ac_cv_struct_tm+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include ++ ++int ++main () ++{ ++struct tm *tp; tp->tm_sec; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_struct_tm=time.h ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_struct_tm=sys/time.h ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 ++echo "${ECHO_T}$ac_cv_struct_tm" >&6; } ++if test $ac_cv_struct_tm = sys/time.h; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define TM_IN_SYS_TIME 1 ++_ACEOF + + fi + +-echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 +-echo "configure:3138: 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 ++{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5 ++echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; } ++if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include <$ac_cv_struct_tm> ++ ++ ++int ++main () ++{ ++static struct tm ac_aggr; ++if (ac_aggr.tm_zone) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_member_struct_tm_tm_zone=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++#include <$ac_cv_struct_tm> ++ ++ ++int ++main () ++{ ++static struct tm ac_aggr; ++if (sizeof ac_aggr.tm_zone) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_member_struct_tm_tm_zone=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_member_struct_tm_tm_zone=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 ++echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; } ++if test $ac_cv_member_struct_tm_tm_zone = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_TM_TM_ZONE 1 ++_ACEOF ++ ++ ++fi ++ ++if test "$ac_cv_member_struct_tm_tm_zone" = yes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_TM_ZONE 1 ++_ACEOF ++ + else +- cat > conftest.$ac_ext < ++ { echo "$as_me:$LINENO: checking whether tzname is declared" >&5 ++echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; } ++if test "${ac_cv_have_decl_tzname+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { +-struct tm *tp; tp->tm_sec; +-; return 0; } +-EOF +-if { (eval echo configure:3151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_struct_tm=time.h ++ ++int ++main () ++{ ++#ifndef tzname ++ char *p = (char *) tzname; ++ return !p; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_have_decl_tzname=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_struct_tm=sys/time.h ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_have_decl_tzname=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5 ++echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; } ++if test $ac_cv_have_decl_tzname = yes; then + +-echo "$ac_t""$ac_cv_struct_tm" 1>&6 +-if test $ac_cv_struct_tm = sys/time.h; then +- cat >> confdefs.h <<\EOF +-#define TM_IN_SYS_TIME 1 +-EOF ++cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_TZNAME 1 ++_ACEOF + +-fi + +-echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 +-echo "configure:3172: 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> +-int main() { +-struct tm tm; tm.tm_zone; +-; return 0; } +-EOF +-if { (eval echo configure:3185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_struct_tm_zone=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_struct_tm_zone=no +-fi +-rm -f conftest* ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_DECL_TZNAME 0 ++_ACEOF ++ ++ + fi + +-echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6 +-if test "$ac_cv_struct_tm_zone" = yes; then +- cat >> confdefs.h <<\EOF +-#define HAVE_TM_ZONE 1 +-EOF + ++ { echo "$as_me:$LINENO: checking for tzname" >&5 ++echo $ECHO_N "checking for tzname... $ECHO_C" >&6; } ++if test "${ac_cv_var_tzname+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo $ac_n "checking for tzname""... $ac_c" 1>&6 +-echo "configure:3205: 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 <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-#ifndef tzname /* For SGI. */ +-extern char *tzname[]; /* RS6000 and others reject char **tzname. */ ++#if !HAVE_DECL_TZNAME ++extern char *tzname[]; + #endif +-int main() { +-atoi(*tzname); +-; return 0; } +-EOF +-if { (eval echo configure:3220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ++int ++main () ++{ ++return tzname[0][0]; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_var_tzname=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_var_tzname=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_var_tzname=no + fi + +-echo "$ac_t""$ac_cv_var_tzname" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5 ++echo "${ECHO_T}$ac_cv_var_tzname" >&6; } + if test $ac_cv_var_tzname = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define HAVE_TZNAME 1 +-EOF ++_ACEOF + + fi + fi + +-echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 +-echo "configure:3242: checking for tm_gmtoff in struct tm" >&5 +-if eval "test \"`echo '$''{'emacs_cv_tm_gmtoff'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; } ++if test "${emacs_cv_tm_gmtoff+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + struct tm t; t.tm_gmtoff = 0 +-; return 0; } +-EOF +-if { (eval echo configure:3254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_tm_gmtoff=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_tm_gmtoff=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_tm_gmtoff=no + fi + +-echo "$ac_t""$emacs_cv_tm_gmtoff" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_tm_gmtoff" >&5 ++echo "${ECHO_T}$emacs_cv_tm_gmtoff" >&6; } + if test $emacs_cv_tm_gmtoff = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_TM_GMTOFF 1 +-EOF ++_ACEOF + + fi + + +-echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 +-echo "configure:3276: checking for ${CC-cc} option to accept ANSI C" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_cv_prog_cc_stdc=no +-ac_save_CC="$CC" +-# Don't try gcc -ansi; that turns off useful extensions and +-# breaks some systems' header files. +-# AIX -qlanglvl=ansi +-# Ultrix and OSF/1 -std1 +-# HP-UX 10.20 and later -Ae +-# HP-UX older versions -Aa -D_HPUX_SOURCE +-# SVR4 -Xc -D__EXTENSIONS__ +-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +-do +- CC="$ac_save_CC $ac_arg" +- cat > conftest.$ac_ext < +-#include +-#include +-#include +-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +-struct buf { int x; }; +-FILE * (*rcsopen) (struct buf *, struct stat *, int); +-static char *e (p, i) +- char **p; +- int i; +-{ +- return p[i]; +-} +-static char *f (char * (*g) (char **, int), char **p, ...) +-{ +- char *s; +- va_list v; +- va_start (v,p); +- s = g (p, va_arg (v,int)); +- va_end (v); +- return s; +-} +-int test (int i, double x); +-struct s1 {int (*f) (int a);}; +-struct s2 {int (*f) (double a);}; +-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +-int argc; +-char **argv; +-int main() { +-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +-; return 0; } +-EOF +-if { (eval echo configure:3327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_prog_cc_stdc="$ac_arg"; break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-CC="$ac_save_CC" ++{ echo "$as_me:$LINENO: checking for function prototypes" >&5 ++echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6; } ++if test "$ac_cv_prog_cc_c89" != no; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + +-fi ++cat >>confdefs.h <<\_ACEOF ++#define PROTOTYPES 1 ++_ACEOF + +-case "x$ac_cv_prog_cc_stdc" in +- x|xno) +- echo "$ac_t""none needed" 1>&6 ;; +- *) +- echo "$ac_t""$ac_cv_prog_cc_stdc" 1>&6 +- CC="$CC $ac_cv_prog_cc_stdc" ;; +-esac + +-echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 +-echo "configure:3349: checking for function prototypes" >&5 +-if test "$ac_cv_prog_cc_stdc" != no; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define PROTOTYPES 1 +-EOF ++cat >>confdefs.h <<\_ACEOF ++#define __PROTOTYPES 1 ++_ACEOF + + else +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +-echo $ac_n "checking for working volatile""... $ac_c" 1>&6 +-echo "configure:3361: checking for working volatile" >&5 +-if eval "test \"`echo '$''{'ac_cv_c_volatile'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for working volatile" >&5 ++echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; } ++if test "${ac_cv_c_volatile+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-int main() { ++int ++main () ++{ + + volatile int x; +-int * volatile y; +-; return 0; } +-EOF +-if { (eval echo configure:3375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++int * volatile y = (int *) 0; ++return !x && !y; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_c_volatile=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_c_volatile=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_c_volatile=no + fi + +-echo "$ac_t""$ac_cv_c_volatile" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5 ++echo "${ECHO_T}$ac_cv_c_volatile" >&6; } + if test $ac_cv_c_volatile = no; then +- cat >> confdefs.h <<\EOF +-#define volatile +-EOF ++ ++cat >>confdefs.h <<\_ACEOF ++#define volatile ++_ACEOF + + fi + +-echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:3396: 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 <j = 5; +-} +-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ +- const int foo = 10; +-} +- +-; return 0; } +-EOF +-if { (eval echo configure:3450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 ++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } ++if test "${ac_cv_c_const+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++int ++main () ++{ ++/* FIXME: Include the comments suggested by Paul. */ ++#ifndef __cplusplus ++ /* Ultrix mips cc rejects this. */ ++ typedef int charset[2]; ++ const charset cs; ++ /* SunOS 4.1.1 cc rejects this. */ ++ char const *const *pcpcc; ++ char **ppc; ++ /* NEC SVR4.0.2 mips cc rejects this. */ ++ struct point {int x, y;}; ++ static struct point const zero = {0,0}; ++ /* AIX XL C 1.02.0.0 rejects this. ++ It does not let you subtract one const X* pointer from another in ++ an arm of an if-expression whose if-part is not a constant ++ expression */ ++ const char *g = "string"; ++ pcpcc = &g + (g ? g-g : 0); ++ /* HPUX 7.0 cc rejects these. */ ++ ++pcpcc; ++ ppc = (char**) pcpcc; ++ pcpcc = (char const *const *) ppc; ++ { /* SCO 3.2v4 cc rejects this. */ ++ char *t; ++ char const *s = 0 ? (char *) 0 : (char const *) 0; ++ ++ *t++ = 0; ++ if (s) return 0; ++ } ++ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ ++ int x[] = {25, 17}; ++ const int *foo = &x[0]; ++ ++foo; ++ } ++ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ ++ typedef const int *iptr; ++ iptr p = 0; ++ ++p; ++ } ++ { /* AIX XL C 1.02.0.0 rejects this saying ++ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ ++ struct s { int j; const int *ap[3]; }; ++ struct s *b; b->j = 5; ++ } ++ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ ++ const int foo = 10; ++ if (!foo) return 0; ++ } ++ return !cs[0] && !zero.x; ++#endif ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_c_const=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_c_const=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_c_const=no + fi + +-echo "$ac_t""$ac_cv_c_const" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 ++echo "${ECHO_T}$ac_cv_c_const" >&6; } + if test $ac_cv_c_const = no; then +- cat >> confdefs.h <<\EOF +-#define const +-EOF ++ ++cat >>confdefs.h <<\_ACEOF ++#define const ++_ACEOF + + fi + +-echo $ac_n "checking for void * support""... $ac_c" 1>&6 +-echo "configure:3471: checking for void * support" >&5 +-if eval "test \"`echo '$''{'emacs_cv_void_star'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for void * support... $ECHO_C" >&6; } ++if test "${emacs_cv_void_star+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-int main() { ++int ++main () ++{ + void * foo; +-; return 0; } +-EOF +-if { (eval echo configure:3483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_void_star=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_void_star=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_void_star=no + fi + +-echo "$ac_t""$emacs_cv_void_star" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_void_star" >&5 ++echo "${ECHO_T}$emacs_cv_void_star" >&6; } + if test $emacs_cv_void_star = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define POINTER_TYPE void +-EOF ++_ACEOF + + else +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define POINTER_TYPE char +-EOF ++_ACEOF + + fi + +-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:3509: 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 ++{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 ++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } ++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` ++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftestmake <<\EOF ++ cat >conftest.make <<\_ACEOF ++SHELL = /bin/sh + all: +- @echo 'ac_maketemp="${MAKE}"' +-EOF ++ @echo '@@@%%%=$(MAKE)=@@@%%%' ++_ACEOF + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +-if test -n "$ac_maketemp"; then +- eval ac_cv_prog_make_${ac_make}_set=yes +-else +- eval ac_cv_prog_make_${ac_make}_set=no +-fi +-rm -f conftestmake ++case `${MAKE-make} -f conftest.make 2>/dev/null` in ++ *@@@%%%=?*=@@@%%%*) ++ eval ac_cv_prog_make_${ac_make}_set=yes;; ++ *) ++ eval ac_cv_prog_make_${ac_make}_set=no;; ++esac ++rm -f conftest.make + fi +-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + SET_MAKE= + else +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" + fi + + +-echo $ac_n "checking for long file names""... $ac_c" 1>&6 +-echo "configure:3537: 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 ++{ echo "$as_me:$LINENO: checking for long file names" >&5 ++echo $ECHO_N "checking for long file names... $ECHO_C" >&6; } ++if test "${ac_cv_sys_long_file_names+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_sys_long_file_names=yes + # Test for long file names in all the places we know might matter: + # . the current directory, where building will happen + # $prefix/lib where we will be installing things + # $exec_prefix/lib likewise +-# eval it to expand exec_prefix. + # $TMPDIR if set, where it might want to write temporary files +-# if $TMPDIR is not set: + # /tmp where it might want to write temporary files + # /var/tmp likewise + # /usr/tmp likewise +-if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then +- ac_tmpdirs="$TMPDIR" +-else +- ac_tmpdirs='/tmp /var/tmp /usr/tmp' +-fi +-for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do +- test -d $ac_dir || continue +- test -w $ac_dir || continue # It is less confusing to not echo anything here. +- (echo 1 > $ac_dir/conftest9012345) 2>/dev/null +- (echo 2 > $ac_dir/conftest9012346) 2>/dev/null +- val=`cat $ac_dir/conftest9012345 2>/dev/null` +- if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then ++for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do ++ # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib ++ # in the usual case where exec_prefix is '${prefix}'. ++ case $ac_dir in #( ++ . | /* | ?:[\\/]*) ;; #( ++ *) continue;; ++ esac ++ test -w "$ac_dir/." || continue # It is less confusing to not echo anything here. ++ ac_xdir=$ac_dir/cf$$ ++ (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue ++ ac_tf1=$ac_xdir/conftest9012345 ++ ac_tf2=$ac_xdir/conftest9012346 ++ touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" || + ac_cv_sys_long_file_names=no +- rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null +- break +- fi +- rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null ++ rm -f -r "$ac_xdir" 2>/dev/null ++ test $ac_cv_sys_long_file_names = no && break + done + fi +- +-echo "$ac_t""$ac_cv_sys_long_file_names" 1>&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 ++echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6; } + if test $ac_cv_sys_long_file_names = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define HAVE_LONG_FILE_NAMES 1 +-EOF ++_ACEOF + + fi + + + #### Choose a window system. + +-# If we find X, set shell vars x_includes and x_libraries to the +-# paths, otherwise set no_x=yes. +-# 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:3588: checking for X" >&5 ++{ echo "$as_me:$LINENO: checking for X" >&5 ++echo $ECHO_N "checking for X... $ECHO_C" >&6; } ++ + +-# Check whether --with-x or --without-x was given. ++# Check whether --with-x was given. + if test "${with_x+set}" = set; then +- withval="$with_x" +- : ++ withval=$with_x; + fi + + # $have_x is `yes', `no', `disabled', or empty when we do not yet know. +@@ -3597,220 +7774,252 @@ + # The user explicitly disabled X. + have_x=disabled + else +- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then +- # Both variables are already set. +- have_x=yes +- else +-if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ case $x_includes,$x_libraries in #( ++ *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 ++echo "$as_me: error: Cannot use X directory names containing '" >&2;} ++ { (exit 1); exit 1; }; };; #( ++ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + # One or both of the vars are not set, and there is no cached value. +-ac_x_includes=NO ac_x_libraries=NO +-rm -fr conftestdir +-if mkdir conftestdir; then +- cd conftestdir +- # Make sure to not put "make" in the Imakefile rules, since we grep it out. +- cat > Imakefile <<'EOF' +-acfindx: +- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +-EOF +- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then ++ac_x_includes=no ac_x_libraries=no ++rm -f -r conftest.dir ++if mkdir conftest.dir; then ++ cd conftest.dir ++ cat >Imakefile <<'_ACEOF' ++incroot: ++ @echo incroot='${INCROOT}' ++usrlibdir: ++ @echo usrlibdir='${USRLIBDIR}' ++libdir: ++ @echo libdir='${LIBDIR}' ++_ACEOF ++ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. +- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` ++ for ac_var in incroot usrlibdir libdir; do ++ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" ++ done + # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. + for ac_extension in a so sl; do +- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && +- test -f $ac_im_libdir/libX11.$ac_extension; then +- ac_im_usrlibdir=$ac_im_libdir; break ++ if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && ++ test -f "$ac_im_libdir/libX11.$ac_extension"; then ++ ac_im_usrlibdir=$ac_im_libdir; break + fi + done + # Screen out bogus values from the imake configuration. They are + # bogus both because they are the default anyway, and because + # using them would break gcc on systems where it needs fixed includes. +- case "$ac_im_incroot" in +- /usr/include) ;; +- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; ++ case $ac_im_incroot in ++ /usr/include) ac_x_includes= ;; ++ *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; + esac +- case "$ac_im_usrlibdir" in ++ case $ac_im_usrlibdir in + /usr/lib | /lib) ;; +- *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; ++ *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; + esac + fi + cd .. +- rm -fr conftestdir ++ rm -f -r conftest.dir + fi + +-if test "$ac_x_includes" = NO; then +- # Guess where to find include files, by looking for this one X11 .h file. +- test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h ++# Standard set of common directories for X headers. ++# Check X11 before X11Rn because it is often a symlink to the current release. ++ac_x_header_dirs=' ++/usr/X11/include ++/usr/X11R6/include ++/usr/X11R5/include ++/usr/X11R4/include ++ ++/usr/include/X11 ++/usr/include/X11R6 ++/usr/include/X11R5 ++/usr/include/X11R4 ++ ++/usr/local/X11/include ++/usr/local/X11R6/include ++/usr/local/X11R5/include ++/usr/local/X11R4/include ++ ++/usr/local/include/X11 ++/usr/local/include/X11R6 ++/usr/local/include/X11R5 ++/usr/local/include/X11R4 ++ ++/usr/X386/include ++/usr/x386/include ++/usr/XFree86/include/X11 ++ ++/usr/include ++/usr/local/include ++/usr/unsupported/include ++/usr/athena/include ++/usr/local/x11r5/include ++/usr/lpp/Xamples/include ++ ++/usr/openwin/include ++/usr/openwin/share/include' + ++if test "$ac_x_includes" = no; then ++ # Guess where to find include files, by looking for Xlib.h. + # 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:3655: \"$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* ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then + # We can compile using X headers with no special include directory. + ac_x_includes= + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- # Look for the header file in a standard set of common directories. +-# Check X11 before X11Rn because it is often a symlink to the current release. +- for ac_dir in \ +- /usr/X11/include \ +- /usr/X11R6/include \ +- /usr/X11R5/include \ +- /usr/X11R4/include \ +- \ +- /usr/include/X11 \ +- /usr/include/X11R6 \ +- /usr/include/X11R5 \ +- /usr/include/X11R4 \ +- \ +- /usr/local/X11/include \ +- /usr/local/X11R6/include \ +- /usr/local/X11R5/include \ +- /usr/local/X11R4/include \ +- \ +- /usr/local/include/X11 \ +- /usr/local/include/X11R6 \ +- /usr/local/include/X11R5 \ +- /usr/local/include/X11R4 \ +- \ +- /usr/X386/include \ +- /usr/x386/include \ +- /usr/XFree86/include/X11 \ +- \ +- /usr/include \ +- /usr/local/include \ +- /usr/unsupported/include \ +- /usr/athena/include \ +- /usr/local/x11r5/include \ +- /usr/lpp/Xamples/include \ +- \ +- /usr/openwin/include \ +- /usr/openwin/share/include \ +- ; \ +- do +- if test -r "$ac_dir/$x_direct_test_include"; then +- ac_x_includes=$ac_dir +- break +- fi +- done +-fi +-rm -f conftest* +-fi # $ac_x_includes = NO ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-if test "$ac_x_libraries" = NO; then +- # Check for the libraries. ++ for ac_dir in $ac_x_header_dirs; do ++ if test -r "$ac_dir/X11/Xlib.h"; then ++ ac_x_includes=$ac_dir ++ break ++ fi ++done ++fi + +- test -z "$x_direct_test_library" && x_direct_test_library=Xt +- test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc ++rm -f conftest.err conftest.$ac_ext ++fi # $ac_x_includes = no + ++if test "$ac_x_libraries" = no; then ++ # Check for the libraries. + # See if we find them without any special options. + # Don't add to $LIBS permanently. +- 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 +- rm -rf conftest* +- LIBS="$ac_save_LIBS" ++ ac_save_LIBS=$LIBS ++ LIBS="-lX11 $LIBS" ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++int ++main () ++{ ++XrmInitialize () ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ LIBS=$ac_save_LIBS + # We can link X programs with no special library path. + ac_x_libraries= + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- LIBS="$ac_save_LIBS" +-# First see if replacing the include by lib works. +-# Check X11 before X11Rn because it is often a symlink to the current release. +-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ +- /usr/X11/lib \ +- /usr/X11R6/lib \ +- /usr/X11R5/lib \ +- /usr/X11R4/lib \ +- \ +- /usr/lib/X11 \ +- /usr/lib/X11R6 \ +- /usr/lib/X11R5 \ +- /usr/lib/X11R4 \ +- \ +- /usr/local/X11/lib \ +- /usr/local/X11R6/lib \ +- /usr/local/X11R5/lib \ +- /usr/local/X11R4/lib \ +- \ +- /usr/local/lib/X11 \ +- /usr/local/lib/X11R6 \ +- /usr/local/lib/X11R5 \ +- /usr/local/lib/X11R4 \ +- \ +- /usr/X386/lib \ +- /usr/x386/lib \ +- /usr/XFree86/lib/X11 \ +- \ +- /usr/lib \ +- /usr/local/lib \ +- /usr/unsupported/lib \ +- /usr/athena/lib \ +- /usr/local/x11r5/lib \ +- /usr/lpp/Xamples/lib \ +- /lib/usr/lib/X11 \ +- \ +- /usr/openwin/lib \ +- /usr/openwin/share/lib \ +- ; \ ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ LIBS=$ac_save_LIBS ++for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` + do ++ # Don't even attempt the hair of trying to link an X program! + for ac_extension in a so sl; do +- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then ++ if test -r "$ac_dir/libX11.$ac_extension"; then + ac_x_libraries=$ac_dir + break 2 + fi + done + done + fi +-rm -f conftest* +-fi # $ac_x_libraries = NO + +-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then +- # Didn't find X anywhere. Cache the known absence of X. +- ac_cv_have_x="have_x=no" +-else +- # Record where we found X for the cache. +- ac_cv_have_x="have_x=yes \ +- ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" +-fi ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi # $ac_x_libraries = no ++ ++case $ac_x_includes,$ac_x_libraries in #( ++ no,* | *,no | *\'*) ++ # Didn't find X, or a directory has "'" in its name. ++ ac_cv_have_x="have_x=no";; #( ++ *) ++ # Record where we found X for the cache. ++ ac_cv_have_x="have_x=yes\ ++ ac_x_includes='$ac_x_includes'\ ++ ac_x_libraries='$ac_x_libraries'" ++esac + fi +- fi ++;; #( ++ *) have_x=yes;; ++ esac + eval "$ac_cv_have_x" + fi # $with_x != no + + if test "$have_x" != yes; then +- echo "$ac_t""$have_x" 1>&6 ++ { echo "$as_me:$LINENO: result: $have_x" >&5 ++echo "${ECHO_T}$have_x" >&6; } + no_x=yes + else + # If each of the values was on the command line, it overrides each guess. + test "x$x_includes" = xNONE && x_includes=$ac_x_includes + test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries + # Update the cache value to reflect the command line values. +- ac_cv_have_x="have_x=yes \ +- ac_x_includes=$x_includes ac_x_libraries=$x_libraries" +- echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 ++ ac_cv_have_x="have_x=yes\ ++ ac_x_includes='$x_includes'\ ++ ac_x_libraries='$x_libraries'" ++ { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 ++echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } + fi + + if test "$no_x" = yes; then +@@ -3883,7 +8092,7 @@ + case ${HAVE_X11} in + yes ) HAVE_MENUS=yes ;; + esac +- ++ + if test "${opsys}" = "hpux9"; then + case "${x_libraries}" in + *X11R4* ) +@@ -3907,130 +8116,279 @@ + # Assume not, until told otherwise. + GNU_MALLOC=yes + doug_lea_malloc=yes +-echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6 +-echo "configure:3912: 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 ++echo $ECHO_N "checking for malloc_get_state... $ECHO_C" >&6; } ++if test "${ac_cv_func_malloc_get_state+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define malloc_get_state to an innocuous variant, in case declares malloc_get_state. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define malloc_get_state innocuous_malloc_get_state ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char malloc_get_state(); below. */ +-#include +-/* 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 malloc_get_state(); ++ which can conflict with char malloc_get_state (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef malloc_get_state + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char malloc_get_state (); + /* 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_malloc_get_state) || defined (__stub___malloc_get_state) ++#if defined __stub_malloc_get_state || defined __stub___malloc_get_state + choke me +-#else +-malloc_get_state(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:3940: \"$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 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_malloc_get_state=no" +-fi +-rm -f conftest* ++int ++main () ++{ ++return malloc_get_state (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_malloc_get_state=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_malloc_get_state=no + fi + +-if eval "test \"`echo '$ac_cv_func_'malloc_get_state`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_get_state" >&5 ++echo "${ECHO_T}$ac_cv_func_malloc_get_state" >&6; } ++if test $ac_cv_func_malloc_get_state = yes; then + : + else +- echo "$ac_t""no" 1>&6 +-doug_lea_malloc=no ++ doug_lea_malloc=no + fi + +-echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 +-echo "configure:3961: 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 ++echo $ECHO_N "checking for malloc_set_state... $ECHO_C" >&6; } ++if test "${ac_cv_func_malloc_set_state+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define malloc_set_state to an innocuous variant, in case declares malloc_set_state. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define malloc_set_state innocuous_malloc_set_state ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char malloc_set_state(); below. */ +-#include +-/* 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 malloc_set_state(); ++ which can conflict with char malloc_set_state (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef malloc_set_state + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char malloc_set_state (); + /* 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_malloc_set_state) || defined (__stub___malloc_set_state) ++#if defined __stub_malloc_set_state || defined __stub___malloc_set_state + choke me +-#else +-malloc_set_state(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:3989: \"$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 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_malloc_set_state=no" +-fi +-rm -f conftest* ++int ++main () ++{ ++return malloc_set_state (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_malloc_set_state=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_malloc_set_state=no + fi + +-if eval "test \"`echo '$ac_cv_func_'malloc_set_state`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_set_state" >&5 ++echo "${ECHO_T}$ac_cv_func_malloc_set_state" >&6; } ++if test $ac_cv_func_malloc_set_state = yes; then + : + else +- echo "$ac_t""no" 1>&6 +-doug_lea_malloc=no ++ doug_lea_malloc=no + fi + +-echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 +-echo "configure:4010: 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 ++echo $ECHO_N "checking whether __after_morecore_hook exists... $ECHO_C" >&6; } ++if test "${emacs_cv_var___after_morecore_hook+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + extern void (* __after_morecore_hook)(); +-int main() { ++int ++main () ++{ + __after_morecore_hook = 0 +-; return 0; } +-EOF +-if { (eval echo configure:4022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_var___after_morecore_hook=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_var___after_morecore_hook=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_var___after_morecore_hook=no + fi + +-echo "$ac_t""$emacs_cv_var___after_morecore_hook" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_var___after_morecore_hook" >&5 ++echo "${ECHO_T}$emacs_cv_var___after_morecore_hook" >&6; } + if test $emacs_cv_var___after_morecore_hook = no; then + doug_lea_malloc=no + fi +@@ -4044,123 +8402,310 @@ + GNU_MALLOC_reason=" + (Using Doug Lea's new malloc from the GNU C Library.)" + fi +- cat >> confdefs.h <<\EOF +-#define DOUG_LEA_MALLOC 1 +-EOF +- ++ cat >>confdefs.h <<\_ACEOF ++#define DOUG_LEA_MALLOC 1 ++_ACEOF ++ ++fi ++ ++if test x"${REL_ALLOC}" = x; then ++ REL_ALLOC=${GNU_MALLOC} ++fi ++ ++ ++ ++ ++for ac_header in stdlib.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-if test x"${REL_ALLOC}" = x; then +- REL_ALLOC=${GNU_MALLOC} ++ ac_header_preproc=no + fi + ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + +-for ac_hdr in stdlib.h unistd.h sys/stat.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:4063: 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:4073: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 + fi ++ + done + ++ + for ac_func in getpagesize + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:4102: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef $ac_func + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:4130: \"$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 ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-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 + +-echo $ac_n "checking for working mmap""... $ac_c" 1>&6 +-echo "configure:4155: checking for working mmap" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for working mmap" >&5 ++echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } ++if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then + ac_cv_func_mmap_fixed_mapped=no + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++/* malloc might have been renamed as rpl_malloc. */ ++#undef malloc ++ + /* Thanks to Mike Haertel and Jim Avera for this test. + Here is a matrix of mmap possibilities: + mmap private not fixed +@@ -4176,39 +8721,31 @@ + VM page cache was not coherent with the file system buffer cache + like early versions of FreeBSD and possibly contemporary NetBSD.) + For shared mappings, we should conversely verify that changes get +- propogated back to all the places they're supposed to be. ++ propagated back to all the places they're supposed to be. + + Grep wants private fixed already mapped. + The main things grep needs to know about mmap are: + * does it exist and is it safe to write into the mmap'd area + * how to use it (BSD variants) */ +-#include ++ + #include + #include + +-#if STDC_HEADERS || HAVE_STDLIB_H +-# include +-#else ++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H + char *malloc (); + #endif +-#if HAVE_UNISTD_H +-# include +-#endif +-#if HAVE_SYS_STAT_H +-# include +-#endif + + /* This mess was copied from the GNU getpagesize.h. */ +-#if !HAVE_GETPAGESIZE ++#ifndef HAVE_GETPAGESIZE + /* Assume that all systems that can run configure have sys/param.h. */ +-# if !HAVE_SYS_PARAM_H ++# ifndef HAVE_SYS_PARAM_H + # define HAVE_SYS_PARAM_H 1 + # endif + + # ifdef _SC_PAGESIZE + # define getpagesize() sysconf(_SC_PAGESIZE) + # else /* no _SC_PAGESIZE */ +-# if HAVE_SYS_PARAM_H ++# ifdef HAVE_SYS_PARAM_H + # include + # ifdef EXEC_PAGESIZE + # define getpagesize() EXEC_PAGESIZE +@@ -4247,33 +8784,33 @@ + /* First, make a file with some known garbage in it. */ + data = (char *) malloc (pagesize); + if (!data) +- exit (1); ++ return 1; + for (i = 0; i < pagesize; ++i) + *(data + i) = rand (); + umask (0); +- fd = creat ("conftestmmap", 0600); ++ fd = creat ("conftest.mmap", 0600); + if (fd < 0) +- exit (1); ++ return 1; + if (write (fd, data, pagesize) != pagesize) +- exit (1); ++ return 1; + close (fd); + + /* Next, try to mmap the file at a fixed address which already has + something else allocated at it. If we can, also make sure that + we see the same garbage. */ +- fd = open ("conftestmmap", O_RDWR); ++ fd = open ("conftest.mmap", O_RDWR); + if (fd < 0) +- exit (1); ++ return 1; + data2 = (char *) malloc (2 * pagesize); + if (!data2) +- exit (1); +- data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1); ++ return 1; ++ data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); + if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, +- MAP_PRIVATE | MAP_FIXED, fd, 0L)) +- exit (1); ++ MAP_PRIVATE | MAP_FIXED, fd, 0L)) ++ return 1; + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data2 + i)) +- exit (1); ++ return 1; + + /* Finally, make sure that changes to the mapped area do not + percolate back to the file as seen by read(). (This is a bug on +@@ -4282,38 +8819,60 @@ + *(data2 + i) = *(data2 + i) + 1; + data3 = (char *) malloc (pagesize); + if (!data3) +- exit (1); ++ return 1; + if (read (fd, data3, pagesize) != pagesize) +- exit (1); ++ return 1; + for (i = 0; i < pagesize; ++i) + if (*(data + i) != *(data3 + i)) +- exit (1); ++ return 1; + close (fd); +- unlink ("conftestmmap"); +- exit (0); ++ return 0; + } +-EOF +-if { (eval echo configure:4297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_func_mmap_fixed_mapped=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_func_mmap_fixed_mapped=no ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_mmap_fixed_mapped=no + fi +-rm -fr conftest* ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + +-fi + +-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 ++echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } + if test $ac_cv_func_mmap_fixed_mapped = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define HAVE_MMAP 1 +-EOF ++_ACEOF + + fi ++rm -f conftest.mmap + + if test $use_mmap_for_buffers = yes; then + REL_ALLOC=no +@@ -4321,185 +8880,347 @@ + + LIBS="$libsrc_libs $LIBS" + +-echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 +-echo "configure:4326: 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 ++ ++{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 ++echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } ++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-ldnet $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 +- ac_tr_lib=HAVE_LIB`echo dnet | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dnet_ntoa (); ++int ++main () ++{ ++return dnet_ntoa (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_dnet_dnet_ntoa=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_dnet_dnet_ntoa=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 ++echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } ++if test $ac_cv_lib_dnet_dnet_ntoa = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBDNET 1 ++_ACEOF + + LIBS="-ldnet $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + + +-echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 +-echo "configure:4374: 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 ++{ echo "$as_me:$LINENO: checking for main in -lXbsd" >&5 ++echo $ECHO_N "checking for main in -lXbsd... $ECHO_C" >&6; } ++if test "${ac_cv_lib_Xbsd_main+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lXbsd $LIBS" +-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-int main() { +-main() +-; return 0; } +-EOF +-if { (eval echo configure:4389: \"$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 +- 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 ++int ++main () ++{ ++return main (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_Xbsd_main=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_Xbsd_main=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xbsd_main" >&6; } ++if test $ac_cv_lib_Xbsd_main = yes; then + LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd" +-else +- echo "$ac_t""no" 1>&6 + fi + + +-echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 +-echo "configure:4411: 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 ++ ++{ echo "$as_me:$LINENO: checking for cma_open in -lpthreads" >&5 ++echo $ECHO_N "checking for cma_open in -lpthreads... $ECHO_C" >&6; } ++if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lpthreads $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 +- ac_tr_lib=HAVE_LIB`echo pthreads | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char cma_open (); ++int ++main () ++{ ++return cma_open (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_pthreads_cma_open=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_pthreads_cma_open=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_cma_open" >&5 ++echo "${ECHO_T}$ac_cv_lib_pthreads_cma_open" >&6; } ++if test $ac_cv_lib_pthreads_cma_open = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBPTHREADS 1 ++_ACEOF + + LIBS="-lpthreads $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + + +-echo $ac_n "checking for XFree86 in /usr/X386""... $ac_c" 1>&6 +-echo "configure:4459: checking for XFree86 in /usr/X386" >&5 ++{ echo "$as_me:$LINENO: checking for XFree86 in /usr/X386" >&5 ++echo $ECHO_N "checking for XFree86 in /usr/X386... $ECHO_C" >&6; } + if test -d /usr/X386/include; then + HAVE_XFREE386=yes + : ${C_SWITCH_X_SITE="-I/usr/X386/include"} + else + HAVE_XFREE386=no + fi +-echo "$ac_t""$HAVE_XFREE386" 1>&6 ++{ echo "$as_me:$LINENO: result: $HAVE_XFREE386" >&5 ++echo "${ECHO_T}$HAVE_XFREE386" >&6; } + + + case ${host_os} in + aix*) +- echo $ac_n "checking for -bbigtoc option""... $ac_c" 1>&6 +-echo "configure:4472: checking for -bbigtoc option" >&5 +-if eval "test \"`echo '$''{'gdb_cv_bigtoc'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ { echo "$as_me:$LINENO: checking for -bbigtoc option" >&5 ++echo $ECHO_N "checking for -bbigtoc option... $ECHO_C" >&6; } ++if test "${gdb_cv_bigtoc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ++ + case $GCC in + yes) gdb_cv_bigtoc=-Wl,-bbigtoc ;; + *) gdb_cv_bigtoc=-bbigtoc ;; + esac + + LDFLAGS=$LDFLAGS\ $gdb_cv_bigtoc +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-int main() { ++int ++main () ++{ + int i; +-; return 0; } +-EOF +-if { (eval echo configure:4491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + : + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- gdb_cv_bigtoc= +-fi +-rm -f conftest* +- ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ gdb_cv_bigtoc= + fi + +-echo "$ac_t""$gdb_cv_bigtoc" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ ++fi ++{ echo "$as_me:$LINENO: result: $gdb_cv_bigtoc" >&5 ++echo "${ECHO_T}$gdb_cv_bigtoc" >&6; } + ;; + esac + +@@ -4525,26 +9246,67 @@ + fi + + 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:4530: checking whether X on GNU/Linux needs -b to link" >&5 +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking whether X on GNU/Linux needs -b to link... $ECHO_C" >&6; } ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-int main() { ++int ++main () ++{ + XOpenDisplay ("foo"); +-; return 0; } +-EOF +-if { (eval echo configure:4539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + xlinux_first_failure=no + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- xlinux_first_failure=yes ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ xlinux_first_failure=yes + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + if test "${xlinux_first_failure}" = "yes"; then + OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE" + OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE" +@@ -4554,24 +9316,65 @@ + C_SWITCH_X_SITE="$C_SWITCH_X_SITE -b i486-linuxaout" + CPPFLAGS="$CPPFLAGS -b i486-linuxaout" + LIBS="$LIBS -b i486-linuxaout" +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + +-int main() { ++int ++main () ++{ + XOpenDisplay ("foo"); +-; return 0; } +-EOF +-if { (eval echo configure:4566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + xlinux_second_failure=no + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- xlinux_second_failure=yes ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ xlinux_second_failure=yes + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + if test "${xlinux_second_failure}" = "yes"; then + # If we get the same failure with -b, there is no use adding -b. + # So take it out. This plays safe. +@@ -4579,220 +9382,452 @@ + C_SWITCH_X_SITE="$OLD_C_SWITCH_X_SITE" + CPPFLAGS="$OLD_CPPFLAGS" + LIBS="$OLD_LIBS" +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + else +- echo "$ac_t""yes" 1>&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + fi + else +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + fi + + # Reportedly, some broken Solaris systems have XKBlib.h but are missing + # header files included from there. +- echo $ac_n "checking for Xkb""... $ac_c" 1>&6 +-echo "configure:4595: checking for Xkb" >&5 +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for Xkb... $ECHO_C" >&6; } ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include + #include +-int main() { ++int ++main () ++{ + XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd); +-; return 0; } +-EOF +-if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_xkb=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_xkb=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_xkb=no + fi +-rm -f conftest* +- echo "$ac_t""$emacs_xkb" 1>&6 ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++ { echo "$as_me:$LINENO: result: $emacs_xkb" >&5 ++echo "${ECHO_T}$emacs_xkb" >&6; } + if test $emacs_xkb = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_XKBGETKEYBOARD 1 +-EOF ++_ACEOF + + fi + +- for ac_func in XrmSetDatabase XScreenResourceString \ ++ ++ ++ ++ ++for ac_func in XrmSetDatabase XScreenResourceString \ + XScreenNumberOfScreen XSetWMProtocols + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:4627: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef $ac_func + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:4655: \"$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 ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-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 + + fi + + if test "${window_system}" = "x11"; then +- echo $ac_n "checking X11 version 6""... $ac_c" 1>&6 +-echo "configure:4683: 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 <&5 ++echo $ECHO_N "checking X11 version 6... $ECHO_C" >&6; } ++ if test "${emacs_cv_x11_version_6+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + #if XlibSpecificationRelease < 6 + fail; + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_x11_version_6=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_x11_version_6=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_x11_version_6=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + fi + + if test $emacs_cv_x11_version_6 = yes; then +- echo "$ac_t""6 or newer" 1>&6 +- cat >> confdefs.h <<\EOF ++ { echo "$as_me:$LINENO: result: 6 or newer" >&5 ++echo "${ECHO_T}6 or newer" >&6; } ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_X11R6 1 +-EOF ++_ACEOF + + else +- echo "$ac_t""before 6" 1>&6 ++ { echo "$as_me:$LINENO: result: before 6" >&5 ++echo "${ECHO_T}before 6" >&6; } + fi + fi + + if test "${window_system}" = "x11"; then +- echo $ac_n "checking X11 version 5""... $ac_c" 1>&6 +-echo "configure:4723: 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 <&5 ++echo $ECHO_N "checking X11 version 5... $ECHO_C" >&6; } ++ if test "${emacs_cv_x11_version_5+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + #if XlibSpecificationRelease < 5 + fail; + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:4738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_x11_version_5=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_x11_version_5=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_x11_version_5=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + fi + + if test $emacs_cv_x11_version_5 = yes; then +- echo "$ac_t""5 or newer" 1>&6 ++ { echo "$as_me:$LINENO: result: 5 or newer" >&5 ++echo "${ECHO_T}5 or newer" >&6; } + HAVE_X11R5=yes +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_X11R5 1 +-EOF ++_ACEOF + + else + HAVE_X11R5=no +- echo "$ac_t""before 5" 1>&6 ++ { echo "$as_me:$LINENO: result: before 5" >&5 ++echo "${ECHO_T}before 5" >&6; } + fi + fi + + 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:4766: 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 <&5 ++echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6; } ++ if test "${emacs_cv_x11_version_5_with_xaw+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + + #include + #include +-int main() { ++int ++main () ++{ + +-; return 0; } +-EOF +-if { (eval echo configure:4780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_x11_version_5_with_xaw=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_x11_version_5_with_xaw=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_x11_version_5_with_xaw=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + fi + + if test $emacs_cv_x11_version_5_with_xaw = yes; then +- echo "$ac_t""5 or newer, with Xaw; use toolkit by default" 1>&6 ++ { echo "$as_me:$LINENO: result: 5 or newer, with Xaw; use toolkit by default" >&5 ++echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6; } + USE_X_TOOLKIT=LUCID + else +- echo "$ac_t""before 5 or no Xaw; do not use toolkit by default" 1>&6 ++ { echo "$as_me:$LINENO: result: before 5 or no Xaw; do not use toolkit by default" >&5 ++echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6; } + USE_X_TOOLKIT=none + fi + else +@@ -4803,43 +9838,86 @@ + X_TOOLKIT_TYPE=$USE_X_TOOLKIT + + if test "${USE_X_TOOLKIT}" != "none"; then +- echo $ac_n "checking X11 toolkit version""... $ac_c" 1>&6 +-echo "configure:4808: 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 <&5 ++echo $ECHO_N "checking X11 toolkit version... $ECHO_C" >&6; } ++ if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + #if XtSpecificationRelease < 6 + fail; + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:4823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_x11_toolkit_version_6=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_x11_toolkit_version_6=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_x11_toolkit_version_6=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + fi + + HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6 + if test $emacs_cv_x11_toolkit_version_6 = yes; then +- echo "$ac_t""6 or newer" 1>&6 +- cat >> confdefs.h <<\EOF ++ { echo "$as_me:$LINENO: result: 6 or newer" >&5 ++echo "${ECHO_T}6 or newer" >&6; } ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_X11XTR6 1 +-EOF ++_ACEOF + + else +- echo "$ac_t""before 6" 1>&6 ++ { echo "$as_me:$LINENO: result: before 6" >&5 ++echo "${ECHO_T}before 6" >&6; } + fi + + OLDLIBS="$LIBS" +@@ -4848,51 +9926,91 @@ + else + LIBS="-lXt $LIBS" + fi +- echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6 +-echo "configure:4853: 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 ++ ++{ echo "$as_me:$LINENO: checking for XmuConvertStandardSelection in -lXmu" >&5 ++echo $ECHO_N "checking for XmuConvertStandardSelection in -lXmu... $ECHO_C" >&6; } ++if test "${ac_cv_lib_Xmu_XmuConvertStandardSelection+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lXmu $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 +- ac_tr_lib=HAVE_LIB`echo Xmu | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XmuConvertStandardSelection (); ++int ++main () ++{ ++return XmuConvertStandardSelection (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_Xmu_XmuConvertStandardSelection=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_Xmu_XmuConvertStandardSelection=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; } ++if test $ac_cv_lib_Xmu_XmuConvertStandardSelection = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBXMU 1 ++_ACEOF + + LIBS="-lXmu $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + + test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS" +@@ -4901,140 +10019,261 @@ + # On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D. + if test "${HAVE_X11}" = "yes"; then + if test "${USE_X_TOOLKIT}" != "none"; then +- echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6 +-echo "configure:4906: checking for XShapeQueryExtension in -lXext" >&5 +-ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++{ echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5 ++echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6; } ++if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lXext $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 +- ac_tr_lib=HAVE_LIB`echo Xext | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XShapeQueryExtension (); ++int ++main () ++{ ++return XShapeQueryExtension (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_Xext_XShapeQueryExtension=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_Xext_XShapeQueryExtension=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } ++if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBXEXT 1 ++_ACEOF + + LIBS="-lXext $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + + fi + fi + + if test "${USE_X_TOOLKIT}" = "MOTIF"; then +- echo $ac_n "checking for Motif version 2.1""... $ac_c" 1>&6 +-echo "configure:4957: 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 <&5 ++echo $ECHO_N "checking for Motif version 2.1... $ECHO_C" >&6; } ++if test "${emacs_cv_motif_version_2_1+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + #if XmVERSION > 2 || (XmVERSION == 2 && XmREVISION >= 1) + int x = 5; + #else + Motif version prior to 2.1. + #endif +-; return 0; } +-EOF +-if { (eval echo configure:4973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_motif_version_2_1=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_motif_version_2_1=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_motif_version_2_1=no + fi + +-echo "$ac_t""$emacs_cv_motif_version_2_1" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_motif_version_2_1" >&5 ++echo "${ECHO_T}$emacs_cv_motif_version_2_1" >&6; } + HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1 + if test $emacs_cv_motif_version_2_1 = yes; then + HAVE_LIBXP=no +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_MOTIF_2_1 1 +-EOF ++_ACEOF + +- echo $ac_n "checking for XpCreateContext in -lXp""... $ac_c" 1>&6 +-echo "configure:4994: 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 ++ { echo "$as_me:$LINENO: checking for XpCreateContext in -lXp" >&5 ++echo $ECHO_N "checking for XpCreateContext in -lXp... $ECHO_C" >&6; } ++if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lXp $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 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XpCreateContext (); ++int ++main () ++{ ++return XpCreateContext (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_Xp_XpCreateContext=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_Xp_XpCreateContext=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpCreateContext" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xp_XpCreateContext" >&6; } ++if test $ac_cv_lib_Xp_XpCreateContext = yes; then + HAVE_LIBXP=yes +-else +- echo "$ac_t""no" 1>&6 + fi + + if test ${HAVE_LIBXP} = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBXP 1 +-EOF ++_ACEOF + +- fi ++ fi + fi + fi + +@@ -5042,102 +10281,264 @@ + HAVE_XAW3D=no + if test "${HAVE_X11}" = "yes"; then + if test "${USE_X_TOOLKIT}" != "none"; then +- ac_safe=`echo "X11/Xaw3d/Scrollbar.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for X11/Xaw3d/Scrollbar.h""... $ac_c" 1>&6 +-echo "configure:5048: checking for X11/Xaw3d/Scrollbar.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 <&5 ++echo $ECHO_N "checking for X11/Xaw3d/Scrollbar.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_X11_Xaw3d_Scrollbar_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_Scrollbar_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking X11/Xaw3d/Scrollbar.h usability" >&5 ++echo $ECHO_N "checking X11/Xaw3d/Scrollbar.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking X11/Xaw3d/Scrollbar.h presence" >&5 ++echo $ECHO_N "checking X11/Xaw3d/Scrollbar.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5058: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- echo $ac_n "checking for XawScrollbarSetThumb in -lXaw3d""... $ac_c" 1>&6 +-echo "configure:5075: checking for XawScrollbarSetThumb in -lXaw3d" >&5 +-ac_lib_var=`echo Xaw3d'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/Scrollbar.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: X11/Xaw3d/Scrollbar.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/Scrollbar.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: X11/Xaw3d/Scrollbar.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/Scrollbar.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: X11/Xaw3d/Scrollbar.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/Scrollbar.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: X11/Xaw3d/Scrollbar.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/Scrollbar.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: X11/Xaw3d/Scrollbar.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/Scrollbar.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: X11/Xaw3d/Scrollbar.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/Scrollbar.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: X11/Xaw3d/Scrollbar.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/Xaw3d/Scrollbar.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: X11/Xaw3d/Scrollbar.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for X11/Xaw3d/Scrollbar.h" >&5 ++echo $ECHO_N "checking for X11/Xaw3d/Scrollbar.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_X11_Xaw3d_Scrollbar_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lXaw3d $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" ++ ac_cv_header_X11_Xaw3d_Scrollbar_h=$ac_header_preproc + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_Scrollbar_h" >&6; } + + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- HAVE_XAW3D=yes ++if test $ac_cv_header_X11_Xaw3d_Scrollbar_h = yes; then ++ { echo "$as_me:$LINENO: checking for XawScrollbarSetThumb in -lXaw3d" >&5 ++echo $ECHO_N "checking for XawScrollbarSetThumb in -lXaw3d... $ECHO_C" >&6; } ++if test "${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lXaw3d $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XawScrollbarSetThumb (); ++int ++main () ++{ ++return XawScrollbarSetThumb (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_Xaw3d_XawScrollbarSetThumb=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_Xaw3d_XawScrollbarSetThumb=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6; } ++if test $ac_cv_lib_Xaw3d_XawScrollbarSetThumb = yes; then ++ HAVE_XAW3D=yes + fi + +-else +- echo "$ac_t""no" 1>&6 + fi + ++ + if test "${HAVE_XAW3D}" = "yes"; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_XAW3D 1 +-EOF ++_ACEOF + + fi + fi + fi +- ++ + + USE_TOOLKIT_SCROLL_BARS=no + if test "${with_toolkit_scroll_bars}" != "no"; then + if test "${USE_X_TOOLKIT}" != "none"; then + if test "${USE_X_TOOLKIT}" = "MOTIF"; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define USE_TOOLKIT_SCROLL_BARS 1 +-EOF ++_ACEOF + + HAVE_XAW3D=no + USE_TOOLKIT_SCROLL_BARS=yes + elif test "${HAVE_XAW3D}" = "yes"; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define USE_TOOLKIT_SCROLL_BARS 1 +-EOF ++_ACEOF + + USE_TOOLKIT_SCROLL_BARS=yes + fi +@@ -5146,9 +10547,9 @@ + + + if test "${with_xim}" != "no"; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define USE_XIM 1 +-EOF ++_ACEOF + + fi + +@@ -5156,565 +10557,1466 @@ + HAVE_XPM=no + if test "${HAVE_X11}" = "yes"; then + if test "${with_xpm}" != "no"; then +- ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 +-echo "configure:5162: checking for X11/xpm.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 <&5 ++echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_X11_xpm_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5 ++echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5 ++echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5172: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- echo $ac_n "checking for XpmReadFileToPixmap in -lXpm""... $ac_c" 1>&6 +-echo "configure:5189: checking for XpmReadFileToPixmap in -lXpm" >&5 +-ac_lib_var=`echo Xpm'_'XpmReadFileToPixmap | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: X11/xpm.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: X11/xpm.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: X11/xpm.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 ++echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_X11_xpm_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lXpm -lX11 $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" ++ ac_cv_header_X11_xpm_h=$ac_header_preproc + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 ++echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; } + + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- HAVE_XPM=yes ++if test $ac_cv_header_X11_xpm_h = yes; then ++ { echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in -lXpm" >&5 ++echo $ECHO_N "checking for XpmReadFileToPixmap in -lXpm... $ECHO_C" >&6; } ++if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lXpm -lX11 $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char XpmReadFileToPixmap (); ++int ++main () ++{ ++return XpmReadFileToPixmap (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_Xpm_XpmReadFileToPixmap=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_Xpm_XpmReadFileToPixmap=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5 ++echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; } ++if test $ac_cv_lib_Xpm_XpmReadFileToPixmap = yes; then ++ HAVE_XPM=yes + fi + +-else +- echo "$ac_t""no" 1>&6 + fi + ++ + if test "${HAVE_XPM}" = "yes"; then +- echo $ac_n "checking for XpmReturnAllocPixels preprocessor define""... $ac_c" 1>&6 +-echo "configure:5234: checking for XpmReturnAllocPixels preprocessor define" >&5 +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for XpmReturnAllocPixels preprocessor define... $ECHO_C" >&6; } ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include "X11/xpm.h" + #ifndef XpmReturnAllocPixels + no_return_alloc_pixels + #endif +- +-EOF ++ ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "no_return_alloc_pixels" >/dev/null 2>&1; then +- rm -rf conftest* ++ $EGREP "no_return_alloc_pixels" >/dev/null 2>&1; then + HAVE_XPM=no + else +- rm -rf conftest* + HAVE_XPM=yes + fi + rm -f conftest* + + + if test "${HAVE_XPM}" = "yes"; then +- echo "$ac_t""yes" 1>&6 ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } + else +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + fi + fi + + if test "${HAVE_XPM}" = "yes"; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_XPM 1 +-EOF ++_ACEOF + + fi + fi +- ++ + ### Use -ljpeg if available, unless `--with-jpeg=no'. + HAVE_JPEG=no + if test "${HAVE_X11}" = "yes"; then + if test "${with_jpeg}" != "no"; then +- ac_safe=`echo "jerror.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for jerror.h""... $ac_c" 1>&6 +-echo "configure:5277: checking for jerror.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 <&5 ++echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_jerror_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_jerror_h" >&5 ++echo "${ECHO_T}$ac_cv_header_jerror_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking jerror.h usability" >&5 ++echo $ECHO_N "checking jerror.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default + #include +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5287: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking jerror.h presence" >&5 ++echo $ECHO_N "checking jerror.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 +-echo "configure:5304: checking for jpeg_destroy_compress in -ljpeg" >&5 +-ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: jerror.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: jerror.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: jerror.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: jerror.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: jerror.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: jerror.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: jerror.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: jerror.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: jerror.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: jerror.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: jerror.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: jerror.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: jerror.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: jerror.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: jerror.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: jerror.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for jerror.h" >&5 ++echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_jerror_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-ljpeg $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" ++ ac_cv_header_jerror_h=$ac_header_preproc + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++{ echo "$as_me:$LINENO: result: $ac_cv_header_jerror_h" >&5 ++echo "${ECHO_T}$ac_cv_header_jerror_h" >&6; } + + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- HAVE_JPEG=yes ++if test $ac_cv_header_jerror_h = yes; then ++ { echo "$as_me:$LINENO: checking for jpeg_destroy_compress in -ljpeg" >&5 ++echo $ECHO_N "checking for jpeg_destroy_compress in -ljpeg... $ECHO_C" >&6; } ++if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ljpeg $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char jpeg_destroy_compress (); ++int ++main () ++{ ++return jpeg_destroy_compress (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_jpeg_jpeg_destroy_compress=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_jpeg_jpeg_destroy_compress=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5 ++echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; } ++if test $ac_cv_lib_jpeg_jpeg_destroy_compress = yes; then ++ HAVE_JPEG=yes + fi + +-else +- echo "$ac_t""no" 1>&6 + fi + ++ + fi + + if test "${HAVE_JPEG}" = "yes"; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_JPEG 1 +-EOF ++_ACEOF + +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include + version=JPEG_LIB_VERSION + +-EOF ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "version= *(6[2-9]|[7-9][0-9])" >/dev/null 2>&1; then +- rm -rf conftest* +- cat >> confdefs.h <<\EOF ++ $EGREP "version= *(6[2-9]|[7-9][0-9])" >/dev/null 2>&1; then ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_JPEG 1 +-EOF ++_ACEOF + + else +- rm -rf conftest* +- echo "configure: warning: libjpeg found, but not version 6b or later" 1>&2 ++ { echo "$as_me:$LINENO: WARNING: libjpeg found, but not version 6b or later" >&5 ++echo "$as_me: WARNING: libjpeg found, but not version 6b or later" >&2;} + HAVE_JPEG=no + fi + rm -f conftest* + + fi + fi +- ++ + ### Use -lpng if available, unless `--with-png=no'. + HAVE_PNG=no + if test "${HAVE_X11}" = "yes"; then + if test "${with_png}" != "no"; then +- ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for png.h""... $ac_c" 1>&6 +-echo "configure:5384: checking for png.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 <&5 ++echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_png_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 ++echo "${ECHO_T}$ac_cv_header_png_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking png.h usability" >&5 ++echo $ECHO_N "checking png.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking png.h presence" >&5 ++echo $ECHO_N "checking png.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5394: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- echo $ac_n "checking for png_get_channels in -lpng""... $ac_c" 1>&6 +-echo "configure:5411: checking for png_get_channels in -lpng" >&5 +-ac_lib_var=`echo png'_'png_get_channels | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for png.h" >&5 ++echo $ECHO_N "checking for png.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_png_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lpng -lz -lm $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" ++ ac_cv_header_png_h=$ac_header_preproc + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++{ echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 ++echo "${ECHO_T}$ac_cv_header_png_h" >&6; } + + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- HAVE_PNG=yes ++if test $ac_cv_header_png_h = yes; then ++ { echo "$as_me:$LINENO: checking for png_get_channels in -lpng" >&5 ++echo $ECHO_N "checking for png_get_channels in -lpng... $ECHO_C" >&6; } ++if test "${ac_cv_lib_png_png_get_channels+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lpng -lz -lm $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char png_get_channels (); ++int ++main () ++{ ++return png_get_channels (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_png_png_get_channels=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_png_png_get_channels=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_get_channels" >&5 ++echo "${ECHO_T}$ac_cv_lib_png_png_get_channels" >&6; } ++if test $ac_cv_lib_png_png_get_channels = yes; then ++ HAVE_PNG=yes + fi + +-else +- echo "$ac_t""no" 1>&6 + fi + ++ + fi + + if test "${HAVE_PNG}" = "yes"; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_PNG 1 +-EOF ++_ACEOF + + fi + fi +- ++ + ### Use -ltiff if available, unless `--with-tiff=no'. + HAVE_TIFF=no + if test "${HAVE_X11}" = "yes"; then + if test "${with_tiff}" != "no"; then +- ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 +-echo "configure:5470: checking for tiffio.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 <&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_tiffio_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 ++echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 ++echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5480: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 ++echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_tiffio_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_tiffio_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 ++echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } ++ + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++if test $ac_cv_header_tiffio_h = yes; then + tifflibs="-lz -lm" + # At least one tiff package requires the jpeg library. + if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi +- echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 +-echo "configure:5500: checking for TIFFGetVersion in -ltiff" >&5 +-ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ { echo "$as_me:$LINENO: checking for TIFFGetVersion in -ltiff" >&5 ++echo $ECHO_N "checking for TIFFGetVersion in -ltiff... $ECHO_C" >&6; } ++if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-ltiff $tifflibs $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 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char TIFFGetVersion (); ++int ++main () ++{ ++return TIFFGetVersion (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_tiff_TIFFGetVersion=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_tiff_TIFFGetVersion=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5 ++echo "${ECHO_T}$ac_cv_lib_tiff_TIFFGetVersion" >&6; } ++if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then + HAVE_TIFF=yes +-else +- echo "$ac_t""no" 1>&6 + fi + +-else +- echo "$ac_t""no" 1>&6 + fi + ++ + fi + + if test "${HAVE_TIFF}" = "yes"; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_TIFF 1 +-EOF ++_ACEOF + + fi + fi +- ++ + ### Use -lgif if available, unless `--with-gif=no'. + HAVE_GIF=no + if test "${HAVE_X11}" = "yes"; then + if test "${with_gif}" != "no"; then +- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 +-echo "configure:5559: checking for gif_lib.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 <&5 ++echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_gif_lib_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 ++echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking gif_lib.h usability" >&5 ++echo $ECHO_N "checking gif_lib.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking gif_lib.h presence" >&5 ++echo $ECHO_N "checking gif_lib.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:5569: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- # EGifPutExtensionLast only exists from version libungif-4.1.0b1. +-# Earlier versions can crash Emacs. +- echo $ac_n "checking for EGifPutExtensionLast in -lungif""... $ac_c" 1>&6 +-echo "configure:5588: checking for EGifPutExtensionLast in -lungif" >&5 +-ac_lib_var=`echo ungif'_'EGifPutExtensionLast | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: gif_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: gif_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gif_lib.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: gif_lib.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: gif_lib.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: gif_lib.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gif_lib.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: gif_lib.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gif_lib.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: gif_lib.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gif_lib.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: gif_lib.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gif_lib.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: gif_lib.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for gif_lib.h" >&5 ++echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_gif_lib_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lungif $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" ++ ac_cv_header_gif_lib_h=$ac_header_preproc + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++{ echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 ++echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6; } + + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- HAVE_GIF=yes ++if test $ac_cv_header_gif_lib_h = yes; then ++ # EGifPutExtensionLast only exists from version libungif-4.1.0b1. ++# Earlier versions can crash Emacs. ++ { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5 ++echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; } ++if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lungif $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char EGifPutExtensionLast (); ++int ++main () ++{ ++return EGifPutExtensionLast (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_ungif_EGifPutExtensionLast=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_ungif_EGifPutExtensionLast=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 ++echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } ++if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then ++ HAVE_GIF=yes + fi + +-else +- echo "$ac_t""no" 1>&6 + fi + ++ + fi + + if test "${HAVE_GIF}" = "yes"; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_GIF 1 +-EOF ++_ACEOF + + fi + fi + + # 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:5643: 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 <&5 ++echo $ECHO_N "checking whether netdb declares h_errno... $ECHO_C" >&6; } ++if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + return h_errno; +-; return 0; } +-EOF +-if { (eval echo configure:5655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_netdb_declares_h_errno=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_netdb_declares_h_errno=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_netdb_declares_h_errno=no + fi + +-echo "$ac_t""$emacs_cv_netdb_declares_h_errno" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_netdb_declares_h_errno" >&5 ++echo "${ECHO_T}$emacs_cv_netdb_declares_h_errno" >&6; } + if test $emacs_cv_netdb_declares_h_errno = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_H_ERRNO 1 +-EOF ++_ACEOF + + fi + + # 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:5678: 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 <&5 ++echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; } ++if test "${ac_cv_working_alloca_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { +-char *p = alloca(2 * sizeof(int)); +-; return 0; } +-EOF +-if { (eval echo configure:5690: \"$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 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_header_alloca_h=no ++int ++main () ++{ ++char *p = (char *) alloca (2 * sizeof (int)); ++ if (p) return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_working_alloca_h=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_working_alloca_h=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 ++echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; } ++if test $ac_cv_working_alloca_h = yes; then + +-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 +-if test $ac_cv_header_alloca_h = yes; then +- cat >> confdefs.h <<\EOF ++cat >>confdefs.h <<\_ACEOF + #define HAVE_ALLOCA_H 1 +-EOF ++_ACEOF + + fi + +-echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:5711: checking for alloca" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for alloca" >&5 ++echo $ECHO_N "checking for alloca... $ECHO_C" >&6; } ++if test "${ac_cv_func_alloca_works+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #ifdef __GNUC__ + # define alloca __builtin_alloca + #else +@@ -5722,7 +12024,7 @@ + # include + # define alloca _alloca + # else +-# if HAVE_ALLOCA_H ++# ifdef HAVE_ALLOCA_H + # include + # else + # ifdef _AIX +@@ -5736,137 +12038,240 @@ + # endif + #endif + +-int main() { +-char *p = (char *) alloca(1); +-; return 0; } +-EOF +-if { (eval echo configure:5744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++int ++main () ++{ ++char *p = (char *) alloca (1); ++ if (p) return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_func_alloca_works=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_func_alloca_works=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_alloca_works=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 ++echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; } + +-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 + if test $ac_cv_func_alloca_works = yes; then +- cat >> confdefs.h <<\EOF +-#define HAVE_ALLOCA 1 +-EOF + +-fi ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_ALLOCA 1 ++_ACEOF + +-if test $ac_cv_func_alloca_works = no; then ++else + # The SVR3 libPW and SVR4 libucb both contain incompatible functions +- # that cause trouble. Some versions do not even contain alloca or +- # contain a buggy version. If you still want to use their alloca, +- # use ar to extract alloca.o from them instead of compiling alloca.c. +- ALLOCA=alloca.${ac_objext} +- cat >> confdefs.h <<\EOF ++# that cause trouble. Some versions do not even contain alloca or ++# contain a buggy version. If you still want to use their alloca, ++# use ar to extract alloca.o from them instead of compiling alloca.c. ++ ++ALLOCA=\${LIBOBJDIR}alloca.$ac_objext ++ ++cat >>confdefs.h <<\_ACEOF + #define C_ALLOCA 1 +-EOF ++_ACEOF + + +-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:5776: 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 <&5 ++echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; } ++if test "${ac_cv_os_cray+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#if defined CRAY && ! defined CRAY2 + webecray + #else + wenotbecray + #endif + +-EOF ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "webecray" >/dev/null 2>&1; then +- rm -rf conftest* ++ $EGREP "webecray" >/dev/null 2>&1; then + ac_cv_os_cray=yes + else +- rm -rf conftest* + ac_cv_os_cray=no + fi + rm -f conftest* + + fi +- +-echo "$ac_t""$ac_cv_os_cray" 1>&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 ++echo "${ECHO_T}$ac_cv_os_cray" >&6; } + 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 +-echo "configure:5806: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ + +-int main() { ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:5834: \"$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" ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then + +-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <>confdefs.h <<_ACEOF + #define CRAY_STACKSEG_END $ac_func +-EOF ++_ACEOF + +- break +-else +- echo "$ac_t""no" 1>&6 ++ break + fi + +-done ++ done + fi + +-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:5861: 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 ++{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 ++echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; } ++if test "${ac_cv_c_stack_direction+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then + ac_cv_c_stack_direction=0 + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int + find_stack_direction () + { + static char *addr = 0; +@@ -5879,317 +12284,1045 @@ + else + return (&dummy > addr) ? 1 : -1; + } ++ ++int + main () + { +- exit (find_stack_direction() < 0); ++ return find_stack_direction () < 0; + } +-EOF +-if { (eval echo configure:5888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_c_stack_direction=1 + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_c_stack_direction=-1 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_c_stack_direction=-1 + fi +-rm -fr conftest* ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + ++ + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 ++echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; } + +-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define STACK_DIRECTION $ac_cv_c_stack_direction +-EOF ++_ACEOF ++ + + fi + + + # 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:5913: 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 ++ ++{ echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 ++echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6; } ++if test "${ac_cv_lib_m_sqrt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lm $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 +- ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char sqrt (); ++int ++main () ++{ ++return sqrt (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_m_sqrt=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_m_sqrt=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 ++echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6; } ++if test $ac_cv_lib_m_sqrt = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBM 1 ++_ACEOF + + LIBS="-lm $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + + +-# Check for mail-locking functions in a "mail" library +-echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6 +-echo "configure:5962: 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 ++# Check for mail-locking functions in a "mail" library Check for ++# lockfile first, a free replacement for -lmail. We use AC_CHECK_LIB ++# for touchlock because we don't want to have to put the lock libs ++# into LIBS and AC_CHECK_FUNCS would require that. ++ ++{ echo "$as_me:$LINENO: checking for maillock in -llockfile" >&5 ++echo $ECHO_N "checking for maillock in -llockfile... $ECHO_C" >&6; } ++if test "${ac_cv_lib_lockfile_maillock+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lmail $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" ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-llockfile $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char maillock (); ++int ++main () ++{ ++return maillock (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_lockfile_maillock=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_lockfile_maillock=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_lockfile_maillock" >&5 ++echo "${ECHO_T}$ac_cv_lib_lockfile_maillock" >&6; } ++if test $ac_cv_lib_lockfile_maillock = yes; then ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBMAIL 1 ++_ACEOF ++ ++ MOVEMAIL_LOCK_LIBS="-llockfile" ++ { echo "$as_me:$LINENO: checking for touchlock in -llockfile" >&5 ++echo $ECHO_N "checking for touchlock in -llockfile... $ECHO_C" >&6; } ++if test "${ac_cv_lib_lockfile_touchlock+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-llockfile $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char touchlock (); ++int ++main () ++{ ++return touchlock (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_lockfile_touchlock=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_cv_lib_lockfile_touchlock=no + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo mail | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&5 ++echo "${ECHO_T}$ac_cv_lib_lockfile_touchlock" >&6; } ++if test $ac_cv_lib_lockfile_touchlock = yes; then ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_TOUCHLOCK 1 ++_ACEOF + +-else +- echo "$ac_t""no" 1>&6 + fi + +-echo $ac_n "checking for maillock in -llockfile""... $ac_c" 1>&6 +-echo "configure:6009: checking for maillock in -llockfile" >&5 +-ac_lib_var=`echo lockfile'_'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 ++ ++for ac_header in maillock.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- ac_save_LIBS="$LIBS" +-LIBS="-llockfile $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" ++ ac_cpp_err=yes + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_header_preproc=no + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo lockfile | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&6 +-fi +- +-# If we have the shared liblockfile, assume we must use it for mail +-# locking (e.g. Debian). If we couldn't link against liblockfile +-# (no liblockfile.a installed), ensure that we don't need to. +-if test "$ac_cv_lib_lockfile_maillock" = no; then +- # Extract the first word of "liblockfile.so", so it can be a program name with args. +-set dummy liblockfile.so; ac_word=$2 +-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:6062: checking for $ac_word" >&5 +-if eval "test \"`echo '$''{'ac_cv_prog_liblockfile'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- if test -n "$liblockfile"; then +- ac_cv_prog_liblockfile="$liblockfile" # Let the user override the test. +-else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" +- ac_dummy="/usr/lib:/lib:/usr/local/lib:$LD_LIBRARY_PATH" +- for ac_dir in $ac_dummy; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- ac_cv_prog_liblockfile="yes" +- break +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_prog_liblockfile" && ac_cv_prog_liblockfile="no" +-fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ + fi +-liblockfile="$ac_cv_prog_liblockfile" +-if test -n "$liblockfile"; then +- echo "$ac_t""$liblockfile" 1>&6 ++ ++done ++ ++else ++ { echo "$as_me:$LINENO: checking for maillock in -lmail" >&5 ++echo $ECHO_N "checking for maillock in -lmail... $ECHO_C" >&6; } ++if test "${ac_cv_lib_mail_maillock+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lmail $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char maillock (); ++int ++main () ++{ ++return maillock (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_mail_maillock=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_mail_maillock=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mail_maillock" >&5 ++echo "${ECHO_T}$ac_cv_lib_mail_maillock" >&6; } ++if test $ac_cv_lib_mail_maillock = yes; then ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBMAIL 1 ++_ACEOF ++ ++ MOVEMAIL_LOCK_LIBS="-lmail" ++ { echo "$as_me:$LINENO: checking for touchlock in -lmail" >&5 ++echo $ECHO_N "checking for touchlock in -lmail... $ECHO_C" >&6; } ++if test "${ac_cv_lib_mail_touchlock+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lmail $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char touchlock (); ++int ++main () ++{ ++return touchlock (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_mail_touchlock=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_mail_touchlock=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_mail_touchlock" >&5 ++echo "${ECHO_T}$ac_cv_lib_mail_touchlock" >&6; } ++if test $ac_cv_lib_mail_touchlock = yes; then ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_TOUCHLOCK 1 ++_ACEOF ++ + fi + +- if test $ac_cv_prog_liblockfile = yes; then +- { echo "configure: error: Shared liblockfile found but can't link against it. +-This probably means that movemail could lose mail. +-There may be a \`development' package to install containing liblockfile." 1>&2; exit 1; } +- else cat >> confdefs.h <<\EOF +-#define LIBMAIL -llockfile +-EOF + +- fi +- else : +-fi + for ac_func in touchlock + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:6103: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef $ac_func + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:6131: \"$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" ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ + fi +-rm -f conftest* ++done ++ ++ ++for ac_header in maillock.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no + 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 ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ + fi ++ + done + +-for ac_hdr in maillock.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:6159: 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:6169: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" + fi +-rm -f conftest* ++ + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 ++ ++ ++ ++# Tests borrowed (and slightly rearranged) from old paths.el ++# rmail-spool-directory tests. They should be in the order most ++# likely to get the right answer. You can always override them on the ++# system level in src/s/* and on a one-shot basis with ++# --with-mail-spool-directory. ++ ++{ echo "$as_me:$LINENO: checking for mail spool location" >&5 ++echo $ECHO_N "checking for mail spool location... $ECHO_C" >&6; } ++if test "${with_mail_spool+set}" = set; then ++ { echo "$as_me:$LINENO: result: ${with_mail_spool}" >&5 ++echo "${ECHO_T}${with_mail_spool}" >&6; } ++elif test -d /var/mail/; then ++ cat >>confdefs.h <<_ACEOF ++#define CONF_MAIL_SPOOL_DIRECTORY "/var/mail" ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: \"/var/mail\"" >&5 ++echo "${ECHO_T}\"/var/mail\"" >&6; } ++elif test -d /var/spool/mail/; then ++ cat >>confdefs.h <<_ACEOF ++#define CONF_MAIL_SPOOL_DIRECTORY "/var/spool/mail" ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: \"/var/spool/mail\"" >&5 ++echo "${ECHO_T}\"/var/spool/mail\"" >&6; } ++elif test -d /usr/mail/; then ++ cat >>confdefs.h <<_ACEOF ++#define CONF_MAIL_SPOOL_DIRECTORY "/usr/mail" ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: \"/usr/mail\"" >&5 ++echo "${ECHO_T}\"/usr/mail\"" >&6; } ++elif test -d /usr/spool/mail/; then ++ cat >>confdefs.h <<_ACEOF ++#define CONF_MAIL_SPOOL_DIRECTORY "/usr/spool/mail" ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: \"/usr/spool/mail\"" >&5 ++echo "${ECHO_T}\"/usr/spool/mail\"" >&6; } ++else ++ { echo "$as_me:$LINENO: result: not found" >&5 ++echo "${ECHO_T}not found" >&6; } ++fi ++ ++# Find the location of "mail". This is critical for fakemail at ++# least. before fakemail would silently fail if this was wrong, so ++# insist on finding it. ++{ echo "$as_me:$LINENO: checking for mail binary" >&5 ++echo $ECHO_N "checking for mail binary... $ECHO_C" >&6; } ++if test -x /bin/mail; then ++ cat >>confdefs.h <<_ACEOF ++#define CONF_MAIL_PROGRAM_NAME "/bin/mail" ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: \"/bin/mail\"" >&5 ++echo "${ECHO_T}\"/bin/mail\"" >&6; } ++elif test -x /usr/bin/mail; then ++ cat >>confdefs.h <<_ACEOF ++#define CONF_MAIL_PROGRAM_NAME "/usr/bin/mail" ++_ACEOF ++ ++ { echo "$as_me:$LINENO: result: \"/usr/bin/mail\"" >&5 ++echo "${ECHO_T}\"/usr/bin/mail\"" >&6; } ++else ++ { { echo "$as_me:$LINENO: error: could not find mail binary" >&5 ++echo "$as_me: error: could not find mail binary" >&2;} ++ { (exit 1); exit 1; }; } + fi +-done ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + for ac_func in gethostname getdomainname dup2 \ +@@ -6200,184 +13333,425 @@ + __fpending mblen mbrlen strsignal setitimer ualarm index rindex \ + gai_strerror mkstemp + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:6205: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ + +-int main() { ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:6233: \"$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" ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ + fi +-rm -f conftest* ++done ++ ++ ++ ++ ++ ++for ac_header in stdlib.h sys/time.h unistd.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + +-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 ++ ac_header_preproc=no + fi +-done + ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + +-for ac_hdr in sys/time.h unistd.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:6262: 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:6272: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 + fi ++ + done + ++ + for ac_func in alarm + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:6301: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef $ac_func + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:6329: \"$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 ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-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 + +-echo $ac_n "checking for working mktime""... $ac_c" 1>&6 +-echo "configure:6354: checking for working mktime" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_working_mktime'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for working mktime" >&5 ++echo $ECHO_N "checking for working mktime... $ECHO_C" >&6; } ++if test "${ac_cv_func_working_mktime+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test "$cross_compiling" = yes; then + ac_cv_func_working_mktime=no + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Test program from Paul Eggert and Tony Leneis. */ ++#ifdef TIME_WITH_SYS_TIME + # include + # include + #else +-# if HAVE_SYS_TIME_H ++# ifdef HAVE_SYS_TIME_H + # include + # else + # include + # endif + #endif + +-#if HAVE_UNISTD_H ++#ifdef HAVE_STDLIB_H ++# include ++#endif ++ ++#ifdef HAVE_UNISTD_H + # include + #endif + +-#if !HAVE_ALARM ++#ifndef HAVE_ALARM + # define alarm(X) /* empty */ + #endif + +@@ -6385,20 +13759,21 @@ + #undef putenv + + static time_t time_t_max; ++static time_t time_t_min; + + /* Values we'll use to set the TZ environment variable. */ +-static const char *const tz_strings[] = { +- (const char *) 0, "TZ=GMT0", "TZ=JST-9", ++static char *tz_strings[] = { ++ (char *) 0, "TZ=GMT0", "TZ=JST-9", + "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" + }; + #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) + +-/* Fail if mktime fails to convert a date in the spring-forward gap. ++/* Return 0 if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ +-static void ++static int + spring_forward_gap () + { +- /* glibc (up to about 1998-10-07) failed this test) */ ++ /* glibc (up to about 1998-10-07) failed this test. */ + struct tm tm; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" +@@ -6414,23 +13789,27 @@ + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; +- if (mktime (&tm) == (time_t)-1) +- exit (1); ++ return mktime (&tm) != (time_t) -1; + } + +-static void +-mktime_test (now) ++static int ++mktime_test1 (now) + time_t now; + { + struct tm *lt; +- if ((lt = localtime (&now)) && mktime (lt) != now) +- exit (1); +- now = time_t_max - now; +- if ((lt = localtime (&now)) && mktime (lt) != now) +- exit (1); ++ return ! (lt = localtime (&now)) || mktime (lt) == now; + } + +-static void ++static int ++mktime_test (now) ++ time_t now; ++{ ++ return (mktime_test1 (now) ++ && mktime_test1 ((time_t) (time_t_max - now)) ++ && mktime_test1 ((time_t) (time_t_min + now))); ++} ++ ++static int + irix_6_4_bug () + { + /* Based on code from Ariel Faigon. */ +@@ -6443,11 +13822,10 @@ + tm.tm_sec = 0; + tm.tm_isdst = -1; + mktime (&tm); +- if (tm.tm_mon != 2 || tm.tm_mday != 31) +- exit (1); ++ return tm.tm_mon == 2 && tm.tm_mday == 31; + } + +-static void ++static int + bigtime_test (j) + int j; + { +@@ -6469,8 +13847,9 @@ + && lt->tm_wday == tm.tm_wday + && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) + == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) +- exit (1); ++ return 0; + } ++ return 1; + } + + int +@@ -6487,6 +13866,9 @@ + for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) + continue; + time_t_max--; ++ if ((time_t) -1 < 0) ++ for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) ++ continue; + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { +@@ -6494,881 +13876,2687 @@ + putenv (tz_strings[i]); + + for (t = 0; t <= time_t_max - delta; t += delta) +- mktime_test (t); +- mktime_test ((time_t) 60 * 60); +- mktime_test ((time_t) 60 * 60 * 24); ++ if (! mktime_test (t)) ++ return 1; ++ if (! (mktime_test ((time_t) 1) ++ && mktime_test ((time_t) (60 * 60)) ++ && mktime_test ((time_t) (60 * 60 * 24)))) ++ return 1; + + for (j = 1; 0 < j; j *= 2) +- bigtime_test (j); +- bigtime_test (j - 1); ++ if (! bigtime_test (j)) ++ return 1; ++ if (! bigtime_test (j - 1)) ++ return 1; + } +- irix_6_4_bug (); +- spring_forward_gap (); +- exit (0); ++ return ! (irix_6_4_bug () && spring_forward_gap ()); + } +-EOF +-if { (eval echo configure:6511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_func_working_mktime=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_func_working_mktime=no ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_working_mktime=no + fi +-rm -fr conftest* ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + +-fi + +-echo "$ac_t""$ac_cv_func_working_mktime" 1>&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5 ++echo "${ECHO_T}$ac_cv_func_working_mktime" >&6; } + if test $ac_cv_func_working_mktime = no; then +- LIBOBJS="$LIBOBJS mktime.${ac_objext}" ++ case " $LIBOBJS " in ++ *" mktime.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS mktime.$ac_objext" ++ ;; ++esac ++ + fi + + if test "$ac_cv_func_working_mktime" = no; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define BROKEN_MKTIME 1 +-EOF ++_ACEOF + + fi + + ac_have_func=no # yes means we've found a way to get the load average. + +-# Some systems have getloadavg without any extra libraries. +-echo $ac_n "checking for getloadavg""... $ac_c" 1>&6 +-echo "configure:6541: checking for getloadavg" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_getloadavg'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo "$as_me: error: $srcdir/$ac_config_libobj_dir/getloadavg.c is missing" >&2;} ++ { (exit 1); exit 1; }; } ++ ++ac_save_LIBS=$LIBS ++ ++# Check for getloadavg, but be sure not to touch the cache variable. ++({ echo "$as_me:$LINENO: checking for getloadavg" >&5 ++echo $ECHO_N "checking for getloadavg... $ECHO_C" >&6; } ++if test "${ac_cv_func_getloadavg+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define getloadavg to an innocuous variant, in case declares getloadavg. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define getloadavg innocuous_getloadavg ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char getloadavg(); below. */ +-#include +-/* 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 getloadavg(); ++ which can conflict with char getloadavg (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef getloadavg + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char getloadavg (); + /* 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_getloadavg) || defined (__stub___getloadavg) ++#if defined __stub_getloadavg || defined __stub___getloadavg + choke me +-#else +-getloadavg(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:6569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_getloadavg=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_getloadavg=no" ++int ++main () ++{ ++return getloadavg (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_getloadavg=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_getloadavg=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg" >&5 ++echo "${ECHO_T}$ac_cv_func_getloadavg" >&6; } ++if test $ac_cv_func_getloadavg = yes; then ++ exit 0 ++else ++ exit 1 + fi ++) && ac_have_func=yes + +-if eval "test \"`echo '$ac_cv_func_'getloadavg`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_have_func=yes ++# On HPUX9, an unprivileged user can get load averages through this function. ++ ++for ac_func in pstat_getdynamic ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* 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 ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++done ++ ++ ++# Solaris has libkstat which does not require root. ++ ++{ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 ++echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6; } ++if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lkstat $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char kstat_open (); ++int ++main () ++{ ++return kstat_open (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_kstat_kstat_open=yes + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_kstat_kstat_open=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 ++echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6; } ++if test $ac_cv_lib_kstat_kstat_open = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBKSTAT 1 ++_ACEOF ++ ++ LIBS="-lkstat $LIBS" ++ + fi + ++test $ac_cv_lib_kstat_kstat_open = yes && ac_have_func=yes + ++# Some systems with -lutil have (and need) -lkvm as well, some do not. ++# On Solaris, -lkvm requires nlist from -lelf, so check that first ++# to get the right answer into the cache. ++# For kstat on solaris, we need libelf to force the definition of SVR4 below. + if test $ac_have_func = no; then +- # Some systems with -lutil have (and need) -lkvm as well, some do not. +- # On Solaris, -lkvm requires nlist from -lelf, so check that first +- # to get the right answer into the cache. +- echo $ac_n "checking for elf_begin in -lelf""... $ac_c" 1>&6 +-echo "configure:6594: checking for elf_begin in -lelf" >&5 +-ac_lib_var=`echo elf'_'elf_begin | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ { echo "$as_me:$LINENO: checking for elf_begin in -lelf" >&5 ++echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6; } ++if test "${ac_cv_lib_elf_elf_begin+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lelf $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" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char elf_begin (); ++int ++main () ++{ ++return elf_begin (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_elf_elf_begin=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_elf_elf_begin=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_elf_elf_begin" >&5 ++echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6; } ++if test $ac_cv_lib_elf_elf_begin = yes; then ++ LIBS="-lelf $LIBS" + 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 +- LIBS="-lelf $LIBS" ++if test $ac_have_func = no; then ++ { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 ++echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; } ++if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lkvm $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char kvm_open (); ++int ++main () ++{ ++return kvm_open (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_kvm_kvm_open=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_kvm_kvm_open=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 ++echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; } ++if test $ac_cv_lib_kvm_kvm_open = yes; then ++ LIBS="-lkvm $LIBS" + fi + +- echo $ac_n "checking for kvm_open in -lkvm""... $ac_c" 1>&6 +-echo "configure:6634: checking for kvm_open in -lkvm" >&5 +-ac_lib_var=`echo kvm'_'kvm_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 ++ # Check for the 4.4BSD definition of getloadavg. ++ { echo "$as_me:$LINENO: checking for getloadavg in -lutil" >&5 ++echo $ECHO_N "checking for getloadavg in -lutil... $ECHO_C" >&6; } ++if test "${ac_cv_lib_util_getloadavg+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" +-LIBS="-lkvm $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" ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lutil $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char getloadavg (); ++int ++main () ++{ ++return getloadavg (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_util_getloadavg=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_util_getloadavg=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_getloadavg" >&5 ++echo "${ECHO_T}$ac_cv_lib_util_getloadavg" >&6; } ++if test $ac_cv_lib_util_getloadavg = yes; then ++ LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes + 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 +- LIBS="-lkvm $LIBS" ++ ++if test $ac_have_func = no; then ++ # There is a commonly available library for RS/6000 AIX. ++ # Since it is not a standard part of AIX, it might be installed locally. ++ ac_getloadavg_LIBS=$LIBS ++ LIBS="-L/usr/local/lib $LIBS" ++ { echo "$as_me:$LINENO: checking for getloadavg in -lgetloadavg" >&5 ++echo $ECHO_N "checking for getloadavg in -lgetloadavg... $ECHO_C" >&6; } ++if test "${ac_cv_lib_getloadavg_getloadavg+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lgetloadavg $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char getloadavg (); ++int ++main () ++{ ++return getloadavg (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_getloadavg_getloadavg=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_getloadavg_getloadavg=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_getloadavg_getloadavg" >&5 ++echo "${ECHO_T}$ac_cv_lib_getloadavg_getloadavg" >&6; } ++if test $ac_cv_lib_getloadavg_getloadavg = yes; then ++ LIBS="-lgetloadavg $LIBS" + else +- echo "$ac_t""no" 1>&6 ++ LIBS=$ac_getloadavg_LIBS + fi + +- # Check for the 4.4BSD definition of getloadavg. +- echo $ac_n "checking for getloadavg in -lutil""... $ac_c" 1>&6 +-echo "configure:6675: checking for getloadavg in -lutil" >&5 +-ac_lib_var=`echo util'_'getloadavg | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++fi ++ ++# Make sure it is really in the library, if we think we found it, ++# otherwise set up the replacement function. ++ ++for ac_func in getloadavg ++do ++as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` ++{ echo "$as_me:$LINENO: checking for $ac_func" >&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $ac_func ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); ++/* 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 ++#endif ++ ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ ++else ++ case " $LIBOBJS " in ++ *" getloadavg.$ac_objext "* ) ;; ++ *) LIBOBJS="$LIBOBJS getloadavg.$ac_objext" ++ ;; ++esac ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define C_GETLOADAVG 1 ++_ACEOF ++ ++# Figure out what our getloadavg.c needs. ++ac_have_func=no ++if test "${ac_cv_header_sys_dg_sys_info_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for sys/dg_sys_info.h" >&5 ++echo $ECHO_N "checking for sys/dg_sys_info.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_dg_sys_info_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_dg_sys_info_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_dg_sys_info_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking sys/dg_sys_info.h usability" >&5 ++echo $ECHO_N "checking sys/dg_sys_info.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking sys/dg_sys_info.h presence" >&5 ++echo $ECHO_N "checking sys/dg_sys_info.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- ac_save_LIBS="$LIBS" +-LIBS="-lutil $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" ++ ac_cpp_err=yes + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_header_preproc=no + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: sys/dg_sys_info.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/dg_sys_info.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/dg_sys_info.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/dg_sys_info.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: sys/dg_sys_info.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/dg_sys_info.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/dg_sys_info.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/dg_sys_info.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/dg_sys_info.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/dg_sys_info.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/dg_sys_info.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/dg_sys_info.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/dg_sys_info.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/dg_sys_info.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/dg_sys_info.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/dg_sys_info.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for sys/dg_sys_info.h" >&5 ++echo $ECHO_N "checking for sys/dg_sys_info.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_dg_sys_info_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_sys_dg_sys_info_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_dg_sys_info_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_dg_sys_info_h" >&6; } ++ ++fi ++if test $ac_cv_header_sys_dg_sys_info_h = yes; then ++ ac_have_func=yes ++ ++cat >>confdefs.h <<\_ACEOF ++#define DGUX 1 ++_ACEOF ++ ++ ++{ echo "$as_me:$LINENO: checking for dg_sys_info in -ldgc" >&5 ++echo $ECHO_N "checking for dg_sys_info in -ldgc... $ECHO_C" >&6; } ++if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldgc $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dg_sys_info (); ++int ++main () ++{ ++return dg_sys_info (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_dgc_dg_sys_info=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_dgc_dg_sys_info=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_dgc_dg_sys_info" >&5 ++echo "${ECHO_T}$ac_cv_lib_dgc_dg_sys_info" >&6; } ++if test $ac_cv_lib_dgc_dg_sys_info = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBDGC 1 ++_ACEOF ++ ++ LIBS="-ldgc $LIBS" ++ ++fi ++ ++fi ++ ++ ++ ++if test "${ac_cv_header_locale_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for locale.h" >&5 ++echo $ECHO_N "checking for locale.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_locale_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_locale_h" >&5 ++echo "${ECHO_T}$ac_cv_header_locale_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking locale.h usability" >&5 ++echo $ECHO_N "checking locale.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking locale.h presence" >&5 ++echo $ECHO_N "checking locale.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_t""no" 1>&6 ++ ac_cpp_err=yes + fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_header_preproc=no + fi + +-if test $ac_have_func = no; then +- # There is a commonly available library for RS/6000 AIX. +- # Since it is not a standard part of AIX, it might be installed locally. +- ac_getloadavg_LIBS="$LIBS"; LIBS="-L/usr/local/lib $LIBS" +- echo $ac_n "checking for getloadavg in -lgetloadavg""... $ac_c" 1>&6 +-echo "configure:6721: checking for getloadavg in -lgetloadavg" >&5 +-ac_lib_var=`echo getloadavg'_'getloadavg | 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="-lgetloadavg $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" ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- LIBS="-lgetloadavg $LIBS" ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: locale.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: locale.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: locale.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: locale.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: locale.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: locale.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: locale.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: locale.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: locale.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: locale.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: locale.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: locale.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: locale.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: locale.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: locale.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: locale.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for locale.h" >&5 ++echo $ECHO_N "checking for locale.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_locale_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 +-LIBS="$ac_getloadavg_LIBS" ++ ac_cv_header_locale_h=$ac_header_preproc + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_locale_h" >&5 ++echo "${ECHO_T}$ac_cv_header_locale_h" >&6; } + + fi + +-# Make sure it is really in the library, if we think we found it. +-for ac_func in getloadavg ++ ++ ++for ac_func in setlocale + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:6767: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef $ac_func + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:6795: \"$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 ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-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 +-LIBOBJS="$LIBOBJS ${ac_func}.${ac_objext}" + fi + done + + ++# We cannot check for , because Solaris 2 does not use dwarf (it ++# uses stabs), but it is still SVR4. We cannot check for because ++# Irix 4.0.5F has the header but not the library. ++if test $ac_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then ++ ac_have_func=yes + +-if test $ac_cv_func_getloadavg = yes; then +- cat >> confdefs.h <<\EOF +-#define HAVE_GETLOADAVG 1 +-EOF ++cat >>confdefs.h <<\_ACEOF ++#define SVR4 1 ++_ACEOF + +- ac_have_func=yes +-else +- # Figure out what our getloadavg.c needs. +- ac_have_func=no +- ac_safe=`echo "sys/dg_sys_info.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for sys/dg_sys_info.h""... $ac_c" 1>&6 +-echo "configure:6833: checking for sys/dg_sys_info.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:6843: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_have_func=yes; cat >> confdefs.h <<\EOF +-#define DGUX 1 +-EOF + +- echo $ac_n "checking for dg_sys_info in -ldgc""... $ac_c" 1>&6 +-echo "configure:6864: checking for dg_sys_info in -ldgc" >&5 +-ac_lib_var=`echo dgc'_'dg_sys_info | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++if test $ac_have_func = no; then ++ if test "${ac_cv_header_inq_stats_cpustats_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for inq_stats/cpustats.h" >&5 ++echo $ECHO_N "checking for inq_stats/cpustats.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_inq_stats_cpustats_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_inq_stats_cpustats_h" >&5 ++echo "${ECHO_T}$ac_cv_header_inq_stats_cpustats_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking inq_stats/cpustats.h usability" >&5 ++echo $ECHO_N "checking inq_stats/cpustats.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking inq_stats/cpustats.h presence" >&5 ++echo $ECHO_N "checking inq_stats/cpustats.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- ac_save_LIBS="$LIBS" +-LIBS="-ldgc $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" ++ ac_cpp_err=yes + fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_header_preproc=no + fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_lib=HAVE_LIB`echo dgc | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: inq_stats/cpustats.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: inq_stats/cpustats.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: inq_stats/cpustats.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: inq_stats/cpustats.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: inq_stats/cpustats.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: inq_stats/cpustats.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: inq_stats/cpustats.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: inq_stats/cpustats.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: inq_stats/cpustats.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: inq_stats/cpustats.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: inq_stats/cpustats.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: inq_stats/cpustats.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: inq_stats/cpustats.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: inq_stats/cpustats.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: inq_stats/cpustats.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: inq_stats/cpustats.h: in the future, the compiler will take precedence" >&2;} + ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for inq_stats/cpustats.h" >&5 ++echo $ECHO_N "checking for inq_stats/cpustats.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_inq_stats_cpustats_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- echo "$ac_t""no" 1>&6 ++ ac_cv_header_inq_stats_cpustats_h=$ac_header_preproc + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_inq_stats_cpustats_h" >&5 ++echo "${ECHO_T}$ac_cv_header_inq_stats_cpustats_h" >&6; } + +-else +- echo "$ac_t""no" 1>&6 + fi ++if test $ac_cv_header_inq_stats_cpustats_h = yes; then ++ ac_have_func=yes + ++cat >>confdefs.h <<\_ACEOF ++#define UMAX 1 ++_ACEOF + +- # We cannot check for , because Solaris 2 does not use dwarf (it +- # uses stabs), but it is still SVR4. We cannot check for because +- # Irix 4.0.5F has the header but not the library. +- if test $ac_have_func = no && test $ac_cv_lib_elf_elf_begin = yes; then +- ac_have_func=yes; cat >> confdefs.h <<\EOF +-#define SVR4 1 +-EOF + +- fi ++cat >>confdefs.h <<\_ACEOF ++#define UMAX4_3 1 ++_ACEOF + +- if test $ac_have_func = no; then +- ac_safe=`echo "inq_stats/cpustats.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for inq_stats/cpustats.h""... $ac_c" 1>&6 +-echo "configure:6928: checking for inq_stats/cpustats.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:6938: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_have_func=yes; cat >> confdefs.h <<\EOF +-#define UMAX 1 +-EOF + +- cat >> confdefs.h <<\EOF +-#define UMAX4_3 1 +-EOF + +-else +- echo "$ac_t""no" 1>&6 + fi + ++if test $ac_have_func = no; then ++ if test "${ac_cv_header_sys_cpustats_h+set}" = set; then ++ { echo "$as_me:$LINENO: checking for sys/cpustats.h" >&5 ++echo $ECHO_N "checking for sys/cpustats.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_cpustats_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_cpustats_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_cpustats_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking sys/cpustats.h usability" >&5 ++echo $ECHO_N "checking sys/cpustats.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking sys/cpustats.h presence" >&5 ++echo $ECHO_N "checking sys/cpustats.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= + fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } + +- if test $ac_have_func = no; then +- ac_safe=`echo "sys/cpustats.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for sys/cpustats.h""... $ac_c" 1>&6 +-echo "configure:6971: checking for sys/cpustats.h" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: sys/cpustats.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: sys/cpustats.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/cpustats.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: sys/cpustats.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: sys/cpustats.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: sys/cpustats.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/cpustats.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: sys/cpustats.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/cpustats.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: sys/cpustats.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/cpustats.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: sys/cpustats.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/cpustats.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: sys/cpustats.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: sys/cpustats.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: sys/cpustats.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for sys/cpustats.h" >&5 ++echo $ECHO_N "checking for sys/cpustats.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_sys_cpustats_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext < +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:6981: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++ ac_cv_header_sys_cpustats_h=$ac_header_preproc + fi +-rm -f conftest* ++{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_cpustats_h" >&5 ++echo "${ECHO_T}$ac_cv_header_sys_cpustats_h" >&6; } ++ + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_have_func=yes; cat >> confdefs.h <<\EOF ++if test $ac_cv_header_sys_cpustats_h = yes; then ++ ac_have_func=yes; cat >>confdefs.h <<\_ACEOF + #define UMAX 1 +-EOF ++_ACEOF + +-else +- echo "$ac_t""no" 1>&6 + fi + +- fi + +- if test $ac_have_func = no; then +- for ac_hdr in mach/mach.h ++fi ++ ++if test $ac_have_func = no; then ++ ++for ac_header in mach/mach.h + do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:7012: 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:7022: \"$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* +- eval "ac_cv_header_$ac_safe=yes" ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++ ac_cpp_err=yes + fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ + fi ++ + done + +- fi ++fi + +- ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 +-echo "configure:7052: checking for nlist.h" >&5 +-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++for ac_header in nlist.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- cat > conftest.$ac_ext < +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:7062: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define NLIST_STRUCT 1 +-EOF +- +- echo $ac_n "checking for n_un in struct nlist""... $ac_c" 1>&6 +-echo "configure:7083: checking for n_un in struct nlist" >&5 +-if eval "test \"`echo '$''{'ac_cv_struct_nlist_n_un'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ { echo "$as_me:$LINENO: checking for struct nlist.n_un.n_name" >&5 ++echo $ECHO_N "checking for struct nlist.n_un.n_name... $ECHO_C" >&6; } ++if test "${ac_cv_member_struct_nlist_n_un_n_name+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { +-struct nlist n; n.n_un.n_name = 0; +-; return 0; } +-EOF +-if { (eval echo configure:7095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_struct_nlist_n_un=yes +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- ac_cv_struct_nlist_n_un=no ++ ++int ++main () ++{ ++static struct nlist ac_aggr; ++if (ac_aggr.n_un.n_name) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_member_struct_nlist_n_un_n_name=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include ++ ++int ++main () ++{ ++static struct nlist ac_aggr; ++if (sizeof ac_aggr.n_un.n_name) ++return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_member_struct_nlist_n_un_n_name=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_member_struct_nlist_n_un_n_name=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5 ++echo "${ECHO_T}$ac_cv_member_struct_nlist_n_un_n_name" >&6; } ++if test $ac_cv_member_struct_nlist_n_un_n_name = yes; then ++ ++cat >>confdefs.h <<_ACEOF ++#define HAVE_STRUCT_NLIST_N_UN_N_NAME 1 ++_ACEOF + +-echo "$ac_t""$ac_cv_struct_nlist_n_un" 1>&6 +- if test $ac_cv_struct_nlist_n_un = yes; then +- cat >> confdefs.h <<\EOF ++ ++cat >>confdefs.h <<\_ACEOF + #define NLIST_NAME_UNION 1 +-EOF ++_ACEOF ++ ++fi ++ ++ ++fi ++ ++done + +- fi +- +-else +- echo "$ac_t""no" 1>&6 + fi +-fi # Do not have getloadavg in system libraries. ++done ++ + + # Some definitions of getloadavg require that the program be installed setgid. +-echo $ac_n "checking whether getloadavg requires setgid""... $ac_c" 1>&6 +-echo "configure:7122: checking whether getloadavg requires setgid" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_getloadavg_setgid'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking whether getloadavg requires setgid... $ECHO_C" >&6; } ++if test "${ac_cv_func_getloadavg_setgid+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include "$srcdir/$ac_config_libobj_dir/getloadavg.c" + #ifdef LDAV_PRIVILEGED + Yowza Am I SETGID yet + #endif +-EOF ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "Yowza Am I SETGID yet" >/dev/null 2>&1; then +- rm -rf conftest* ++ $EGREP "Yowza Am I SETGID yet" >/dev/null 2>&1; then + ac_cv_func_getloadavg_setgid=yes + else +- rm -rf conftest* + ac_cv_func_getloadavg_setgid=no + fi + rm -f conftest* + + fi +- +-echo "$ac_t""$ac_cv_func_getloadavg_setgid" 1>&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg_setgid" >&5 ++echo "${ECHO_T}$ac_cv_func_getloadavg_setgid" >&6; } + if test $ac_cv_func_getloadavg_setgid = yes; then +- NEED_SETGID=true; cat >> confdefs.h <<\EOF ++ NEED_SETGID=true ++ ++cat >>confdefs.h <<\_ACEOF + #define GETLOADAVG_PRIVILEGED 1 +-EOF ++_ACEOF + + else + NEED_SETGID=false + fi + + if test $ac_cv_func_getloadavg_setgid = yes; then +- echo $ac_n "checking group of /dev/kmem""... $ac_c" 1>&6 +-echo "configure:7158: checking group of /dev/kmem" >&5 +-if eval "test \"`echo '$''{'ac_cv_group_kmem'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ { echo "$as_me:$LINENO: checking group of /dev/kmem" >&5 ++echo $ECHO_N "checking group of /dev/kmem... $ECHO_C" >&6; } ++if test "${ac_cv_group_kmem+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- # On Solaris, /dev/kmem is a symlink. Get info on the real file. ++ # On Solaris, /dev/kmem is a symlink. Get info on the real file. + ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null` + # If we got an error (system does not support symlinks), try without -L. + test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem` + ac_cv_group_kmem=`echo $ac_ls_output \ +- | sed -ne 's/[ ][ ]*/ /g; ++ | sed -ne 's/[ ][ ]*/ /g; + s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\) *.*/\1/; + / /s/.* //;p;'` + + fi +- +-echo "$ac_t""$ac_cv_group_kmem" 1>&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_group_kmem" >&5 ++echo "${ECHO_T}$ac_cv_group_kmem" >&6; } + KMEM_GROUP=$ac_cv_group_kmem + fi ++if test "x$ac_save_LIBS" = x; then ++ GETLOADAVG_LIBS=$LIBS ++else ++ GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$ac_save_LIBS!!"` ++fi ++LIBS=$ac_save_LIBS ++ + + +-echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6 +-echo "configure:7179: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +-if eval "test \"`echo '$''{'ac_cv_sys_largefile_source'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 ++echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; } ++if test "${ac_cv_sys_largefile_source+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ while :; do + ac_cv_sys_largefile_source=no +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + return !fseeko; +-; return 0; } +-EOF +-if { (eval echo configure:7192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ break + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- cat > conftest.$ac_ext <&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #define _LARGEFILE_SOURCE 1 + #include +- +-int main() { ++int ++main () ++{ + return !fseeko; +-; return 0; } +-EOF +-if { (eval echo configure:7208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- ac_cv_sys_largefile_source=1 ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_sys_largefile_source=1; break + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ break ++done + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 ++echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; } ++if test "$ac_cv_sys_largefile_source" != no; then + +-echo "$ac_t""$ac_cv_sys_largefile_source" 1>&6 +- if test "$ac_cv_sys_largefile_source" != no; then +- cat >> confdefs.h <>confdefs.h <<_ACEOF + #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source +-EOF ++_ACEOF + +- fi +- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug +- # in glibc 2.1.3, but that breaks too many other things. +- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. +- +- echo $ac_n "checking for fseeko""... $ac_c" 1>&6 +-echo "configure:7232: checking for fseeko" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_fseeko'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_cv_func_fseeko=no +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for fseeko... $ECHO_C" >&6; } ++if test "${ac_cv_func_fseeko+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + return fseeko && fseeko (stdin, 0, 0); +-; return 0; } +-EOF +-if { (eval echo configure:7245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_func_fseeko=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_fseeko=no + fi +-rm -f conftest* ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5 ++echo "${ECHO_T}$ac_cv_func_fseeko" >&6; } ++if test $ac_cv_func_fseeko = yes; then + +-echo "$ac_t""$ac_cv_func_fseeko" 1>&6 +- if test $ac_cv_func_fseeko != no; then +- cat >> confdefs.h <<\EOF ++cat >>confdefs.h <<\_ACEOF + #define HAVE_FSEEKO 1 +-EOF ++_ACEOF ++ ++fi + +- fi + + # UNIX98 PTYs. ++ + for ac_func in grantpt + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:7267: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef $ac_func + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:7295: \"$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 ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-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 + + + # PTY-related GNU extensions. ++ + for ac_func in getpt + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:7324: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef $ac_func + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:7352: \"$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 ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-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 + +@@ -7377,51 +16565,91 @@ + # That is because we have not set up to link ncurses in lib-src. + # 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:7382: 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 ++ ++{ echo "$as_me:$LINENO: checking for tparm in -lncurses" >&5 ++echo $ECHO_N "checking for tparm in -lncurses... $ECHO_C" >&6; } ++if test "${ac_cv_lib_ncurses_tparm+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lncurses $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 +- ac_tr_lib=HAVE_LIB`echo ncurses | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char tparm (); ++int ++main () ++{ ++return tparm (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_ncurses_tparm=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_ncurses_tparm=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tparm" >&5 ++echo "${ECHO_T}$ac_cv_lib_ncurses_tparm" >&6; } ++if test $ac_cv_lib_ncurses_tparm = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBNCURSES 1 ++_ACEOF + + LIBS="-lncurses $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + + +@@ -7429,174 +16657,365 @@ + if test "$with_hesiod" = yes ; then + # Don't set $LIBS here -- see comments above. + resolv=no +- echo $ac_n "checking for res_send""... $ac_c" 1>&6 +-echo "configure:7434: checking for res_send" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_res_send'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for res_send... $ECHO_C" >&6; } ++if test "${ac_cv_func_res_send+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define res_send to an innocuous variant, in case declares res_send. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define res_send innocuous_res_send ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char res_send(); below. */ +-#include +-/* 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 res_send(); ++ which can conflict with char res_send (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef res_send + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char res_send (); + /* 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_res_send) || defined (__stub___res_send) ++#if defined __stub_res_send || defined __stub___res_send + choke me +-#else +-res_send(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:7462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_res_send=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_res_send=no" +-fi +-rm -f conftest* ++int ++main () ++{ ++return res_send (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_res_send=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_res_send=no + fi + +-if eval "test \"`echo '$ac_cv_func_'res_send`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5 ++echo "${ECHO_T}$ac_cv_func_res_send" >&6; } ++if test $ac_cv_func_res_send = yes; then + : + else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for __res_send""... $ac_c" 1>&6 +-echo "configure:7480: checking for __res_send" >&5 +-if eval "test \"`echo '$''{'ac_cv_func___res_send'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for __res_send... $ECHO_C" >&6; } ++if test "${ac_cv_func___res_send+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define __res_send to an innocuous variant, in case declares __res_send. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define __res_send innocuous___res_send ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char __res_send(); below. */ +-#include +-/* 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 __res_send(); ++ which can conflict with char __res_send (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef __res_send + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char __res_send (); + /* 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___res_send) || defined (__stub_____res_send) ++#if defined __stub___res_send || defined __stub_____res_send + choke me +-#else +-__res_send(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:7508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func___res_send=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func___res_send=no" +-fi +-rm -f conftest* ++int ++main () ++{ ++return __res_send (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func___res_send=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func___res_send=no + fi + +-if eval "test \"`echo '$ac_cv_func_'__res_send`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func___res_send" >&5 ++echo "${ECHO_T}$ac_cv_func___res_send" >&6; } ++if test $ac_cv_func___res_send = yes; then + : + else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for res_send in -lresolv""... $ac_c" 1>&6 +-echo "configure:7526: checking for res_send in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'res_send | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ { echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5 ++echo $ECHO_N "checking for res_send in -lresolv... $ECHO_C" >&6; } ++if test "${ac_cv_lib_resolv_res_send+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lresolv $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 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char res_send (); ++int ++main () ++{ ++return res_send (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_resolv_res_send=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_resolv_res_send=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5 ++echo "${ECHO_T}$ac_cv_lib_resolv_res_send" >&6; } ++if test $ac_cv_lib_resolv_res_send = yes; then + resolv=yes + else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for __res_send in -lresolv""... $ac_c" 1>&6 +-echo "configure:7564: checking for __res_send in -lresolv" >&5 +-ac_lib_var=`echo resolv'_'__res_send | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ { echo "$as_me:$LINENO: checking for __res_send in -lresolv" >&5 ++echo $ECHO_N "checking for __res_send in -lresolv... $ECHO_C" >&6; } ++if test "${ac_cv_lib_resolv___res_send+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lresolv $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 ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char __res_send (); ++int ++main () ++{ ++return __res_send (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_resolv___res_send=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_resolv___res_send=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_send" >&5 ++echo "${ECHO_T}$ac_cv_lib_resolv___res_send" >&6; } ++if test $ac_cv_lib_resolv___res_send = yes; then + resolv=yes +-else +- echo "$ac_t""no" 1>&6 + fi + + fi +@@ -7607,101 +17026,197 @@ + + if test "$resolv" = yes ; then + RESOLVLIB=-lresolv +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBRESOLV 1 +-EOF ++_ACEOF + + else + RESOLVLIB= + fi +- echo $ac_n "checking for hes_getmailhost""... $ac_c" 1>&6 +-echo "configure:7619: checking for hes_getmailhost" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_hes_getmailhost'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for hes_getmailhost... $ECHO_C" >&6; } ++if test "${ac_cv_func_hes_getmailhost+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define hes_getmailhost to an innocuous variant, in case declares hes_getmailhost. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define hes_getmailhost innocuous_hes_getmailhost ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char hes_getmailhost(); below. */ +-#include +-/* 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 hes_getmailhost(); ++ which can conflict with char hes_getmailhost (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef hes_getmailhost + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char hes_getmailhost (); + /* 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_hes_getmailhost) || defined (__stub___hes_getmailhost) ++#if defined __stub_hes_getmailhost || defined __stub___hes_getmailhost + choke me +-#else +-hes_getmailhost(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:7647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_hes_getmailhost=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_hes_getmailhost=no" +-fi +-rm -f conftest* ++int ++main () ++{ ++return hes_getmailhost (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_hes_getmailhost=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_hes_getmailhost=no + fi + +-if eval "test \"`echo '$ac_cv_func_'hes_getmailhost`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_hes_getmailhost" >&5 ++echo "${ECHO_T}$ac_cv_func_hes_getmailhost" >&6; } ++if test $ac_cv_func_hes_getmailhost = yes; then + : + else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for hes_getmailhost in -lhesiod""... $ac_c" 1>&6 +-echo "configure:7665: checking for hes_getmailhost in -lhesiod" >&5 +-ac_lib_var=`echo hesiod'_'hes_getmailhost | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ { echo "$as_me:$LINENO: checking for hes_getmailhost in -lhesiod" >&5 ++echo $ECHO_N "checking for hes_getmailhost in -lhesiod... $ECHO_C" >&6; } ++if test "${ac_cv_lib_hesiod_hes_getmailhost+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lhesiod $RESOLVLIB $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 +- cat >> confdefs.h <<\EOF ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char hes_getmailhost (); ++int ++main () ++{ ++return hes_getmailhost (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_hesiod_hes_getmailhost=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_hesiod_hes_getmailhost=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5 ++echo "${ECHO_T}$ac_cv_lib_hesiod_hes_getmailhost" >&6; } ++if test $ac_cv_lib_hesiod_hes_getmailhost = yes; then ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBHESIOD 1 +-EOF ++_ACEOF + + else +- echo "$ac_t""no" 1>&6 +-: ++ : + fi + + fi +@@ -7710,773 +17225,1478 @@ + + # These tell us which Kerberos-related libraries to use. + if test "${with_kerberos+set}" = set; then +- echo $ac_n "checking for com_err in -lcom_err""... $ac_c" 1>&6 +-echo "configure:7715: checking for com_err in -lcom_err" >&5 +-ac_lib_var=`echo com_err'_'com_err | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++{ echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5 ++echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6; } ++if test "${ac_cv_lib_com_err_com_err+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lcom_err $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 +- ac_tr_lib=HAVE_LIB`echo com_err | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char com_err (); ++int ++main () ++{ ++return com_err (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_com_err_com_err=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_com_err_com_err=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5 ++echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6; } ++if test $ac_cv_lib_com_err_com_err = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBCOM_ERR 1 ++_ACEOF + + LIBS="-lcom_err $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + +- echo $ac_n "checking for mit_des_cbc_encrypt in -lk5crypto""... $ac_c" 1>&6 +-echo "configure:7762: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 +-ac_lib_var=`echo k5crypto'_'mit_des_cbc_encrypt | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++{ echo "$as_me:$LINENO: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 ++echo $ECHO_N "checking for mit_des_cbc_encrypt in -lk5crypto... $ECHO_C" >&6; } ++if test "${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lk5crypto $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 +- ac_tr_lib=HAVE_LIB`echo k5crypto | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char mit_des_cbc_encrypt (); ++int ++main () ++{ ++return mit_des_cbc_encrypt (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_k5crypto_mit_des_cbc_encrypt=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_k5crypto_mit_des_cbc_encrypt=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5 ++echo "${ECHO_T}$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; } ++if test $ac_cv_lib_k5crypto_mit_des_cbc_encrypt = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBK5CRYPTO 1 ++_ACEOF + + LIBS="-lk5crypto $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + +- echo $ac_n "checking for mit_des_cbc_encrypt in -lcrypto""... $ac_c" 1>&6 +-echo "configure:7809: checking for mit_des_cbc_encrypt in -lcrypto" >&5 +-ac_lib_var=`echo crypto'_'mit_des_cbc_encrypt | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++{ echo "$as_me:$LINENO: checking for mit_des_cbc_encrypt in -lcrypto" >&5 ++echo $ECHO_N "checking for mit_des_cbc_encrypt in -lcrypto... $ECHO_C" >&6; } ++if test "${ac_cv_lib_crypto_mit_des_cbc_encrypt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lcrypto $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 +- ac_tr_lib=HAVE_LIB`echo crypto | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char mit_des_cbc_encrypt (); ++int ++main () ++{ ++return mit_des_cbc_encrypt (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_crypto_mit_des_cbc_encrypt=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_crypto_mit_des_cbc_encrypt=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5 ++echo "${ECHO_T}$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; } ++if test $ac_cv_lib_crypto_mit_des_cbc_encrypt = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBCRYPTO 1 ++_ACEOF + + LIBS="-lcrypto $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + +- echo $ac_n "checking for krb5_init_context in -lkrb5""... $ac_c" 1>&6 +-echo "configure:7856: checking for krb5_init_context in -lkrb5" >&5 +-ac_lib_var=`echo krb5'_'krb5_init_context | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++{ echo "$as_me:$LINENO: checking for krb5_init_context in -lkrb5" >&5 ++echo $ECHO_N "checking for krb5_init_context in -lkrb5... $ECHO_C" >&6; } ++if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lkrb5 $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 +- ac_tr_lib=HAVE_LIB`echo krb5 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char krb5_init_context (); ++int ++main () ++{ ++return krb5_init_context (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_krb5_krb5_init_context=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_krb5_krb5_init_context=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5 ++echo "${ECHO_T}$ac_cv_lib_krb5_krb5_init_context" >&6; } ++if test $ac_cv_lib_krb5_krb5_init_context = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBKRB5 1 ++_ACEOF + + LIBS="-lkrb5 $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + + if test "${with_kerberos5+set}" != set; then +- echo $ac_n "checking for des_cbc_encrypt in -ldes425""... $ac_c" 1>&6 +-echo "configure:7904: checking for des_cbc_encrypt in -ldes425" >&5 +-ac_lib_var=`echo des425'_'des_cbc_encrypt | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++{ echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes425" >&5 ++echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6; } ++if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-ldes425 $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 +- ac_tr_lib=HAVE_LIB`echo des425 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char des_cbc_encrypt (); ++int ++main () ++{ ++return des_cbc_encrypt (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_des425_des_cbc_encrypt=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_des425_des_cbc_encrypt=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 ++echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6; } ++if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBDES425 1 ++_ACEOF + + LIBS="-ldes425 $LIBS" + + else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for des_cbc_encrypt in -ldes""... $ac_c" 1>&6 +-echo "configure:7949: checking for des_cbc_encrypt in -ldes" >&5 +-ac_lib_var=`echo des'_'des_cbc_encrypt | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++{ echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes" >&5 ++echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6; } ++if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-ldes $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 +- ac_tr_lib=HAVE_LIB`echo des | sed -e 's/^a-zA-Z0-9_/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char des_cbc_encrypt (); ++int ++main () ++{ ++return des_cbc_encrypt (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_des_des_cbc_encrypt=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_des_des_cbc_encrypt=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 ++echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6; } ++if test $ac_cv_lib_des_des_cbc_encrypt = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBDES 1 ++_ACEOF + + LIBS="-ldes $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + + fi + +- echo $ac_n "checking for krb_get_cred in -lkrb4""... $ac_c" 1>&6 +-echo "configure:7998: checking for krb_get_cred in -lkrb4" >&5 +-ac_lib_var=`echo krb4'_'krb_get_cred | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++{ echo "$as_me:$LINENO: checking for krb_get_cred in -lkrb4" >&5 ++echo $ECHO_N "checking for krb_get_cred in -lkrb4... $ECHO_C" >&6; } ++if test "${ac_cv_lib_krb4_krb_get_cred+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lkrb4 $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 +- ac_tr_lib=HAVE_LIB`echo krb4 | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char krb_get_cred (); ++int ++main () ++{ ++return krb_get_cred (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_krb4_krb_get_cred=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_krb4_krb_get_cred=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_get_cred" >&5 ++echo "${ECHO_T}$ac_cv_lib_krb4_krb_get_cred" >&6; } ++if test $ac_cv_lib_krb4_krb_get_cred = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBKRB4 1 ++_ACEOF + + LIBS="-lkrb4 $LIBS" + + else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for krb_get_cred in -lkrb""... $ac_c" 1>&6 +-echo "configure:8043: checking for krb_get_cred in -lkrb" >&5 +-ac_lib_var=`echo krb'_'krb_get_cred | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 ++ ++{ echo "$as_me:$LINENO: checking for krb_get_cred in -lkrb" >&5 ++echo $ECHO_N "checking for krb_get_cred in -lkrb... $ECHO_C" >&6; } ++if test "${ac_cv_lib_krb_krb_get_cred+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lkrb $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" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char krb_get_cred (); ++int ++main () ++{ ++return krb_get_cred (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_krb_krb_get_cred=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_krb_krb_get_cred=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_get_cred" >&5 ++echo "${ECHO_T}$ac_cv_lib_krb_krb_get_cred" >&6; } ++if test $ac_cv_lib_krb_krb_get_cred = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBKRB 1 ++_ACEOF ++ ++ LIBS="-lkrb $LIBS" ++ + 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 +- ac_tr_lib=HAVE_LIB`echo krb | sed -e 's/^a-zA-Z0-9_/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_t""no" 1>&6 ++ ac_cpp_err=yes + fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_header_preproc=no + fi + +- fi ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + +- if test "${with_kerberos5+set}" = set; then +- for ac_hdr in krb5.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8098: 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:8108: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 + fi ++ + done + + else +- for ac_hdr in des.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8139: 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:8149: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 +-for ac_hdr in kerberosIV/des.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8176: 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:8186: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 +-for ac_hdr in kerberos/des.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8213: 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:8223: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_t""no" 1>&6 ++ ac_cpp_err=yes + fi +-done ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_header_preproc=no + fi +-done + ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ break + fi ++ + done + +- for ac_hdr in krb.h ++ ++ ++ ++for ac_header in krb.h kerberosIV/krb.h kerberos/krb.h + do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8259: 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:8269: \"$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* +- eval "ac_cv_header_$ac_safe=yes" ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 +-for ac_hdr in kerberosIV/krb.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8296: 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:8306: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* ++ ac_cpp_err=yes + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 +-for ac_hdr in kerberos/krb.h +-do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8333: 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:8343: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 +-fi +-done ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + ++ ac_header_preproc=no + fi +-done + ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ break + fi ++ + done + + fi +- for ac_hdr in com_err.h ++ ++for ac_header in com_err.h + do +-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:8380: 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:8390: \"$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* +- eval "ac_cv_header_$ac_safe=yes" ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi + else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++ ac_cpp_err=yes + fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +- cat >> confdefs.h <&6 ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ + fi ++ + done + + fi + + # 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:8421: 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 ++ ++{ echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 ++echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_intl_dgettext+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_save_LIBS="$LIBS" ++ ac_check_lib_save_LIBS=$LIBS + LIBS="-lintl $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 +- ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dgettext (); ++int ++main () ++{ ++return dgettext (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_intl_dgettext=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_intl_dgettext=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 ++echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } ++if test $ac_cv_lib_intl_dgettext = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBINTL 1 ++_ACEOF + + LIBS="-lintl $LIBS" + +-else +- echo "$ac_t""no" 1>&6 + fi + + +-echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 +-echo "configure:8469: 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 ++{ echo "$as_me:$LINENO: checking whether localtime caches TZ" >&5 ++echo $ECHO_N "checking whether localtime caches TZ... $ECHO_C" >&6; } ++if test "${emacs_cv_localtime_cache+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else + if test x$ac_cv_func_tzset = xyes; then + if test "$cross_compiling" = yes; then + # If we have tzset, assume the worst when cross-compiling. + emacs_cv_localtime_cache=yes + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include + extern char **environ; + unset_TZ () +@@ -8506,97 +18726,177 @@ + exit (1); + exit (0); + } +-EOF +-if { (eval echo configure:8511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_localtime_cache=no + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- emacs_cv_localtime_cache=yes ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++emacs_cv_localtime_cache=yes + fi +-rm -fr conftest* ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + ++ + else + # If we lack tzset, report that localtime does not cache TZ, + # since we can't invalidate the cache if we don't have tzset. + emacs_cv_localtime_cache=no + fi + fi +-echo "$ac_t""$emacs_cv_localtime_cache" 1>&6 ++{ echo "$as_me:$LINENO: result: $emacs_cv_localtime_cache" >&5 ++echo "${ECHO_T}$emacs_cv_localtime_cache" >&6; } + if test $emacs_cv_localtime_cache = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define LOCALTIME_CACHE 1 +-EOF ++_ACEOF + + fi + + if test "x$HAVE_TIMEVAL" = xyes; then +- for ac_func in gettimeofday ++ ++for ac_func in gettimeofday + do +-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:8541: 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 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $ac_func(); below. */ +-#include +-/* 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(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef $ac_func + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-$ac_func(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:8569: \"$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 ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + +-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 + +- echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6 +-echo "configure:8594: 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 ++echo $ECHO_N "checking whether gettimeofday can accept two arguments... $ECHO_C" >&6; } ++if test "${emacs_cv_gettimeofday_two_arguments+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + + #ifdef TIME_WITH_SYS_TIME + #include +@@ -8608,54 +18908,133 @@ + #include + #endif + #endif +-int main() { ++int ++main () ++{ + struct timeval time; + gettimeofday (&time, 0); +-; return 0; } +-EOF +-if { (eval echo configure:8617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_gettimeofday_two_arguments=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_gettimeofday_two_arguments=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_gettimeofday_two_arguments=no + fi + +-echo "$ac_t""$emacs_cv_gettimeofday_two_arguments" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_gettimeofday_two_arguments" >&5 ++echo "${ECHO_T}$emacs_cv_gettimeofday_two_arguments" >&6; } + if test $emacs_cv_gettimeofday_two_arguments = no; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define GETTIMEOFDAY_ONE_ARGUMENT 1 +-EOF ++_ACEOF + + fi + fi + + if test "$ac_cv_func_gettimeofday" = yes; then +- echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 +-echo "configure:8640: checking for struct timezone" >&5 +-if eval "test \"`echo '$''{'emacs_cv_struct_timezone'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for struct timezone... $ECHO_C" >&6; } ++if test "${emacs_cv_struct_timezone+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-int main() { ++int ++main () ++{ + struct timezone tz; +-; return 0; } +-EOF +-if { (eval echo configure:8652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + if test "$cross_compiling" = yes; then + emacs_cv_struct_timezone=yes + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + + #ifdef TIME_WITH_SYS_TIME + #include +@@ -8672,327 +19051,968 @@ + struct timezone dummy; + exit (gettimeofday (&time, &dummy)); + } +-EOF +-if { (eval echo configure:8677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + emacs_cv_struct_timezone=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- emacs_cv_struct_timezone=no ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++emacs_cv_struct_timezone=no + fi +-rm -fr conftest* ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi + ++ + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- emacs_cv_struct_timezone=no +-fi +-rm -f conftest* ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ emacs_cv_struct_timezone=no + fi + +-echo "$ac_t""$emacs_cv_struct_timezone" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $emacs_cv_struct_timezone" >&5 ++echo "${ECHO_T}$emacs_cv_struct_timezone" >&6; } + fi + + ok_so_far=yes +-echo $ac_n "checking for socket""... $ac_c" 1>&6 +-echo "configure:8703: 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 ++echo $ECHO_N "checking for socket... $ECHO_C" >&6; } ++if test "${ac_cv_func_socket+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define socket to an innocuous variant, in case declares socket. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define socket innocuous_socket ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char socket(); below. */ +-#include +-/* 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 socket(); ++ which can conflict with char socket (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef socket + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char socket (); + /* 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_socket) || defined (__stub___socket) ++#if defined __stub_socket || defined __stub___socket + choke me +-#else +-socket(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:8731: \"$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 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_socket=no" +-fi +-rm -f conftest* ++int ++main () ++{ ++return socket (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_socket=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_func_socket=no + fi + +-if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 ++echo "${ECHO_T}$ac_cv_func_socket" >&6; } ++if test $ac_cv_func_socket = yes; then + : + else +- echo "$ac_t""no" 1>&6 +-ok_so_far=no ++ ok_so_far=no + fi + + 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:8754: 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 <&5 ++echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_netinet_in_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 ++echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking netinet/in.h usability" >&5 ++echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking netinet/in.h presence" >&5 ++echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8764: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: netinet/in.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: netinet/in.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: netinet/in.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: netinet/in.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: netinet/in.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: netinet/in.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: netinet/in.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: netinet/in.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for netinet/in.h" >&5 ++echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_netinet_in_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_netinet_in_h=$ac_header_preproc + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 ++echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; } ++ ++fi ++if test $ac_cv_header_netinet_in_h = yes; then + : + else +- echo "$ac_t""no" 1>&6 +-ok_so_far=no ++ ok_so_far=no + fi + ++ + fi + 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:8790: 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 <&5 ++echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_arpa_inet_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 ++echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking arpa/inet.h usability" >&5 ++echo $ECHO_N "checking arpa/inet.h usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking arpa/inet.h presence" >&5 ++echo $ECHO_N "checking arpa/inet.h presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + #include +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:8800: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes + fi +-rm -f conftest* ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: arpa/inet.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: arpa/inet.h: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: arpa/inet.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: arpa/inet.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: arpa/inet.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: arpa/inet.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: arpa/inet.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 ++echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; } ++if test "${ac_cv_header_arpa_inet_h+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_cv_header_arpa_inet_h=$ac_header_preproc ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 ++echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; } ++ + fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 ++if test $ac_cv_header_arpa_inet_h = yes; then + : + else +- echo "$ac_t""no" 1>&6 +-ok_so_far=no ++ ok_so_far=no + fi + ++ + fi + if test $ok_so_far = yes; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_INET_SOCKETS 1 +-EOF ++_ACEOF + + fi + + if test -f /usr/lpp/X11/bin/smt.exp; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_AIX_SMT_EXP 1 +-EOF ++_ACEOF + + fi + +-echo $ac_n "checking whether system supports dynamic ptys""... $ac_c" 1>&6 +-echo "configure:8838: checking whether system supports dynamic ptys" >&5 ++{ echo "$as_me:$LINENO: checking whether system supports dynamic ptys" >&5 ++echo $ECHO_N "checking whether system supports dynamic ptys... $ECHO_C" >&6; } + if test -d /dev/pts && ls -d /dev/ptmx > /dev/null 2>&1 ; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF ++ { echo "$as_me:$LINENO: result: yes" >&5 ++echo "${ECHO_T}yes" >&6; } ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_DEV_PTMX 1 +-EOF ++_ACEOF + + else +- echo "$ac_t""no" 1>&6 ++ { echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6; } + fi + +-echo $ac_n "checking for pid_t""... $ac_c" 1>&6 +-echo "configure:8850: checking for pid_t" >&5 +-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-#if STDC_HEADERS +-#include +-#include +-#endif +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +- rm -rf conftest* ++{ echo "$as_me:$LINENO: checking for pid_t" >&5 ++echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } ++if test "${ac_cv_type_pid_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++typedef pid_t ac__type_new_; ++int ++main () ++{ ++if ((ac__type_new_ *) 0) ++ return 0; ++if (sizeof (ac__type_new_)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_type_pid_t=yes + else +- rm -rf conftest* +- ac_cv_type_pid_t=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_type_pid_t=no + fi +-rm -f conftest* + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$ac_t""$ac_cv_type_pid_t" 1>&6 +-if test $ac_cv_type_pid_t = no; then +- cat >> confdefs.h <<\EOF ++{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 ++echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } ++if test $ac_cv_type_pid_t = yes; then ++ : ++else ++ ++cat >>confdefs.h <<_ACEOF + #define pid_t int +-EOF ++_ACEOF ++ ++fi ++ ++ ++for ac_header in vfork.h ++do ++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ { echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++else ++ # Is the header compilable? ++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 ++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++#include <$ac_header> ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_header_compiler=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_compiler=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 ++echo "${ECHO_T}$ac_header_compiler" >&6; } ++ ++# Is the header present? ++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 ++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++#include <$ac_header> ++_ACEOF ++if { (ac_try="$ac_cpp conftest.$ac_ext" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } >/dev/null; then ++ if test -s conftest.err; then ++ ac_cpp_err=$ac_c_preproc_warn_flag ++ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag ++ else ++ ac_cpp_err= ++ fi ++else ++ ac_cpp_err=yes ++fi ++if test -z "$ac_cpp_err"; then ++ ac_header_preproc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_header_preproc=no ++fi ++ ++rm -f conftest.err conftest.$ac_ext ++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 ++echo "${ECHO_T}$ac_header_preproc" >&6; } ++ ++# So? What about this header? ++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in ++ yes:no: ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ++ ac_header_preproc=yes ++ ;; ++ no:yes:* ) ++ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ++ ++ ;; ++esac ++{ echo "$as_me:$LINENO: checking for $ac_header" >&5 ++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } ++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ eval "$as_ac_Header=\$ac_header_preproc" ++fi ++ac_res=`eval echo '${'$as_ac_Header'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++ ++fi ++if test `eval echo '${'$as_ac_Header'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF + + fi + +-ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 +-echo "configure:8884: checking for vfork.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:8894: \"$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* +- eval "ac_cv_header_$ac_safe=yes" +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_header_$ac_safe=no" +-fi +-rm -f conftest* +-fi +-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- cat >> confdefs.h <<\EOF +-#define HAVE_VFORK_H 1 +-EOF ++done + +-else +- echo "$ac_t""no" 1>&6 +-fi + +-echo $ac_n "checking for working vfork""... $ac_c" 1>&6 +-echo "configure:8919: checking for working vfork" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- if test "$cross_compiling" = yes; then +- echo $ac_n "checking for vfork""... $ac_c" 1>&6 +-echo "configure:8925: checking for vfork" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <&5 ++echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } ++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++/* Define $ac_func to an innocuous variant, in case declares $ac_func. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $ac_func innocuous_$ac_func ++ + /* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char vfork(); below. */ +-#include +-/* 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 vfork(); ++ which can conflict with char $ac_func (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif + +-int main() { ++#undef $ac_func + ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $ac_func (); + /* 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_vfork) || defined (__stub___vfork) ++#if defined __stub_$ac_func || defined __stub___$ac_func + choke me +-#else +-vfork(); + #endif + +-; return 0; } +-EOF +-if { (eval echo configure:8953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_vfork=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_vfork=no" +-fi +-rm -f conftest* ++int ++main () ++{ ++return $ac_func (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ eval "$as_ac_var=yes" ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ eval "$as_ac_var=no" ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++ac_res=`eval echo '${'$as_ac_var'}'` ++ { echo "$as_me:$LINENO: result: $ac_res" >&5 ++echo "${ECHO_T}$ac_res" >&6; } ++if test `eval echo '${'$as_ac_var'}'` = yes; then ++ cat >>confdefs.h <<_ACEOF ++#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF ++ + fi ++done + +-if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- : ++if test "x$ac_cv_func_fork" = xyes; then ++ { echo "$as_me:$LINENO: checking for working fork" >&5 ++echo $ECHO_N "checking for working fork... $ECHO_C" >&6; } ++if test "${ac_cv_func_fork_works+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ if test "$cross_compiling" = yes; then ++ ac_cv_func_fork_works=cross ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++int ++main () ++{ ++ ++ /* By Ruediger Kuhlmann. */ ++ return fork () < 0; ++ ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_func_fork_works=yes + else +- echo "$ac_t""no" 1>&6 ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_fork_works=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext ++fi ++ ++ + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 ++echo "${ECHO_T}$ac_cv_func_fork_works" >&6; } + ++else ++ ac_cv_func_fork_works=$ac_cv_func_fork ++fi ++if test "x$ac_cv_func_fork_works" = xcross; then ++ case $host in ++ *-*-amigaos* | *-*-msdosdjgpp*) ++ # Override, as these systems have only a dummy fork() stub ++ ac_cv_func_fork_works=no ++ ;; ++ *) ++ ac_cv_func_fork_works=yes ++ ;; ++ esac ++ { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 ++echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} ++fi + ac_cv_func_vfork_works=$ac_cv_func_vfork ++if test "x$ac_cv_func_vfork" = xyes; then ++ { echo "$as_me:$LINENO: checking for working vfork" >&5 ++echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; } ++if test "${ac_cv_func_vfork_works+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + /* Thanks to Paul Eggert for this test. */ +-#include +-#include +-#include +-#ifdef HAVE_UNISTD_H +-#include +-#endif ++$ac_includes_default ++#include + #ifdef HAVE_VFORK_H +-#include ++# include + #endif + /* On some sparc systems, changes by the child to local and incoming +- argument registers are propagated back to the parent. +- The compiler is told about this with #include , +- but some compilers (e.g. gcc -O) don't grok . +- Test for this by using a static variable whose address +- is put into a register that is clobbered by the vfork. */ +-static ++ argument registers are propagated back to the parent. The compiler ++ is told about this with #include , but some compilers ++ (e.g. gcc -O) don't grok . Test for this by using a ++ static variable whose address is put into a register that is ++ clobbered by the vfork. */ ++static void + #ifdef __cplusplus + sparc_address_test (int arg) +-#else ++# else + sparc_address_test (arg) int arg; + #endif + { +@@ -9010,25 +20030,27 @@ + } + } + } +-main() { ++ ++int ++main () ++{ + pid_t parent = getpid (); + pid_t child; + +- sparc_address_test (); ++ sparc_address_test (0); + + child = vfork (); + + if (child == 0) { +- /* Here is another test for sparc vfork register problems. +- This test uses lots of local variables, at least +- as many local variables as main has allocated so far +- including compiler temporaries. 4 locals are enough for +- gcc 1.40.3 on a Solaris 4.1.3 sparc, but we use 8 to be safe. +- A buggy compiler should reuse the register of parent +- for one of the local variables, since it will think that +- parent can't possibly be used any more in this routine. +- Assigning to the local variable will thus munge parent +- in the parent process. */ ++ /* Here is another test for sparc vfork register problems. This ++ test uses lots of local variables, at least as many local ++ variables as main has allocated so far including compiler ++ temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris ++ 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should ++ reuse the register of parent for one of the local variables, ++ since it will think that parent can't possibly be used any more ++ in this routine. Assigning to the local variable will thus ++ munge parent in the parent process. */ + pid_t + p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(), + p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid(); +@@ -9038,11 +20060,10 @@ + || p != p5 || p != p6 || p != p7) + _exit(1); + +- /* On some systems (e.g. IRIX 3.3), +- vfork doesn't separate parent from child file descriptors. +- If the child closes a descriptor before it execs or exits, +- this munges the parent's descriptor as well. +- Test for this by closing stdout in the child. */ ++ /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent ++ from child file descriptors. If the child closes a descriptor ++ before it execs or exits, this munges the parent's descriptor ++ as well. Test for this by closing stdout in the child. */ + _exit(close(fileno(stdout)) != 0); + } else { + int status; +@@ -9050,7 +20071,7 @@ + + while (wait(&status) != child) + ; +- exit( ++ return ( + /* Was there some problem with vforking? */ + child < 0 + +@@ -9065,61 +20086,151 @@ + ); + } + } +-EOF +-if { (eval echo configure:9070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-then ++_ACEOF ++rm -f conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_func_vfork_works=yes + else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -fr conftest* +- ac_cv_func_vfork_works=no ++ echo "$as_me: program exited with status $ac_status" >&5 ++echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++( exit $ac_status ) ++ac_cv_func_vfork_works=no ++fi ++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext + fi +-rm -fr conftest* ++ ++ + fi ++{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 ++echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; } + ++fi; ++if test "x$ac_cv_func_fork_works" = xcross; then ++ ac_cv_func_vfork_works=$ac_cv_func_vfork ++ { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 ++echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} + fi + +-echo "$ac_t""$ac_cv_func_vfork_works" 1>&6 +-if test $ac_cv_func_vfork_works = no; then +- cat >> confdefs.h <<\EOF ++if test "x$ac_cv_func_vfork_works" = xyes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_WORKING_VFORK 1 ++_ACEOF ++ ++else ++ ++cat >>confdefs.h <<\_ACEOF + #define vfork fork +-EOF ++_ACEOF ++ ++fi ++if test "x$ac_cv_func_fork_works" = xyes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_WORKING_FORK 1 ++_ACEOF + + fi + + + # Fixme: This should be replaced when we have autoconf 2.14. +-echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:9095: checking for size_t" >&5 +-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext < +-#if STDC_HEADERS +-#include +-#include +-#endif +-EOF +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +- rm -rf conftest* ++{ echo "$as_me:$LINENO: checking for size_t" >&5 ++echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } ++if test "${ac_cv_type_size_t+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++$ac_includes_default ++typedef size_t ac__type_new_; ++int ++main () ++{ ++if ((ac__type_new_ *) 0) ++ return 0; ++if (sizeof (ac__type_new_)) ++ return 0; ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext ++if { (ac_try="$ac_compile" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_compile") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest.$ac_objext' ++ { (case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_try") 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then + ac_cv_type_size_t=yes + else +- rm -rf conftest* +- ac_cv_type_size_t=no ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_type_size_t=no + fi +-rm -f conftest* + ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi +-echo "$ac_t""$ac_cv_type_size_t" 1>&6 +-if test $ac_cv_type_size_t = no; then +- cat >> confdefs.h <<\EOF +-#define size_t unsigned +-EOF ++{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 ++echo "${ECHO_T}$ac_cv_type_size_t" >&6; } ++if test $ac_cv_type_size_t = yes; then ++ : ++else ++ ++cat >>confdefs.h <<_ACEOF ++#define size_t unsigned int ++_ACEOF + + fi + +@@ -9132,7 +20243,9 @@ + version=`grep 'defconst[ ]*emacs-version' ${srcdir}/lisp/version.el \ + | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` + if test x"${version}" = x; then +- { echo "configure: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." 1>&2; exit 1; } ++ { { echo "$as_me:$LINENO: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&5 ++echo "$as_me: error: can't find current emacs version in \`${srcdir}/lisp/version.el'." >&2;} ++ { (exit 1); exit 1; }; } + fi + + ### Specify what sort of things we'll be editing into Makefile and config.h. +@@ -9168,79 +20281,80 @@ + + + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define EMACS_CONFIGURATION "${canonical}" +-EOF ++_ACEOF + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define EMACS_CONFIG_OPTIONS "${ac_configure_args}" +-EOF ++_ACEOF + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define config_machfile "${machfile}" +-EOF ++_ACEOF + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define config_opsysfile "${opsysfile}" +-EOF ++_ACEOF + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define LD_SWITCH_X_SITE ${LD_SWITCH_X_SITE} +-EOF ++_ACEOF + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define LD_SWITCH_X_SITE_AUX ${LD_SWITCH_X_SITE_AUX} +-EOF ++_ACEOF + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define C_SWITCH_X_SITE ${C_SWITCH_X_SITE} +-EOF ++_ACEOF + +-cat >> confdefs.h <>confdefs.h <<_ACEOF + #define UNEXEC_SRC ${UNEXEC_SRC} +-EOF ++_ACEOF + + + if test "${HAVE_X_WINDOWS}" = "yes" ; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_X_WINDOWS 1 +-EOF ++_ACEOF + + fi + if test "${USE_X_TOOLKIT}" != "none" ; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define USE_X_TOOLKIT 1 +-EOF ++_ACEOF + + fi + if test "${HAVE_X11}" = "yes" ; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_X11 1 +-EOF ++_ACEOF + + fi + if test "${HAVE_XFREE386}" = "yes" ; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_XFREE386 1 +-EOF ++_ACEOF + + fi + if test "${HAVE_MENUS}" = "yes" ; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define HAVE_MENUS 1 +-EOF ++_ACEOF + + fi + if test "${GNU_MALLOC}" = "yes" ; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define GNU_MALLOC 1 +-EOF ++_ACEOF + + fi + if test "${REL_ALLOC}" = "yes" ; then +- cat >> confdefs.h <<\EOF ++ cat >>confdefs.h <<\_ACEOF + #define REL_ALLOC 1 +-EOF ++_ACEOF + + fi + +@@ -9289,413 +20403,1145 @@ + ## from Makefile.c can correctly provide the arg `-traditional' to the + ## C preprocessor. + +-cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ + yes..yes +-EOF ++_ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +- egrep "yes..yes" >/dev/null 2>&1; then +- rm -rf conftest* ++ $EGREP "yes..yes" >/dev/null 2>&1; then + CPP_NEED_TRADITIONAL=no + else +- rm -rf conftest* + CPP_NEED_TRADITIONAL=yes + fi + rm -f conftest* + + +-trap '' 1 2 15 +-cat > confcache <<\EOF ++ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in lisp/Makefile leim/Makefile" ++ ++ac_config_commands="$ac_config_commands default" ++ ++cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +-# scripts and configure runs. It is not useful on other systems. +-# If it contains results you don't want to keep, you may remove or edit it. ++# scripts and configure runs, see configure's option --config-cache. ++# It is not useful on other systems. If it contains results you don't ++# want to keep, you may remove or edit it. + # +-# By default, configure uses ./config.cache as the cache file, +-# creating it if it does not exist already. You can give configure +-# the --cache-file=FILE option to use a different cache file; that is +-# what configure does when it calls configure scripts in +-# subdirectories, so they share the cache. +-# Giving --cache-file=/dev/null disables caching, for debugging configure. +-# config.status only pays attention to the cache file if you give it the +-# --recheck option to rerun configure. ++# config.status only pays attention to the cache file if you give it ++# the --recheck option to rerun configure. + # +-EOF ++# `ac_cv_env_foo' variables (set or unset) will be overridden when ++# loading this file, other *unset* `ac_cv_foo' will be assigned the ++# following values. ++ ++_ACEOF ++ + # The following way of writing the cache mishandles newlines in values, + # but we know of no workaround that is simple, portable, and efficient. +-# So, don't put newlines in cache variables' values. ++# So, we kill variables containing newlines. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. +-(set) 2>&1 | +- case `(ac_space=' '; set | grep ac_space) 2>&1` in +- *ac_space=\ *) +- # `set' does not quote correctly, so add quotes (double-quote substitution +- # turns \\\\ into \\, and sed turns \\ into \). +- sed -n \ +- -e "s/'/'\\\\''/g" \ +- -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" +- ;; +- *) +- # `set' quotes correctly as required by POSIX, so do not add quotes. +- sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' +- ;; +- esac >> confcache +-if cmp -s $cache_file confcache; then +- : +-else +- if test -w $cache_file; then +- echo "updating cache $cache_file" +- cat confcache > $cache_file ++( ++ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do ++ eval ac_val=\$$ac_var ++ case $ac_val in #( ++ *${as_nl}*) ++ case $ac_var in #( ++ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ++echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; ++ esac ++ case $ac_var in #( ++ _ | IFS | as_nl) ;; #( ++ *) $as_unset $ac_var ;; ++ esac ;; ++ esac ++ done ++ ++ (set) 2>&1 | ++ case $as_nl`(ac_space=' '; set) 2>&1` in #( ++ *${as_nl}ac_space=\ *) ++ # `set' does not quote correctly, so add quotes (double-quote ++ # substitution turns \\\\ into \\, and sed turns \\ into \). ++ sed -n \ ++ "s/'/'\\\\''/g; ++ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" ++ ;; #( ++ *) ++ # `set' quotes correctly as required by POSIX, so do not add quotes. ++ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ++ ;; ++ esac | ++ sort ++) | ++ sed ' ++ /^ac_cv_env_/b end ++ t clear ++ :clear ++ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ ++ t end ++ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ ++ :end' >>confcache ++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else ++ if test -w "$cache_file"; then ++ test "x$cache_file" != "x/dev/null" && ++ { echo "$as_me:$LINENO: updating cache $cache_file" >&5 ++echo "$as_me: updating cache $cache_file" >&6;} ++ cat confcache >$cache_file + else +- echo "not updating unwritable cache $cache_file" ++ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 ++echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi + fi + rm -f confcache + +-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 +- + test "x$prefix" = xNONE && prefix=$ac_default_prefix + # Let make expand exec_prefix. + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +-# Any assignment to VPATH causes Sun make to only execute +-# the first set of double-colon rules, so remove it if not needed. +-# If there is a colon in the path, we need to keep it. +-if test "x$srcdir" = x.; then +- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +-fi ++DEFS=-DHAVE_CONFIG_H ++ ++ac_libobjs= ++ac_ltlibobjs= ++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue ++ # 1. Remove the extension, and $U if already installed. ++ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' ++ ac_i=`echo "$ac_i" | sed "$ac_script"` ++ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR ++ # will be set to the directory where LIBOBJS objects are built. ++ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" ++ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' ++done ++LIBOBJS=$ac_libobjs ++ ++LTLIBOBJS=$ac_ltlibobjs + +-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +-DEFS=-DHAVE_CONFIG_H + +-# Without the "./", some shells look in PATH for config.status. + : ${CONFIG_STATUS=./config.status} ++ac_clean_files_save=$ac_clean_files ++ac_clean_files="$ac_clean_files $CONFIG_STATUS" ++{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 ++echo "$as_me: creating $CONFIG_STATUS" >&6;} ++cat >$CONFIG_STATUS <<_ACEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate the current configuration. ++# Compiler output produced by configure, useful for debugging ++# configure, is in config.log if it exists. ++ ++debug=false ++ac_cs_recheck=false ++ac_cs_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++## --------------------- ## ++## M4sh Initialization. ## ++## --------------------- ## ++ ++# Be Bourne compatible ++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then ++ emulate sh ++ NULLCMD=: ++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which ++ # is contrary to our usage. Disable this feature. ++ alias -g '${1+"$@"}'='"$@"' ++ setopt NO_GLOB_SUBST ++else ++ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac ++fi ++BIN_SH=xpg4; export BIN_SH # for Tru64 ++DUALCASE=1; export DUALCASE # for MKS sh ++ ++ ++# PATH needs CR ++# Avoid depending upon Character Ranges. ++as_cr_letters='abcdefghijklmnopqrstuvwxyz' ++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' ++as_cr_Letters=$as_cr_letters$as_cr_LETTERS ++as_cr_digits='0123456789' ++as_cr_alnum=$as_cr_Letters$as_cr_digits ++ ++# The user is always right. ++if test "${PATH_SEPARATOR+set}" != set; then ++ echo "#! /bin/sh" >conf$$.sh ++ echo "exit 0" >>conf$$.sh ++ chmod +x conf$$.sh ++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then ++ PATH_SEPARATOR=';' ++ else ++ PATH_SEPARATOR=: ++ fi ++ rm -f conf$$.sh ++fi ++ ++# Support unset when possible. ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ as_unset=unset ++else ++ as_unset=false ++fi ++ ++ ++# IFS ++# We need space, tab and new line, in precisely that order. Quoting is ++# there to prevent editors from complaining about space-tab. ++# (If _AS_PATH_WALK were called with IFS unset, it would disable word ++# splitting by setting IFS to empty value.) ++as_nl=' ++' ++IFS=" "" $as_nl" ++ ++# Find who we are. Look in the path if we contain no directory separator. ++case $0 in ++ *[\\/]* ) as_myself=$0 ;; ++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break ++done ++IFS=$as_save_IFS ++ ++ ;; ++esac ++# We did not find ourselves, most probably we were run as `sh COMMAND' ++# in which case we are not to be found in the path. ++if test "x$as_myself" = x; then ++ as_myself=$0 ++fi ++if test ! -f "$as_myself"; then ++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 ++ { (exit 1); exit 1; } ++fi ++ ++# Work around bugs in pre-3.0 UWIN ksh. ++for as_var in ENV MAIL MAILPATH ++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++done ++PS1='$ ' ++PS2='> ' ++PS4='+ ' ++ ++# NLS nuisances. ++for as_var in \ ++ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ ++ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ ++ LC_TELEPHONE LC_TIME ++do ++ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then ++ eval $as_var=C; export $as_var ++ else ++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var ++ fi ++done ++ ++# Required to use basename. ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then ++ as_basename=basename ++else ++ as_basename=false ++fi ++ ++ ++# Name of the executable. ++as_me=`$as_basename -- "$0" || ++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ ++ X"$0" : 'X\(//\)$' \| \ ++ X"$0" : 'X\(/\)' \| . 2>/dev/null || ++echo X/"$0" | ++ sed '/^.*\/\([^/][^/]*\)\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\/\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ ++# CDPATH. ++$as_unset CDPATH ++ ++ ++ ++ as_lineno_1=$LINENO ++ as_lineno_2=$LINENO ++ test "x$as_lineno_1" != "x$as_lineno_2" && ++ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { ++ ++ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO ++ # uniformly replaced by the line number. The first 'sed' inserts a ++ # line-number line after each line using $LINENO; the second 'sed' ++ # does the real work. The second script uses 'N' to pair each ++ # line-number line with the line containing $LINENO, and appends ++ # trailing '-' during substitution so that $LINENO is not a special ++ # case at line end. ++ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the ++ # scripts with optimization help from Paolo Bonzini. Blame Lee ++ # E. McMahon (1931-1989) for sed's syntax. :-) ++ sed -n ' ++ p ++ /[$]LINENO/= ++ ' <$as_myself | ++ sed ' ++ s/[$]LINENO.*/&-/ ++ t lineno ++ b ++ :lineno ++ N ++ :loop ++ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ ++ t loop ++ s/-\n.*// ++ ' >$as_me.lineno && ++ chmod +x "$as_me.lineno" || ++ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 ++ { (exit 1); exit 1; }; } ++ ++ # Don't try to exec as it changes $[0], causing all sort of problems ++ # (the dirname of $[0] is not the place where we might find the ++ # original and so on. Autoconf is especially sensitive to this). ++ . "./$as_me.lineno" ++ # Exit status is that of the last command. ++ exit ++} ++ ++ ++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then ++ as_dirname=dirname ++else ++ as_dirname=false ++fi ++ ++ECHO_C= ECHO_N= ECHO_T= ++case `echo -n x` in ++-n*) ++ case `echo 'x\c'` in ++ *c*) ECHO_T=' ';; # ECHO_T is single tab character. ++ *) ECHO_C='\c';; ++ esac;; ++*) ++ ECHO_N='-n';; ++esac ++ ++if expr a : '\(a\)' >/dev/null 2>&1 && ++ test "X`expr 00001 : '.*\(...\)'`" = X001; then ++ as_expr=expr ++else ++ as_expr=false ++fi ++ ++rm -f conf$$ conf$$.exe conf$$.file ++if test -d conf$$.dir; then ++ rm -f conf$$.dir/conf$$.file ++else ++ rm -f conf$$.dir ++ mkdir conf$$.dir ++fi ++echo >conf$$.file ++if ln -s conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s='ln -s' ++ # ... but there are two gotchas: ++ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. ++ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. ++ # In both cases, we have to default to `cp -p'. ++ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || ++ as_ln_s='cp -p' ++elif ln conf$$.file conf$$ 2>/dev/null; then ++ as_ln_s=ln ++else ++ as_ln_s='cp -p' ++fi ++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file ++rmdir conf$$.dir 2>/dev/null ++ ++if mkdir -p . 2>/dev/null; then ++ as_mkdir_p=: ++else ++ test -d ./-p && rmdir ./-p ++ as_mkdir_p=false ++fi + +-echo creating $CONFIG_STATUS +-rm -f $CONFIG_STATUS +-cat > $CONFIG_STATUS <conf$$.file <<_ASEOF + #! /bin/sh +-# Generated automatically by configure. +-# Run this file to recreate the current configuration. +-# This directory was configured as follows, +-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++exit 0 ++_ASEOF ++chmod +x conf$$.file ++if test -x conf$$.file >/dev/null 2>&1; then ++ as_executable_p="test -x" ++else ++ as_executable_p=: ++fi ++rm -f conf$$.file ++ ++# Sed expression to map a string onto a valid CPP name. ++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" ++ ++# Sed expression to map a string onto a valid variable name. ++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" ++ ++ ++exec 6>&1 ++ ++# Save the log message, to keep $[0] and so on meaningful, and to ++# report actual input values of CONFIG_FILES etc. instead of their ++# values after options handling. ++ac_log=" ++This file was extended by $as_me, which was ++generated by GNU Autoconf 2.60a. Invocation command line was ++ ++ CONFIG_FILES = $CONFIG_FILES ++ CONFIG_HEADERS = $CONFIG_HEADERS ++ CONFIG_LINKS = $CONFIG_LINKS ++ CONFIG_COMMANDS = $CONFIG_COMMANDS ++ $ $0 $@ ++ ++on `(hostname || uname -n) 2>/dev/null | sed 1q` ++" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++# Files that config.status was made for. ++config_files="$ac_config_files" ++config_headers="$ac_config_headers" ++config_commands="$ac_config_commands" ++ ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++ac_cs_usage="\ ++\`$as_me' instantiates files from templates according to the ++current configuration. ++ ++Usage: $0 [OPTIONS] [FILE]... ++ ++ -h, --help print this help, then exit ++ -V, --version print version number and configuration settings, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ --recheck update $as_me by reconfiguring in the same conditions ++ --file=FILE[:TEMPLATE] ++ instantiate the configuration file FILE ++ --header=FILE[:TEMPLATE] ++ instantiate the configuration header FILE ++ ++Configuration files: ++$config_files ++ ++Configuration headers: ++$config_headers ++ ++Configuration commands: ++$config_commands ++ ++Report bugs to ." ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++ac_cs_version="\\ ++config.status ++configured by $0, generated by GNU Autoconf 2.60a, ++ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" ++ ++Copyright (C) 2006 Free Software Foundation, Inc. ++This config.status script is free software; the Free Software Foundation ++gives unlimited permission to copy, distribute and modify it." ++ ++ac_pwd='$ac_pwd' ++srcdir='$srcdir' ++INSTALL='$INSTALL' ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If no file are specified by the user, then we need to provide default ++# value. By we need to know if files were specified by the user. ++ac_need_defaults=: ++while test $# != 0 ++do ++ case $1 in ++ --*=*) ++ ac_option=`expr "X$1" : 'X\([^=]*\)='` ++ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ++ ac_shift=: ++ ;; ++ *) ++ ac_option=$1 ++ ac_optarg=$2 ++ ac_shift=shift ++ ;; ++ esac ++ ++ case $ac_option in ++ # Handling of the options. ++ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ++ ac_cs_recheck=: ;; ++ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) ++ echo "$ac_cs_version"; exit ;; ++ --debug | --debu | --deb | --de | --d | -d ) ++ debug=: ;; ++ --file | --fil | --fi | --f ) ++ $ac_shift ++ CONFIG_FILES="$CONFIG_FILES $ac_optarg" ++ ac_need_defaults=false;; ++ --header | --heade | --head | --hea ) ++ $ac_shift ++ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ++ ac_need_defaults=false;; ++ --he | --h) ++ # Conflict between --help and --header ++ { echo "$as_me: error: ambiguous option: $1 ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; };; ++ --help | --hel | -h ) ++ echo "$ac_cs_usage"; exit ;; ++ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ ++ | -silent | --silent | --silen | --sile | --sil | --si | --s) ++ ac_cs_silent=: ;; ++ ++ # This is an error. ++ -*) { echo "$as_me: error: unrecognized option: $1 ++Try \`$0 --help' for more information." >&2 ++ { (exit 1); exit 1; }; } ;; ++ ++ *) ac_config_targets="$ac_config_targets $1" ++ ac_need_defaults=false ;; ++ ++ esac ++ shift ++done ++ ++ac_configure_extra_args= ++ ++if $ac_cs_silent; then ++ exec 6>/dev/null ++ ac_configure_extra_args="$ac_configure_extra_args --silent" ++fi ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++if \$ac_cs_recheck; then ++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 ++ CONFIG_SHELL=$SHELL ++ export CONFIG_SHELL ++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion ++fi ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++exec 5>>config.log ++{ ++ echo ++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ++## Running $as_me. ## ++_ASBOX ++ echo "$ac_log" ++} >&5 ++ ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF + # +-# $0 $ac_configure_args ++# INIT-COMMANDS + # +-# Compiler output produced by configure, useful for debugging +-# configure, is in ./config.log if it exists. ++GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS" + +-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +-for ac_option ++_ACEOF ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++ ++# Handling of arguments. ++for ac_config_target in $ac_config_targets + do +- case "\$ac_option" in +- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) +- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" +- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; +- -version | --version | --versio | --versi | --vers | --ver | --ve | --v) +- echo "$CONFIG_STATUS generated by autoconf version 2.13" +- exit 0 ;; +- -help | --help | --hel | --he | --h) +- echo "\$ac_cs_usage"; exit 0 ;; +- *) echo "\$ac_cs_usage"; exit 1 ;; ++ case $ac_config_target in ++ "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;; ++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; ++ "lib-src/Makefile.c") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;; ++ "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;; ++ "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; ++ "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;; ++ "src/Makefile.c") CONFIG_FILES="$CONFIG_FILES src/Makefile.c:src/Makefile.in" ;; ++ "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; ++ "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; ++ "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; ++ ++ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 ++echo "$as_me: error: invalid argument: $ac_config_target" >&2;} ++ { (exit 1); exit 1; }; };; + esac + done + +-ac_given_srcdir=$srcdir +-ac_given_INSTALL="$INSTALL" + +-trap 'rm -fr `echo "Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ +- man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in \ +- lisp/Makefile leim/Makefile src/config.h:src/config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +-EOF +-cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF +-$ac_vpsub +-$extrasub +-s%@SHELL@%$SHELL%g +-s%@CFLAGS@%$CFLAGS%g +-s%@CPPFLAGS@%$CPPFLAGS%g +-s%@CXXFLAGS@%$CXXFLAGS%g +-s%@FFLAGS@%$FFLAGS%g +-s%@DEFS@%$DEFS%g +-s%@LDFLAGS@%$LDFLAGS%g +-s%@LIBS@%$LIBS%g +-s%@exec_prefix@%$exec_prefix%g +-s%@prefix@%$prefix%g +-s%@program_transform_name@%$program_transform_name%g +-s%@bindir@%$bindir%g +-s%@sbindir@%$sbindir%g +-s%@libexecdir@%$libexecdir%g +-s%@datadir@%$datadir%g +-s%@sysconfdir@%$sysconfdir%g +-s%@sharedstatedir@%$sharedstatedir%g +-s%@localstatedir@%$localstatedir%g +-s%@libdir@%$libdir%g +-s%@includedir@%$includedir%g +-s%@oldincludedir@%$oldincludedir%g +-s%@infodir@%$infodir%g +-s%@mandir@%$mandir%g +-s%@host@%$host%g +-s%@host_alias@%$host_alias%g +-s%@host_cpu@%$host_cpu%g +-s%@host_vendor@%$host_vendor%g +-s%@host_os@%$host_os%g +-s%@CC@%$CC%g +-s%@LN_S@%$LN_S%g +-s%@CPP@%$CPP%g +-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +-s%@INSTALL_DATA@%$INSTALL_DATA%g +-s%@YACC@%$YACC%g +-s%@RANLIB@%$RANLIB%g +-s%@LIBSOUND@%$LIBSOUND%g +-s%@SET_MAKE@%$SET_MAKE%g +-s%@ALLOCA@%$ALLOCA%g +-s%@liblockfile@%$liblockfile%g +-s%@LIBOBJS@%$LIBOBJS%g +-s%@NEED_SETGID@%$NEED_SETGID%g +-s%@KMEM_GROUP@%$KMEM_GROUP%g +-s%@version@%$version%g +-s%@configuration@%$configuration%g +-s%@canonical@%$canonical%g +-s%@srcdir@%$srcdir%g +-s%@lispdir@%$lispdir%g +-s%@locallisppath@%$locallisppath%g +-s%@lisppath@%$lisppath%g +-s%@x_default_search_path@%$x_default_search_path%g +-s%@etcdir@%$etcdir%g +-s%@archlibdir@%$archlibdir%g +-s%@docdir@%$docdir%g +-s%@bitmapdir@%$bitmapdir%g +-s%@c_switch_system@%$c_switch_system%g +-s%@c_switch_machine@%$c_switch_machine%g +-s%@LD_SWITCH_X_SITE@%$LD_SWITCH_X_SITE%g +-s%@LD_SWITCH_X_SITE_AUX@%$LD_SWITCH_X_SITE_AUX%g +-s%@C_SWITCH_X_SITE@%$C_SWITCH_X_SITE%g +-s%@X_TOOLKIT_TYPE@%$X_TOOLKIT_TYPE%g +-s%@machfile@%$machfile%g +-s%@opsysfile@%$opsysfile%g +-s%@GETLOADAVG_LIBS@%$GETLOADAVG_LIBS%g +- +-CEOF +-EOF +- +-cat >> $CONFIG_STATUS <<\EOF +- +-# Split the substitutions into bite-sized pieces for seds with +-# small command number limits, like on Digital OSF/1 and HP-UX. +-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +-ac_file=1 # Number of current file. +-ac_beg=1 # First line for current file. +-ac_end=$ac_max_sed_cmds # Line after last line for current file. +-ac_more_lines=: +-ac_sed_cmds="" +-while $ac_more_lines; do +- if test $ac_beg -gt 1; then +- sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file +- else +- sed "${ac_end}q" conftest.subs > conftest.s$ac_file +- fi +- if test ! -s conftest.s$ac_file; then +- ac_more_lines=false +- rm -f conftest.s$ac_file ++# If the user did not use the arguments to specify the items to instantiate, ++# then the envvar interface is used. Set only those that are not. ++# We use the long form for the default assignment because of an extremely ++# bizarre bug on SunOS 4.1.3. ++if $ac_need_defaults; then ++ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files ++ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers ++ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands ++fi ++ ++# Have a temporary directory for convenience. Make it in the build tree ++# simply because there is no reason against having it here, and in addition, ++# creating and moving files from /tmp can sometimes cause problems. ++# Hook for its removal unless debugging. ++# Note that there is a small window in which the directory will not be cleaned: ++# after its creation but before its name has been assigned to `$tmp'. ++$debug || ++{ ++ tmp= ++ trap 'exit_status=$? ++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ++' 0 ++ trap '{ (exit 1); exit 1; }' 1 2 13 15 ++} ++# Create a (secure) tmp directory for tmp files. ++ ++{ ++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && ++ test -n "$tmp" && test -d "$tmp" ++} || ++{ ++ tmp=./conf$$-$RANDOM ++ (umask 077 && mkdir "$tmp") ++} || ++{ ++ echo "$me: cannot create a temporary directory in ." >&2 ++ { (exit 1); exit 1; } ++} ++ ++# ++# Set up the sed scripts for CONFIG_FILES section. ++# ++ ++# No need to generate the scripts if there are no CONFIG_FILES. ++# This happens for instance when ./config.status config.h ++if test -n "$CONFIG_FILES"; then ++ ++_ACEOF ++ ++ ++ ++ac_delim='%!_!# ' ++for ac_last_try in false false false false false :; do ++ cat >conf$$subs.sed <<_ACEOF ++SHELL!$SHELL$ac_delim ++PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim ++PACKAGE_NAME!$PACKAGE_NAME$ac_delim ++PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim ++PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim ++PACKAGE_STRING!$PACKAGE_STRING$ac_delim ++PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim ++exec_prefix!$exec_prefix$ac_delim ++prefix!$prefix$ac_delim ++program_transform_name!$program_transform_name$ac_delim ++bindir!$bindir$ac_delim ++sbindir!$sbindir$ac_delim ++libexecdir!$libexecdir$ac_delim ++datarootdir!$datarootdir$ac_delim ++datadir!$datadir$ac_delim ++sysconfdir!$sysconfdir$ac_delim ++sharedstatedir!$sharedstatedir$ac_delim ++localstatedir!$localstatedir$ac_delim ++includedir!$includedir$ac_delim ++oldincludedir!$oldincludedir$ac_delim ++docdir!$docdir$ac_delim ++infodir!$infodir$ac_delim ++htmldir!$htmldir$ac_delim ++dvidir!$dvidir$ac_delim ++pdfdir!$pdfdir$ac_delim ++psdir!$psdir$ac_delim ++libdir!$libdir$ac_delim ++localedir!$localedir$ac_delim ++mandir!$mandir$ac_delim ++DEFS!$DEFS$ac_delim ++ECHO_C!$ECHO_C$ac_delim ++ECHO_N!$ECHO_N$ac_delim ++ECHO_T!$ECHO_T$ac_delim ++LIBS!$LIBS$ac_delim ++build_alias!$build_alias$ac_delim ++host_alias!$host_alias$ac_delim ++target_alias!$target_alias$ac_delim ++build!$build$ac_delim ++build_cpu!$build_cpu$ac_delim ++build_vendor!$build_vendor$ac_delim ++build_os!$build_os$ac_delim ++host!$host$ac_delim ++host_cpu!$host_cpu$ac_delim ++host_vendor!$host_vendor$ac_delim ++host_os!$host_os$ac_delim ++CC!$CC$ac_delim ++CFLAGS!$CFLAGS$ac_delim ++LDFLAGS!$LDFLAGS$ac_delim ++CPPFLAGS!$CPPFLAGS$ac_delim ++ac_ct_CC!$ac_ct_CC$ac_delim ++EXEEXT!$EXEEXT$ac_delim ++OBJEXT!$OBJEXT$ac_delim ++LN_S!$LN_S$ac_delim ++CPP!$CPP$ac_delim ++INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim ++INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim ++INSTALL_DATA!$INSTALL_DATA$ac_delim ++YACC!$YACC$ac_delim ++YFLAGS!$YFLAGS$ac_delim ++RANLIB!$RANLIB$ac_delim ++GREP!$GREP$ac_delim ++EGREP!$EGREP$ac_delim ++LIBSOUND!$LIBSOUND$ac_delim ++SET_MAKE!$SET_MAKE$ac_delim ++XMKMF!$XMKMF$ac_delim ++ALLOCA!$ALLOCA$ac_delim ++LIBOBJS!$LIBOBJS$ac_delim ++NEED_SETGID!$NEED_SETGID$ac_delim ++KMEM_GROUP!$KMEM_GROUP$ac_delim ++GETLOADAVG_LIBS!$GETLOADAVG_LIBS$ac_delim ++version!$version$ac_delim ++configuration!$configuration$ac_delim ++canonical!$canonical$ac_delim ++srcdir!$srcdir$ac_delim ++lispdir!$lispdir$ac_delim ++locallisppath!$locallisppath$ac_delim ++lisppath!$lisppath$ac_delim ++x_default_search_path!$x_default_search_path$ac_delim ++etcdir!$etcdir$ac_delim ++archlibdir!$archlibdir$ac_delim ++bitmapdir!$bitmapdir$ac_delim ++c_switch_system!$c_switch_system$ac_delim ++c_switch_machine!$c_switch_machine$ac_delim ++LD_SWITCH_X_SITE!$LD_SWITCH_X_SITE$ac_delim ++LD_SWITCH_X_SITE_AUX!$LD_SWITCH_X_SITE_AUX$ac_delim ++C_SWITCH_X_SITE!$C_SWITCH_X_SITE$ac_delim ++X_TOOLKIT_TYPE!$X_TOOLKIT_TYPE$ac_delim ++machfile!$machfile$ac_delim ++opsysfile!$opsysfile$ac_delim ++MOVEMAIL_LOCK_LIBS!$MOVEMAIL_LOCK_LIBS$ac_delim ++LTLIBOBJS!$LTLIBOBJS$ac_delim ++_ACEOF ++ ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then ++ break ++ elif $ac_last_try; then ++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 ++echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} ++ { (exit 1); exit 1; }; } + else +- if test -z "$ac_sed_cmds"; then +- ac_sed_cmds="sed -f conftest.s$ac_file" +- else +- ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" +- fi +- ac_file=`expr $ac_file + 1` +- ac_beg=$ac_end +- ac_end=`expr $ac_end + $ac_max_sed_cmds` +- fi +-done +-if test -z "$ac_sed_cmds"; then +- ac_sed_cmds=cat +-fi +-EOF +- +-cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case "$ac_file" in +- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` +- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; +- *) ac_file_in="${ac_file}.in" ;; +- esac ++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " ++ fi ++done ++ ++ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` ++if test -n "$ac_eof"; then ++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` ++ ac_eof=`expr $ac_eof + 1` ++fi ++ ++cat >>$CONFIG_STATUS <<_ACEOF ++cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end ++_ACEOF ++sed ' ++s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g ++s/^/s,@/; s/!/@,|#_!!_#|/ ++:n ++t n ++s/'"$ac_delim"'$/,g/; t ++s/$/\\/; p ++N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ++' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF ++:end ++s/|#_!!_#|//g ++CEOF$ac_eof ++_ACEOF ++ ++ ++# VPATH may cause trouble with some makes, so we remove $(srcdir), ++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and ++# trailing colons and then remove the whole line if VPATH becomes empty ++# (actually we leave an empty line to preserve line numbers). ++if test "x$srcdir" = x.; then ++ ac_vpsub='/^[ ]*VPATH[ ]*=/{ ++s/:*\$(srcdir):*/:/ ++s/:*\${srcdir}:*/:/ ++s/:*@srcdir@:*/:/ ++s/^\([^=]*=[ ]*\):*/\1/ ++s/:*$// ++s/^[^=]*=[ ]*$// ++}' ++fi ++ ++cat >>$CONFIG_STATUS <<\_ACEOF ++fi # test -n "$CONFIG_FILES" + +- # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + +- # Remove last slash and all that follows it. Not all systems have dirname. +- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` +- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then +- # The file is in a subdirectory. +- test ! -d "$ac_dir" && mkdir "$ac_dir" +- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" +- # A "../" for each directory in $ac_dir_suffix. +- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` +- else +- ac_dir_suffix= ac_dots= +- fi +- +- case "$ac_given_srcdir" in +- .) srcdir=. +- if test -z "$ac_dots"; then top_srcdir=. +- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; +- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; +- *) # Relative path. +- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" +- top_srcdir="$ac_dots$ac_given_srcdir" ;; ++for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS ++do ++ case $ac_tag in ++ :[FHLC]) ac_mode=$ac_tag; continue;; ++ esac ++ case $ac_mode$ac_tag in ++ :[FHL]*:*);; ++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 ++echo "$as_me: error: Invalid tag $ac_tag." >&2;} ++ { (exit 1); exit 1; }; };; ++ :[FH]-) ac_tag=-:-;; ++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac ++ ac_save_IFS=$IFS ++ IFS=: ++ set x $ac_tag ++ IFS=$ac_save_IFS ++ shift ++ ac_file=$1 ++ shift ++ ++ case $ac_mode in ++ :L) ac_source=$1;; ++ :[FH]) ++ ac_file_inputs= ++ for ac_f ++ do ++ case $ac_f in ++ -) ac_f="$tmp/stdin";; ++ *) # Look for the file first in the build tree, then in the source tree ++ # (if the path is not absolute). The absolute path cannot be DOS-style, ++ # because $ac_f cannot contain `:'. ++ test -f "$ac_f" || ++ case $ac_f in ++ [\\/$]*) false;; ++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; ++ esac || ++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 ++echo "$as_me: error: cannot find input file: $ac_f" >&2;} ++ { (exit 1); exit 1; }; };; ++ esac ++ ac_file_inputs="$ac_file_inputs $ac_f" ++ done + +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; ++ # Let's still pretend it is `configure' which instantiates (i.e., don't ++ # use $as_me), people would be surprised to read: ++ # /* config.h. Generated by config.status. */ ++ configure_input="Generated from "`IFS=: ++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." ++ if test x"$ac_file" != x-; then ++ configure_input="$ac_file. $configure_input" ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ fi ++ ++ case $ac_tag in ++ *:-:* | *:-) cat >"$tmp/stdin";; ++ esac ++ ;; + esac + +- echo creating "$ac_file" +- rm -f "$ac_file" +- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." +- case "$ac_file" in +- *Makefile*) ac_comsub="1i\\ +-# $configure_input" ;; +- *) ac_comsub= ;; ++ ac_dir=`$as_dirname -- "$ac_file" || ++$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$ac_file" : 'X\(//\)[^/]' \| \ ++ X"$ac_file" : 'X\(//\)$' \| \ ++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$ac_file" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ { as_dir="$ac_dir" ++ case $as_dir in #( ++ -*) as_dir=./$as_dir;; + esac ++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { ++ as_dirs= ++ while :; do ++ case $as_dir in #( ++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( ++ *) as_qdir=$as_dir;; ++ esac ++ as_dirs="'$as_qdir' $as_dirs" ++ as_dir=`$as_dirname -- "$as_dir" || ++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ ++ X"$as_dir" : 'X\(//\)[^/]' \| \ ++ X"$as_dir" : 'X\(//\)$' \| \ ++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || ++echo X"$as_dir" | ++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)[^/].*/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\/\)$/{ ++ s//\1/ ++ q ++ } ++ /^X\(\/\).*/{ ++ s//\1/ ++ q ++ } ++ s/.*/./; q'` ++ test -d "$as_dir" && break ++ done ++ test -z "$as_dirs" || eval "mkdir $as_dirs" ++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 ++echo "$as_me: error: cannot create directory $as_dir" >&2;} ++ { (exit 1); exit 1; }; }; } ++ ac_builddir=. ++ ++case "$ac_dir" in ++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; ++*) ++ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` ++ # A ".." for each directory in $ac_dir_suffix. ++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` ++ case $ac_top_builddir_sub in ++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; ++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; ++ esac ;; ++esac ++ac_abs_top_builddir=$ac_pwd ++ac_abs_builddir=$ac_pwd$ac_dir_suffix ++# for backward compatibility: ++ac_top_builddir=$ac_top_build_prefix ++ ++case $srcdir in ++ .) # We are building in place. ++ ac_srcdir=. ++ ac_top_srcdir=$ac_top_builddir_sub ++ ac_abs_top_srcdir=$ac_pwd ;; ++ [\\/]* | ?:[\\/]* ) # Absolute name. ++ ac_srcdir=$srcdir$ac_dir_suffix; ++ ac_top_srcdir=$srcdir ++ ac_abs_top_srcdir=$srcdir ;; ++ *) # Relative name. ++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix ++ ac_top_srcdir=$ac_top_build_prefix$srcdir ++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; ++esac ++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + +- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +- sed -e "$ac_comsub +-s%@configure_input@%$configure_input%g +-s%@srcdir@%$srcdir%g +-s%@top_srcdir@%$top_srcdir%g +-s%@INSTALL@%$INSTALL%g +-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +-fi; done +-rm -f conftest.s* + +-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +-# NAME is the cpp macro being defined and VALUE is the value it is being given. +-# +-# ac_d sets the value in "#define NAME VALUE" lines. +-ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +-ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +-ac_dC='\3' +-ac_dD='%g' +-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +-ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_uB='\([ ]\)%\1#\2define\3' +-ac_uC=' ' +-ac_uD='\4%g' +-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +-ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +-ac_eB='$%\1#\2define\3' +-ac_eC=' ' +-ac_eD='%g' +- +-if test "${CONFIG_HEADERS+set}" != set; then +-EOF +-cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +-fi +-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then +- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +- case "$ac_file" in +- *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` +- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; +- *) ac_file_in="${ac_file}.in" ;; ++ case $ac_mode in ++ :F) ++ # ++ # CONFIG_FILE ++ # ++ ++ case $INSTALL in ++ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; ++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac ++_ACEOF + +- echo creating $ac_file ++cat >>$CONFIG_STATUS <<\_ACEOF ++# If the template does not know about datarootdir, expand it. ++# FIXME: This hack should be removed a few years after 2.60. ++ac_datarootdir_hack=; ac_datarootdir_seen= ++ ++case `sed -n '/datarootdir/ { ++ p ++ q ++} ++/@datadir@/p ++/@docdir@/p ++/@infodir@/p ++/@localedir@/p ++/@mandir@/p ++' $ac_file_inputs` in ++*datarootdir*) ac_datarootdir_seen=yes;; ++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) ++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 ++echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} ++_ACEOF ++cat >>$CONFIG_STATUS <<_ACEOF ++ ac_datarootdir_hack=' ++ s&@datadir@&$datadir&g ++ s&@docdir@&$docdir&g ++ s&@infodir@&$infodir&g ++ s&@localedir@&$localedir&g ++ s&@mandir@&$mandir&g ++ s&\\\${datarootdir}&$datarootdir&g' ;; ++esac ++_ACEOF + +- rm -f conftest.frag conftest.in conftest.out +- ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` +- cat $ac_file_inputs > conftest.in +- +-EOF +- +-# Transform confdefs.h into a sed script conftest.vals that substitutes +-# the proper values into config.h.in to produce config.h. And first: +-# Protect against being on the right side of a sed subst in config.status. +-# Protect against being in an unquoted here document in config.status. +-rm -f conftest.vals +-cat > conftest.hdr <<\EOF +-s/[\\&%]/\\&/g +-s%[\\$`]%\\&%g +-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +-s%ac_d%ac_u%gp +-s%ac_u%ac_e%gp +-EOF +-sed -n -f conftest.hdr confdefs.h > conftest.vals +-rm -f conftest.hdr ++# Neutralize VPATH when `$srcdir' = `.'. ++# Shell code in configure.ac might set extrasub. ++# FIXME: do we really want to maintain this feature? ++cat >>$CONFIG_STATUS <<_ACEOF ++ sed "$ac_vpsub ++$extrasub ++_ACEOF ++cat >>$CONFIG_STATUS <<\_ACEOF ++:t ++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b ++s&@configure_input@&$configure_input&;t t ++s&@top_builddir@&$ac_top_builddir_sub&;t t ++s&@srcdir@&$ac_srcdir&;t t ++s&@abs_srcdir@&$ac_abs_srcdir&;t t ++s&@top_srcdir@&$ac_top_srcdir&;t t ++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t ++s&@builddir@&$ac_builddir&;t t ++s&@abs_builddir@&$ac_abs_builddir&;t t ++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t ++s&@INSTALL@&$ac_INSTALL&;t t ++$ac_datarootdir_hack ++" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out ++ ++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && ++ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && ++ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && ++ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&5 ++echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' ++which seems to be undefined. Please make sure it is defined." >&2;} ++ ++ rm -f "$tmp/stdin" ++ case $ac_file in ++ -) cat "$tmp/out"; rm -f "$tmp/out";; ++ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; ++ esac ++ ;; ++ :H) ++ # ++ # CONFIG_HEADER ++ # ++_ACEOF ++ ++# Transform confdefs.h into a sed script `conftest.defines', that ++# substitutes the proper values into config.h.in to produce config.h. ++rm -f conftest.defines conftest.tail ++# First, append a space to every undef/define line, to ease matching. ++echo 's/$/ /' >conftest.defines ++# Then, protect against being on the right side of a sed subst, or in ++# an unquoted here document, in config.status. If some macros were ++# called several times there might be several #defines for the same ++# symbol, which is useless. But do not sort them, since the last ++# AC_DEFINE must be honored. ++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* ++# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where ++# NAME is the cpp macro being defined, VALUE is the value it is being given. ++# PARAMS is the parameter list in the macro definition--in most cases, it's ++# just an empty string. ++ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' ++ac_dB='\\)[ (].*,\\1define\\2' ++ac_dC=' ' ++ac_dD=' ,' ++ ++uniq confdefs.h | ++ sed -n ' ++ t rset ++ :rset ++ s/^[ ]*#[ ]*define[ ][ ]*// ++ t ok ++ d ++ :ok ++ s/[\\&,]/\\&/g ++ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p ++ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p ++ ' >>conftest.defines + +-# This sed command replaces #undef with comments. This is necessary, for ++# Remove the space that was appended to ease matching. ++# Then replace #undef with comments. This is necessary, for + # example, in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. +-cat >> conftest.vals <<\EOF +-s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +-EOF ++# (The regexp can be short, since the line contains either #define or #undef.) ++echo 's/ $// ++s,^[ #]*u.*,/* & */,' >>conftest.defines ++ ++# Break up conftest.defines: ++ac_max_sed_lines=50 ++ ++# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" ++# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" ++# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" ++# et cetera. ++ac_in='$ac_file_inputs' ++ac_out='"$tmp/out1"' ++ac_nxt='"$tmp/out2"' + +-# Break up conftest.vals because some shells have a limit on +-# the size of here documents, and old seds have small limits too. +- +-rm -f conftest.tail + while : + do +- ac_lines=`grep -c . conftest.vals` +- # grep -c gives empty output for an empty file on some AIX systems. +- if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi +- # Write a limited-size here document to conftest.frag. +- echo ' cat > conftest.frag <> $CONFIG_STATUS +- sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS ++ # Write a here document: ++ cat >>$CONFIG_STATUS <<_ACEOF ++ # First, check the format of the line: ++ cat >"\$tmp/defines.sed" <<\\CEOF ++/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def ++/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def ++b ++:def ++_ACEOF ++ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF +- sed -f conftest.frag conftest.in > conftest.out +- rm -f conftest.in +- mv conftest.out conftest.in +-' >> $CONFIG_STATUS +- sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail +- rm -f conftest.vals +- mv conftest.tail conftest.vals +-done +-rm -f conftest.vals +- +-cat >> $CONFIG_STATUS <<\EOF +- rm -f conftest.frag conftest.h +- echo "/* $ac_file. Generated automatically by configure. */" > conftest.h +- cat conftest.in >> conftest.h +- rm -f conftest.in +- if cmp -s $ac_file conftest.h 2>/dev/null; then +- echo "$ac_file is unchanged" +- rm -f conftest.h +- else +- # Remove last slash and all that follows it. Not all systems have dirname. +- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` +- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then +- # The file is in a subdirectory. +- test ! -d "$ac_dir" && mkdir "$ac_dir" ++ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS ++ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in ++ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail ++ grep . conftest.tail >/dev/null || break ++ rm -f conftest.defines ++ mv conftest.tail conftest.defines ++done ++rm -f conftest.defines conftest.tail ++ ++echo "ac_result=$ac_in" >>$CONFIG_STATUS ++cat >>$CONFIG_STATUS <<\_ACEOF ++ if test x"$ac_file" != x-; then ++ echo "/* $configure_input */" >"$tmp/config.h" ++ cat "$ac_result" >>"$tmp/config.h" ++ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then ++ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 ++echo "$as_me: $ac_file is unchanged" >&6;} ++ else ++ rm -f $ac_file ++ mv "$tmp/config.h" $ac_file + fi +- rm -f $ac_file +- mv conftest.h $ac_file ++ else ++ echo "/* $configure_input */" ++ cat "$ac_result" + fi +-fi; done ++ rm -f "$tmp/out12" ++ ;; ++ ++ :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 ++echo "$as_me: executing $ac_file commands" >&6;} ++ ;; ++ esac + +-EOF +-cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF + ++ case $ac_file$ac_mode in ++ "default":C) + + ### Make the necessary directories, if they don't exist. + for dir in etc lisp ; do +@@ -9712,7 +21558,7 @@ + # the C preprocessor to some helpful value like 1, or maybe the empty + # string. Needless to say consequent macro substitutions are less + # than conducive to the makefile finding the correct directory. +-undefs="`echo $top_srcdir $configuration $canonical | ++undefs="`echo $ac_top_srcdir $configuration $canonical | + sed -e 's/[^a-zA-Z0-9_]/ /g' -e 's/^/ /' -e 's/ *$//' \ + -e 's/ */ -U/g' -e 's/-U[0-9][^ ]*//g' \ + `" +@@ -9735,7 +21581,7 @@ + sed -e '1,/start of cpp stuff/d'\ + -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ + < Makefile.c > junk.c +- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ ++ $CPP $undefs -I. -I$ac_top_srcdir/src $CPPFLAGS junk.c | \ + sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c + cat junk1.c junk2.c > Makefile.new + rm -f junk.c junk1.c junk2.c +@@ -9751,7 +21597,7 @@ + sed -e '1,/start of cpp stuff/d'\ + -e 's,/\*\*/#\(.*\)$,/* \1 */,' \ + < Makefile.c > junk.c +- $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \ ++ $CPP $undefs -I. -I$ac_top_srcdir/src $CPPFLAGS junk.c | \ + sed -e 's/^ / /' -e '/^#/d' -e '/^[ ]*$/d' > junk2.c + cat junk1.c junk2.c > Makefile.new + rm -f junk.c junk1.c junk2.c +@@ -9759,19 +21605,45 @@ + mv -f Makefile.new Makefile + ) + +-if test ! -f src/.gdbinit && test -f $top_srcdir/src/.gdbinit; then ++if test ! -f src/.gdbinit && test -f $ac_top_srcdir/src/.gdbinit; then + echo creating src/.gdbinit +- echo source $top_srcdir/src/.gdbinit > src/.gdbinit ++ echo source $ac_top_srcdir/src/.gdbinit > src/.gdbinit + fi + + # This is how we know whether to re-run configure in certain cases. + touch src/config.stamp + ++ ;; + +-exit 0 +-EOF ++ esac ++done # for ac_tag ++ ++ ++{ (exit 0); exit 0; } ++_ACEOF + chmod +x $CONFIG_STATUS +-rm -fr confdefs* $ac_clean_files +-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 ++ac_clean_files=$ac_clean_files_save ++ ++ ++# configure is writing to config.log, and then calls config.status. ++# config.status does its own redirection, appending to config.log. ++# Unfortunately, on DOS this fails, as config.log is still kept open ++# by configure, so config.status won't be able to write to it; its ++# output is simply discarded. So we exec the FD to /dev/null, ++# effectively closing config.log, so it can be properly (re)opened and ++# appended to by config.status. When coming back to configure, we ++# need to make the FD available again. ++if test "$no_create" != yes; then ++ ac_cs_success=: ++ ac_config_status_args= ++ test "$silent" = yes && ++ ac_config_status_args="$ac_config_status_args --quiet" ++ exec 5>/dev/null ++ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false ++ exec 5>>config.log ++ # Use ||, not &&, to avoid exiting from the if with $? = 1, which ++ # would make configure fail if this is the last instruction. ++ $ac_cs_success || { (exit 1); exit 1; } ++fi + + --- emacs21-21.4a+1.orig/debian/patches/whitespace-readonly-infloop.diff +++ emacs21-21.4a+1/debian/patches/whitespace-readonly-infloop.diff @@ -0,0 +1,67 @@ +* Emacs should no longer segfault sometimes when kill-read-only is set to t. + Patch: whitespace-readonly-infloop.diff + Author: Richard Stallman + Provided-by: Romain Francoise + Applied-by: Jerome Marant + Date: Tue, 09 Aug 2005 16:47:25 +0200 + Status: has been incorporated upstream + + Emacs should no longer go in to an infinite loop and then segfault + under some conditions when kill-read-only is set to t. + +diff -urNad --exclude=CVS --exclude=.svn ./lisp/whitespace.el /tmp/dpep-work.Gk47lX/emacs21-21.4a/lisp/whitespace.el +--- ./lisp/whitespace.el 2001-08-20 22:56:08.000000000 +0200 ++++ /tmp/dpep-work.Gk47lX/emacs21-21.4a/lisp/whitespace.el 2005-08-09 16:45:25.000000000 +0200 +@@ -504,17 +504,9 @@ + (defun whitespace-buffer-leading-cleanup () + "Remove any empty lines at the top of the file." + (save-excursion +- (let ((pmin nil) +- (pmax nil)) +- (goto-char (point-min)) +- (beginning-of-line) +- (setq pmin (point)) +- (end-of-line) +- (setq pmax (point)) +- (if (equal pmin pmax) +- (progn +- (kill-line) +- (whitespace-buffer-leading-cleanup)))))) ++ (goto-char (point-min)) ++ (skip-chars-forward "\n") ++ (delete-region (point-min) (point)))) + + (defun whitespace-buffer-trailing () + "Check to see if are is more than one empty line at the bottom." +@@ -541,26 +533,11 @@ + (defun whitespace-buffer-trailing-cleanup () + "Delete all the empty lines at the bottom." + (save-excursion +- (let ((pmin nil) +- (pmax nil)) +- (goto-char (point-max)) +- (beginning-of-line) +- (setq pmin (point)) +- (end-of-line) +- (setq pmax (point)) +- (if (equal pmin pmax) +- (progn +- (goto-char (1- pmin)) +- (beginning-of-line) +- (setq pmin (point)) +- (end-of-line) +- (setq pmax (point)) +- (if (equal pmin pmax) +- (progn +- (goto-char (1- (point-max))) +- (beginning-of-line) +- (kill-line) +- (whitespace-buffer-trailing-cleanup)))))))) ++ (goto-char (point-max)) ++ (skip-chars-backward "\n") ++ (if (not (bolp)) ++ (forward-char 1)) ++ (delete-region (point) (point-max)))) + + (defun whitespace-buffer-search (regexp) + "Search for any given whitespace REGEXP." --- emacs21-21.4a+1.orig/debian/copyright +++ emacs21-21.4a+1/debian/copyright @@ -0,0 +1,448 @@ +-*-text-*- + +This package was debianized by Rob Browning on +Tue, 16 Dec 1997 00:05:45 -0600. + +The source is a combination of the following files: + + prep.ai.mit.edu:/pub/gnu/emacs/emacs-21.4a.tar.gz + prep.ai.mit.edu:/pub/gnu/emacs/leim-21.4.tar.gz + +Please see /usr/share/doc/emacs21-common/README.Debian.gz for a +description of the Debian specific differences from the upstream +version. + +As mentioned there, some files (including some of the Emacs +documentation) have been removed from this package because their +licenses do not appear to satisfy the requirements of the Debian Free +Software Guidelines (DFSG). See http://www.debian.org/social_contract. + +In particular, some of the info pages are covered under the GNU Free +Documentation License (GFDL), which Debian has decided does not +satisfy the DFSG in cases where "Invariant Sections" are specified +(this includes front and back cover texts). See this Debian General +Resolution on the topic: http://www.debian.org/vote/2006/vote_001. + +Some other files have been removed because their license only allows +verbatim copying, or because there was some other question. + +Copyright: + + Emacs itself is licensed under the terms of the GNU General Public + License (GPL). See the file /usr/share/common-licenses/GPL for more + information. + + man/dired-x.texi is licensed as follows: + + Copyright (C) 1993, 1994, 2001 Free Software Foundation, Inc. + + Permission is granted to make and distribute verbatim copies of + this manual provided the copyright notice and this permission + notice are preserved on all copies. + + Permission is granted to copy and distribute modified versions + of this manual under the conditions for verbatim copying, + provided that the entire resulting derived work is distributed + under the terms of a permission notice identical to this one. + + Permission is granted to copy and distribute translations of + this manual into another language, under the above conditions + for modified versions, except that this permission notice may be + stated in a translation approved by the Free Software + Foundation. + + The file used to create this is called dired-x.texi, but the + original work that was altered to make that file was called + dired.texi written by Sebastian Kremer. + + Permission is granted to process this file through TeX and print + the results, provided the printed document carries copying + permission notice identical to this one except for the removal + of this paragraph (this paragraph not being relevant to the + printed manual). + + man/faq.texi is licensed as follows: + + Copyright (C) 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner + Copyright (C) 1992,1993 Steven Byrnes + Copyright (C) 1990,1991,1992 Joseph Brian Wells + + This list of frequently asked questions about GNU Emacs with + answers ("FAQ") may be translated into other languages, + transformed into other formats (e.g. Texinfo, Info, WWW, WAIS), + and updated with new information. + + The same conditions apply to any derivative of the FAQ as apply + to the FAQ itself. Every copy of the FAQ must include this + notice or an approved translation, information on who is + currently maintaining the FAQ and how to contact them (including + their e-mail address), and information on where the latest + version of the FAQ is archived (including FTP information). + + The FAQ may be copied and redistributed under these conditions, + except that the FAQ may not be embedded in a larger literary + work unless that work itself allows free copying and + redistribution. + + Both etc/emacs.1 and etc/etags.1 are licensed under the terms of the + GNU Free Documentation License , Version 1.1 or any later version + published by the Free Software Foundation; with no Invariant Sections, + with no Front-Cover Texts, and no Back-Cover Texts. + +---------------------------------------------------------------------- + + GNU Free Documentation License + Version 1.1, March 2000 + + Copyright (C) 2000 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +written document "free" in the sense of freedom: to assure everyone +the effective freedom to copy and redistribute it, with or without +modifying it, either commercially or noncommercially. Secondarily, +this License preserves for the author and publisher a way to get +credit for their work, while not being considered responsible for +modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work that contains a +notice placed by the copyright holder saying it can be distributed +under the terms of this License. The "Document", below, refers to any +such manual or work. Any member of the public is a licensee, and is +addressed as "you". + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall subject +(or to related matters) and contains nothing that could fall directly +within that overall subject. (For example, if the Document is in part a +textbook of mathematics, a Secondary Section may not explain any +mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, whose contents can be viewed and edited directly and +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup has been designed to thwart or discourage +subsequent modification by readers is not Transparent. A copy that is +not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML designed for human modification. Opaque formats include +PostScript, PDF, proprietary formats that can be read and edited only +by proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML produced by some word processors for output +purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no other +conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies of the Document numbering more than 100, +and the Document's license notice requires Cover Texts, you must enclose +the copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a publicly-accessible computer-network location containing a complete +Transparent copy of the Document, free of added material, which the +general network-using public has access to download anonymously at no +charge using public-standard network protocols. If you use the latter +option, you must take reasonably prudent steps, when you begin +distribution of Opaque copies in quantity, to ensure that this +Transparent copy will remain thus accessible at the stated location +until at least one year after the last time you distribute an Opaque +copy (directly or through your agents or retailers) of that edition to +the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to give +them a chance to provide you with an updated version of the Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has less than five). +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section entitled "History", and its title, and add to + it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. In any section entitled "Acknowledgements" or "Dedications", + preserve the section's title, and preserve in the section all the + substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section as "Endorsements" + or to conflict in title with any Invariant Section. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections entitled "History" +in the various original documents, forming one section entitled +"History"; likewise combine any sections entitled "Acknowledgements", +and any sections entitled "Dedications". You must delete all sections +entitled "Endorsements." + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other documents +released under this License, and replace the individual copies of this +License in the various documents with a single copy that is included in +the collection, provided that you follow the rules of this License for +verbatim copying of each of the documents in all other respects. + +You may extract a single document from such a collection, and distribute +it individually under this License, provided you insert a copy of this +License into the extracted document, and follow this License in all +other respects regarding verbatim copying of that document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, does not as a whole count as a Modified Version +of the Document, provided no compilation copyright is claimed for the +compilation. Such a compilation is called an "aggregate", and this +License does not apply to the other self-contained works thus compiled +with the Document, on account of their being thus compiled, if they +are not themselves derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one quarter +of the entire aggregate, the Document's Cover Texts may be placed on +covers that surround only the Document within the aggregate. +Otherwise they must appear on covers around the whole aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License provided that you also include the +original English version of this License. In case of a disagreement +between the translation and the original English version of this +License, the original English version will prevail. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document except +as expressly provided for under this License. Any other attempt to +copy, modify, sublicense or distribute the Document is void, and will +automatically terminate your rights under this License. However, +parties who have received copies, or rights, from you under this +License will not have their licenses terminated so long as such +parties remain in full compliance. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions +of the GNU Free Documentation License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. See +http://www.gnu.org/copyleft/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation; + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have no Invariant Sections, write "with no Invariant Sections" +instead of saying which ones are invariant. If you have no +Front-Cover Texts, write "no Front-Cover Texts" instead of +"Front-Cover Texts being LIST"; likewise for Back-Cover Texts. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. --- emacs21-21.4a+1.orig/debian/emacsVER-bin-common.postrm +++ emacs21-21.4a+1/debian/emacsVER-bin-common.postrm @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ +MOVEMAIL_BIN=@MOVEMAIL_BIN@ + +# Legacy removal... +if [ -e /etc/suid.conf -a -x /usr/sbin/suidunregister ]; then + suidunregister -s emacs${MAJOR} ${MOVEMAIL_BIN} +fi + +#DEBHELPER# + --- emacs21-21.4a+1.orig/debian/emacsVER-common.README +++ emacs21-21.4a+1/debian/emacsVER-common.README @@ -0,0 +1,42 @@ +This file details the Debian specific changes to Emacs. + +The following tags may be used in the sections below: Patch, Status, +Author, Added-by, Provided-by, and Date. When known, Author is used +to indicate the person believed to have written the relevant code. +Provided-by may be used to indicate the person who submitted the code +to Debian, and Added-by indicates the person who actually added the +code to the Debian pacakge. + +* The Debian copy of the upstream source contains no .elc files. + + The .elc files have been removed because we always regenerate them + and because Emacs modifies them in the source tree during the build + process, even when using a VPATH build. This means that a "make + clean" can't easily return the tree to the upstream state, resulting + in a giant Debian binary diff. There are other solutions if this + turns out to be a problem. If nothing else, we can keep the current + infrastructure and just add the .elc files to protected_files in + debian/rules. Removing the .elc files doesn't affect whether or not + our source archive would match the upstream md5sum because we have + to repackage it anyway to add leim support. + +* The etc/yow.lines file has been updated from the upstream development tree. + +The etc/yow.lines file in the Debian package is newer than the one in +the original distribution. It has been copied from the upstream Emacs +development tree. + +* The -i icon is the Emacs GNU. + +* Those who prefer the old-style scrollbars can edit debian/rules + + If you prefer the old-style, non-toolkit scrollbars, just edit + debian/rules to uncomment the --without-toolkit-scrollbars line and + rebuild. + +@@PATCH_LIST_HERE@@ + +Local Variables: +mode: outline +outline-regexp: " *\\*+" +End: --- emacs21-21.4a+1.orig/debian/emacsVER-common.postinst +++ emacs21-21.4a+1/debian/emacsVER-common.postinst @@ -0,0 +1,106 @@ +#!/bin/sh -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ +INFOFILES="@INFOFILES@" + +PRIORITY=24 + +# Fix from Manoj so we don't clean up more than we should. +if [ -f /usr/share/info/gnus.gz ]; then + CRUFT_INFOFILES="ccmode cl dired-x ediff emacs forms info mh-e reftex sc \ + vip viper widget" +else + CRUFT_INFOFILES="ccmode cl dired-x ediff emacs forms gnus info message \ + mh-e reftex sc vip viper widget" +fi + +# We have to clean these up because the old package didn't. The info +# files were being removed in the postinst, not the prerm, and so +# install-info wasn't doing anything because the files weren't there.. +for file in ${CRUFT_INFOFILES} +do + install-info --quiet --remove-exactly ${file} || true +done + +for file in ${INFOFILES} +do + install-info --quiet --section Emacs Emacs \ + /usr/share/info/emacs-${MAJOR}/${file}.gz || true +done + +# Create the site-lisp dir for this flavor if we're allowed + +#### Begin Bug fix hack for old emacs20 package brain damage. +# +# We have to handle /usr/local/share and /usr/local/share/emacs here +# because emacs20 used to contain /usr/local/share :< . Normally +# these dirs should have been handled exclusively by emacsen-common. + +parentdir=/usr/local +newdir=share + +if [ -d ${parentdir} ] +then + if mkdir ${parentdir}/${newdir} 2>/dev/null + then + chown root:staff ${parentdir}/${newdir} + chmod 2775 ${parentdir}/${newdir} + fi +fi + +parentdir=/usr/local/share +newdir=emacs + +if [ -d ${parentdir} ] +then + if mkdir ${parentdir}/${newdir} 2>/dev/null + then + chown root:staff ${parentdir}/${newdir} + chmod 2775 ${parentdir}/${newdir} + fi +fi + +parentdir=/usr/local/share/emacs +newdir=site-lisp + +if [ -d ${parentdir} ] +then + if mkdir ${parentdir}/${newdir} 2>/dev/null + then + chown root:staff ${parentdir}/${newdir} + chmod 2775 ${parentdir}/${newdir} + fi +fi + +#### End Bug fix hack for old emacs20 package brain damage. + + +parentdir=/usr/local/share/emacs +newdir=${FULL} + +if [ -d ${parentdir} ] +then + if mkdir ${parentdir}/${newdir} 2>/dev/null + then + chown root:staff ${parentdir}/${newdir} + chmod 2775 ${parentdir}/${newdir} + fi +fi + +parentdir=/usr/local/share/emacs/${FULL} +newdir=site-lisp + +if [ -d ${parentdir} ] +then + if mkdir ${parentdir}/${newdir} 2>/dev/null + then + chown root:staff ${parentdir}/${newdir} + chmod 2775 ${parentdir}/${newdir} + fi +fi + +# emacsen-common/emacs-install used to be here. + +#DEBHELPER# --- emacs21-21.4a+1.orig/debian/emacsVER.prerm +++ emacs21-21.4a+1/debian/emacsVER.prerm @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ + +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ] +then + rm -f /usr/doc/@PKG_NAME@ +fi + +# update-alternatives on things that collide with xemacs, other editors +if [ "$1" != "upgrade" ] +then + update-alternatives --remove emacs /usr/bin/emacs${MAJOR}-@X_SUPPORT@ + update-alternatives --remove editor /usr/bin/emacs${MAJOR} +fi + +# emacsen-common registration. +/usr/lib/emacsen-common/emacs-remove emacs${MAJOR} + +#DEBHELPER# + --- emacs21-21.4a+1.orig/debian/emacsVER-common.docs +++ emacs21-21.4a+1/debian/emacsVER-common.docs @@ -0,0 +1,3 @@ +BUGS +README +debian/README.add-on-package-maintainers --- emacs21-21.4a+1.orig/debian/emacsVER-el.prerm +++ emacs21-21.4a+1/debian/emacsVER-el.prerm @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +MAJOR=@MAJOR_VERSION@ +MINOR=@MINOR_VERSION@ +FULL=@FULL_VERSION@ + +if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/emacs${MAJOR}-el ] +then + rm -f /usr/doc/emacs${MAJOR}-el +fi + +#DEBHELPER#