diff -r -u -N xemacs-21.1.7/ChangeLog xemacs-21.1.8/ChangeLog --- xemacs-21.1.7/ChangeLog Sun Sep 26 13:43:44 1999 +++ xemacs-21.1.8/ChangeLog Tue Nov 2 22:30:27 1999 @@ -1,3 +1,37 @@ +1999-11-02 XEmacs Build Bot + + * XEmacs 21.1.8 is released + +1999-11-01 Yoshiki Hayashi + + * INSTALL: Update configure option. + +1999-11-01 Alexandre Oliva + + * configure.in (native_sound_lib, *-sgi-*): Check for audio.h. + (LIBS): Check for libCsup. + +1999-10-22 Vin Shelton + + * INSTALL: Added more information about README.packages, and + re-numbered some bullets. + +1999-10-21 Giacomo Boffi + + * etc/sample.Xdefaults: adds a reference to beNiceToColrmap, + so that the user can guess what to do if xemacs' dialogs are + butt ugly. + +1999-10-21 Jan Vroonhof + + * INSTALL: Make disk space requirements more realistic. + Add note about stack size requirements. + Update and add more weight to the package section. + + * README: Add reference to README.packages + + * INSTALL: Remove junk from install.sh + 1999-09-26 XEmacs Build Bot * XEmacs 21.1.7 is released diff -r -u -N xemacs-21.1.7/INSTALL xemacs-21.1.8/INSTALL --- xemacs-21.1.7/INSTALL Sun Sep 19 22:20:39 1999 +++ xemacs-21.1.8/INSTALL Mon Nov 1 23:17:06 1999 @@ -1,242 +1,6 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# This comes from X11R5. -# -# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $ -# -# This script is compatible with the BSD install script, but was written -# from scratch. -# - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -tranformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd="$cpprog" - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd="$stripprog" - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "install: no input file specified" - exit 1 -else - true -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d $dst ]; then - instcmd=: - else - instcmd=mkdir - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f $src -o -d $src ] - then - true - else - echo "install: $src does not exist" - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "install: no destination specified" - exit 1 - else - true - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d $dst ] - then - dst="$dst"/`basename $src` - else - true - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' -' -IFS="${IFS-${defaultIFS}}" - -oIFS="${IFS}" -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS="${oIFS}" - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp="${pathcomp}${1}" - shift - - if [ ! -d "${pathcomp}" ] ; - then - $mkdirprog "${pathcomp}" - else - true - fi - - pathcomp="${pathcomp}/" -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd $dst && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename $dst` - else - dstfile=`basename $dst $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename $dst` - else - true - fi - -# Make a temp file name in the proper directory. - - dsttmp=$dstdir/#inst.$$# - -# Move or copy the file name to the temp name - - $doit $instcmd $src $dsttmp && - - trap "rm -f ${dsttmp}" 0 && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi && - -# Now rename the file to the real destination. - - $doit $rmcmd -f $dstdir/$dstfile && - $doit $mvcmd $dsttmp $dstdir/$dstfile - -fi && - - -exit 0 XEmacs Installation Guide Copyright (c) 1994, 1995, 1996 Board of Trustees, University of Illinois -Copyright (c) 1994 Free Software Foundation, Inc. +Copyright (c) 1994-1999 Free Software Foundation, Inc. Synched up with: FSF 19.30. @@ -259,20 +23,22 @@ 1) Make sure your system has enough swapping space allocated to handle a program whose pure code is 900k bytes and whose data area is at - least 400k and can reach 8Mb or more. If the swapping space is + least 400k and can reach 8Mb or more. Note that a typical XEmacs + build is much bigger. If the swapping space is insufficient, you will get an error in the command `temacs -batch -l loadup dump', found in `./src/Makefile.in.in', or possibly when running the final dumped XEmacs. -Building XEmacs requires about 41 Mb of disk space (including the -XEmacs sources). Once installed, XEmacs occupies about 16 Mb in the -file system where it is installed; this includes the executable files, -Lisp libraries, miscellaneous data files, and on-line documentation. -The amount of storage of the Lisp directories may be reduced by -compressing the .el files. If the building and installation take place -in different directories, then the installation procedure temporarily -requires 41+16 Mb. Adjust this value upwards depending upon what -additional Lisp support is installed. + Verify that your users have a high enough stack limit. On some + systems such as OpenBSD and OSF/Tru64 the default is 2MB which is + too low. See 'PROBLEMS' for details. + +Building XEmacs requires about 100 Mb of disk space (including the +XEmacs sources). Once installed, XEmacs occupies between 20 and 100 Mb +in the file system where it is installed; this includes the executable files, +Lisp libraries, miscellaneous data files, and on-line documentation. The +exact amount depends greatly on the number of extra lisp packages that are +installed XEmacs requires an ANSI C compiler, such as GCC. If you wish to build the documentation yourself, you will need at least version 1.68 of @@ -301,20 +67,34 @@ XEmacs to allow configure to find the external software packages. If you link with dynamic (``.so'') external package libraries, which is not recommended, you will also need to add the library directories -to the --site-runtime-libraries option. - +to the --site-runtime-libraries option. For your convenience these can +be set together by using the --with-site-prefix command. This will set +these variables as needed assuming your libraries are organised as a +typical /usr tree. + +3) [N.B. Most of this section can be done during or after the +compilation of the core source code, but is present early to catch +your attention.] -3) Decide what Initial Lisp you need with XEmacs. XEmacs is -distributed separately from most of its runtime environment. This is +Decide what Initial Lisp you need with XEmacs. XEmacs is +distributed separately from most of its runtime environment. This is done to make it easier for administrators to tune an installation for -what the local users need. See the file etc/PACKAGES for an overview -of what is available and which packages need to be installed prior to -building XEmacs. At this point you only need a minimum to get started -at which point you may install what you wish without further changes -to the XEmacs binary. A sample minimum configuration for a Linux -system using Mule and Wnn6 from OMRON corporation would be the -packages `mule-base' and `egg-its'. By default, packages will be -searched for in the path +what the local users need. Note that while XEmacs will compile and +install without any packages present at least some additional lisp +packages are needed to bring XEmacs up to "normal" editor +functionality. Installation and upgrading of the packages can be done +almost automatically when from inside XEmacs when it has been compiled +and installed. + +More information and suggestions for which packages to install see the +file README.packages. + +IMPORTANT! The file README.packages contain information vital to have +a fully working XEmacs. This information was not included in this file +only because it is too large for this terse INSTALL. Please read +README.packages now! + +By default, packages will be searched for in the path ~/.xemacs::$prefix/lib/xemacs-${version}/mule-packages:$prefix/lib/xemacs/mule-packages:$prefix/lib/xemacs-${version}/xemacs-packages:$prefix/lib/xemacs/xemacs-packages @@ -324,6 +104,8 @@ IMPORTANT NOTE: In a future version of XEmacs, the user-specific package hierarchy will move from ~/.xemacs to ~/.xemacs/packages. + + 4) In the top level directory of the XEmacs distribution, run the program `configure' as follows: @@ -538,12 +320,12 @@ configuration for your system. You can tweak this based on how you use XEmacs, and the memory and cpu resources available on your system. -The `--use-system-malloc' option can be use to either enable or +The `--with-system-malloc' option can be use to either enable or disable use of the system malloc. Generally, it's best to go with the default configuration for your system. Note that on many systems using the system malloc disables the use of the relocating allocator. -The `--use-debug-malloc' option can be used to link a special debugging +The `--with-debug-malloc' option can be used to link a special debugging version of malloc. Debug Malloc is not included with XEmacs, is intended for use only by the developers and may be obtained from . @@ -624,7 +406,7 @@ same configuration. If `configure' exits with an error after disturbing the status quo, it removes `config.status'. -4) Look at `./lisp/paths.el'; if some of those values are not right +5) Look at `./lisp/paths.el'; if some of those values are not right for your system, set up the file `./lisp/site-init.el' with XEmacs Lisp code to override them; it is not a good idea to edit paths.el itself. YOU MUST USE THE LISP FUNCTION `setq' TO ASSIGN VALUES, @@ -647,7 +429,7 @@ XEmacs cannot detect, you may need to change the value of `directory-abbrev-alist'. -5) Put into `./lisp/site-init.el' or `./lisp/site-load.el' any Emacs +6) Put into `./lisp/site-init.el' or `./lisp/site-load.el' any Emacs Lisp code you want XEmacs to load before it is dumped out. Use site-load.el for additional libraries if you arrange for their documentation strings to be in the lib-src/DOC file (see @@ -666,12 +448,12 @@ The `site-*.el' files are nonexistent in the distribution. You do not need to create them if you have nothing to put in them. -6) Refer to the file `./etc/TERMS' for information on fields you may +7) Refer to the file `./etc/TERMS' for information on fields you may wish to add to various termcap entries. The files `./etc/termcap.ucb' and `./etc/termcap.dat' may already contain appropriately-modified entries. -7) Run `make' in the top directory of the XEmacs distribution to finish +8) Run `make' in the top directory of the XEmacs distribution to finish building XEmacs in the standard way. The final executable file is named `src/emacs'. You can execute this file "in place" without copying it, if you wish; then it automatically uses the sibling @@ -735,18 +517,18 @@ the command. See the section below called `MAKE VARIABLES' for more information on this. -8) If your system uses lock files to interlock access to mailer inbox files, -then you might need to make the movemail program setuid or setgid -to enable it to write the lock files. We believe this is safe. +9) If your system uses lock files to interlock access to mailer inbox +files, then you might need to make the movemail program setuid or +setgid to enable it to write the lock files. We believe this is safe. The setuid/setgid bits need not be set on any other XEmacs-related executables. -9) You are done with the hard part! You can remove executables and +10) You are done with the hard part! You can remove executables and object files from the build directory by typing `make clean'. To also remove the files that `configure' created (so you can compile XEmacs for a different configuration), type `make distclean'. -10) You should now go to the XEmacs web page at http://www.xemacs.org/ +11) You should now go to the XEmacs web page at http://www.xemacs.org/ and decide what additional Lisp support you wish to have. MAKE VARIABLES @@ -887,13 +669,13 @@ `src/config.h', and change the two `#include' directives to include the appropriate system and architecture description files. -2) Edit `./src/config.h' to set the right options for your system. If +3) Edit `./src/config.h' to set the right options for your system. If you need to override any of the definitions in the s/*.h and m/*.h files for your system and machine, do so by editing config.h, not by changing the s/*.h and m/*.h files. Occasionally you may need to redefine parameters used in `./lib-src/movemail.c'. -3) If you're going to use the make utility to build XEmacs, you will +4) If you're going to use the make utility to build XEmacs, you will still need to run `configure' first, giving the appropriate values for the variables in the sections entitled "Things `configure' Might Edit" and "Where To Install Things." Note that you may only need to change @@ -992,6 +774,10 @@ PROBLEMS + +The most likely problem is that you forgot to read and follow the +directions in README.packages. You can not have a working XEmacs +without downloading some additional packages. See the file PROBLEMS in this directory for a list of various problems sometimes encountered, and what to do about them. diff -r -u -N xemacs-21.1.7/README xemacs-21.1.8/README --- xemacs-21.1.7/README Thu May 13 12:14:05 1999 +++ xemacs-21.1.8/README Thu Oct 21 23:22:15 1999 @@ -16,6 +16,9 @@ See the file `nt/README' for instructions on building XEmacs for Microsoft Windows. +The file 'README.packages' will guide you in the installation of +(essential) add on packages. + Reports of bugs in XEmacs should be posted to the newsgroup comp.emacs.xemacs or sent to the mailing list xemacs@xemacs.org. See the "Bugs" section of the XEmacs manual for more information on how to diff -r -u -N xemacs-21.1.7/configure xemacs-21.1.8/configure --- xemacs-21.1.7/configure Thu Sep 23 23:11:05 1999 +++ xemacs-21.1.8/configure Tue Nov 2 18:42:56 1999 @@ -6716,13 +6716,52 @@ echo "checking for graphics libraries" 1>&6 echo "configure:6718: checking for graphics libraries" >&5 + +echo $ac_n "checking for __T_9__nothrow in -lCsup""... $ac_c" 1>&6 +echo "configure:6722: checking for __T_9__nothrow in -lCsup" >&5 +ac_lib_var=`echo Csup'_'__T_9__nothrow | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lCsup " +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* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + LIBS="-lCsup $LIBS" +else + echo "$ac_t""no" 1>&6 +fi + + + xpm_problem="" if test -z "$with_xpm"; then echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:6723: checking for Xpm - no older than 3.4f" >&5 +echo "configure:6762: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext < int main(int c, char **v) { @@ -6730,7 +6769,7 @@ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; xpm_status=$?; if test "$xpm_status" = "0"; then @@ -6772,17 +6811,17 @@ libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:6776: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:6815: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else @@ -6824,12 +6863,12 @@ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:6828: checking for inflate in -lc" >&5 +echo "configure:6867: checking for inflate in -lc" >&5 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6883: \"$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 @@ -6859,12 +6898,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:6863: checking for inflate in -lz" >&5 +echo "configure:6902: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lz " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6918: \"$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 @@ -6894,12 +6933,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:6898: checking for inflate in -lgz" >&5 +echo "configure:6937: checking for inflate in -lgz" >&5 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lgz " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6953: \"$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 @@ -6940,15 +6979,15 @@ test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:6944: checking for jpeglib.h" >&5 +echo "configure:6983: checking for jpeglib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6991: \"$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* @@ -6971,12 +7010,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:6975: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:7014: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7030: \"$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 @@ -7023,10 +7062,10 @@ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:7027: checking for pow" >&5 +echo "configure:7066: checking for pow" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pow=yes" else @@ -7070,15 +7109,15 @@ } test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:7074: checking for png.h" >&5 +echo "configure:7113: checking for png.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7121: \"$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* @@ -7101,12 +7140,12 @@ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:7105: checking for png_read_image in -lpng" >&5 +echo "configure:7144: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7160: \"$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 @@ -7140,10 +7179,10 @@ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:7144: checking for workable png version information" >&5 +echo "configure:7183: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext < int main(int c, char **v) { @@ -7151,7 +7190,7 @@ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:7155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; png_status=$?; if test "$png_status" = "0"; then @@ -7194,15 +7233,15 @@ test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:7198: checking for tiffio.h" >&5 +echo "configure:7237: checking for tiffio.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7245: \"$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* @@ -7225,12 +7264,12 @@ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:7229: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:7268: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7284: \"$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 @@ -7280,19 +7319,19 @@ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:7284: checking for X11 graphics libraries" >&5 +echo "configure:7323: checking for X11 graphics libraries" >&5 test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:7288: checking for compface.h" >&5 +echo "configure:7327: checking for compface.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7335: \"$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* @@ -7315,12 +7354,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:7319: checking for UnGenFace in -lcompface" >&5 +echo "configure:7358: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7374: \"$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 @@ -7367,12 +7406,12 @@ echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6 -echo "configure:7371: checking for XawScrollbarSetThumb in -lXaw" >&5 +echo "configure:7410: checking for XawScrollbarSetThumb in -lXaw" >&5 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7426: \"$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 @@ -7407,15 +7446,15 @@ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:7411: checking for Xm/Xm.h" >&5 +echo "configure:7450: checking for Xm/Xm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7458: \"$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* @@ -7432,12 +7471,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:7436: checking for XmStringFree in -lXm" >&5 +echo "configure:7475: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7491: \"$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 @@ -7477,9 +7516,9 @@ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:7481: checking for Lesstif" >&5 +echo "configure:7520: checking for Lesstif" >&5 cat > conftest.$ac_ext < #ifdef LESSTIF_VERSION @@ -7763,7 +7802,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:7767: checking for Mule-related features" >&5 +echo "configure:7806: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -7788,15 +7827,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7792: checking for $ac_hdr" >&5 +echo "configure:7831: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7839: \"$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* @@ -7827,12 +7866,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:7831: checking for strerror in -lintl" >&5 +echo "configure:7870: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7886: \"$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 @@ -7876,18 +7915,18 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:7880: checking for Mule input methods" >&5 +echo "configure:7919: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:7883: checking for XIM" >&5 +echo "configure:7922: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:7886: checking for XOpenIM in -lX11" >&5 +echo "configure:7925: checking for XOpenIM in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7941: \"$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 @@ -7922,12 +7961,12 @@ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:7926: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:7965: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7981: \"$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 @@ -8003,15 +8042,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:8007: checking for XFontSet" >&5 +echo "configure:8046: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:8010: checking for XmbDrawString in -lX11" >&5 +echo "configure:8049: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8065: \"$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 @@ -8062,15 +8101,15 @@ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:8066: checking for wnn/jllib.h" >&5 +echo "configure:8105: checking for wnn/jllib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8113: \"$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* @@ -8095,10 +8134,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8099: checking for $ac_func" >&5 +echo "configure:8138: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8164: \"$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 @@ -8150,12 +8189,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:8154: checking for crypt in -lcrypt" >&5 +echo "configure:8193: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8209: \"$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 @@ -8201,12 +8240,12 @@ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:8205: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:8244: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8260: \"$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 @@ -8235,12 +8274,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:8239: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:8278: checking for jl_dic_list_e in -lwnn4" >&5 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn4 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8294: \"$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 @@ -8269,12 +8308,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:8273: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:8312: checking for jl_dic_list_e in -lwnn6" >&5 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8328: \"$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 @@ -8303,12 +8342,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:8307: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:8346: checking for dic_list_e in -lwnn6_fromsrc" >&5 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6_fromsrc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8362: \"$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 @@ -8367,12 +8406,12 @@ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:8371: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:8410: checking for jl_fi_dic_list in -l$libwnn" >&5 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -l$libwnn " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8426: \"$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 @@ -8418,15 +8457,15 @@ if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:8422: checking for canna/jrkanji.h" >&5 +echo "configure:8461: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8469: \"$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* @@ -8453,15 +8492,15 @@ c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:8457: checking for canna/jrkanji.h" >&5 +echo "configure:8496: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8504: \"$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* @@ -8489,15 +8528,15 @@ test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:8493: checking for canna/RK.h" >&5 +echo "configure:8532: checking for canna/RK.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8501: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8540: \"$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* @@ -8520,12 +8559,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:8524: checking for RkBgnBun in -lRKC" >&5 +echo "configure:8563: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8579: \"$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 @@ -8559,12 +8598,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:8563: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:8602: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8618: \"$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 @@ -8624,12 +8663,12 @@ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:8628: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:8667: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8683: \"$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 @@ -8726,10 +8765,10 @@ for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8730: checking for $ac_func" >&5 +echo "configure:8769: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8795: \"$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 @@ -8793,10 +8832,10 @@ * ) for ac_func in realpath do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8797: checking for $ac_func" >&5 +echo "configure:8836: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8862: \"$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 @@ -8853,16 +8892,16 @@ esac echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:8857: checking whether netdb declares h_errno" >&5 +echo "configure:8896: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext < int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:8866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -8882,16 +8921,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:8886: checking for sigsetjmp" >&5 +echo "configure:8925: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:8895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -8911,11 +8950,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:8915: checking whether localtime caches TZ" >&5 +echo "configure:8954: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8950,7 +8989,7 @@ exit (0); } EOF -if { (eval echo configure:8954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -8980,9 +9019,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:8984: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:9023: checking whether gettimeofday accepts one or two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""two" 1>&6 else @@ -9026,19 +9065,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:9030: checking for inline" >&5 +echo "configure:9069: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -9088,17 +9127,17 @@ # 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:9092: checking for working alloca.h" >&5 +echo "configure:9131: checking for working alloca.h" >&5 cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9141: \"$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 @@ -9122,10 +9161,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:9126: checking for alloca" >&5 +echo "configure:9165: checking for alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -9192,10 +9231,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:9196: checking whether alloca needs Cray hooks" >&5 +echo "configure:9235: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <&6 -echo "configure:9223: checking for $ac_func" >&5 +echo "configure:9262: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9288: \"$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 @@ -9275,10 +9314,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:9279: checking stack direction for C alloca" >&5 +echo "configure:9318: checking stack direction for C alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -9326,15 +9365,15 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:9330: checking for vfork.h" >&5 +echo "configure:9369: checking for vfork.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9377: \"$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* @@ -9362,10 +9401,10 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:9366: checking for working vfork" >&5 +echo "configure:9405: checking for working vfork" >&5 cat > conftest.$ac_ext < @@ -9460,7 +9499,7 @@ } } EOF -if { (eval echo configure:9464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_vfork_works=yes else @@ -9486,10 +9525,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:9490: checking for working strcoll" >&5 +echo "configure:9529: checking for working strcoll" >&5 cat > conftest.$ac_ext < main () @@ -9499,7 +9538,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:9503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -9527,10 +9566,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9531: checking for $ac_func" >&5 +echo "configure:9570: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9596: \"$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 @@ -9581,10 +9620,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:9585: checking whether getpgrp takes no argument" >&5 +echo "configure:9624: checking whether getpgrp takes no argument" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -9666,10 +9705,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:9670: checking for working mmap" >&5 +echo "configure:9709: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext < #include @@ -9702,7 +9741,7 @@ return 1; } EOF -if { (eval echo configure:9706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -9737,15 +9776,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:9741: checking for termios.h" >&5 +echo "configure:9780: checking for termios.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9788: \"$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* @@ -9788,15 +9827,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:9792: checking for termio.h" >&5 +echo "configure:9831: checking for termio.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9839: \"$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* @@ -9828,10 +9867,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:9832: checking for socket" >&5 +echo "configure:9871: checking for socket" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9897: \"$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 @@ -9869,15 +9908,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:9873: checking for netinet/in.h" >&5 +echo "configure:9912: checking for netinet/in.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9920: \"$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* @@ -9894,15 +9933,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:9898: checking for arpa/inet.h" >&5 +echo "configure:9937: checking for arpa/inet.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9945: \"$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* @@ -9927,9 +9966,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:9931: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:9970: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext < @@ -9940,7 +9979,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:9944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN @@ -9958,9 +9997,9 @@ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:9962: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:10001: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext < @@ -9970,7 +10009,7 @@ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:9974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST @@ -10001,10 +10040,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:10005: checking for msgget" >&5 +echo "configure:10044: checking for msgget" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -10042,15 +10081,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:10046: checking for sys/ipc.h" >&5 +echo "configure:10085: checking for sys/ipc.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10093: \"$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* @@ -10067,15 +10106,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:10071: checking for sys/msg.h" >&5 +echo "configure:10110: checking for sys/msg.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10079: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10118: \"$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* @@ -10113,15 +10152,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:10117: checking for dirent.h" >&5 +echo "configure:10156: checking for dirent.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10164: \"$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* @@ -10148,15 +10187,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:10152: checking for sys/dir.h" >&5 +echo "configure:10191: checking for sys/dir.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10199: \"$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* @@ -10189,15 +10228,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:10193: checking for nlist.h" >&5 +echo "configure:10232: checking for nlist.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10240: \"$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* @@ -10227,7 +10266,7 @@ echo "checking "for sound support"" 1>&6 -echo "configure:10231: checking "for sound support"" >&5 +echo "configure:10270: checking "for sound support"" >&5 case "$with_sound" in native | both ) with_native_sound=yes;; nas | no ) with_native_sound=no;; @@ -10238,15 +10277,15 @@ if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:10242: checking for multimedia/audio_device.h" >&5 +echo "configure:10281: checking for multimedia/audio_device.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10289: \"$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* @@ -10292,14 +10331,40 @@ case "$canonical" in *-sgi-* ) if test -z "$native_sound_lib"; then + ac_safe=`echo "audio.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for audio.h""... $ac_c" 1>&6 +echo "configure:10337: checking for audio.h" >&5 + +cat > conftest.$ac_ext < +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:10345: \"$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* +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:10298: checking for ALopenport in -laudio" >&5 +echo "configure:10363: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10379: \"$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 @@ -10330,6 +10395,11 @@ fi + +else + echo "$ac_t""no" 1>&6 +fi + fi if test -n "$native_sound_lib"; then sound_found=yes sound_cflags="" @@ -10341,12 +10411,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:10345: checking for AOpenAudio in -lAlib" >&5 +echo "configure:10415: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10431: \"$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 @@ -10395,15 +10465,15 @@ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:10399: checking for ${dir}/soundcard.h" >&5 +echo "configure:10469: checking for ${dir}/soundcard.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10477: \"$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* @@ -10473,7 +10543,7 @@ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext < EOF @@ -10500,7 +10570,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:10504: checking for TTY-related features" >&5 +echo "configure:10574: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -10516,12 +10586,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:10520: checking for tgetent in -lncurses" >&5 +echo "configure:10590: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10606: \"$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 @@ -10565,15 +10635,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:10569: checking for ncurses/curses.h" >&5 +echo "configure:10639: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10647: \"$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* @@ -10595,15 +10665,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:10599: checking for ncurses/term.h" >&5 +echo "configure:10669: checking for ncurses/term.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10677: \"$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* @@ -10633,15 +10703,15 @@ c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:10637: checking for ncurses/curses.h" >&5 +echo "configure:10707: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10715: \"$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* @@ -10676,12 +10746,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:10680: checking for tgetent in -l$lib" >&5 +echo "configure:10750: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -l$lib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10766: \"$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 @@ -10723,12 +10793,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:10727: checking for tgetent in -lcurses" >&5 +echo "configure:10797: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10813: \"$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 @@ -10757,12 +10827,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:10761: checking for tgetent in -ltermcap" >&5 +echo "configure:10831: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10847: \"$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 @@ -10821,15 +10891,15 @@ test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:10825: checking for gpm.h" >&5 +echo "configure:10895: checking for gpm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10903: \"$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* @@ -10852,12 +10922,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:10856: checking for Gpm_Open in -lgpm" >&5 +echo "configure:10926: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10942: \"$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 @@ -10917,20 +10987,20 @@ echo "checking for database support" 1>&6 -echo "configure:10921: checking for database support" >&5 +echo "configure:10991: checking for database support" >&5 if test "$with_database_gnudbm $with_database_dbm" != "no no"; then ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:10926: checking for ndbm.h" >&5 +echo "configure:10996: checking for ndbm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11004: \"$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* @@ -10960,12 +11030,12 @@ if test "$with_database_gnudbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:10964: checking for dbm_open in -lgdbm" >&5 +echo "configure:11034: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11050: \"$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 @@ -11004,10 +11074,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:11008: checking for dbm_open" >&5 +echo "configure:11078: checking for dbm_open" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -11049,12 +11119,12 @@ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:11053: checking for dbm_open in -ldbm" >&5 +echo "configure:11123: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11139: \"$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 @@ -11107,10 +11177,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:11111: checking for Berkeley db.h" >&5 +echo "configure:11181: checking for Berkeley db.h" >&5 for path in "db/db.h" "db.h"; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_path="$path"; break else @@ -11144,9 +11214,9 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:11148: checking for Berkeley DB version" >&5 +echo "configure:11218: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 1 @@ -11165,10 +11235,10 @@ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:11169: checking for $dbfunc" >&5 +echo "configure:11239: checking for $dbfunc" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$dbfunc=yes" else @@ -11210,12 +11280,12 @@ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:11214: checking for $dbfunc in -ldb" >&5 +echo "configure:11284: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11300: \"$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 @@ -11290,12 +11360,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:11294: checking for SOCKSinit in -lsocks" >&5 +echo "configure:11364: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11380: \"$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 @@ -11365,15 +11435,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11369: checking for $ac_hdr" >&5 +echo "configure:11439: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11447: \"$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* @@ -11404,12 +11474,12 @@ test -z "$with_shlib" && test ! -z "$have_dlfcn" && { echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:11408: checking for dlopen in -ldl" >&5 +echo "configure:11478: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` xe_check_libs=" -ldl " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11494: \"$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 @@ -11449,12 +11519,12 @@ } test -z "$with_shlib" && test ! -z "$have_dlfcn" && { echo $ac_n "checking for _dlopen in -lc""... $ac_c" 1>&6 -echo "configure:11453: checking for _dlopen in -lc" >&5 +echo "configure:11523: checking for _dlopen in -lc" >&5 ac_lib_var=`echo c'_'_dlopen | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11539: \"$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 @@ -11494,12 +11564,12 @@ } test -z "$with_shlib" && test ! -z "$have_dlfcn" && { echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:11498: checking for dlopen in -lc" >&5 +echo "configure:11568: checking for dlopen in -lc" >&5 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11584: \"$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 @@ -11539,12 +11609,12 @@ } test -z "$with_shlib" && { echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:11543: checking for shl_load in -ldld" >&5 +echo "configure:11613: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11629: \"$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 @@ -11584,12 +11654,12 @@ } test -z "$with_shlib" && { echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:11588: checking for dld_init in -ldld" >&5 +echo "configure:11658: checking for dld_init in -ldld" >&5 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11674: \"$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 @@ -11650,7 +11720,7 @@ dll_oflags="-o " echo $ac_n "checking how to build a shared library""... $ac_c" 1>&6 -echo "configure:11654: checking how to build a shared library" >&5 +echo "configure:11724: checking how to build a shared library" >&5 case `uname -rs` in UNIX_SV*|UNIX_System_V*) dll_lflags="-G" @@ -11741,10 +11811,10 @@ for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11745: checking for $ac_func" >&5 +echo "configure:11815: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11841: \"$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 @@ -11803,11 +11873,11 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else diff -r -u -N xemacs-21.1.7/configure.in xemacs-21.1.8/configure.in --- xemacs-21.1.7/configure.in Thu Sep 23 23:11:08 1999 +++ xemacs-21.1.8/configure.in Mon Nov 1 23:17:06 1999 @@ -2702,6 +2702,9 @@ if test "$window_system" != "none"; then AC_CHECKING(for graphics libraries) + dnl On IRIX 6, most graphics libraries depend on libCsup + AC_CHECK_LIB(Csup,__T_9__nothrow,[LIBS="-lCsup $LIBS"]) + dnl Autodetect Xpm xpm_problem="" if test -z "$with_xpm"; then @@ -3354,7 +3357,9 @@ case "$canonical" in *-sgi-* ) if test -z "$native_sound_lib"; then + AC_CHECK_HEADER(audio.h, [ AC_CHECK_LIB(audio, ALopenport, native_sound_lib="-laudio") + ]) fi if test -n "$native_sound_lib"; then sound_found=yes sound_cflags="" diff -r -u -N xemacs-21.1.7/etc/sample.Xdefaults xemacs-21.1.8/etc/sample.Xdefaults --- xemacs-21.1.7/etc/sample.Xdefaults Mon Mar 3 21:29:18 1997 +++ xemacs-21.1.8/etc/sample.Xdefaults Thu Oct 21 23:22:16 1999 @@ -75,6 +75,13 @@ ! While this one is for Athena dialog boxes. Emacs*dialog*Command*Background: WhiteSmoke +! Athena dialog boxes are sometimes built with the Xaw3d +! variant of the Athena toolkit. +! XEmacs being nice to 8bit displays, it defaults to: +Emacs*dialog*Command*beNiceToColormap: true +! If you are shocked by the ugliness of the 3d rendition, +! you may want to set (even on 8bit displays) the above to false. + ! Xlw Scrollbar colors Emacs*XlwScrollBar.Foreground: Gray30 Emacs*XlwScrollBar.Background: Gray75 diff -r -u -N xemacs-21.1.7/lib-src/ChangeLog xemacs-21.1.8/lib-src/ChangeLog --- xemacs-21.1.7/lib-src/ChangeLog Sun Sep 26 13:43:44 1999 +++ xemacs-21.1.8/lib-src/ChangeLog Tue Nov 2 22:30:27 1999 @@ -1,3 +1,11 @@ +1999-11-02 XEmacs Build Bot + + * XEmacs 21.1.8 is released + +1999-11-01 Andy Piper + + * mmencode.c: include + 1999-09-26 XEmacs Build Bot * XEmacs 21.1.7 is released diff -r -u -N xemacs-21.1.7/lib-src/mmencode.c xemacs-21.1.8/lib-src/mmencode.c --- xemacs-21.1.7/lib-src/mmencode.c Thu Sep 23 23:11:11 1999 +++ xemacs-21.1.8/lib-src/mmencode.c Mon Nov 1 23:17:09 1999 @@ -18,6 +18,7 @@ #include #include #include +#include static void output64chunk(int c1, int c2, int c3, int pads, FILE *outfile); diff -r -u -N xemacs-21.1.7/lisp/ChangeLog xemacs-21.1.8/lisp/ChangeLog --- xemacs-21.1.7/lisp/ChangeLog Sun Sep 26 13:43:44 1999 +++ xemacs-21.1.8/lisp/ChangeLog Tue Nov 2 22:30:27 1999 @@ -1,3 +1,69 @@ +1999-11-02 XEmacs Build Bot + + * XEmacs 21.1.8 is released + +1999-11-01 Yoshiki Hayashi + + * mule/cyrillic.el (setup-cyrillic-environment): Revert + previous change and modify for XEmacs 21.1. + (language-info-alist): Revert last change. + +1999-11-01 Yoshiki Hayashi + + * mule/japanese.el (setup-japanese-environment): Set up + default-coding-system. + * mule/chinese.el (setup-chinese-gb-environment): New function. + (setup-chinese-big5-environment): New function. + * mule/cyrillic.el (setup-cyrillic-iso-environment): New function. + (setup-cyrillic-koi8-environment): New function. + (setup-cyrillic-alternativnyj-environment): New function. + (setup-cyrillic-environment, describe-cyrillic-support): + Remove bogus functions. + (language-info-alist): Don't add Cyrillic. + +1999-10-21 Jan Vroonhof + + * xemacs-20/lisp/package-get.el + (package-get-user-package-location): + Use user-init-directory in the "correct" way for 21.1 + +1999-10-21 Yoshiki Hayashi + + * apropos.el (apropos-documentation): Use insert instead + of princ. + +1999-10-20 Yoshiki Hayashi + + * info.el (Info-page-prev): Don't do (sit-for 0). + +1999-10-20 Yoshiki Hayashi + + * mule/japanese.el (setup-japanese-environment): New function. + (language-info-alist): Use setup-japanese-enviroment as a + setup function. + +1999-10-20 Jan Vroonhof + + * coding.el (set-terminal-coding-system): Only set the console + coding system on the selected console if it is a tty. + +1999-10-20 Werner Fink + + * setup-paths.el (paths-find-exec-directory): Add missing nil + parameter for environment. + +1999-10-20 Werner Fink + + * cyrillic.el (setup-cyrillic-environment): Replace + old set-coding-priority. + +1999-09-25 Adrian Aichner + + * package-get.el (package-get-download-menu): Make menu really + toggle download sites. + (package-get-download-sites): Add autoload cookie. + [This was in 21.1.7.] + 1999-09-26 XEmacs Build Bot * XEmacs 21.1.7 is released diff -r -u -N xemacs-21.1.7/lisp/apropos.el xemacs-21.1.8/lisp/apropos.el --- xemacs-21.1.7/lisp/apropos.el Mon May 11 22:15:07 1998 +++ xemacs-21.1.8/lisp/apropos.el Thu Oct 21 23:22:17 1999 @@ -377,7 +377,7 @@ (defun apropos-documentation-check-doc-file () (let (type symbol (sepa 2) sepb beg end) - (princ ?\^_) + (insert ?\^_) (backward-char) (insert-file-contents (concat doc-directory internal-doc-file-name)) (forward-char) diff -r -u -N xemacs-21.1.7/lisp/auto-autoloads.el xemacs-21.1.8/lisp/auto-autoloads.el --- xemacs-21.1.7/lisp/auto-autoloads.el Thu May 13 08:19:37 1999 +++ xemacs-21.1.8/lisp/auto-autoloads.el Tue Nov 2 20:54:10 1999 @@ -1293,6 +1293,8 @@ be lexically ordered. It is debatable if it makes sense to have more than one version of a package available.") +(defcustom package-get-download-sites '(("xemacs.org" "ftp.xemacs.org" "pub/xemacs/packages") ("cso.uiuc.edu" "ftp.cso.uiuc.edu" "pub/packages/xemacs/packages") ("unicamp.br" "ftp.unicamp.br" "pub/xemacs/packages") ("sunsite.cnlab-switch.ch" "sunsite.cnlab-switch.ch" "mirror/xemacs/packages") ("tu-darmstadt.de" "ftp.tu-darmstadt.de" "pub/editors/xemacs/packages") ("sunsite.auc.dk" "sunsite.auc.dk" "pub/emacs/xemacs/packages") ("pasteur.fr" "ftp.pasteur.fr" "pub/computing/xemacs/packages") ("cenatls.cena.dgac.fr" "ftp.cenatls.cena.dgac.fr" "pub/Emacs/xemacs/packages") ("kfki.hu" "ftp.kfki.hu" "pub/packages/xemacs/packages") ("uniroma2.it" "ftp.uniroma2.it" "unix/misc/dist/XEMACS/packages") ("icm.edu.pl" "ftp.icm.edu.pl" "pub/unix/editors/xemacs/packages") ("sunet.se" "ftp.sunet.se" "pub/gnu/xemacs/packages") ("doc.ic.ac.uk" "sunsite.doc.ic.ac.uk" "packages/xemacs/packages") ("srcc.msu.su" "ftp1.srcc.msu.su" "mirror/ftp.xemacs.org/packages") ("usyd.edu.au" "ftp.usyd.edu.au" "pub/Xemacs/packages") ("netlab.is.tsukuba.ac.jp" "ftp.netlab.is.tsukuba.ac.jp" "pub/GNU/xemacs/packages") ("jaist.ac.jp" "ftp.jaist.ac.jp" "pub/GNU/xemacs/packages") ("ring.aist.go.jp" "ring.aist.go.jp" "pub/text/xemacs/packages") ("ring.asahi-net.or.jp" "ring.asahi-net.or.jp" "pub/text/xemacs/packages") ("SunSITE.sut.ac.jp" "SunSITE.sut.ac.jp" "pub/archives/packages/xemacs/packages") ("dti.ad.jp" "ftp.dti.ad.jp" "pub/unix/editor/xemacs/packages") ("kreonet.re.kr" "ftp.kreonet.re.kr" "pub/tools/emacs/xemacs/packages")) "*List of remote sites available for downloading packages.\nList format is '(site-description site-name directory-on-site).\nSITE-DESCRIPTION is a textual description of the site. SITE-NAME\nis the internet address of the download site. DIRECTORY-ON-SITE\nis the directory on the site in which packages may be found.\nThis variable is used to initialize `package-get-remote', the\nvariable actually used to specify package download sites." :tag "Package download sites" :type '(repeat (list hostname directory)) :group 'package-get) + (autoload 'package-get-download-menu "package-get" "\ Build the `Add Download Site' menu." nil nil) @@ -1736,6 +1738,24 @@ (autoload 'font-menu-size-constructor "x-font-menu" nil nil nil) (autoload 'font-menu-weight-constructor "x-font-menu" nil nil nil) + +;;;*** + +;;;### (autoloads (xpm-button-create) "xpm-button" "lisp/xpm-button.el") + +(autoload 'xpm-button-create "xpm-button" "\ +Returns a list of XPM image instantiators for a button displaying TEXT. +The list is of the form + (UP DOWN DISABLED) +where UP, DOWN, and DISABLED are the up, down and disabled image +instantiators for the button. + +SHADOW-THICKNESS specifies how many pixels should be used for the +shadows on the edges of the buttons. It should be a positive integer, +or 0 to mean no shadows on the edges. +FG-COLOR is the color used to display the text. It should be a string. +BG-COLOR is the background color the text will be displayed upon. +It should be a string." nil nil) ;;;*** diff -r -u -N xemacs-21.1.7/lisp/coding.el xemacs-21.1.8/lisp/coding.el --- xemacs-21.1.7/lisp/coding.el Sat Feb 28 16:34:56 1998 +++ xemacs-21.1.8/lisp/coding.el Wed Oct 20 22:53:26 1999 @@ -115,7 +115,9 @@ (interactive "zterminal-coding-system: ") (get-coding-system coding-system) ; correctness check (setq terminal-coding-system coding-system) - (set-console-tty-coding-system (device-console) terminal-coding-system) + ; #### should this affect all current tty consoles ? + (if (eq (device-type) 'tty) + (set-console-tty-coding-system (device-console) terminal-coding-system)) (redraw-modeline t)) (defun set-pathname-coding-system (coding-system) diff -r -u -N xemacs-21.1.7/lisp/info.el xemacs-21.1.8/lisp/info.el --- xemacs-21.1.7/lisp/info.el Sun Jun 13 01:16:44 1999 +++ xemacs-21.1.8/lisp/info.el Wed Oct 20 22:53:26 1999 @@ -2055,11 +2055,9 @@ (progn (Info-global-prev) (message "Node: %s" Info-current-node) - (sit-for 0) - ;;(scroll-up 1) ; work around bug in pos-visible-in-window-p - ;;(scroll-down 1) - (while (not (pos-visible-in-window-p (point-max))) - (scroll-up))) + (goto-char (point-max)) + (recenter -1) + (move-to-window-line 0)) (scroll-down))))) (defun Info-scroll-prev (arg) diff -r -u -N xemacs-21.1.7/lisp/mule/chinese.el xemacs-21.1.8/lisp/mule/chinese.el --- xemacs-21.1.7/lisp/mule/chinese.el Wed Feb 17 08:59:31 1999 +++ xemacs-21.1.8/lisp/mule/chinese.el Mon Nov 1 23:17:12 1999 @@ -200,6 +200,19 @@ . describe-chinese-environment-map)) )) +(defun setup-chinese-gb-environment () + "Setup multilingual environment (MULE) for Chinese GB2312 users." + (interactive) + (setup-english-environment) + (set-coding-category-system 'iso-8-2 'cn-gb-2312) + (set-coding-category-system 'big5 'big5) + (set-coding-category-system 'iso-7 'iso-2022-7bit) + (set-coding-priority-list + '(iso-8-2 + big5 + iso-7)) + (set-default-coding-systems 'cn-gb-2312)) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Chinese BIG5 (traditional) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -248,6 +261,19 @@ (documentation . ("Support for Chinese Big5 character set." . describe-chinese-environment-map)) )) + +(defun setup-chinese-big5-environment () + "Setup multilingual environment (MULE) for Chinese Big5 users." + (interactive) + (setup-english-environment) + (set-coding-category-system 'big5 'big5) + (set-coding-category-system 'iso-8-2 'cn-gb-2312) + (set-coding-category-system 'iso-7 'iso-2022-7bit) + (set-coding-priority-list + '(big5 + iso-8-2 + iso-7)) + (set-default-coding-systems 'big5)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Chinese CNS11643 (traditional) diff -r -u -N xemacs-21.1.7/lisp/mule/cyrillic.el xemacs-21.1.8/lisp/mule/cyrillic.el --- xemacs-21.1.7/lisp/mule/cyrillic.el Wed Feb 17 08:59:32 1999 +++ xemacs-21.1.8/lisp/mule/cyrillic.el Mon Nov 1 23:17:12 1999 @@ -81,6 +81,15 @@ (documentation . ("Support for Cyrillic ISO-8859-5." . describe-cyrillic-environment-map)))) +(defun setup-cyrillic-iso-environment () + "Setup multilingual environment (MULE) for Cyrillic ISO-8859-5 users." + (interactive) + (setup-english-environment) + (set-coding-category-system 'iso-8-1 'iso-8859-5) + (set-coding-priority-list + '(iso-8-1)) + (set-default-coding-systems 'iso-8859-5)) + ;; KOI-8 staff (define-ccl-program ccl-decode-koi8 @@ -173,6 +182,15 @@ (documentation . ("Support for Cyrillic KOI-8." . describe-cyrillic-environment-map)))) +(defun setup-cyrillic-koi8-environment () + "Setup multilingual environment (MULE) for Cyrillic KOI8 users." + (interactive) + (setup-english-environment) + (set-coding-category-system 'iso-8-1 'koi8-r) + (set-coding-priority-list + '(iso-8-1)) + (set-default-coding-systems 'koi8-r)) + ;;; ALTERNATIVNYJ staff (define-ccl-program ccl-decode-alternativnyj @@ -257,34 +275,31 @@ (documentation . ("Support for Cyrillic ALTERNATIVNYJ." . describe-cyrillic-environment-map)))) +(defun setup-cyrillic-alternativnyj-environment () + "Setup multilingual environment (MULE) for Cyrillic ALTERNATIVNYJ users." + (interactive) + (setup-english-environment) + (set-coding-category-system 'iso-8-1 'alternativnyj) + (set-coding-priority-list + '(iso-8-1)) + (set-default-coding-systems 'alternativnyj)) + ;;; GENERAL (defun setup-cyrillic-environment () "Setup multilingual environment for Cyrillic users." (interactive) - (setq primary-language "Cyrillic") - - (setq coding-category-iso-8-1 'iso-8859-5) - - (set-coding-priority - '(coding-category-iso-7 - coding-category-iso-8-1)) + (set-coding-category-system 'iso-8-1 'iso-8859-5) + (set-coding-priority-list + '(iso-8-1)) - (setq-default buffer-file-coding-system 'iso-8859-5) - (set-terminal-coding-system 'iso-8859-5) - (set-keyboard-coding-system 'iso-8859-5) + (set-default-coding-systems 'iso-8859-5) - (setq default-input-method '("Cyrillic" . "quail-yawerty")) + (setq default-input-method 'cyrillic-yawerty) ) -(defun describe-cyrillic-support () - "Describe how Emacs support Cyrillic." - (interactive) - (describe-language-support-internal "Cyrillic")) - (set-language-info-alist "Cyrillic" '((setup-function . setup-cyrillic-environment) - (describe-function . describe-cyrillic-support) (charset . (cyrillic-iso8859-5)) (tutorial . "TUTORIAL.ru") (coding-system . (iso-8859-5 koi8-r alternativnyj)) diff -r -u -N xemacs-21.1.7/lisp/mule/japanese.el xemacs-21.1.8/lisp/mule/japanese.el --- xemacs-21.1.7/lisp/mule/japanese.el Sat Aug 28 16:24:17 1999 +++ xemacs-21.1.8/lisp/mule/japanese.el Mon Nov 1 23:17:12 1999 @@ -218,8 +218,28 @@ (copy-coding-system 'euc-jp 'euc-japan) ; only for w3 (copy-coding-system 'euc-jp 'japanese-euc) +(defun setup-japanese-environment () + "Setup multilingual environment (MULE) for Japanese." + (interactive) + (setup-english-environment) + (set-coding-category-system 'shift-jis 'shift_jis) + (set-coding-category-system 'iso-8-2 'euc-jp) + (set-coding-category-system 'iso-7 'iso-2022-jp) + (set-coding-category-system 'iso-8-designate 'iso-2022-8bit-ss2) + + (set-coding-priority-list + '(iso-7 + iso-8-2 + shift-jis + iso-8-1 + iso-lock-shift + iso-8-designate + no-conversion + big5)) + (set-default-coding-systems 'iso-2022-jp)) + (set-language-info-alist - "Japanese" '((setup-function . setup-japanese-environment-internal) + "Japanese" '((setup-function . setup-japanese-environment) (tutorial . "TUTORIAL.ja") (charset . (japanese-jisx0208 japanese-jisx0208-1978 japanese-jisx0212 latin-jisx0201 diff -r -u -N xemacs-21.1.7/lisp/package-get.el xemacs-21.1.8/lisp/package-get.el --- xemacs-21.1.7/lisp/package-get.el Sat Sep 25 10:51:24 1999 +++ xemacs-21.1.8/lisp/package-get.el Thu Oct 21 23:22:17 1999 @@ -337,7 +337,8 @@ (locate-data-file package-get-base-filename) package-get-base-filename)) -(defvar package-get-user-package-location user-init-directory) +(defvar package-get-user-package-location + (concat "~" init-file-user user-init-directory)) (defun package-get-maybe-save-index (filename) "Offer to save the current buffer as the local package index file, diff -r -u -N xemacs-21.1.7/lisp/setup-paths.el xemacs-21.1.8/lisp/setup-paths.el --- xemacs-21.1.7/lisp/setup-paths.el Sun Sep 19 22:20:52 1999 +++ xemacs-21.1.8/lisp/setup-paths.el Wed Oct 20 22:53:26 1999 @@ -126,7 +126,7 @@ (defun paths-find-exec-directory (roots) "Find the binary directory." - (paths-find-architecture-directory roots "lib-src" configure-exec-directory)) + (paths-find-architecture-directory roots "lib-src" nil configure-exec-directory)) (defun paths-construct-exec-path (roots exec-directory early-packages late-packages last-packages) diff -r -u -N xemacs-21.1.7/lwlib/ChangeLog xemacs-21.1.8/lwlib/ChangeLog --- xemacs-21.1.7/lwlib/ChangeLog Sun Sep 26 13:43:44 1999 +++ xemacs-21.1.8/lwlib/ChangeLog Tue Nov 2 22:30:27 1999 @@ -1,3 +1,7 @@ +1999-11-02 XEmacs Build Bot + + * XEmacs 21.1.8 is released + 1999-09-26 XEmacs Build Bot * XEmacs 21.1.7 is released diff -r -u -N xemacs-21.1.7/man/ChangeLog xemacs-21.1.8/man/ChangeLog --- xemacs-21.1.7/man/ChangeLog Sun Sep 26 13:43:44 1999 +++ xemacs-21.1.8/man/ChangeLog Tue Nov 2 22:30:27 1999 @@ -1,3 +1,7 @@ +1999-11-02 XEmacs Build Bot + + * XEmacs 21.1.8 is released + 1999-09-26 XEmacs Build Bot * XEmacs 21.1.7 is released diff -r -u -N xemacs-21.1.7/nt/ChangeLog xemacs-21.1.8/nt/ChangeLog --- xemacs-21.1.7/nt/ChangeLog Sun Sep 26 13:43:44 1999 +++ xemacs-21.1.8/nt/ChangeLog Tue Nov 2 22:30:27 1999 @@ -1,3 +1,15 @@ +1999-11-02 XEmacs Build Bot + + * XEmacs 21.1.8 is released + +1999-10-20 Adrian Aichner + + * xemacs.mak (all): Update $(LISP)/auto-autoloads.elc? and + $(LISP)/custom-load.el using XEmacs itself, like xemacs-packages + do. + ($(LISP)\auto-autoloads.el): Add new rule. + ($(LISP)\custom-load.el): Ditto. + 1999-09-26 XEmacs Build Bot * XEmacs 21.1.7 is released diff -r -u -N xemacs-21.1.7/nt/xemacs.mak xemacs-21.1.8/nt/xemacs.mak --- xemacs-21.1.7/nt/xemacs.mak Sat Aug 28 16:24:22 1999 +++ xemacs-21.1.8/nt/xemacs.mak Wed Oct 20 22:53:29 1999 @@ -1174,7 +1174,9 @@ # use this rule to build the complete system all: $(OUTDIR)\nul $(LASTFILE) $(LWLIB) $(LIB_SRC_TOOLS) $(RUNEMACS) \ - $(TEMACS) $(TEMACS_BROWSE) update-elc $(DOC) dump-xemacs info + $(TEMACS) $(TEMACS_BROWSE) update-elc $(DOC) dump-xemacs \ + $(LISP)/auto-autoloads.el $(LISP)/custom-load.el \ + info temacs: $(TEMACS) @@ -1238,6 +1240,21 @@ depend: mkdepend -f xemacs.mak -p$(OUTDIR)\ -o.obj -w9999 -- $(TEMACS_CPP_FLAGS) -- $(DOC_SRC1) $(DOC_SRC2) $(DOC_SRC3) $(DOC_SRC4) $(DOC_SRC5) $(DOC_SRC6) $(DOC_SRC7) $(DOC_SRC8) $(DOC_SRC9) $(LASTFILE_SRC)\lastfile.c $(LIB_SRC)\make-docfile.c .\runemacs.c + +# Update auto-autoloads.el and custom-load.el similar to what +# XEmacs.rules does for xemacs-packages. +VANILLA=-vanilla +FORCE: +$(LISP)\auto-autoloads.el: FORCE + $(PROGNAME) $(VANILLA) -batch \ + -l autoload -f batch-update-directory $(LISP) + $(PROGNAME) $(VANILLA) -batch \ + -f batch-byte-compile $@ + @del $(LISP)\auto-autoloads.el~ + +$(LISP)\custom-load.el: FORCE + $(PROGNAME) $(VANILLA) -batch -l cus-dep \ + -f Custom-make-dependencies $(LISP) # DO NOT DELETE THIS LINE -- make depend depends on it. diff -r -u -N xemacs-21.1.7/src/ChangeLog xemacs-21.1.8/src/ChangeLog --- xemacs-21.1.7/src/ChangeLog Sun Sep 26 13:43:44 1999 +++ xemacs-21.1.8/src/ChangeLog Tue Nov 2 22:30:27 1999 @@ -1,3 +1,93 @@ +1999-11-02 XEmacs Build Bot + + * XEmacs 21.1.8 is released + +1999-11-01 Andy Piper + + * console-msw.h: fix defines for cygwin 1.0 compilation. + * glyphs-msw.c: ditto. + * ntplay.c: ditto. + * objects-msw.c: ditto. + * unexcw.c: ditto. + * s/cygwin32.h: ditto. + +1999-11-01 Andreas Jaeger + + * emacs.c (main_1): Don't set the malloc hooks if using + DOUG_LEA_MALLOC. + +1999-11-01 Adrian Aichner + + * sysdep.h: Declare wait_for_termination() to return process + HANDLE on NT, according to implementation change. + + * sysdep.c (wait_for_termination): Take pHandle argument on NT, + since OpenProcess inside this function may be too late. + (wait_for_termination): Implement processing of child exit status + for NT. + (sys_subshell): _spawnlp (_P_NOWAIT, ...) on NT and + wait_for_termination(). + + * ntproc.c (create_child): Take out Windows 95 cp->pid hack and + remove incorrect bit-masking. + + * callproc.c (call_process_cleanup): Pass on pHandle to + wait_for_termination() on WINDOWSNT. + (Fcall_process_internal): On NT only open process handle if BUFFER + is not 0 (INTP). Close fd_error in parent on NT too. + (Fcall_process_internal): Don't report error for negative pid on + NT (Windows9[58] has them). + (Fcall_process_internal): Call wait_for_termination with pHandle + argument on NT (see sysdep.c). + +1999-11-01 Gunnar Evermann + + * menubar-x.c (pre_activate_callback): set accelerator field in + "No menu" entries to nil. Avoid crash in + command_builder_operate_menu_accelerator + +1999-10-22 Gunnar Evermann + + * glyphs-eimage.c (gif_instantiate): Correct handling of + interlaced gifs to avoid writing past the end of the eimage + buffer. + +1999-10-21 Rasmus Borup Hansen + + * glyphs-x.c (convert_EImage_to_XImage): Avoid infinite loop on + GrayScale, StaticGray or StaticColor visuals. + +1999-10-20 Jan Vroonhof + + * fileio.c (Ffile_truename): Do proper mule decoding on + the argument to xrealpath() + +1999-10-20 Jonathan Harris + + * event-msw.c (mswindows_key_to_emacs_keysym): + Recognise keypad keys as different from normal keys. + +1999-10-20 SL Baur + + * doprnt.c (emacs_doprnt_1): Fix problem with %0XXd for a negative + integer. + Based on a patch from MORIOKA Tomohiko + +1999-10-20 Jan Vroonhof + + * unexelf.c (unexec): Only copy the global offset + table from memory on sgi machines. + +1999-09-26 Andy Piper + + * cygwin32.h: include mousewheel definitions. + [This was actually in 21.1.7]. + +1999-09-24 Martin Buchholz + + * doprnt.c (get_doprnt_args): Use int, not short, with va_arg. + [This was actually in 21.1.7]. + 1999-09-26 XEmacs Build Bot * XEmacs 21.1.7 is released diff -r -u -N xemacs-21.1.7/src/callproc.c xemacs-21.1.8/src/callproc.c --- xemacs-21.1.7/src/callproc.c Fri Oct 9 16:58:55 1998 +++ xemacs-21.1.8/src/callproc.c Mon Nov 1 23:17:14 1999 @@ -104,6 +104,9 @@ { int fd = XINT (Fcar (fdpid)); int pid = XINT (Fcdr (fdpid)); +#ifdef WINDOWSNT + HANDLE pHandle; +#endif if (!call_process_exited && EMACS_KILLPG (pid, SIGINT) == 0) @@ -114,7 +117,16 @@ /* #### "c-G" -- need non-consing Single-key-description */ message ("Waiting for process to die...(type C-g again to kill it instantly)"); +#ifdef WINDOWSNT + pHandle = OpenProcess(PROCESS_ALL_ACCESS, 0, pid); + if (pHandle == NULL) + { + stderr_out ("call_process_cleanup.OpenProcess: pHandle == NULL, GetLastError () = %d, (int)pHandle = %d\n", GetLastError (), (int)pHandle); + } + wait_for_termination (pHandle); +#else wait_for_termination (pid); +#endif /* "Discard" the unwind protect. */ XCAR (fdpid) = Qnil; @@ -170,6 +182,9 @@ Lisp_Object infile, buffer, current_dir, display, path; int fd[2]; int filefd; +#ifdef WINDOWSNT + HANDLE pHandle; +#endif int pid; char buf[16384]; char *bufptr = buf; @@ -367,6 +382,19 @@ #ifdef WINDOWSNT pid = child_setup (filefd, fd1, fd_error, new_argv, (char *) XSTRING_DATA (current_dir)); + if (!INTP (buffer)) + { + /* OpenProcess() as soon after child_setup as possible. It's too + late once the process terminated. */ + pHandle = OpenProcess(PROCESS_ALL_ACCESS, 0, pid); + if (pHandle == NULL) + { + stderr_out ("Fcall_process_internal: pHandle == NULL, GetLastError () = %d, (int)pHandle = %d\n", GetLastError (), (int)pHandle); + } + } + /* Close STDERR into the parent process. We no longer need it. */ + if (fd_error >= 0) + close (fd_error); #else /* not WINDOWSNT */ pid = fork (); @@ -406,12 +434,14 @@ if (!NILP (fork_error)) signal_error (Qfile_error, fork_error); +#ifndef WINDOWSNT if (pid < 0) { if (fd[0] >= 0) close (fd[0]); report_file_error ("Doing fork", Qnil); } +#endif if (INTP (buffer)) { @@ -519,7 +549,11 @@ QUIT; /* Wait for it to terminate, unless it already has. */ +#ifdef WINDOWSNT + wait_for_termination (pHandle); +#else wait_for_termination (pid); +#endif /* Don't kill any children that the subprocess may have left behind when exiting. */ diff -r -u -N xemacs-21.1.7/src/console-msw.h xemacs-21.1.8/src/console-msw.h --- xemacs-21.1.7/src/console-msw.h Sun Sep 27 03:59:17 1998 +++ xemacs-21.1.8/src/console-msw.h Mon Nov 1 23:17:14 1999 @@ -38,7 +38,7 @@ #endif #include #include /* DDE management library */ -#ifndef __CYGWIN32__ +#if !defined(__CYGWIN32__) || CYGWIN_VERSION_DLL_MAJOR > 20 #include /* FileManager/Explorer drag and drop */ #include #endif diff -r -u -N xemacs-21.1.7/src/doprnt.c xemacs-21.1.8/src/doprnt.c --- xemacs-21.1.7/src/doprnt.c Sat Sep 25 10:51:26 1999 +++ xemacs-21.1.8/src/doprnt.c Wed Oct 20 22:53:30 1999 @@ -633,6 +633,7 @@ { char text_to_print[500]; char constructed_spec[100]; + int tem; /* Partially reconstruct the spec and use sprintf() to format the string. */ @@ -657,7 +658,7 @@ long_to_string (constructed_spec + strlen (constructed_spec), spec->precision); } - sprintf (constructed_spec + strlen (constructed_spec), "%c", ch); + sprintf (constructed_spec + (tem = strlen (constructed_spec)), "%c", ch); /* sprintf the mofo */ /* we have to use separate calls to sprintf(), rather than @@ -674,6 +675,12 @@ } else { + /* In the special case of zero padding a signed integer */ + /* with a field width specified, we overwrite the default */ + /* format. */ + if (spec->zero_flag && spec->minwidth) + sprintf (constructed_spec + tem, + "0%d%c", spec->minwidth, ch); if (spec->l_flag) sprintf (text_to_print, constructed_spec, arg.l); else diff -r -u -N xemacs-21.1.7/src/emacs.c xemacs-21.1.8/src/emacs.c --- xemacs-21.1.7/src/emacs.c Wed Jun 16 16:45:57 1999 +++ xemacs-21.1.8/src/emacs.c Mon Nov 1 23:17:14 1999 @@ -531,7 +531,8 @@ extern int malloc_cookie; #endif -#if !defined(SYSTEM_MALLOC) && !defined(HAVE_LIBMCHECK) +#if (!defined (SYSTEM_MALLOC) && !defined (HAVE_LIBMCHECK) \ + && !defined (DOUG_LEA_MALLOC)) /* Make sure that any libraries we link against haven't installed a hook for a gmalloc of a potentially incompatible version. */ /* If we're using libmcheck, the hooks have already been initialized, */ @@ -539,7 +540,7 @@ __malloc_hook = NULL; __realloc_hook = NULL; __free_hook = NULL; -#endif /* not SYSTEM_MALLOC */ +#endif /* not SYSTEM_MALLOC or HAVE_LIBMCHECK or DOUG_LEA_MALLOC */ noninteractive = 0; diff -r -u -N xemacs-21.1.7/src/event-msw.c xemacs-21.1.8/src/event-msw.c --- xemacs-21.1.7/src/event-msw.c Sat Sep 25 10:51:26 1999 +++ xemacs-21.1.8/src/event-msw.c Wed Oct 20 22:53:30 1999 @@ -88,7 +88,8 @@ static Lisp_Object mswindows_find_frame (HWND hwnd); static Lisp_Object mswindows_find_console (HWND hwnd); -static Lisp_Object mswindows_key_to_emacs_keysym(int mswindows_key, int mods); +static Lisp_Object mswindows_key_to_emacs_keysym (int mswindows_key, int mods, + int extendedp); static int mswindows_modifier_state (BYTE* keymap, int has_AltGr); static void mswindows_set_chord_timer (HWND hwnd); static int mswindows_button2_near_enough (POINTS p1, POINTS p2); @@ -1635,15 +1636,17 @@ BYTE keymap[256]; int has_AltGr = mswindows_current_layout_has_AltGr (); int mods; + int extendedp = lParam & 0x1000000; Lisp_Object keysym; GetKeyboardState (keymap); mods = mswindows_modifier_state (keymap, has_AltGr); - /* Handle those keys for which TranslateMessage won't generate a WM_CHAR */ - if (!NILP (keysym = mswindows_key_to_emacs_keysym(wParam, mods))) + /* Handle non-printables */ + if (!NILP (keysym = mswindows_key_to_emacs_keysym (wParam, mods, + extendedp))) mswindows_enqueue_keypress_event (hwnd, keysym, mods); - else + else /* Normal keys & modifiers */ { int quit_ch = CONSOLE_QUIT_CHAR (XCONSOLE (mswindows_find_console (hwnd))); BYTE keymap_orig[256]; @@ -1653,9 +1656,9 @@ * to loosely track Left and Right modifiers on behalf of the OS, * without screwing up Windows NT which tracks them properly. */ if (wParam == VK_CONTROL) - keymap [(lParam & 0x1000000) ? VK_RCONTROL : VK_LCONTROL] |= 0x80; + keymap [extendedp ? VK_RCONTROL : VK_LCONTROL] |= 0x80; else if (wParam == VK_MENU) - keymap [(lParam & 0x1000000) ? VK_RMENU : VK_LMENU] |= 0x80; + keymap [extendedp ? VK_RMENU : VK_LMENU] |= 0x80; memcpy (keymap_orig, keymap, 256); @@ -2312,67 +2315,100 @@ * Only returns non-Qnil for keys that don't generate WM_CHAR messages * or whose ASCII codes (like space) xemacs doesn't like. * Virtual key values are defined in winresrc.h - * XXX I'm not sure that KEYSYM("name") is the best thing to use here. */ -Lisp_Object mswindows_key_to_emacs_keysym(int mswindows_key, int mods) +Lisp_Object mswindows_key_to_emacs_keysym (int mswindows_key, int mods, + int extendedp) { - switch (mswindows_key) - { - /* First the predefined ones */ - case VK_BACK: return QKbackspace; - case VK_TAB: return QKtab; - case '\n': return QKlinefeed; /* No VK_LINEFEED in winresrc.h */ - case VK_RETURN: return QKreturn; - case VK_ESCAPE: return QKescape; - case VK_SPACE: return QKspace; - case VK_DELETE: return QKdelete; - - /* The rest */ - case VK_CLEAR: return KEYSYM ("clear"); /* Should do ^L ? */ - case VK_PRIOR: return KEYSYM ("prior"); - case VK_NEXT: return KEYSYM ("next"); - case VK_END: return KEYSYM ("end"); - case VK_HOME: return KEYSYM ("home"); - case VK_LEFT: return KEYSYM ("left"); - case VK_UP: return KEYSYM ("up"); - case VK_RIGHT: return KEYSYM ("right"); - case VK_DOWN: return KEYSYM ("down"); - case VK_SELECT: return KEYSYM ("select"); - case VK_PRINT: return KEYSYM ("print"); - case VK_EXECUTE: return KEYSYM ("execute"); - case VK_SNAPSHOT: return KEYSYM ("print"); - case VK_INSERT: return KEYSYM ("insert"); - case VK_HELP: return KEYSYM ("help"); -#if 0 /* XXX What are these supposed to do? */ - case VK_LWIN return KEYSYM (""); - case VK_RWIN return KEYSYM (""); + if (extendedp) /* Keys not present on a 82 key keyboard */ + { + switch (mswindows_key) + { + case VK_RETURN: return KEYSYM ("kp-enter"); + case VK_PRIOR: return KEYSYM ("prior"); + case VK_NEXT: return KEYSYM ("next"); + case VK_END: return KEYSYM ("end"); + case VK_HOME: return KEYSYM ("home"); + case VK_LEFT: return KEYSYM ("left"); + case VK_UP: return KEYSYM ("up"); + case VK_RIGHT: return KEYSYM ("right"); + case VK_DOWN: return KEYSYM ("down"); + case VK_INSERT: return KEYSYM ("insert"); + case VK_DELETE: return QKdelete; + } + } + else + { + switch (mswindows_key) + { + case VK_BACK: return QKbackspace; + case VK_TAB: return QKtab; + case '\n': return QKlinefeed; + case VK_CLEAR: return KEYSYM ("clear"); + case VK_RETURN: return QKreturn; + case VK_ESCAPE: return QKescape; + case VK_SPACE: return QKspace; + case VK_PRIOR: return KEYSYM ("kp-prior"); + case VK_NEXT: return KEYSYM ("kp-next"); + case VK_END: return KEYSYM ("kp-end"); + case VK_HOME: return KEYSYM ("kp-home"); + case VK_LEFT: return KEYSYM ("kp-left"); + case VK_UP: return KEYSYM ("kp-up"); + case VK_RIGHT: return KEYSYM ("kp-right"); + case VK_DOWN: return KEYSYM ("kp-down"); + case VK_SELECT: return KEYSYM ("select"); + case VK_PRINT: return KEYSYM ("print"); + case VK_EXECUTE: return KEYSYM ("execute"); + case VK_SNAPSHOT: return KEYSYM ("print"); + case VK_INSERT: return KEYSYM ("kp-insert"); + case VK_DELETE: return KEYSYM ("kp-delete"); + case VK_HELP: return KEYSYM ("help"); +#if 0 /* FSF Emacs allows these to return configurable syms/mods */ + case VK_LWIN return KEYSYM (""); + case VK_RWIN return KEYSYM (""); #endif - case VK_APPS: return KEYSYM ("menu"); - case VK_F1: return KEYSYM ("f1"); - case VK_F2: return KEYSYM ("f2"); - case VK_F3: return KEYSYM ("f3"); - case VK_F4: return KEYSYM ("f4"); - case VK_F5: return KEYSYM ("f5"); - case VK_F6: return KEYSYM ("f6"); - case VK_F7: return KEYSYM ("f7"); - case VK_F8: return KEYSYM ("f8"); - case VK_F9: return KEYSYM ("f9"); - case VK_F10: return KEYSYM ("f10"); - case VK_F11: return KEYSYM ("f11"); - case VK_F12: return KEYSYM ("f12"); - case VK_F13: return KEYSYM ("f13"); - case VK_F14: return KEYSYM ("f14"); - case VK_F15: return KEYSYM ("f15"); - case VK_F16: return KEYSYM ("f16"); - case VK_F17: return KEYSYM ("f17"); - case VK_F18: return KEYSYM ("f18"); - case VK_F19: return KEYSYM ("f19"); - case VK_F20: return KEYSYM ("f20"); - case VK_F21: return KEYSYM ("f21"); - case VK_F22: return KEYSYM ("f22"); - case VK_F23: return KEYSYM ("f23"); - case VK_F24: return KEYSYM ("f24"); - } + case VK_APPS: return KEYSYM ("menu"); + case VK_NUMPAD0: return KEYSYM ("kp-0"); + case VK_NUMPAD1: return KEYSYM ("kp-1"); + case VK_NUMPAD2: return KEYSYM ("kp-2"); + case VK_NUMPAD3: return KEYSYM ("kp-3"); + case VK_NUMPAD4: return KEYSYM ("kp-4"); + case VK_NUMPAD5: return KEYSYM ("kp-5"); + case VK_NUMPAD6: return KEYSYM ("kp-6"); + case VK_NUMPAD7: return KEYSYM ("kp-7"); + case VK_NUMPAD8: return KEYSYM ("kp-8"); + case VK_NUMPAD9: return KEYSYM ("kp-9"); + case VK_MULTIPLY: return KEYSYM ("kp-multiply"); + case VK_ADD: return KEYSYM ("kp-add"); + case VK_SEPARATOR: return KEYSYM ("kp-separator"); + case VK_SUBTRACT: return KEYSYM ("kp-subtract"); + case VK_DECIMAL: return KEYSYM ("kp-decimal"); + case VK_DIVIDE: return KEYSYM ("kp-divide"); + case VK_F1: return KEYSYM ("f1"); + case VK_F2: return KEYSYM ("f2"); + case VK_F3: return KEYSYM ("f3"); + case VK_F4: return KEYSYM ("f4"); + case VK_F5: return KEYSYM ("f5"); + case VK_F6: return KEYSYM ("f6"); + case VK_F7: return KEYSYM ("f7"); + case VK_F8: return KEYSYM ("f8"); + case VK_F9: return KEYSYM ("f9"); + case VK_F10: return KEYSYM ("f10"); + case VK_F11: return KEYSYM ("f11"); + case VK_F12: return KEYSYM ("f12"); + case VK_F13: return KEYSYM ("f13"); + case VK_F14: return KEYSYM ("f14"); + case VK_F15: return KEYSYM ("f15"); + case VK_F16: return KEYSYM ("f16"); + case VK_F17: return KEYSYM ("f17"); + case VK_F18: return KEYSYM ("f18"); + case VK_F19: return KEYSYM ("f19"); + case VK_F20: return KEYSYM ("f20"); + case VK_F21: return KEYSYM ("f21"); + case VK_F22: return KEYSYM ("f22"); + case VK_F23: return KEYSYM ("f23"); + case VK_F24: return KEYSYM ("f24"); + } + } return Qnil; } diff -r -u -N xemacs-21.1.7/src/fileio.c xemacs-21.1.8/src/fileio.c --- xemacs-21.1.7/src/fileio.c Sun Jun 13 01:16:48 1999 +++ xemacs-21.1.8/src/fileio.c Wed Oct 20 22:53:30 1999 @@ -1299,18 +1299,18 @@ { char resolved_path[MAXPATHLEN]; - char path[MAXPATHLEN]; - char *p = path; + char *path; + char *p; int elen = XSTRING_LENGTH (expanded_name); - if (elen >= countof (path)) + GET_STRING_FILENAME_DATA_ALLOCA(expanded_name,path,elen); + p = path; + if (elen > MAXPATHLEN) goto toolong; - - memcpy (path, XSTRING_DATA (expanded_name), elen + 1); - /* memset (resolved_path, 0, sizeof (resolved_path)); */ - + /* Try doing it all at once. */ - /* !!#### Does realpath() Mule-encapsulate? */ + /* !! Does realpath() Mule-encapsulate? + Answer: Nope! So we do it above */ if (!xrealpath (path, resolved_path)) { /* Didn't resolve it -- have to do it one component at a time. */ diff -r -u -N xemacs-21.1.7/src/glyphs-eimage.c xemacs-21.1.8/src/glyphs-eimage.c --- xemacs-21.1.7/src/glyphs-eimage.c Wed Sep 9 20:07:03 1998 +++ xemacs-21.1.8/src/glyphs-eimage.c Fri Oct 22 08:25:11 1999 @@ -701,7 +701,7 @@ if (interlace) if (row >= height) { row = InterlacedOffset[++pass]; - while (row > height) + while (row >= height) row = InterlacedOffset[++pass]; } eip = unwind.eimage + (row * width * 3); diff -r -u -N xemacs-21.1.7/src/glyphs-msw.c xemacs-21.1.8/src/glyphs-msw.c --- xemacs-21.1.7/src/glyphs-msw.c Tue Feb 2 05:00:58 1999 +++ xemacs-21.1.8/src/glyphs-msw.c Mon Nov 1 23:17:15 1999 @@ -1011,7 +1011,9 @@ #define OIC_BANG 32515 #define OIC_NOTE 32516 #define OIC_WINLOGO 32517 +#if defined (__CYGWIN32__) && CYGWIN_VERSION_DLL_MAJOR < 21 #define LR_SHARED 0x8000 +#endif #endif static CONST resource_t bitmap_table[] = diff -r -u -N xemacs-21.1.7/src/glyphs-x.c xemacs-21.1.8/src/glyphs-x.c --- xemacs-21.1.7/src/glyphs-x.c Mon Feb 22 10:25:07 1999 +++ xemacs-21.1.8/src/glyphs-x.c Thu Oct 21 23:22:19 1999 @@ -42,6 +42,7 @@ GIF/JPEG/PNG/TIFF code moved to new glyph-eimage.c for 21.0 TODO: + Support the GrayScale, StaticColor and StaticGray visual classes. Convert images.el to C and stick it in here? */ @@ -132,6 +133,13 @@ cmap = DEVICE_X_COLORMAP (XDEVICE(device)); vis = DEVICE_X_VISUAL (XDEVICE(device)); depth = DEVICE_X_DEPTH(XDEVICE(device)); + + if (vis->class == GrayScale || vis->class == StaticColor || + vis->class == StaticGray) + { + /* #### Implement me!!! */ + return NULL; + } if (vis->class == PseudoColor) { diff -r -u -N xemacs-21.1.7/src/menubar-x.c xemacs-21.1.8/src/menubar-x.c --- xemacs-21.1.7/src/menubar-x.c Sat Aug 28 16:24:23 1999 +++ xemacs-21.1.8/src/menubar-x.c Mon Nov 1 23:17:15 1999 @@ -467,10 +467,12 @@ wv = xmalloc_widget_value (); wv->type = CASCADE_TYPE; wv->next = NULL; + wv->accel = LISP_TO_VOID (Qnil); wv->contents = xmalloc_widget_value (); wv->contents->type = TEXT_TYPE; wv->contents->name = (char *) "No menu"; wv->contents->next = NULL; + wv->contents->accel = LISP_TO_VOID (Qnil); } assert (wv && wv->type == CASCADE_TYPE && wv->contents); replace_widget_value_tree (hack_wv, wv->contents); diff -r -u -N xemacs-21.1.7/src/ntplay.c xemacs-21.1.8/src/ntplay.c --- xemacs-21.1.7/src/ntplay.c Sun Jun 14 19:12:39 1998 +++ xemacs-21.1.8/src/ntplay.c Mon Nov 1 23:17:15 1999 @@ -25,7 +25,7 @@ #include "sysfile.h" #include "lisp.h" -#ifdef __CYGWIN32__ +#if defined (__CYGWIN32__) && CYGWIN_VERSION_DLL_MAJOR < 21 extern BOOL WINAPI PlaySound(LPCSTR,HMODULE,DWORD); #else #include diff -r -u -N xemacs-21.1.7/src/ntproc.c xemacs-21.1.8/src/ntproc.c --- xemacs-21.1.7/src/ntproc.c Tue Jun 15 05:36:30 1999 +++ xemacs-21.1.8/src/ntproc.c Mon Nov 1 23:17:16 1999 @@ -383,16 +383,8 @@ cp->procinfo.hThread=NULL; cp->procinfo.hProcess=NULL; - /* Hack for Windows 95, which assigns large (ie negative) pids */ - if (cp->pid < 0) - cp->pid = -cp->pid; - /* pid must fit in a Lisp_Int */ -#ifdef USE_UNION_TYPE - cp->pid = (cp->pid & ((1U << VALBITS) - 1)); -#else - cp->pid = (cp->pid & VALMASK); -#endif + *pPid = cp->pid; diff -r -u -N xemacs-21.1.7/src/objects-msw.c xemacs-21.1.8/src/objects-msw.c --- xemacs-21.1.7/src/objects-msw.c Sun Sep 27 03:59:19 1998 +++ xemacs-21.1.8/src/objects-msw.c Mon Nov 1 23:17:16 1999 @@ -49,7 +49,7 @@ #include "device.h" #include "insdel.h" -#ifdef __CYGWIN32__ +#if defined (__CYGWIN32__) && CYGWIN_VERSION_DLL_MAJOR < 21 #define stricmp strcasecmp #define FONTENUMPROC FONTENUMEXPROC #define ntmTm ntmentm diff -r -u -N xemacs-21.1.7/src/s/cygwin32.h xemacs-21.1.8/src/s/cygwin32.h --- xemacs-21.1.7/src/s/cygwin32.h Sun Sep 26 13:29:03 1999 +++ xemacs-21.1.8/src/s/cygwin32.h Mon Nov 1 23:17:19 1999 @@ -75,8 +75,12 @@ #include #else #ifdef SIGIO +#define CYGWIN_VERSION_DLL_MAJOR 19 +#define CYGWIN_VERSION_DLL_MINOR 0 #define CYGWIN_B19 #else +#define CYGWIN_VERSION_DLL_MAJOR 18 +#define CYGWIN_VERSION_DLL_MINOR 0 #define BROKEN_CYGWIN #endif #endif @@ -85,7 +89,7 @@ extern int cygwin32_win32_to_posix_path_list_buf_size(const char*); extern void cygwin32_posix_to_win32_path_list(const char*, char*); extern int cygwin32_posix_to_win32_path_list_buf_size(const char*); -#ifndef CYGWIN_VERSION_DLL_MAJOR +#if CYGWIN_VERSION_DLL_MAJOR < 20 struct timeval; struct timezone; struct itimerval; diff -r -u -N xemacs-21.1.7/src/sysdep.c xemacs-21.1.8/src/sysdep.c --- xemacs-21.1.7/src/sysdep.c Mon Jun 14 02:32:06 1999 +++ xemacs-21.1.8/src/sysdep.c Mon Nov 1 23:17:16 1999 @@ -233,8 +233,11 @@ #endif /* NO_SUBPROCESSES */ -void -wait_for_termination (int pid) +#ifdef WINDOWSNT +void wait_for_termination (HANDLE pHandle) +#else +void wait_for_termination (int pid) +#endif { /* #### With the new improved SIGCHLD handling stuff, there is much less danger of race conditions and some of the comments below @@ -344,6 +347,47 @@ Since implementations may add their own error indicators on top, we ignore it by default. */ +#elif defined (WINDOWSNT) + int ret = 0, status = 0; + if (pHandle == NULL) + { + stderr_out ("wait_for_termination: pHandle == NULL, GetLastError () = %d, (int)pHandle = %d\n", GetLastError (), (int)pHandle); + return; + } + do + { + QUIT; + ret = WaitForSingleObject(pHandle, 100); + } + while (ret == WAIT_TIMEOUT); + if (ret == WAIT_FAILED) + { + stderr_out ("wait_for_termination.WaitForSingleObject returns %d (WAIT_FAILED) GetLastError () %d for (int)pHandle %d\n", ret, GetLastError (), (int)pHandle); + } + if (ret == WAIT_ABANDONED) + { + stderr_out ("wait_for_termination.WaitForSingleObject returns %d (WAIT_ABANDONED) GetLastError () %d for (int)pHandle %d\n", ret, GetLastError (), (int)pHandle); + } + if (ret == WAIT_OBJECT_0) + { + ret = GetExitCodeProcess(pHandle, &status); + if (ret) + { + synch_process_alive = 0; + synch_process_retcode = status; + } + else + { + /* GetExitCodeProcess() didn't return a valid exit status, + nothing to do. APA */ + stderr_out ("wait_for_termination.GetExitCodeProcess status %d GetLastError () %d for (int)pHandle %d\n", status, GetLastError (), (int)pHandle); + } + } + if (pHandle != NULL && !CloseHandle(pHandle)) + { + stderr_out ("wait_for_termination.CloseHandle GetLastError () %d for (int)pHandle %d\n", + GetLastError (), (int)pHandle); + } #elif defined (EMACS_BLOCK_SIGNAL) && !defined (BROKEN_WAIT_FOR_SIGNAL) && defined (SIGCHLD) while (1) { @@ -375,7 +419,7 @@ Try defining BROKEN_WAIT_FOR_SIGNAL. */ EMACS_WAIT_FOR_SIGNAL (SIGCHLD); } -#else /* not HAVE_WAITPID and (not EMACS_BLOCK_SIGNAL or BROKEN_WAIT_FOR_SIGNAL) */ +#else /* not HAVE_WAITPID and not WINDOWSNT and (not EMACS_BLOCK_SIGNAL or BROKEN_WAIT_FOR_SIGNAL) */ /* This approach is kind of cheesy but is guaranteed(?!) to work for all systems. */ while (1) @@ -577,7 +621,11 @@ static void sys_subshell (void) { +#ifdef WINDOWSNT + HANDLE pid; +#else int pid; +#endif struct save_signal saved_handlers[5]; Lisp_Object dir; unsigned char *str = 0; @@ -616,7 +664,7 @@ xyzzy: #ifdef WINDOWSNT - pid = -1; + pid = NULL; #else /* not WINDOWSNT */ pid = fork (); @@ -650,7 +698,7 @@ #ifdef WINDOWSNT /* Waits for process completion */ pid = _spawnlp (_P_WAIT, sh, sh, NULL); - if (pid == -1) + if (pid == NULL) write (1, "Can't execute subshell", 22); #else /* not WINDOWSNT */ diff -r -u -N xemacs-21.1.7/src/sysdep.h xemacs-21.1.8/src/sysdep.h --- xemacs-21.1.7/src/sysdep.h Tue May 26 17:50:33 1998 +++ xemacs-21.1.8/src/sysdep.h Mon Nov 1 23:17:17 1999 @@ -48,7 +48,12 @@ /* Wait for subprocess with process id `pid' to terminate and make sure it will get eliminated (not remain forever as a zombie) */ +#ifdef WINDOWSNT +#include +void wait_for_termination (HANDLE pid); +#else void wait_for_termination (int pid); +#endif /* flush any pending output * (may flush input as well; it does not matter the way we use it) diff -r -u -N xemacs-21.1.7/src/unexcw.c xemacs-21.1.8/src/unexcw.c --- xemacs-21.1.7/src/unexcw.c Fri Apr 24 17:34:26 1998 +++ xemacs-21.1.8/src/unexcw.c Mon Nov 1 23:17:17 1999 @@ -40,7 +40,9 @@ #else #undef CONST -#include +#ifndef MAX_PATH +#define MAX_PATH 260 +#endif #include #define ALLOC_UNIT 0xFFFF diff -r -u -N xemacs-21.1.7/src/unexelf.c xemacs-21.1.8/src/unexelf.c --- xemacs-21.1.7/src/unexelf.c Sat Aug 14 21:29:56 1999 +++ xemacs-21.1.8/src/unexelf.c Wed Oct 20 22:53:31 1999 @@ -432,7 +432,7 @@ #include #include #endif /* __sony_news && _SYSTYPE_SYSV */ -#if __sgi +#ifdef __sgi #include /* for HDRR declaration */ #endif /* __sgi */ @@ -956,12 +956,17 @@ if (!strcmp (old_section_names + NEW_SECTION_H (n).sh_name, ".data") || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), ".sdata") + /* Taking these sections from the current process, breaks + Linux in a subtle way. Binaries only run on the + architecture (e.g. i586 vs i686) of the dumping machine */ +#ifdef __sgi || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), ".lit4") || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), ".lit8") || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), ".got") +#endif || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), ".sdata1") || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name), @@ -1018,7 +1023,7 @@ } #endif /* __sony_news && _SYSTYPE_SYSV */ -#if __sgi +#ifdef __sgi /* Adjust the HDRR offsets in .mdebug and copy the line data if it's in its usual 'hole' in the object. Makes the new file debuggable with dbx. @@ -1133,12 +1138,14 @@ if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data") || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), ".sdata") +#ifdef __sgi || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), ".lit4") || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), ".lit8") || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), ".got") +#endif || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), ".sdata1") || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name), diff -r -u -N xemacs-21.1.7/version.sh xemacs-21.1.8/version.sh --- xemacs-21.1.7/version.sh Sun Sep 26 13:38:54 1999 +++ xemacs-21.1.8/version.sh Tue Nov 2 22:25:37 1999 @@ -1,8 +1,8 @@ #!/bin/sh emacs_major_version=21 emacs_minor_version=1 -emacs_beta_version=7 -xemacs_codename="Biscayne" +emacs_beta_version=8 +xemacs_codename="Bryce Canyon" infodock_major_version=4 infodock_minor_version=0 infodock_build_version=7