From 0c693dc08f0794304711787b2eb47c144ea4bef1 Mon Sep 17 00:00:00 2001 From: tomo Date: Wed, 15 Aug 2001 06:54:57 +0000 Subject: [PATCH] XEmacs 21.2.41 "Polyhymnia". --- CHANGES-beta | 22 + ChangeLog | 24 +- PROBLEMS | 8 + configure | 1508 ++++++++++++++++---------------- configure.in | 28 +- info/internals.info | 204 ++--- info/texinfo.info | 604 ++++++------- info/texinfo.info-1 | 4 +- lib-src/ChangeLog | 4 + lib-src/config.values.in | 1 + lisp/ChangeLog | 56 ++ lisp/about.el | 56 +- lisp/auto-autoloads.el | 13 +- lisp/byte-optimize.el | 12 +- lisp/cl-macs.el | 32 +- lisp/faces.el | 54 +- lisp/gutter-items.el | 2 +- lisp/mule/auto-autoloads.el | 225 ++++- lisp/package-net.el | 106 ++- lisp/setup-paths.el | 13 +- lisp/startup.el | 80 +- lwlib/ChangeLog | 4 + man/ChangeLog | 24 + man/internals/internals.texi | 73 +- man/texinfo.texi | 14 +- netinstall/ChangeLog | 42 +- netinstall/Makefile.in.in | 18 +- netinstall/README | 33 +- netinstall/README.xemacs | 23 - netinstall/desktop.cc | 7 +- netinstall/postinstall.cc | 18 +- netinstall/regedit.cc | 5 + netinstall/reginfo.h | 4 +- netinstall/root.cc | 2 +- netinstall/tar.cc | 31 +- nt/ChangeLog | 4 + src/.dbxrc | 6 +- src/.gdbinit | 8 +- src/ChangeLog | 181 +++- src/alloc.c | 149 ++-- src/buffer.c | 4 +- src/chartab.c | 2 +- src/config.h.in | 1 - src/console.c | 6 +- src/console.h | 2 +- src/data.c | 2 +- src/depend | 6 +- src/dumper.c | 335 +++---- src/elhash.c | 2 +- src/eval.c | 2 +- src/event-Xt.c | 2 +- src/event-msw.c | 4 +- src/event-stream.c | 7 +- src/file-coding.c | 4 +- src/glyphs.c | 8 +- src/glyphs.h | 52 +- src/gmalloc.c | 18 +- src/gpmevent.c | 4 +- src/lisp-disunion.h | 2 +- src/lisp.h | 44 +- src/m/ibmrs6000.h | 4 + src/make-src-depend | 2 +- src/miscplay.c | 7 +- src/mule-charset.c | 4 +- src/s/aix4.h | 9 + src/s/netbsd.h | 8 + src/specifier.c | 4 +- src/specifier.h | 17 +- src/symbols.c | 10 +- src/symeval.h | 2 +- src/sysdep.c | 2 +- src/sysdll.c | 8 +- src/unexelf.c | 30 - tests/ChangeLog | 9 + tests/automated/byte-compiler-tests.el | 2 + version.sh | 4 +- 76 files changed, 2573 insertions(+), 1758 deletions(-) diff --git a/CHANGES-beta b/CHANGES-beta index baaf16c..f7ff2b8 100644 --- a/CHANGES-beta +++ b/CHANGES-beta @@ -1,3 +1,25 @@ +to 21.2.41 "Polyhymnia" +-- A very important fix to the byte-compiler was made. + RE-BYTE-COMPILE all your .el files that were compiled by any older + 21.2 byte-compiler (the 21.1 byte-compiler was OK.) + Explicitly remove all .elc files using + cd XEMACS; find . -name '*.elc' -print | xargs rm + and then rebuild using `make'. + -- Martin Buchholz +-- More Windows installer changes -- Andy Piper +-- Another tab widget fix -- Andy Piper +-- pdump code cleanup -- Martin Buchholz +-- lisp path changes -- Mike Sperber +-- init file changes -- Mike Sperber +-- debugging support works better with pdump -- Martin Buchholz +-- Port to AIX cc -O3 -qansi-aliasing -- Martin Buchholz +-- Allow building 64-bit binaries on AIX. -- Martin Buchholz +-- Make code more resistant to aliasing optimizations. -- Martin Buchholz +-- XEmacs now works on Netbsd 1.5. -- Martin Buchholz +-- Eliminate kludgy checks for non-standard _dlopen -- Golubev I. N. +-- Make Purify a little happier working on pdumped xemacs -- Martin Buchholz +-- Fix never-used macro LISP_TO_CVOID -- Jerry James + to 21.2.40 "Persephone" -- various doc fixes -- Stephen Turnbull -- more widget bug fixes -- Andy Piper diff --git a/ChangeLog b/ChangeLog index ce5c89a..673916d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2001-01-17 Martin Buchholz + + * XEmacs 21.2.41 "Polyhymnia" is released. + +2001-01-16 Martin Buchholz + + * PROBLEMS: Document MIPSpro ICE problem workaround. + +2001-01-06 Golubev I. N. + + * configure.in: check for dlopen by linking program with + . + +2001-01-08 Andy Piper + + * configure.in: add extra_includes and populate appropriately for + cygwin and mingw. + +2000-12-28 Andy Piper + + * configure.in: allow --with-widgets=msw + 2001-01-08 Martin Buchholz * XEmacs 21.2.40 is released. @@ -1381,7 +1403,7 @@ * config.guess: Synched with latest FSF version. -1998-07-12 Bjrn Torkelsson +1998-07-12 Björn Torkelsson * Makefile.in: added LDFLAGS. diff --git a/PROBLEMS b/PROBLEMS index 7610939..4c5d43d 100644 --- a/PROBLEMS +++ b/PROBLEMS @@ -298,6 +298,14 @@ This is a Linux problem where you've compiled the XEmacs binary on a libc an earlier version. The solution is to upgrade your old library. ** IRIX + +*** On Irix 6.5, the MIPSpro compiler gets an internal compiler error + +The MIPSpro Compiler (at least version 7.2.1) can't seem to handle the +union type properly, and fails to compile src/glyphs.c. To avoid this +problem, always build ---use-union-type=no (but that's the default, so +you should only see this problem if you're an XEmacs maintainer). + *** Linking with -rpath on IRIX. Darrell Kindred writes: diff --git a/configure b/configure index b57dabf..5353c07 100755 --- a/configure +++ b/configure @@ -251,6 +251,7 @@ with_widgets='' with_dialogs='' with_file_coding='' cpp='' cppflags='' libs='' ldflags='' +extra_includes='' dynamic='' with_x11='' with_msw='' @@ -726,6 +727,7 @@ EOF a | at | ath | athe | athen | athena ) val=athena ;; n | no | non | none ) val=no ;; y | ye | yes ) val=yes ;; + m | ms | msw ) val=msw ;; * ) (echo "$progname: Usage error:" echo " " "The \`--$optname' option must have one of these values: \`lucid', \`motif', \`athena', \`yes', or \`no'." @@ -830,7 +832,7 @@ echo " Use \`$progname --help' to show usage.") >&2 && exit 1 fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:834: checking whether ln -s works" >&5 +echo "configure:836: checking whether ln -s works" >&5 rm -f conftestdata if ln -s X conftestdata 2>/dev/null @@ -1095,7 +1097,7 @@ EOF echo $ac_n "checking "host system type"""... $ac_c" 1>&6 -echo "configure:1099: checking "host system type"" >&5 +echo "configure:1101: checking "host system type"" >&5 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'` canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"` configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` @@ -1614,7 +1616,7 @@ xe_save_CFLAGS="$CFLAGS" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1618: checking for $ac_word" >&5 +echo "configure:1620: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1641,7 +1643,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1645: checking for $ac_word" >&5 +echo "configure:1647: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1689,7 +1691,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1693: checking for $ac_word" >&5 +echo "configure:1695: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1718,7 +1720,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1722: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1724: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1731,12 +1733,12 @@ cross_compiling=no cat > conftest.$ac_ext << EOF -#line 1735 "configure" +#line 1737 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1764,19 +1766,19 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1768: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1770: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1773: checking whether we are using GNU C" >&5 +echo "configure:1775: checking whether we are using GNU C" >&5 cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1794,7 +1796,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1798: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1800: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1827,7 +1829,7 @@ if test "$with_gcc" = "no" -a "$GCC" = "yes"; then # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1831: checking for $ac_word" >&5 +echo "configure:1833: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1854,7 +1856,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1858: checking for $ac_word" >&5 +echo "configure:1860: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1902,7 +1904,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1906: checking for $ac_word" >&5 +echo "configure:1908: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1931,7 +1933,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1935: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1937: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1944,12 +1946,12 @@ cross_compiling=no cat > conftest.$ac_ext << EOF -#line 1948 "configure" +#line 1950 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1977,19 +1979,19 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1981: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1983: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1986: checking whether we are using GNU C" >&5 +echo "configure:1988: checking whether we are using GNU C" >&5 cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2007,7 +2009,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2011: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2013: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2040,7 +2042,7 @@ elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2044: checking for $ac_word" >&5 +echo "configure:2046: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2067,7 +2069,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2071: checking for $ac_word" >&5 +echo "configure:2073: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2115,7 +2117,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2119: checking for $ac_word" >&5 +echo "configure:2121: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2144,7 +2146,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2148: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2150: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -2157,12 +2159,12 @@ cross_compiling=no cat > conftest.$ac_ext << EOF -#line 2161 "configure" +#line 2163 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2190,19 +2192,19 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2194: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2196: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2199: checking whether we are using GNU C" >&5 +echo "configure:2201: checking whether we are using GNU C" >&5 cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2220,7 +2222,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2224: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2226: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2257,7 +2259,7 @@ test -n "$CPP" -a -d "$CPP" && CPP= test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2261: checking how to run the C preprocessor" >&5 +echo "configure:2263: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2270,13 +2272,13 @@ if test -z "$CPP"; then # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2282: \"$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 : @@ -2287,13 +2289,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2299: \"$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 : @@ -2304,13 +2306,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2316: \"$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 : @@ -2336,9 +2338,9 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2340: checking for AIX" >&5 +echo "configure:2342: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:2369: checking for GNU libc" >&5 +echo "configure:2371: checking for GNU libc" >&5 cat > conftest.$ac_ext < int main() { @@ -2379,7 +2381,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_glibc=yes else @@ -2456,7 +2458,7 @@ EOF esac cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -2686,10 +2688,15 @@ fi test "$extra_verbose" = "yes" && \ for var in libs_machine libs_system libs_termcap libs_standard objects_machine objects_system c_switch_machine c_switch_system ld_switch_machine ld_switch_system unexec ld_switch_shared ld lib_gcc ld_text_start_addr start_files ordinary_link have_terminfo mail_use_flock mail_use_lockf; do eval "echo \"$var = '\$$var'\""; done && echo "" -case "$opsys" in mingw*) mingw_include=`eval "gcc -print-file-name=libc.a"` ; - mingw_include=`eval "dirname $mingw_include"` ; - mingw_include="-I$mingw_include/../include/mingw32" ; - c_switch_system="$c_switch_system $mingw_include" && if test "$extra_verbose" = "yes"; then echo " Appending \"$mingw_include\" to \$c_switch_system"; fi ;; +case "$opsys" in mingw* | cygwin*) + cygwin_include=`eval "gcc -print-file-name=libc.a"` ; + cygwin_include=`eval "dirname $cygwin_include"` ; + cygwin_include="-I$cygwin_include/../include" ; + extra_includes="$cygwin_include/mingw32 $cygwin_include/mingw $cygwin_include" ; + case "$opsys" in mingw*) + c_switch_system="$c_switch_system $extra_includes" && if test "$extra_verbose" = "yes"; then echo " Appending \"$extra_includes\" to \$c_switch_system"; fi ;; + esac + ;; esac test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc" @@ -2699,17 +2706,17 @@ test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" && if test "$ext if test "$__USLC__" = yes; then echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6 -echo "configure:2703: checking for whether the -Kalloca compiler flag is needed" >&5 +echo "configure:2710: checking for whether the -Kalloca compiler flag is needed" >&5 need_kalloca=no cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2720,14 +2727,14 @@ else xe_save_c_switch_system="$c_switch_system" c_switch_system="$c_switch_system -Kalloca" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* need_kalloca=yes else @@ -2760,7 +2767,7 @@ fi if test "$GCC" = "yes"; then echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6 -echo "configure:2764: checking for buggy gcc versions" >&5 +echo "configure:2771: checking for buggy gcc versions" >&5 GCC_VERSION=`$CC --version` case `uname -s`:`uname -m`:$GCC_VERSION in *:sun4*:2.8.1|*:sun4*:egcs-2.90.*) @@ -2883,7 +2890,7 @@ test "$pdump" = "yes" && extra_objs="$extra_objs dumper.o" && if test "$extra_v fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:2887: checking for dynodump" >&5 +echo "configure:2894: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -2921,12 +2928,12 @@ if test "$unexec" = "unexaix.o"; then done echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6 -echo "configure:2925: checking for terminateAndUnload in -lC" >&5 +echo "configure:2932: checking for terminateAndUnload in -lC" >&5 ac_lib_var=`echo C'_'terminateAndUnload | 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:2948: \"$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 @@ -3045,7 +3052,7 @@ fi if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:3049: checking "for runtime libraries flag"" >&5 +echo "configure:3056: checking "for runtime libraries flag"" >&5 case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; @@ -3067,14 +3074,14 @@ if test "$GCC" = "yes"; then done fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* dash_r="$try_dash_r" else @@ -3176,10 +3183,10 @@ else fi after_morecore_hook_exists=yes echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:3180: checking for malloc_set_state" >&5 +echo "configure:3187: checking for malloc_set_state" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_malloc_set_state=yes" else @@ -3222,16 +3229,16 @@ doug_lea_malloc=no fi echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:3226: checking whether __after_morecore_hook exists" >&5 +echo "configure:3233: checking whether __after_morecore_hook exists" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -3287,7 +3294,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3291: checking for $ac_word" >&5 +echo "configure:3298: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -3342,7 +3349,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3346: checking for a BSD compatible install" >&5 +echo "configure:3353: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -3396,7 +3403,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3400: checking for $ac_word" >&5 +echo "configure:3407: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -3428,15 +3435,15 @@ for ac_hdr in a.out.h elf.h cygwin/version.h fcntl.h inttypes.h libg do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3432: checking for $ac_hdr" >&5 +echo "configure:3439: 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:3440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3447: \"$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* @@ -3466,10 +3473,10 @@ fi done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3470: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3477: checking for sys/wait.h that is POSIX.1 compatible" >&5 cat > conftest.$ac_ext < #include @@ -3485,7 +3492,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3489: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3509,10 +3516,10 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3513: checking for ANSI C header files" >&5 +echo "configure:3520: checking for ANSI C header files" >&5 cat > conftest.$ac_ext < #include @@ -3520,7 +3527,7 @@ cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3531: \"$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* @@ -3537,7 +3544,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3555,7 +3562,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3573,7 +3580,7 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3584,7 +3591,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:3595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -3610,10 +3617,10 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3614: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3621: checking whether time.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext < #include @@ -3622,7 +3629,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3646,10 +3653,10 @@ EOF fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3650: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:3657: checking for sys_siglist declaration in signal.h or unistd.h" >&5 cat > conftest.$ac_ext < #include @@ -3661,7 +3668,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -3686,9 +3693,9 @@ fi echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 -echo "configure:3690: checking for struct utimbuf" >&5 +echo "configure:3697: checking for struct utimbuf" >&5 cat > conftest.$ac_ext < @@ -3707,7 +3714,7 @@ int main() { static struct utimbuf x; x.actime = x.modtime; ; return 0; } EOF -if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3718: \"$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 @@ -3727,10 +3734,10 @@ fi rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3731: checking return type of signal handlers" >&5 +echo "configure:3738: checking return type of signal handlers" >&5 cat > conftest.$ac_ext < #include @@ -3747,7 +3754,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3758: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3769,10 +3776,10 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3773: checking for size_t" >&5 +echo "configure:3780: checking for size_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3803,10 +3810,10 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3807: checking for pid_t" >&5 +echo "configure:3814: checking for pid_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3837,10 +3844,10 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3841: checking for uid_t in sys/types.h" >&5 +echo "configure:3848: checking for uid_t in sys/types.h" >&5 cat > conftest.$ac_ext < EOF @@ -3876,10 +3883,10 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3880: checking for mode_t" >&5 +echo "configure:3887: checking for mode_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3910,10 +3917,10 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3914: checking for off_t" >&5 +echo "configure:3921: checking for off_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3944,10 +3951,10 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:3948: checking for ssize_t" >&5 +echo "configure:3955: checking for ssize_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3979,9 +3986,9 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:3983: checking for socklen_t" >&5 +echo "configure:3990: checking for socklen_t" >&5 cat > conftest.$ac_ext < socklen_t x; @@ -3990,7 +3997,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -3999,7 +4006,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < int accept (int, struct sockaddr *, size_t *); @@ -4008,7 +4015,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""size_t" 1>&6 @@ -4040,9 +4047,9 @@ fi rm -f conftest* echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:4044: checking for struct timeval" >&5 +echo "configure:4051: checking for struct timeval" >&5 cat > conftest.$ac_ext < @@ -4058,7 +4065,7 @@ int main() { static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:4062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -4080,10 +4087,10 @@ fi rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4084: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4091: checking whether struct tm is in sys/time.h or time.h" >&5 cat > conftest.$ac_ext < #include @@ -4091,7 +4098,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4115,10 +4122,10 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4119: checking for tm_zone in struct tm" >&5 +echo "configure:4126: checking for tm_zone in struct tm" >&5 cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -4126,7 +4133,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4149,10 +4156,10 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4153: checking for tzname" >&5 +echo "configure:4160: checking for tzname" >&5 cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -4162,7 +4169,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4188,10 +4195,10 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4192: checking for working const" >&5 +echo "configure:4199: checking for working const" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4265,7 +4272,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:4269: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:4276: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -4290,12 +4297,12 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4294: checking whether byte ordering is bigendian" >&5 +echo "configure:4301: checking whether byte ordering is bigendian" >&5 ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4306,11 +4313,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4321,7 +4328,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4338,7 +4345,7 @@ fi rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_bigendian=no else @@ -4378,10 +4385,10 @@ fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4382: checking size of short" >&5 +echo "configure:4389: checking size of short" >&5 cat > conftest.$ac_ext < main() @@ -4392,7 +4399,7 @@ main() exit(0); } EOF -if { (eval echo configure:4396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -4420,10 +4427,10 @@ if test "$ac_cv_sizeof_short" = 0; then exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4424: checking size of int" >&5 +echo "configure:4431: checking size of int" >&5 cat > conftest.$ac_ext < main() @@ -4434,7 +4441,7 @@ main() exit(0); } EOF -if { (eval echo configure:4438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -4456,10 +4463,10 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4460: checking size of long" >&5 +echo "configure:4467: checking size of long" >&5 cat > conftest.$ac_ext < main() @@ -4470,7 +4477,7 @@ main() exit(0); } EOF -if { (eval echo configure:4474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -4492,10 +4499,10 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4496: checking size of long long" >&5 +echo "configure:4503: checking size of long long" >&5 cat > conftest.$ac_ext < main() @@ -4506,7 +4513,7 @@ main() exit(0); } EOF -if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long_long=`cat conftestval` else @@ -4528,10 +4535,10 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4532: checking size of void *" >&5 +echo "configure:4539: checking size of void *" >&5 cat > conftest.$ac_ext < main() @@ -4542,7 +4549,7 @@ main() exit(0); } EOF -if { (eval echo configure:4546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_void_p=`cat conftestval` else @@ -4565,7 +4572,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:4569: checking for long file names" >&5 +echo "configure:4576: checking for long file names" >&5 ac_cv_sys_long_file_names=yes # Test for long file names in all the places we know might matter: @@ -4611,10 +4618,10 @@ fi echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:4615: checking for sin" >&5 +echo "configure:4622: checking for sin" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" else @@ -4655,12 +4662,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:4659: checking for sin in -lm" >&5 +echo "configure:4666: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` xe_check_libs=" -lm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4682: \"$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 @@ -4715,14 +4722,14 @@ EOF cat > conftest.$ac_ext < int main() { return atanh(1.0) + asinh(1.0) + acosh(1.0); ; return 0; } EOF -if { (eval echo configure:4726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_INVERSE_HYPERBOLIC @@ -4739,14 +4746,14 @@ fi rm -f conftest* echo "checking type of mail spool file locking" 1>&6 -echo "configure:4743: checking type of mail spool file locking" >&5 +echo "configure:4750: checking type of mail spool file locking" >&5 for ac_func in lockf flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4747: checking for $ac_func" >&5 +echo "configure:4754: 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:4780: \"$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 @@ -4851,12 +4858,12 @@ test "$mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:4855: checking for cma_open in -lpthreads" >&5 +echo "configure:4862: checking for cma_open in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lpthreads " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4878: \"$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 @@ -4903,7 +4910,7 @@ fi esac echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:4907: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:4914: checking whether the -xildoff compiler flag is required" >&5 if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then echo "$ac_t""no" 1>&6; @@ -4915,7 +4922,7 @@ fi if test "$opsys" = "sol2"; then if test "$os_release" -ge 56; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:4919: checking for \"-z ignore\" linker flag" >&5 +echo "configure:4926: checking for \"-z ignore\" linker flag" >&5 case "`ld -h 2>&1`" in *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6 ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;; @@ -4926,7 +4933,7 @@ fi echo "checking "for specified window system"" 1>&6 -echo "configure:4930: checking "for specified window system"" >&5 +echo "configure:4937: checking "for specified window system"" >&5 if test "$with_x11" != "no"; then test "$x_includes $x_libraries" != "NONE NONE" && \ @@ -4959,7 +4966,7 @@ if test "$with_x11" != "no"; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:4963: checking for X" >&5 +echo "configure:4970: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5019,12 +5026,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5035: \"$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* @@ -5093,14 +5100,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5209,17 +5216,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:5213: checking whether -R must be followed by a space" >&5 +echo "configure:5220: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -5235,14 +5242,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -5278,12 +5285,12 @@ ac_cv_lib_dnet_dnet_ntoa=no else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5282: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:5289: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5305: \"$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 @@ -5318,12 +5325,12 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:5322: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:5329: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet_stub " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5345: \"$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 @@ -5363,10 +5370,10 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5367: checking for gethostbyname" >&5 +echo "configure:5374: checking for gethostbyname" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5410,12 +5417,12 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5414: checking for gethostbyname in -lnsl" >&5 +echo "configure:5421: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5437: \"$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 @@ -5456,10 +5463,10 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:5460: checking for connect" >&5 +echo "configure:5467: checking for connect" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5505,12 +5512,12 @@ fi xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:5509: checking "$xe_msg_checking"" >&5 +echo "configure:5516: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocket $X_EXTRA_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5532: \"$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 @@ -5545,10 +5552,10 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:5549: checking for remove" >&5 +echo "configure:5556: checking for remove" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -5592,12 +5599,12 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:5596: checking for remove in -lposix" >&5 +echo "configure:5603: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5619: \"$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 @@ -5632,10 +5639,10 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:5636: checking for shmat" >&5 +echo "configure:5643: checking for shmat" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -5679,12 +5686,12 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:5683: checking for shmat in -lipc" >&5 +echo "configure:5690: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5706: \"$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 @@ -5731,12 +5738,12 @@ fi xe_msg_checking="for IceConnectionNumber in -lICE" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:5735: checking "$xe_msg_checking"" >&5 +echo "configure:5742: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE $X_EXTRA_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5758: \"$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 @@ -5918,7 +5925,7 @@ EOF echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:5922: checking for X defines extracted by xmkmf" >&5 +echo "configure:5929: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -5965,15 +5972,15 @@ EOF ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:5969: checking for X11/Intrinsic.h" >&5 +echo "configure:5976: checking for X11/Intrinsic.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5984: \"$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* @@ -5997,12 +6004,12 @@ fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6001: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6008: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | 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:6024: \"$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 @@ -6038,12 +6045,12 @@ fi xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6042: checking "$xe_msg_checking"" >&5 +echo "configure:6049: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 -b i486-linuxaout" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6065: \"$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 @@ -6081,12 +6088,12 @@ fi echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:6085: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:6092: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6108: \"$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 @@ -6120,12 +6127,12 @@ fi echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:6124: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:6131: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6147: \"$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 @@ -6159,14 +6166,14 @@ fi echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:6163: checking the version of X11 being used" >&5 +echo "configure:6170: checking the version of X11 being used" >&5 cat > conftest.$ac_ext < int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:6170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else @@ -6197,10 +6204,10 @@ EOF for ac_func in XConvertCase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6201: checking for $ac_func" >&5 +echo "configure:6208: 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:6234: \"$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 @@ -6255,15 +6262,15 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6259: checking for $ac_hdr" >&5 +echo "configure:6266: 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:6267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6274: \"$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* @@ -6296,10 +6303,10 @@ done for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6300: checking for $ac_func" >&5 +echo "configure:6307: 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:6333: \"$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 @@ -6350,9 +6357,9 @@ fi done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:6354: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:6361: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -6385,12 +6392,12 @@ rm -f conftest* test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:6389: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:6396: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6412: \"$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 @@ -6440,19 +6447,19 @@ EOF echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:6444: checking for main in -lXbsd" >&5 +echo "configure:6451: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lXbsd " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6463: \"$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 @@ -6489,22 +6496,22 @@ fi fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:6493: checking for MS-Windows" >&5 +echo "configure:6500: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:6496: checking for main in -lgdi32" >&5 +echo "configure:6503: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdi32 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6515: \"$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 @@ -6575,12 +6582,12 @@ EOF fi fi cat > conftest.$ac_ext < int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:6584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MSG_SELECT @@ -6644,15 +6651,15 @@ fi if test "$with_x11" = "yes"; then ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6 -echo "configure:6648: checking for X11/extensions/shape.h" >&5 +echo "configure:6655: checking for X11/extensions/shape.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6663: \"$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* @@ -6699,7 +6706,7 @@ case "$x_libraries" in *X11R4* ) esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:6703: checking for WM_COMMAND option" >&5; +echo "configure:6710: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND @@ -6714,15 +6721,15 @@ fi test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:6718: checking for X11/Xauth.h" >&5 +echo "configure:6725: checking for X11/Xauth.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6726: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6733: \"$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* @@ -6745,12 +6752,12 @@ fi } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:6749: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:6756: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6772: \"$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 @@ -6806,15 +6813,15 @@ if test "$with_tooltalk" != "no" ; then for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:6810: checking for ${dir}tt_c.h" >&5 +echo "configure:6817: checking for ${dir}tt_c.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6825: \"$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* @@ -6850,12 +6857,12 @@ if test "$with_tooltalk" != "no" ; then xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6854: checking "$xe_msg_checking"" >&5 +echo "configure:6861: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'` xe_check_libs=" -ltt $extra_libs" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6877: \"$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 @@ -6923,15 +6930,15 @@ fi test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:6927: checking for Dt/Dt.h" >&5 +echo "configure:6934: checking for Dt/Dt.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6942: \"$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* @@ -6954,12 +6961,12 @@ fi } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:6958: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:6965: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6981: \"$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 @@ -7040,7 +7047,7 @@ fi if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:7044: checking if drag and drop API is needed" >&5 +echo "configure:7051: checking if drag and drop API is needed" >&5 if test -n "$dragndrop_proto" ; then with_dragndrop=yes echo "$ac_t""yes (${dragndrop_proto} )" 1>&6 @@ -7060,18 +7067,18 @@ EOF fi echo "checking for LDAP" 1>&6 -echo "configure:7064: checking for LDAP" >&5 +echo "configure:7071: checking for LDAP" >&5 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ldap.h""... $ac_c" 1>&6 -echo "configure:7067: checking for ldap.h" >&5 +echo "configure:7074: checking for ldap.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7082: \"$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* @@ -7094,15 +7101,15 @@ fi } test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lber.h""... $ac_c" 1>&6 -echo "configure:7098: checking for lber.h" >&5 +echo "configure:7105: checking for lber.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7113: \"$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* @@ -7126,12 +7133,12 @@ fi if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:7130: checking for ldap_search in -lldap" >&5 +echo "configure:7137: checking for ldap_search in -lldap" >&5 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7153: \"$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 @@ -7167,12 +7174,12 @@ fi xe_msg_checking="for ldap_open in -lldap" test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7171: checking "$xe_msg_checking"" >&5 +echo "configure:7178: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7194: \"$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 @@ -7208,12 +7215,12 @@ fi xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7212: checking "$xe_msg_checking"" >&5 +echo "configure:7219: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7235: \"$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 @@ -7249,12 +7256,12 @@ fi xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7253: checking "$xe_msg_checking"" >&5 +echo "configure:7260: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb -ldes" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7276: \"$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 @@ -7316,10 +7323,10 @@ EOF for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7320: checking for $ac_func" >&5 +echo "configure:7327: 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:7353: \"$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 @@ -7373,20 +7380,20 @@ fi if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:7377: checking for PostgreSQL" >&5 +echo "configure:7384: checking for PostgreSQL" >&5 for header_dir in "" "pgsql/" "postgresql/"; do ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6 -echo "configure:7382: checking for ${header_dir}libpq-fe.h" >&5 +echo "configure:7389: checking for ${header_dir}libpq-fe.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7397: \"$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* @@ -7410,12 +7417,12 @@ fi test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:7414: checking for PQconnectdb in -lpq" >&5 +echo "configure:7421: checking for PQconnectdb in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7437: \"$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 @@ -7459,12 +7466,12 @@ EOF echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:7463: checking for PQconnectStart in -lpq" >&5 +echo "configure:7470: checking for PQconnectStart in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7486: \"$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 @@ -7523,15 +7530,15 @@ fi if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:7527: checking for graphics libraries" >&5 +echo "configure:7534: checking for graphics libraries" >&5 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:7532: checking for Xpm - no older than 3.4f" >&5 +echo "configure:7539: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext < @@ -7540,7 +7547,7 @@ echo "configure:7532: checking for Xpm - no older than 3.4f" >&5 XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:7544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7551: \"$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 @@ -7582,17 +7589,17 @@ EOF 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:7586: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:7593: 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:7603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else @@ -7618,15 +7625,15 @@ EOF 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:7622: checking for compface.h" >&5 +echo "configure:7629: 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:7630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7637: \"$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* @@ -7649,12 +7656,12 @@ fi } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:7653: checking for UnGenFace in -lcompface" >&5 +echo "configure:7660: 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:7676: \"$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 @@ -7717,12 +7724,12 @@ EOF if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:7721: checking for inflate in -lc" >&5 +echo "configure:7728: 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:7744: \"$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 @@ -7752,12 +7759,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:7756: checking for inflate in -lz" >&5 +echo "configure:7763: 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:7779: \"$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 @@ -7787,12 +7794,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:7791: checking for inflate in -lgz" >&5 +echo "configure:7798: 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:7814: \"$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 @@ -7833,15 +7840,15 @@ fi 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:7837: checking for jpeglib.h" >&5 +echo "configure:7844: 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:7845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7852: \"$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* @@ -7864,12 +7871,12 @@ fi } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:7868: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:7875: 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:7891: \"$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 @@ -7916,10 +7923,10 @@ EOF png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:7920: checking for pow" >&5 +echo "configure:7927: checking for pow" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7953: \"$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 @@ -7963,15 +7970,15 @@ fi } 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:7967: checking for png.h" >&5 +echo "configure:7974: 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:7975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7982: \"$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* @@ -7994,12 +8001,12 @@ fi } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:7998: checking for png_read_image in -lpng" >&5 +echo "configure:8005: 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:8021: \"$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 @@ -8033,10 +8040,10 @@ fi } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:8037: checking for workable png version information" >&5 +echo "configure:8044: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext < int main(int c, char **v) { @@ -8044,7 +8051,7 @@ echo "configure:8037: checking for workable png version information" >&5 if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:8048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8055: \"$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 @@ -8087,15 +8094,15 @@ EOF 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:8091: checking for tiffio.h" >&5 +echo "configure:8098: 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:8099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8106: \"$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* @@ -8118,12 +8125,12 @@ fi } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:8122: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:8129: 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:8145: \"$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 @@ -8173,10 +8180,10 @@ fi if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:8177: checking for X11 graphics libraries" >&5 +echo "configure:8184: checking for X11 graphics libraries" >&5 echo "checking for the Athena widgets" 1>&6 -echo "configure:8180: checking for the Athena widgets" >&5 +echo "configure:8187: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; @@ -8190,12 +8197,12 @@ echo "configure:8180: checking for the Athena widgets" >&5 if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8194: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:8201: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8217: \"$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 @@ -8222,12 +8229,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8226: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:8233: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8249: \"$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 +8276,12 @@ fi else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8273: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:8280: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8296: \"$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 +8310,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:8307: checking for threeDClassRec in -lXaw" >&5 +echo "configure:8314: checking for threeDClassRec in -lXaw" >&5 ac_lib_var=`echo Xaw'_'threeDClassRec | 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:8330: \"$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 @@ -8350,15 +8357,15 @@ fi if test "$athena_3d" = "no"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:8354: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:8361: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8369: \"$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* @@ -8378,15 +8385,15 @@ else echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6 -echo "configure:8382: checking for X11/Xaw/XawInit.h" >&5 +echo "configure:8389: checking for X11/Xaw/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8397: \"$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* @@ -8412,15 +8419,15 @@ fi else ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:8416: checking for X11/$athena_variant/XawInit.h" >&5 +echo "configure:8423: checking for X11/$athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8431: \"$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* @@ -8437,15 +8444,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:8441: checking for X11/$athena_variant/ThreeD.h" >&5 +echo "configure:8448: checking for X11/$athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8456: \"$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* @@ -8473,15 +8480,15 @@ fi if test -z "$athena_h_path"; then ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:8477: checking for $athena_variant/XawInit.h" >&5 +echo "configure:8484: checking for $athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8492: \"$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* @@ -8498,15 +8505,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:8502: checking for $athena_variant/ThreeD.h" >&5 +echo "configure:8509: checking for $athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8517: \"$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* @@ -8535,15 +8542,15 @@ fi if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:8539: checking for X11/Xaw3d/XawInit.h" >&5 +echo "configure:8546: checking for X11/Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8554: \"$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* @@ -8560,15 +8567,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:8564: checking for X11/Xaw3d/ThreeD.h" >&5 +echo "configure:8571: checking for X11/Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8579: \"$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* @@ -8600,15 +8607,15 @@ fi if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:8604: checking for Xaw3d/XawInit.h" >&5 +echo "configure:8611: checking for Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8619: \"$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* @@ -8625,15 +8632,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:8629: checking for Xaw3d/ThreeD.h" >&5 +echo "configure:8636: checking for Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8637: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8644: \"$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* @@ -8665,15 +8672,15 @@ fi if test -z "$athena_h_path"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:8669: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:8676: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8684: \"$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* @@ -8708,15 +8715,15 @@ fi ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:8712: checking for Xm/Xm.h" >&5 +echo "configure:8719: 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:8720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8727: \"$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* @@ -8733,12 +8740,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:8737: checking for XmStringFree in -lXm" >&5 +echo "configure:8744: 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:8760: \"$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 @@ -8778,9 +8785,9 @@ fi if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:8782: checking for Lesstif" >&5 +echo "configure:8789: checking for Lesstif" >&5 cat > conftest.$ac_ext < #ifdef LESSTIF_VERSION @@ -9186,7 +9193,7 @@ fi if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:9190: checking for Mule-related features" >&5 +echo "configure:9197: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -9211,15 +9218,15 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9215: checking for $ac_hdr" >&5 +echo "configure:9222: 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:9223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9230: \"$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* @@ -9250,12 +9257,12 @@ done echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:9254: checking for strerror in -lintl" >&5 +echo "configure:9261: 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:9277: \"$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 @@ -9299,18 +9306,18 @@ fi echo "checking for Mule input methods" 1>&6 -echo "configure:9303: checking for Mule input methods" >&5 +echo "configure:9310: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:9306: checking for XIM" >&5 +echo "configure:9313: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:9309: checking for XOpenIM in -lX11" >&5 +echo "configure:9316: 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:9332: \"$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 @@ -9345,12 +9352,12 @@ fi if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:9349: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:9356: 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:9372: \"$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 @@ -9426,15 +9433,15 @@ EOF if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:9430: checking for XFontSet" >&5 +echo "configure:9437: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:9433: checking for XmbDrawString in -lX11" >&5 +echo "configure:9440: 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:9456: \"$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 @@ -9485,15 +9492,15 @@ EOF 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:9489: checking for wnn/jllib.h" >&5 +echo "configure:9496: 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:9497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9504: \"$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* @@ -9518,10 +9525,10 @@ fi for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9522: checking for $ac_func" >&5 +echo "configure:9529: 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:9555: \"$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 @@ -9573,12 +9580,12 @@ done test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:9577: checking for crypt in -lcrypt" >&5 +echo "configure:9584: 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:9600: \"$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 @@ -9624,12 +9631,12 @@ fi 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:9628: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:9635: 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:9651: \"$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 @@ -9658,12 +9665,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:9662: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:9669: 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:9685: \"$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 @@ -9692,12 +9699,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:9696: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:9703: 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:9719: \"$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 @@ -9726,12 +9733,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:9730: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:9737: 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:9753: \"$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 @@ -9790,12 +9797,12 @@ EOF if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:9794: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:9801: 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:9817: \"$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 @@ -9841,15 +9848,15 @@ EOF 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:9845: checking for canna/jrkanji.h" >&5 +echo "configure:9852: 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:9853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9860: \"$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* @@ -9876,15 +9883,15 @@ fi 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:9880: checking for canna/jrkanji.h" >&5 +echo "configure:9887: 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:9888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9895: \"$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* @@ -9912,15 +9919,15 @@ fi 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:9916: checking for canna/RK.h" >&5 +echo "configure:9923: 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:9924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9931: \"$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* @@ -9943,12 +9950,12 @@ fi } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:9947: checking for RkBgnBun in -lRKC" >&5 +echo "configure:9954: 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:9970: \"$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 @@ -9982,12 +9989,12 @@ fi } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:9986: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:9993: 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:10009: \"$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 @@ -10047,12 +10054,12 @@ if test "$need_motif" = "yes" ; then 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:10051: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:10058: 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:10074: \"$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 @@ -10149,10 +10156,10 @@ fi for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo 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 stpcpy strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10153: checking for $ac_func" >&5 +echo "configure:10160: 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:10186: \"$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 @@ -10206,10 +10213,10 @@ done for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10210: checking for $ac_func" >&5 +echo "configure:10217: 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:10243: \"$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 @@ -10261,10 +10268,10 @@ done echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:10265: checking for openpty" >&5 +echo "configure:10272: checking for openpty" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openpty=yes" else @@ -10306,12 +10313,12 @@ else echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:10310: checking for openpty in -lutil" >&5 +echo "configure:10317: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` xe_check_libs=" -lutil " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10333: \"$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 @@ -10357,15 +10364,15 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10361: checking for $ac_hdr" >&5 +echo "configure:10368: 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:10369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10376: \"$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* @@ -10401,15 +10408,15 @@ for ac_hdr in stropts.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10405: checking for $ac_hdr" >&5 +echo "configure:10412: 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:10413: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10420: \"$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* @@ -10442,10 +10449,10 @@ if test "$ac_cv_header_stropts_h" = "yes"; then for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10446: checking for $ac_func" >&5 +echo "configure:10453: 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:10479: \"$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 @@ -10499,15 +10506,15 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10503: checking for $ac_hdr" >&5 +echo "configure:10510: 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:10511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10518: \"$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* @@ -10544,10 +10551,10 @@ extra_objs="$extra_objs realpath.o" && if test "$extra_verbose" = "yes"; then for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10548: checking for $ac_func" >&5 +echo "configure:10555: 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:10581: \"$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 @@ -10603,15 +10610,15 @@ if test "$ac_cv_func_getloadavg" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10607: checking for $ac_hdr" >&5 +echo "configure:10614: 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:10615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10622: \"$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* @@ -10647,12 +10654,12 @@ else echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:10651: checking for kstat_open in -lkstat" >&5 +echo "configure:10658: checking for kstat_open in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lkstat " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10674: \"$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 @@ -10698,15 +10705,15 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10702: checking for $ac_hdr" >&5 +echo "configure:10709: 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:10710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10717: \"$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* @@ -10738,12 +10745,12 @@ done echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:10742: checking for kvm_read in -lkvm" >&5 +echo "configure:10749: checking for kvm_read in -lkvm" >&5 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` xe_check_libs=" -lkvm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10765: \"$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 @@ -10788,16 +10795,16 @@ fi fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:10792: checking whether netdb declares h_errno" >&5 +echo "configure:10799: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext < int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:10801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10808: \"$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 @@ -10817,16 +10824,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:10821: checking for sigsetjmp" >&5 +echo "configure:10828: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:10830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10837: \"$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 @@ -10846,11 +10853,11 @@ fi rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:10850: checking whether localtime caches TZ" >&5 +echo "configure:10857: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext < #if STDC_HEADERS @@ -10885,7 +10892,7 @@ main() exit (0); } EOF -if { (eval echo configure:10889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:10896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -10915,9 +10922,9 @@ fi if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:10919: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:10926: 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:10949: \"$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 @@ -10960,19 +10967,19 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:10964: checking for inline" >&5 +echo "configure:10971: 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:10983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -11013,17 +11020,17 @@ if test "$__DECC" != "yes"; then # 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:11017: checking for working alloca.h" >&5 +echo "configure:11024: 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:11027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11034: \"$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 @@ -11047,10 +11054,10 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:11051: checking for alloca" >&5 +echo "configure:11058: checking for alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11089: \"$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 @@ -11117,10 +11124,10 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:11121: checking whether alloca needs Cray hooks" >&5 +echo "configure:11128: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11148: checking for $ac_func" >&5 +echo "configure:11155: 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:11181: \"$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 @@ -11200,10 +11207,10 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:11204: checking stack direction for C alloca" >&5 +echo "configure:11211: 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:11233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -11252,15 +11259,15 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:11256: checking for vfork.h" >&5 +echo "configure:11263: 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:11264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11271: \"$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* @@ -11288,10 +11295,10 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:11292: checking for working vfork" >&5 +echo "configure:11299: checking for working vfork" >&5 cat > conftest.$ac_ext < @@ -11386,7 +11393,7 @@ main() { } } EOF -if { (eval echo configure:11390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_vfork_works=yes else @@ -11412,10 +11419,10 @@ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:11416: checking for working strcoll" >&5 +echo "configure:11423: checking for working strcoll" >&5 cat > conftest.$ac_ext < main () @@ -11425,7 +11432,7 @@ main () strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:11429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -11453,10 +11460,10 @@ fi for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11457: checking for $ac_func" >&5 +echo "configure:11464: 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:11490: \"$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 @@ -11507,10 +11514,10 @@ fi done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:11511: checking whether getpgrp takes no argument" >&5 +echo "configure:11518: 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:11576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -11592,10 +11599,10 @@ fi echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:11596: checking for working mmap" >&5 +echo "configure:11603: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext < #include @@ -11628,7 +11635,7 @@ int main (int argc, char *argv[]) return 1; } EOF -if { (eval echo configure:11632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -11654,9 +11661,9 @@ test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no if test "$rel_alloc $have_mmap" = "default yes"; then if test "$doug_lea_malloc" = "yes"; then echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6 -echo "configure:11658: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:11665: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext < int main() { @@ -11668,7 +11675,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:11672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -11693,15 +11700,15 @@ EOF ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:11697: checking for termios.h" >&5 +echo "configure:11704: 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:11705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11712: \"$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* @@ -11744,15 +11751,15 @@ else 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:11748: checking for termio.h" >&5 +echo "configure:11755: 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:11756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11763: \"$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* @@ -11784,10 +11791,10 @@ fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:11788: checking for socket" >&5 +echo "configure:11795: checking for socket" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11821: \"$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 @@ -11825,15 +11832,15 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then 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:11829: checking for netinet/in.h" >&5 +echo "configure:11836: 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:11837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11844: \"$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* @@ -11850,15 +11857,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 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:11854: checking for arpa/inet.h" >&5 +echo "configure:11861: 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:11862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11869: \"$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* @@ -11883,9 +11890,9 @@ EOF } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:11887: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:11894: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext < @@ -11896,7 +11903,7 @@ int main() { static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:11900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11907: \"$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 @@ -11914,9 +11921,9 @@ else fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:11918: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:11925: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext < @@ -11926,7 +11933,7 @@ int main() { static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:11930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11937: \"$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 @@ -11957,10 +11964,10 @@ fi echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:11961: checking for msgget" >&5 +echo "configure:11968: checking for msgget" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11994: \"$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 @@ -11998,15 +12005,15 @@ if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then 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:12002: checking for sys/ipc.h" >&5 +echo "configure:12009: 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:12010: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12017: \"$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* @@ -12023,15 +12030,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then 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:12027: checking for sys/msg.h" >&5 +echo "configure:12034: 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:12035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12042: \"$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* @@ -12069,15 +12076,15 @@ fi ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:12073: checking for dirent.h" >&5 +echo "configure:12080: 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:12081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12088: \"$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* @@ -12104,15 +12111,15 @@ else 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:12108: checking for sys/dir.h" >&5 +echo "configure:12115: 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:12116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12123: \"$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* @@ -12145,15 +12152,15 @@ fi ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:12149: checking for nlist.h" >&5 +echo "configure:12156: 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:12157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12164: \"$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* @@ -12183,22 +12190,22 @@ fi echo "checking "for sound support"" 1>&6 -echo "configure:12187: checking "for sound support"" >&5 +echo "configure:12194: checking "for sound support"" >&5 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes if test "$with_native_sound" != "no"; then 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:12194: checking for multimedia/audio_device.h" >&5 +echo "configure:12201: 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:12202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12209: \"$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* @@ -12246,12 +12253,12 @@ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:12250: checking for ALopenport in -laudio" >&5 +echo "configure:12257: 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:12273: \"$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 @@ -12293,12 +12300,12 @@ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:12297: checking for AOpenAudio in -lAlib" >&5 +echo "configure:12304: 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:12320: \"$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 @@ -12347,15 +12354,15 @@ fi 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:12351: checking for ${dir}/soundcard.h" >&5 +echo "configure:12358: 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:12359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12366: \"$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* @@ -12416,15 +12423,15 @@ fi if test "$with_nas_sound" != "no"; then ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6 -echo "configure:12420: checking for audio/audiolib.h" >&5 +echo "configure:12427: checking for audio/audiolib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12435: \"$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* @@ -12442,12 +12449,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:12446: checking for AuOpenServer in -laudio" >&5 +echo "configure:12453: checking for AuOpenServer in -laudio" >&5 ac_lib_var=`echo audio'_'AuOpenServer | 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:12469: \"$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 @@ -12497,7 +12504,7 @@ EOF fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext < EOF @@ -12528,7 +12535,7 @@ if test "$with_esd_sound" != "no"; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12532: checking for $ac_word" >&5 +echo "configure:12539: checking for $ac_word" >&5 if test -n "$have_esd_config"; then ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test. @@ -12557,10 +12564,10 @@ fi c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6 -echo "configure:12561: checking for esd_play_stream" >&5 +echo "configure:12568: checking for esd_play_stream" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_esd_play_stream=yes" else @@ -12634,7 +12641,7 @@ test -z "$with_tty" && with_tty=yes if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:12638: checking for TTY-related features" >&5 +echo "configure:12645: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -12650,12 +12657,12 @@ EOF if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:12654: checking for tgetent in -lncurses" >&5 +echo "configure:12661: 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:12677: \"$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 @@ -12699,15 +12706,15 @@ EOF ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:12703: checking for ncurses/curses.h" >&5 +echo "configure:12710: 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:12711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12718: \"$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* @@ -12729,15 +12736,15 @@ fi ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:12733: checking for ncurses/term.h" >&5 +echo "configure:12740: 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:12741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12748: \"$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* @@ -12767,15 +12774,15 @@ fi 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:12771: checking for ncurses/curses.h" >&5 +echo "configure:12778: 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:12779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12786: \"$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* @@ -12810,12 +12817,12 @@ fi for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:12814: checking for tgetent in -l$lib" >&5 +echo "configure:12821: 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:12837: \"$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 @@ -12857,12 +12864,12 @@ fi else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:12861: checking for tgetent in -lcurses" >&5 +echo "configure:12868: 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:12884: \"$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 @@ -12891,12 +12898,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:12895: checking for tgetent in -ltermcap" >&5 +echo "configure:12902: 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:12918: \"$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 @@ -12955,15 +12962,15 @@ EOF 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:12959: checking for gpm.h" >&5 +echo "configure:12966: 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:12967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12974: \"$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* @@ -12986,12 +12993,12 @@ fi } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:12990: checking for Gpm_Open in -lgpm" >&5 +echo "configure:12997: 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:13013: \"$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 @@ -13052,20 +13059,20 @@ test "$with_x11" = "yes" -o "$with_tty" = "yes" && extra_objs="$extra_objs event test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:13056: checking for database support" >&5 +echo "configure:13063: checking for database support" >&5 if test "$with_database_gdbm $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:13061: checking for ndbm.h" >&5 +echo "configure:13068: 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:13069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13076: \"$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* @@ -13095,12 +13102,12 @@ fi if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:13099: checking for dbm_open in -lgdbm" >&5 +echo "configure:13106: 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:13122: \"$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 @@ -13139,10 +13146,10 @@ fi if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:13143: checking for dbm_open" >&5 +echo "configure:13150: 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:13176: \"$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 @@ -13184,12 +13191,12 @@ else echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:13188: checking for dbm_open in -ldbm" >&5 +echo "configure:13195: 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:13211: \"$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 @@ -13241,10 +13248,10 @@ EOF if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:13245: checking for Berkeley db.h" >&5 +echo "configure:13252: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext < @@ -13266,7 +13273,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -13282,9 +13289,9 @@ rm -f conftest* if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:13286: checking for Berkeley DB version" >&5 +echo "configure:13293: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 1 @@ -13296,7 +13303,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 2 @@ -13323,10 +13330,10 @@ fi rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:13327: checking for $dbfunc" >&5 +echo "configure:13334: checking for $dbfunc" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13360: \"$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 @@ -13368,12 +13375,12 @@ else echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:13372: checking for $dbfunc in -ldb" >&5 +echo "configure:13379: 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:13395: \"$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 @@ -13448,12 +13455,12 @@ fi if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:13452: checking for SOCKSinit in -lsocks" >&5 +echo "configure:13459: 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:13475: \"$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 @@ -13519,22 +13526,22 @@ fi if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:13523: checking for module support" >&5 +echo "configure:13530: checking for module support" >&5 if test "$with_msw" = "yes"; then have_dl=yes; else ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:13530: checking for dlfcn.h" >&5 +echo "configure:13537: checking for dlfcn.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13545: \"$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* @@ -13550,82 +13557,49 @@ 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 dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:13556: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` - -xe_check_libs=" -ldl " -cat > conftest.$ac_ext <&6 +echo "configure:13562: checking for dlopen in -lc" >&5 + cat > conftest.$ac_ext < int main() { -dlopen() + dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:13572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13571: \"$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" + have_dl=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 - have_dl=yes libdl=dl -else - echo "$ac_t""no" 1>&6 - -echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:13591: checking for dlopen in -lc" >&5 -ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'` - -xe_check_libs=" -lc " -cat > conftest.$ac_ext <&6 +echo "configure:13580: checking for dlopen in -ldl" >&5 + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + cat > conftest.$ac_ext < int main() { -dlopen() + dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:13607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13591: \"$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" + have_dl=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + LIBS="$ac_save_LIBS" 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 - have_dl=yes -else - echo "$ac_t""no" 1>&6 + ac_save_LIBS= fi - - -fi - - +rm -f conftest* else echo "$ac_t""no" 1>&6 fi @@ -13642,12 +13616,12 @@ EOF else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:13646: checking for shl_load in -ldld" >&5 +echo "configure:13620: 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:13636: \"$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 @@ -13685,12 +13659,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:13689: checking for dld_init in -ldld" >&5 +echo "configure:13663: 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:13679: \"$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 @@ -13746,7 +13720,7 @@ xehost=$canonical xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:13750: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:13724: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; @@ -13774,9 +13748,9 @@ if test "$GCC" = "yes"; then XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:13778: checking checking whether we are using GNU C" >&5 +echo "configure:13752: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <&6 -echo "configure:13802: checking how to produce PIC code" >&5 +echo "configure:13776: checking how to produce PIC code" >&5 wl= can_build_shared=yes @@ -13894,18 +13868,18 @@ if test -n "$dll_cflags"; then # Check to make sure the dll_cflags actually works. echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6 -echo "configure:13898: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:13872: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also @@ -13936,7 +13910,7 @@ cc_produces_so=no xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:13940: checking if C compiler can produce shared libraries" >&5 +echo "configure:13914: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes; then xcldf="-shared" xldf="-shared" @@ -13987,14 +13961,14 @@ if test -n "$xcldf"; then xe_libs= ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else @@ -14019,7 +13993,7 @@ if test -z "$LTLD"; then if test "$XEGCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:14023: checking for ld used by GCC" >&5 +echo "configure:13997: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -14044,7 +14018,7 @@ echo "configure:14023: checking for ld used by GCC" >&5 esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:14048: checking for GNU ld" >&5 +echo "configure:14022: checking for GNU ld" >&5 fi if test -z "$LTLD"; then @@ -14082,7 +14056,7 @@ ld_dynamic_link_flags= # Check to see if it really is or isn't GNU ld. echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6 -echo "configure:14086: checking if the linker is GNU ld" >&5 +echo "configure:14060: checking if the linker is GNU ld" >&5 # I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LTLD -v 2>&1 &5; then xe_gnu_ld=yes @@ -14110,7 +14084,7 @@ else # OK - only NOW do we futz about with ld. # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6 -echo "configure:14114: checking whether the linker supports shared libraries" >&5 +echo "configure:14088: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes @@ -14325,10 +14299,10 @@ EOF for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14329: checking for $ac_func" >&5 +echo "configure:14303: 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:14329: \"$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 @@ -14390,11 +14364,11 @@ done fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:14372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -14580,6 +14554,7 @@ rm -f core + PREFIX=$prefix while true; do case "$PREFIX" in @@ -15322,6 +15297,7 @@ s%@instvardir@%$instvardir%g s%@srcdir@%$srcdir%g s%@pkgdir@%$pkgdir%g s%@statedir@%$statedir%g +s%@extra_includes@%$extra_includes%g s%@PREFIX_USER_DEFINED@%$PREFIX_USER_DEFINED%g s%@PREFIX@%$PREFIX%g s%@EXEC_PREFIX_USER_DEFINED@%$EXEC_PREFIX_USER_DEFINED%g diff --git a/configure.in b/configure.in index 422e2f7..ebad6d6 100644 --- a/configure.in +++ b/configure.in @@ -369,6 +369,7 @@ with_widgets='' with_dialogs='' with_file_coding='' cpp='' cppflags='' libs='' ldflags='' +extra_includes='' dynamic='' with_x11='' with_msw='' @@ -795,6 +796,7 @@ The default is to autodetect all sound support."]) a | at | ath | athe | athen | athena ) val=athena ;; n | no | non | none ) val=no ;; y | ye | yes ) val=yes ;; + m | ms | msw ) val=msw ;; * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;; esac @@ -1864,10 +1866,15 @@ test "$extra_verbose" = "yes" && \ have_terminfo mail_use_flock mail_use_lockf) && echo "" dnl Pick up mingw32 include path -case "$opsys" in mingw*) mingw_include=`eval "gcc -print-file-name=libc.a"` ; - mingw_include=`eval "dirname $mingw_include"` ; - mingw_include="-I$mingw_include/../include/mingw32" ; - XE_APPEND($mingw_include, c_switch_system) ;; +case "$opsys" in mingw* | cygwin*) + cygwin_include=`eval "gcc -print-file-name=libc.a"` ; + cygwin_include=`eval "dirname $cygwin_include"` ; + cygwin_include="-I$cygwin_include/../include" ; + extra_includes="$cygwin_include/mingw32 $cygwin_include/mingw $cygwin_include" ; + case "$opsys" in mingw*) + XE_APPEND($extra_includes, c_switch_system) ;; + esac + ;; esac dnl Non-ordinary link usually requires -lc @@ -4164,8 +4171,16 @@ if test "$with_modules" != "no"; then else dnl Find headers and libraries AC_CHECK_HEADER(dlfcn.h, [ - AC_CHECK_LIB(dl, dlopen, [ have_dl=yes libdl=dl], [ - AC_CHECK_LIB(c, dlopen, [ have_dl=yes ])])]) + AC_MSG_CHECKING([for dlopen in -lc]) + AC_TRY_LINK([#include ],dnl + [dlopen ("", 0);], [ have_dl=yes ], [ + AC_MSG_CHECKING([for dlopen in -ldl]) + ac_save_LIBS="$LIBS" + LIBS="-ldl $LIBS" + AC_TRY_LINK([#include ],dnl + [dlopen ("", 0);], [ have_dl=yes ], + [LIBS="$ac_save_LIBS"]) + ac_save_LIBS=])]) if test -n "$have_dl"; then AC_DEFINE(HAVE_DLOPEN) else @@ -4339,6 +4354,7 @@ AC_SUBST(pkgdir) AC_SUBST(statedir) AC_SUBST(libdir) AC_SUBST(mandir) +AC_SUBST(extra_includes) AC_SUBST(prefix) AC_SUBST(PREFIX_USER_DEFINED) diff --git a/info/internals.info b/info/internals.info index 9336f06..07e79dc 100644 --- a/info/internals.info +++ b/info/internals.info @@ -43,10 +43,10 @@ internals.info-1: 1776 internals.info-2: 46637 internals.info-3: 94562 internals.info-4: 144259 -internals.info-5: 194150 -internals.info-6: 243751 -internals.info-7: 287818 -internals.info-8: 336685 +internals.info-5: 194152 +internals.info-6: 243742 +internals.info-7: 287809 +internals.info-8: 336676  Tag Table: (Indirect) @@ -94,103 +94,103 @@ Node: GCPROing172449 Node: Garbage Collection - Step by Step179453 Node: Invocation179845 Node: garbage_collect_1182858 -Node: mark_object192338 -Node: gc_sweep194150 -Node: sweep_lcrecords_1199213 -Node: compact_string_chars200208 -Node: sweep_strings202388 -Node: sweep_bit_vectors_1203353 -Node: Integers and Characters204029 -Node: Allocation from Frob Blocks204781 -Node: lrecords206385 -Node: Low-level allocation218611 -Node: Cons222718 -Node: Vector223444 -Node: Bit Vector224021 -Node: Symbol224514 -Node: Marker224868 -Node: String225423 -Node: Compiled Function229036 -Node: Dumping229205 -Node: Overview231426 -Node: Data descriptions231996 -Node: Dumping phase234001 -Node: Object inventory234404 -Node: Address allocation237257 -Node: The header238646 -Node: Data dumping239153 -Node: Pointers dumping239814 -Node: Reloading phase241029 -Node: Remaining issues242790 -Node: Events and the Event Loop243751 -Node: Introduction to Events244201 -Node: Main Loop246150 -Node: Specifics of the Event Gathering Mechanism249725 -Node: Specifics About the Emacs Event262178 -Node: The Event Stream Callback Routines262433 -Node: Other Event Loop Functions262678 -Node: Converting Events263818 -Node: Dispatching Events; The Command Builder264427 -Node: Evaluation; Stack Frames; Bindings264662 -Node: Evaluation265004 -Node: Dynamic Binding; The specbinding Stack; Unwind-Protects271559 -Node: Simple Special Forms273943 -Node: Catch and Throw274726 -Node: Symbols and Variables277301 -Node: Introduction to Symbols277565 -Node: Obarrays278633 -Node: Symbol Values282166 -Node: Buffers and Textual Representation284454 -Node: Introduction to Buffers285112 -Node: The Text in a Buffer287818 -Node: Buffer Lists294968 -Node: Markers and Extents296919 -Node: Bufbytes and Emchars299184 -Node: The Buffer Object299399 -Node: MULE Character Sets and Encodings302879 -Node: Character Sets303941 -Node: Encodings307426 -Node: Japanese EUC (Extended Unix Code)308493 -Node: JIS7309325 -Node: Internal Mule Encodings310675 -Node: Internal String Encoding312505 -Node: Internal Character Encoding314650 -Node: CCL316374 -Node: The Lisp Reader and Compiler323127 -Node: Lstreams323340 -Node: Creating an Lstream324371 -Node: Lstream Types325598 -Node: Lstream Functions325850 -Node: Lstream Methods329416 -Node: Consoles; Devices; Frames; Windows332558 -Node: Introduction to Consoles; Devices; Frames; Windows332873 -Node: Point335406 -Node: Window Hierarchy336685 -Node: The Window Object341137 -Node: The Redisplay Mechanism344574 -Node: Critical Redisplay Sections345366 -Node: Line Start Cache346353 -Node: Redisplay Piece by Piece349589 -Node: Extents351626 -Node: Introduction to Extents352160 -Node: Extent Ordering353302 -Node: Format of the Extent Info354543 -Node: Zero-Length Extents356430 -Node: Mathematics of Extent Ordering357830 -Node: Extent Fragments362587 -Node: Faces363673 -Node: Glyphs363789 -Node: Specifiers365976 -Node: Menus366105 -Node: Subprocesses368363 -Node: Interface to the X Window System370349 -Node: Lucid Widget Library370630 -Node: Generic Widget Interface371921 -Node: Scrollbars375480 -Node: Menubars375623 -Node: Checkboxes and Radio Buttons375766 -Node: Progress Bars375952 -Node: Tab Controls376112 -Node: Index376233 +Node: mark_object192340 +Node: gc_sweep194152 +Node: sweep_lcrecords_1199215 +Node: compact_string_chars200210 +Node: sweep_strings202390 +Node: sweep_bit_vectors_1203355 +Node: Integers and Characters204031 +Node: Allocation from Frob Blocks204783 +Node: lrecords206387 +Node: Low-level allocation218613 +Node: Cons222720 +Node: Vector223446 +Node: Bit Vector224023 +Node: Symbol224516 +Node: Marker224870 +Node: String225425 +Node: Compiled Function229038 +Node: Dumping229207 +Node: Overview231428 +Node: Data descriptions231998 +Node: Dumping phase234003 +Node: Object inventory234406 +Node: Address allocation237342 +Node: The header238731 +Node: Data dumping239176 +Node: Pointers dumping239837 +Node: Reloading phase241227 +Node: Remaining issues242781 +Node: Events and the Event Loop243742 +Node: Introduction to Events244192 +Node: Main Loop246141 +Node: Specifics of the Event Gathering Mechanism249716 +Node: Specifics About the Emacs Event262169 +Node: The Event Stream Callback Routines262424 +Node: Other Event Loop Functions262669 +Node: Converting Events263809 +Node: Dispatching Events; The Command Builder264418 +Node: Evaluation; Stack Frames; Bindings264653 +Node: Evaluation264995 +Node: Dynamic Binding; The specbinding Stack; Unwind-Protects271550 +Node: Simple Special Forms273934 +Node: Catch and Throw274717 +Node: Symbols and Variables277292 +Node: Introduction to Symbols277556 +Node: Obarrays278624 +Node: Symbol Values282157 +Node: Buffers and Textual Representation284445 +Node: Introduction to Buffers285103 +Node: The Text in a Buffer287809 +Node: Buffer Lists294959 +Node: Markers and Extents296910 +Node: Bufbytes and Emchars299175 +Node: The Buffer Object299390 +Node: MULE Character Sets and Encodings302870 +Node: Character Sets303932 +Node: Encodings307417 +Node: Japanese EUC (Extended Unix Code)308484 +Node: JIS7309316 +Node: Internal Mule Encodings310666 +Node: Internal String Encoding312496 +Node: Internal Character Encoding314641 +Node: CCL316365 +Node: The Lisp Reader and Compiler323118 +Node: Lstreams323331 +Node: Creating an Lstream324362 +Node: Lstream Types325589 +Node: Lstream Functions325841 +Node: Lstream Methods329407 +Node: Consoles; Devices; Frames; Windows332549 +Node: Introduction to Consoles; Devices; Frames; Windows332864 +Node: Point335397 +Node: Window Hierarchy336676 +Node: The Window Object341128 +Node: The Redisplay Mechanism344565 +Node: Critical Redisplay Sections345357 +Node: Line Start Cache346344 +Node: Redisplay Piece by Piece349580 +Node: Extents351617 +Node: Introduction to Extents352151 +Node: Extent Ordering353293 +Node: Format of the Extent Info354534 +Node: Zero-Length Extents356421 +Node: Mathematics of Extent Ordering357821 +Node: Extent Fragments362578 +Node: Faces363664 +Node: Glyphs363780 +Node: Specifiers365967 +Node: Menus366096 +Node: Subprocesses368354 +Node: Interface to the X Window System370340 +Node: Lucid Widget Library370621 +Node: Generic Widget Interface371912 +Node: Scrollbars375471 +Node: Menubars375614 +Node: Checkboxes and Radio Buttons375757 +Node: Progress Bars375943 +Node: Tab Controls376103 +Node: Index376224  End Tag Table diff --git a/info/texinfo.info b/info/texinfo.info index 88624fb..1f73e7f 100644 --- a/info/texinfo.info +++ b/info/texinfo.info @@ -35,17 +35,17 @@ translation approved by the Free Software Foundation.  Indirect: texinfo.info-1: 1484 -texinfo.info-2: 48703 -texinfo.info-3: 96677 -texinfo.info-4: 146069 -texinfo.info-5: 196056 -texinfo.info-6: 245148 -texinfo.info-7: 293743 -texinfo.info-8: 343558 -texinfo.info-9: 392871 -texinfo.info-10: 435249 -texinfo.info-11: 481365 -texinfo.info-12: 519525 +texinfo.info-2: 48707 +texinfo.info-3: 96681 +texinfo.info-4: 146073 +texinfo.info-5: 196055 +texinfo.info-6: 245147 +texinfo.info-7: 293746 +texinfo.info-8: 343561 +texinfo.info-9: 392874 +texinfo.info-10: 435252 +texinfo.info-11: 481368 +texinfo.info-12: 519528  Tag Table: (Indirect) @@ -55,296 +55,296 @@ Node: Overview25804 Node: Overview-Footnotes27233 Ref: Overview-Footnote-127297 Node: Using Texinfo27769 -Node: Info Files30252 -Node: Info Files-Footnotes34288 -Ref: Info Files-Footnote-134356 -Node: Printed Books34535 -Node: Printed Books-Footnotes37207 -Ref: Printed Books-Footnote-137281 -Node: Formatting Commands37491 -Node: Formatting Commands-Footnotes40318 -Ref: Formatting Commands-Footnote-140404 -Node: Conventions41020 -Node: Comments43582 -Node: Minimum45005 -Node: Six Parts47191 -Node: Short Sample48703 -Node: Acknowledgements52839 -Node: Texinfo Mode53674 -Node: Texinfo Mode Overview55046 -Node: Emacs Editing55822 -Node: Inserting57952 -Node: Showing the Structure62233 -Node: Updating Nodes and Menus64760 -Node: Updating Commands65833 -Node: Updating Requirements71894 -Node: Other Updating Commands74191 -Node: Info Formatting77459 -Node: Printing78717 -Node: Texinfo Mode Summary81062 -Node: Beginning a File85816 -Node: Four Parts86707 -Node: Sample Beginning88177 -Node: Header89797 -Node: First Line91149 -Node: Start of Header92138 -Node: setfilename92851 -Node: settitle94787 -Node: setchapternewpage96677 -Node: paragraphindent99438 -Node: End of Header100920 -Node: Info Summary and Permissions101759 -Node: Titlepage & Copyright Page102778 -Node: titlepage104384 -Node: titlepage-Footnotes106666 -Ref: titlepage-Footnote-1106732 -Node: titlefont center sp107006 -Node: title subtitle author108232 -Node: Copyright & Permissions110504 -Node: end titlepage112505 -Node: headings on off114211 -Node: The Top Node116256 -Node: Title of Top Node117411 -Node: Master Menu Parts118664 -Node: Software Copying Permissions120901 -Node: Ending a File122069 -Node: Printing Indices & Menus122917 -Node: Contents125226 -Node: File End127566 -Node: Structuring128239 -Node: Tree Structuring129896 -Node: Structuring Command Types131339 -Node: makeinfo top133666 -Node: chapter134199 -Node: unnumbered & appendix135223 -Node: majorheading & chapheading136062 -Node: section136883 -Node: unnumberedsec appendixsec heading137647 -Node: subsection138636 -Node: unnumberedsubsec appendixsubsec subheading139208 -Node: subsubsection140161 -Node: Raise/lower sections141711 -Node: Nodes143846 -Node: Two Paths144783 -Node: Node Menu Illustration146069 -Node: node149764 -Node: Node Names152460 -Node: Writing a Node153536 -Node: Node Line Tips155554 -Node: Node Line Requirements156348 -Node: First Node157949 -Node: makeinfo top command159393 -Node: Top Node Summary160572 -Node: makeinfo Pointer Creation162022 -Node: Menus163269 -Node: Menus-Footnotes164208 -Ref: Menus-Footnote-1164266 -Node: Menu Location164559 -Node: Writing a Menu166236 -Node: Menu Parts167202 -Node: Less Cluttered Menu Entry168360 -Node: Menu Example168985 -Node: Other Info Files170506 -Node: Cross References172374 -Node: References173331 -Node: Cross Reference Commands175078 -Node: Cross Reference Parts176137 -Node: xref178973 -Node: Reference Syntax179772 -Node: One Argument181426 -Node: Two Arguments182438 -Node: Three Arguments183553 -Node: Four and Five Arguments185944 -Node: Top Node Naming188356 -Node: ref189366 -Node: pxref190758 -Node: inforef193140 -Node: uref194433 -Node: Marking Text195432 -Node: Indicating196056 -Node: Useful Highlighting197961 -Node: code199350 -Node: kbd202388 -Node: key204258 -Node: samp205591 -Node: var207178 -Node: file208971 -Node: dfn209578 -Node: cite210488 -Node: url210942 -Node: email211506 -Node: Emphasis212318 -Node: emph & strong213218 -Node: Smallcaps214204 -Node: Fonts215531 -Node: Customized Highlighting216619 -Node: Customized Highlighting-Footnotes219434 -Ref: Customized Highlighting-Footnote-1219528 -Node: Quotations and Examples219654 -Node: Block Enclosing Commands221276 -Node: quotation223301 -Node: example224391 -Node: noindent226446 -Node: Lisp Example227910 -Node: Lisp Example-Footnotes228612 -Ref: Lisp Example-Footnote-1228684 -Node: smallexample & smalllisp228802 -Node: display230827 -Node: format231459 -Node: exdent231920 -Node: flushleft & flushright233000 -Node: cartouche234266 -Node: Lists and Tables235033 -Node: Introducing Lists235709 -Node: itemize237374 -Node: enumerate239521 -Node: Two-column Tables242026 -Node: table242715 -Node: ftable vtable245148 -Node: itemx246249 -Node: Multi-column Tables247260 -Node: Multitable Column Widths247931 -Node: Multitable Rows249385 -Node: Indices251162 -Node: Index Entries252312 -Node: Predefined Indices253445 -Node: Indexing Commands254442 -Node: Combining Indices258982 -Node: syncodeindex260345 -Node: synindex262007 -Node: New Indices262532 -Node: Insertions264357 -Node: Braces Atsigns265541 -Node: Inserting An Atsign266093 -Node: Inserting Braces266367 -Node: Inserting Space266730 -Node: Not Ending a Sentence267234 -Node: Ending a Sentence268588 -Node: Multiple Spaces269717 -Node: dmn270936 -Node: Inserting Accents272143 -Node: Dots Bullets273900 -Node: dots274722 -Node: bullet275246 -Node: TeX and copyright275643 -Node: tex276210 -Node: copyright symbol276626 -Node: pounds276886 -Node: minus277250 -Node: math278172 -Node: Glyphs278900 -Node: Glyphs Summary280013 -Node: result280641 -Node: expansion281126 -Node: Print Glyph282082 -Node: Error Glyph282959 -Node: Equivalence283792 -Node: Point Glyph284480 -Node: Images286037 -Node: Breaks287704 -Node: Break Commands289135 -Node: Line Breaks289976 -Node: - and hyphenation290994 -Node: w292244 -Node: sp292957 -Node: page293366 -Node: group293743 -Node: need295486 -Node: Definition Commands296216 -Node: Def Cmd Template297787 -Node: Optional Arguments300784 -Node: deffnx302372 -Node: Def Cmds in Detail303327 -Node: Functions Commands304437 -Node: Variables Commands307442 -Node: Typed Functions309528 -Node: Typed Variables313070 -Node: Abstract Objects315053 -Node: Data Types320278 -Node: Def Cmd Conventions321533 -Node: Sample Function Definition322096 -Node: Footnotes324980 -Node: Footnotes-Footnotes325368 -Ref: Footnotes-Footnote-1325434 -Node: Footnote Commands325714 -Node: Footnote Commands-Footnotes327211 -Ref: Footnote Commands-Footnote-1327293 -Node: Footnote Styles327329 -Node: Conditionals329915 -Node: Conditional Commands330726 -Node: Conditional Not Commands332219 -Node: Raw Formatter Commands332964 -Node: set clear value334794 -Node: ifset ifclear335595 -Node: value338774 -Node: value Example340186 -Node: Macros341764 -Node: Defining Macros342469 -Node: Invoking Macros343558 -Node: Format/Print Hardcopy344664 -Node: Use TeX346501 -Node: Format with tex/texindex347129 -Node: Format with texi2dvi350770 -Node: Print with lpr351361 -Node: Within Emacs352215 -Node: Texinfo Mode Printing353134 -Node: Compile-Command356544 -Node: Requirements Summary357432 -Node: Preparing for TeX358745 -Node: Overfull hboxes361532 -Node: smallbook363091 -Node: A4 Paper364609 -Node: Cropmarks and Magnification365834 -Node: Create an Info File367775 -Node: makeinfo advantages369078 -Node: Invoking makeinfo369994 -Node: makeinfo options370682 -Node: Pointer Validation376166 -Node: makeinfo in Emacs377510 -Node: texinfo-format commands380068 -Node: Batch Formatting381339 -Node: Tag and Split Files382555 -Node: Install an Info File385909 -Node: Directory file386727 -Node: New Info File388595 -Node: Other Info Directories389656 -Node: Installing Dir Entries392871 -Node: Invoking install-info394864 -Node: Command List397279 -Node: Tips435249 -Node: Sample Texinfo File446659 -Node: Sample Permissions448778 -Node: Inserting Permissions449821 -Node: ifinfo Permissions452127 -Node: Titlepage Permissions453748 -Node: Include Files455010 -Node: Using Include Files456097 -Node: texinfo-multiple-files-update458052 -Node: Include File Requirements460413 -Node: Sample Include File461658 -Node: Include Files Evolution463177 -Node: Headings465148 -Node: Headings Introduced465785 -Node: Heading Format467673 -Node: Heading Choice470125 -Node: Custom Headings471497 -Node: Catching Mistakes475825 -Node: makeinfo Preferred477114 -Node: Debugging with Info478019 -Node: Debugging with TeX481365 -Node: Using texinfo-show-structure485645 -Node: Using occur488744 -Node: Running Info-Validate490281 -Node: Using Info-validate491342 -Node: Unsplit493184 -Node: Tagifying494230 -Node: Splitting495082 -Node: Refilling Paragraphs496698 -Node: Refilling Paragraphs-Footnotes498352 -Ref: Refilling Paragraphs-Footnote-1498440 -Node: Command Syntax498603 -Node: Obtaining TeX501560 -Node: Command and Variable Index503673 -Node: Concept Index519525 +Node: Info Files30256 +Node: Info Files-Footnotes34292 +Ref: Info Files-Footnote-134360 +Node: Printed Books34539 +Node: Printed Books-Footnotes37211 +Ref: Printed Books-Footnote-137285 +Node: Formatting Commands37495 +Node: Formatting Commands-Footnotes40322 +Ref: Formatting Commands-Footnote-140408 +Node: Conventions41024 +Node: Comments43586 +Node: Minimum45009 +Node: Six Parts47195 +Node: Short Sample48707 +Node: Acknowledgements52843 +Node: Texinfo Mode53678 +Node: Texinfo Mode Overview55050 +Node: Emacs Editing55826 +Node: Inserting57956 +Node: Showing the Structure62237 +Node: Updating Nodes and Menus64764 +Node: Updating Commands65837 +Node: Updating Requirements71898 +Node: Other Updating Commands74195 +Node: Info Formatting77463 +Node: Printing78721 +Node: Texinfo Mode Summary81066 +Node: Beginning a File85820 +Node: Four Parts86711 +Node: Sample Beginning88181 +Node: Header89801 +Node: First Line91153 +Node: Start of Header92142 +Node: setfilename92855 +Node: settitle94791 +Node: setchapternewpage96681 +Node: paragraphindent99442 +Node: End of Header100924 +Node: Info Summary and Permissions101763 +Node: Titlepage & Copyright Page102782 +Node: titlepage104388 +Node: titlepage-Footnotes106670 +Ref: titlepage-Footnote-1106736 +Node: titlefont center sp107010 +Node: title subtitle author108236 +Node: Copyright & Permissions110508 +Node: end titlepage112509 +Node: headings on off114215 +Node: The Top Node116260 +Node: Title of Top Node117415 +Node: Master Menu Parts118668 +Node: Software Copying Permissions120905 +Node: Ending a File122073 +Node: Printing Indices & Menus122921 +Node: Contents125230 +Node: File End127570 +Node: Structuring128243 +Node: Tree Structuring129900 +Node: Structuring Command Types131343 +Node: makeinfo top133670 +Node: chapter134203 +Node: unnumbered & appendix135227 +Node: majorheading & chapheading136066 +Node: section136887 +Node: unnumberedsec appendixsec heading137651 +Node: subsection138640 +Node: unnumberedsubsec appendixsubsec subheading139212 +Node: subsubsection140165 +Node: Raise/lower sections141715 +Node: Nodes143850 +Node: Two Paths144787 +Node: Node Menu Illustration146073 +Node: node149768 +Node: Node Names152464 +Node: Writing a Node153540 +Node: Node Line Tips155558 +Node: Node Line Requirements156352 +Node: First Node157953 +Node: makeinfo top command159392 +Node: Top Node Summary160571 +Node: makeinfo Pointer Creation162021 +Node: Menus163268 +Node: Menus-Footnotes164207 +Ref: Menus-Footnote-1164265 +Node: Menu Location164558 +Node: Writing a Menu166235 +Node: Menu Parts167201 +Node: Less Cluttered Menu Entry168359 +Node: Menu Example168984 +Node: Other Info Files170505 +Node: Cross References172373 +Node: References173330 +Node: Cross Reference Commands175077 +Node: Cross Reference Parts176136 +Node: xref178972 +Node: Reference Syntax179771 +Node: One Argument181425 +Node: Two Arguments182437 +Node: Three Arguments183552 +Node: Four and Five Arguments185943 +Node: Top Node Naming188355 +Node: ref189365 +Node: pxref190757 +Node: inforef193139 +Node: uref194432 +Node: Marking Text195431 +Node: Indicating196055 +Node: Useful Highlighting197960 +Node: code199349 +Node: kbd202387 +Node: key204257 +Node: samp205590 +Node: var207177 +Node: file208970 +Node: dfn209577 +Node: cite210487 +Node: url210941 +Node: email211505 +Node: Emphasis212317 +Node: emph & strong213217 +Node: Smallcaps214203 +Node: Fonts215530 +Node: Customized Highlighting216618 +Node: Customized Highlighting-Footnotes219433 +Ref: Customized Highlighting-Footnote-1219527 +Node: Quotations and Examples219653 +Node: Block Enclosing Commands221275 +Node: quotation223300 +Node: example224390 +Node: noindent226445 +Node: Lisp Example227909 +Node: Lisp Example-Footnotes228611 +Ref: Lisp Example-Footnote-1228683 +Node: smallexample & smalllisp228801 +Node: display230826 +Node: format231458 +Node: exdent231919 +Node: flushleft & flushright232999 +Node: cartouche234265 +Node: Lists and Tables235032 +Node: Introducing Lists235708 +Node: itemize237373 +Node: enumerate239520 +Node: Two-column Tables242025 +Node: table242714 +Node: ftable vtable245147 +Node: itemx246248 +Node: Multi-column Tables247259 +Node: Multitable Column Widths247930 +Node: Multitable Rows249384 +Node: Indices251165 +Node: Index Entries252315 +Node: Predefined Indices253448 +Node: Indexing Commands254445 +Node: Combining Indices258985 +Node: syncodeindex260348 +Node: synindex262010 +Node: New Indices262535 +Node: Insertions264360 +Node: Braces Atsigns265544 +Node: Inserting An Atsign266096 +Node: Inserting Braces266370 +Node: Inserting Space266733 +Node: Not Ending a Sentence267237 +Node: Ending a Sentence268591 +Node: Multiple Spaces269720 +Node: dmn270939 +Node: Inserting Accents272146 +Node: Dots Bullets273903 +Node: dots274725 +Node: bullet275249 +Node: TeX and copyright275646 +Node: tex276213 +Node: copyright symbol276629 +Node: pounds276889 +Node: minus277253 +Node: math278175 +Node: Glyphs278903 +Node: Glyphs Summary280016 +Node: result280644 +Node: expansion281129 +Node: Print Glyph282085 +Node: Error Glyph282962 +Node: Equivalence283795 +Node: Point Glyph284483 +Node: Images286040 +Node: Breaks287707 +Node: Break Commands289138 +Node: Line Breaks289979 +Node: - and hyphenation290997 +Node: w292247 +Node: sp292960 +Node: page293369 +Node: group293746 +Node: need295489 +Node: Definition Commands296219 +Node: Def Cmd Template297790 +Node: Optional Arguments300787 +Node: deffnx302375 +Node: Def Cmds in Detail303330 +Node: Functions Commands304440 +Node: Variables Commands307445 +Node: Typed Functions309531 +Node: Typed Variables313073 +Node: Abstract Objects315056 +Node: Data Types320281 +Node: Def Cmd Conventions321536 +Node: Sample Function Definition322099 +Node: Footnotes324983 +Node: Footnotes-Footnotes325371 +Ref: Footnotes-Footnote-1325437 +Node: Footnote Commands325717 +Node: Footnote Commands-Footnotes327214 +Ref: Footnote Commands-Footnote-1327296 +Node: Footnote Styles327332 +Node: Conditionals329918 +Node: Conditional Commands330729 +Node: Conditional Not Commands332222 +Node: Raw Formatter Commands332967 +Node: set clear value334797 +Node: ifset ifclear335598 +Node: value338777 +Node: value Example340189 +Node: Macros341767 +Node: Defining Macros342472 +Node: Invoking Macros343561 +Node: Format/Print Hardcopy344667 +Node: Use TeX346504 +Node: Format with tex/texindex347132 +Node: Format with texi2dvi350773 +Node: Print with lpr351364 +Node: Within Emacs352218 +Node: Texinfo Mode Printing353137 +Node: Compile-Command356547 +Node: Requirements Summary357435 +Node: Preparing for TeX358748 +Node: Overfull hboxes361535 +Node: smallbook363094 +Node: A4 Paper364612 +Node: Cropmarks and Magnification365837 +Node: Create an Info File367778 +Node: makeinfo advantages369081 +Node: Invoking makeinfo369997 +Node: makeinfo options370685 +Node: Pointer Validation376169 +Node: makeinfo in Emacs377513 +Node: texinfo-format commands380071 +Node: Batch Formatting381342 +Node: Tag and Split Files382558 +Node: Install an Info File385912 +Node: Directory file386730 +Node: New Info File388598 +Node: Other Info Directories389659 +Node: Installing Dir Entries392874 +Node: Invoking install-info394867 +Node: Command List397282 +Node: Tips435252 +Node: Sample Texinfo File446662 +Node: Sample Permissions448781 +Node: Inserting Permissions449824 +Node: ifinfo Permissions452130 +Node: Titlepage Permissions453751 +Node: Include Files455013 +Node: Using Include Files456100 +Node: texinfo-multiple-files-update458055 +Node: Include File Requirements460416 +Node: Sample Include File461661 +Node: Include Files Evolution463180 +Node: Headings465151 +Node: Headings Introduced465788 +Node: Heading Format467676 +Node: Heading Choice470128 +Node: Custom Headings471500 +Node: Catching Mistakes475828 +Node: makeinfo Preferred477117 +Node: Debugging with Info478022 +Node: Debugging with TeX481368 +Node: Using texinfo-show-structure485648 +Node: Using occur488747 +Node: Running Info-Validate490284 +Node: Using Info-validate491345 +Node: Unsplit493187 +Node: Tagifying494233 +Node: Splitting495085 +Node: Refilling Paragraphs496701 +Node: Refilling Paragraphs-Footnotes498355 +Ref: Refilling Paragraphs-Footnote-1498443 +Node: Command Syntax498606 +Node: Obtaining TeX501563 +Node: Command and Variable Index503676 +Node: Concept Index519528  End Tag Table diff --git a/info/texinfo.info-1 b/info/texinfo.info-1 index f31fc03..ffb02ba 100644 --- a/info/texinfo.info-1 +++ b/info/texinfo.info-1 @@ -604,8 +604,8 @@ menu-driven, on-line Info file with nodes, menus, cross references, and indices. You can, if you wish, make the chapters and sections of the printed document correspond to the nodes of the on-line information; and you use the same cross references and indices for both the Info -file and the printed work. `The GNU Emacs Manual' is a good example of -a Texinfo file, as is this manual. +file and the printed work. `The XEmacs User's Manual' is a good +example of a Texinfo file, as is this manual. To make a printed document, you process a Texinfo source file with the TeX typesetting program. This creates a DVI file that you can typeset diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 792f924..151a0a1 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2001-01-17 Martin Buchholz + + * XEmacs 21.2.41 "Polyhymnia" is released. + 2001-01-08 Martin Buchholz * XEmacs 21.2.40 is released. diff --git a/lib-src/config.values.in b/lib-src/config.values.in index e71f67b..a0cb7ef 100644 --- a/lib-src/config.values.in +++ b/lib-src/config.values.in @@ -90,6 +90,7 @@ docdir "@docdir@" dynodump_arch "@dynodump_arch@" etcdir "@etcdir@" exec_prefix "@exec_prefix@" +extra_includes "@extra_includes@" extra_objs "@extra_objs@" have_esd_config "@have_esd_config@" includedir "@includedir@" diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26d5dcd..26912e7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,59 @@ +2001-01-17 Martin Buchholz + + * XEmacs 21.2.41 "Polyhymnia" is released. + +2001-01-16 Mike Sperber + + * setup-paths.el (paths-core-load-path-depth): Stopgap bump to + catch lisp/mule/. + +2001-01-14 Mike Sperber + + * startup.el (maybe-create-compatibility-dot-emacs): + (maybe-unmigrate-user-init-file): + (unmigrate-user-init-file): Created. + (maybe-migrate-user-init-file): Offer creation of compatibility + .emacs. + Some doc fixes wrt init file location. + +2001-01-15 Golubev I. N. + + * faces.el (face-frob-from-locale-first): new variable. + (frob-face-font-2): Honor tags arg while trying to use + standard-face-mapping. When face-frob-from-locale-first is set, + first try to set face inheriting from frobbed-face. + +2001-01-15 Didier Verna + + * about.el (xemacs-hackers): update my entry. + * about.el (about-url-alist): ditto. + * about.el (about-maintainer-info): ditto. + * about.el (about-hackers): ditto. + +2001-01-15 Martin Buchholz + + The byte compiler has been badly broken for a year, + by the patch of 1999-12-06. + * byte-optimize.el (byte-optimize-form-code-walker): + Bug was: the byte compiler was making this erroneous optimization: + (progn (or (foo)) (bar)) ==> (bar) + +2000-11-20 Mike Sperber + + * setup-paths.el (paths-core-load-path-depth): Split + `paths-load-path-depth' in two for site and core lisp. Don't + recurse into core. + * setup-paths.el (paths-construct-load-path): Use. + +2001-01-10 Andy Piper + + * package-net.el (package-net-cygwin32-binary-size): new variable + (package-net-win32-binary-size): ditto. add much needed + commentary. + + * gutter-items.el (buffers-tab-items): correct off-by-one error + for buffers-tab-max-size. + 2001-01-08 Martin Buchholz * XEmacs 21.2.40 is released. diff --git a/lisp/about.el b/lisp/about.el index ac32ccb..decbd08 100644 --- a/lisp/about.el +++ b/lisp/about.el @@ -63,7 +63,7 @@ (cthomp "Chuck Thompson" "cthomp@xemacs.org") (dmoore "David Moore" "dmoore@ucsd.edu") (dkindred "Darrell Kindred" "dkindred@cmu.edu") - (dv "Didier Verna" "verna@inf.enst.fr") + (dv "Didier Verna" "didier@xemacs.org") (hniksic "Hrvoje Niksic" "hniksic@xemacs.org") (jareth "Jareth Hein" "jareth@camelot.co.jp") (jason "Jason Mastaler" "jason@xemacs.org") @@ -108,6 +108,7 @@ (chr . "http://www.xemacs.org/faq/") (dkindred . "http://www.cs.cmu.edu/People/dkindred/me.html") (dmoore . "http://oj.egbt.org/dmoore/") + (dv . "http://www.lrde.epita.fr/~didier/") (jason . "http://www.mastaler.com/") (juhp . "http://www.kurims.kyoto-u.ac.jp/~petersen/") (jwz . "http://www.jwz.org/") @@ -900,14 +901,23 @@ a software development firm. See ") (widget-insert ".\n")) (dv (widget-insert "\ -I'm currently working (Ph.D.) on the cognitive aspects of -Human-Machine Interaction in Virtual Environments, and especialy on -the possibility of adding (artificial) intelligence between the system -and the operator, in order to detect the intentions of the latter. - -Otherwise, I'm, say, 35.82% professional Jazz guitar player, -which means that's not the way I earn my crust, but things may very -well reverse in the future ...\n")) +I graduated at ENST (an engineering school in Paris) and have a Ph.D. +in computer science. I'm currently a teacher at EPITA (another +engineering school, still in Paris) and a researcher at LRDE (EPITA's +research and development laboratory). Our research topics include +generic programming and distributed virtual reality. + +Apart from XEmacs, I'm also involved in other free software projects, +including Gnus, BBDB, and the GNU \"autotools\". I also wrote some +LaTeX packages (ugh :-). + +All of this, actually, is only 60% true. Two days per week, I'm also a +semi-professional Jazz guitar player (and singer), which means that it +is not the way I earn my crust, but things may very well reverse in +the future ...\n\n") + (widget-insert "Visit Didier's home page: ") + (about-url-link 'dv "Visit Didier's home page") + (widget-insert "\n")) (rossini (widget-insert "\ Author of the first XEmacs FAQ, as well as minor priest in the @@ -1135,10 +1145,10 @@ XEmacs will speak Scheme.\n") Vin helps maintain the older, more mature (read: moldy) versions of XEmacs. Vin has maintained the official XEmacs patch pages.\n") (about-show-linked-info 'thiessel "\ -Worked at University of Kaiserslautern where he took part in the +Worked at University of Kaiserslautern where he took part in the development and design of a CAD framework for analog integrated -circuits with special emphasis on distributed software concepts. He -has now joined HP as technical consultant. +circuits with special emphasis on distributed software concepts. He +has now joined HP as technical consultant. For XEmacs he does beta testing and tries to take care of XEmacs website at .\n") @@ -1163,14 +1173,16 @@ Darrell is currently a doctoral student in computer science at Carnegie Mellon University, but he's trying hard to kick that habit.\n") (about-show-linked-info 'dv "\ -I'm currently working (Ph.D.) on the cognitive aspects of -Human-Machine Interaction in Virtual Environments, and especialy on -the possibility of adding (artificial) intelligence between the system -and the operator, in order to detect the intentions of the latter. - -Otherwise, I'm, say, 35.82% professional Jazz guitar player, -which means that's not the way I earn my crust, but things may very -well reverse in the future ...\n") +I joined the development of XEmacs in 1996, and have been one of the +core maintainers since 1998. Although I'm mostly interested in the +GUI, ergonomics, redisplay and autoconf issues, it's probably simpler +to describe what I'm *not* involved in: I've never touched the Lisp +implementation, and I probably never will... + +I'm the author of the multicast support, I wrote and maintain some +external Emacs Lisp packages (including mchat) and I'm also +responsible for some of the core Lisp code (including the rectangle +library which I rewrote for both XEmacs and GNU Emacs).\n") (about-show-linked-info 'marcpa "\ I work for Positron Industries Inc., Public Safety Division.\n") (about-show-linked-info 'pez "\ @@ -1259,9 +1271,9 @@ extensions.\n") Perennial Emacs hacker since 1986 or so, when he first started on GNU Emacs 17.something. Over the years, he's developed \"OEmacs\", the first version of GNU Emacs 19 for MSDOS, and \"bigperl\", a 32-bit version of -Perl4 for MSDOS. In recent years, reality has intruded and he no longer +Perl4 for MSDOS. In recent years, reality has intruded and he no longer has much time for playing with cool programs. What little time he has -now goes to XEmacs hacking, where he's worked on speeding up dired under +now goes to XEmacs hacking, where he's worked on speeding up dired under MS Windows, and to feeding his two cats.\n") "\n\ In addition to those just mentioned, the following people have spent a diff --git a/lisp/auto-autoloads.el b/lisp/auto-autoloads.el index cec581d..3881e9a 100644 --- a/lisp/auto-autoloads.el +++ b/lisp/auto-autoloads.el @@ -528,7 +528,7 @@ Check that OBJECT is of type TYPE. TYPE is a Common Lisp-style type specifier." nil nil) (autoload 'check-type "cl-macs" "\ -Verify that FORM is of type TYPE; signal an error if not. +Verify that PLACE is of type TYPE; signal a continuable error if not. STRING is an optional description of the desired type." nil 'macro) (autoload 'assert "cl-macs" "\ @@ -1544,6 +1544,17 @@ Fetch and install the latest versions of all customized packages." t nil) ;;;*** +;;;### (autoloads (package-net-update-installed-db package-net-setup-directory) "package-net" "lisp/package-net.el") + +(autoload 'package-net-setup-directory "package-net" nil nil nil) + +(autoload 'package-net-update-installed-db "package-net" "\ +Write out the installed package index in a net install suitable format. +If DESTDIR is non-nil then use that as the destination directory. +DESTDIR defaults to the value of `package-net-setup-directory'." nil nil) + +;;;*** + ;;;### (autoloads (pui-list-packages pui-add-install-directory package-ui-add-site) "package-ui" "lisp/package-ui.el") (autoload 'package-ui-add-site "package-ui" "\ diff --git a/lisp/byte-optimize.el b/lisp/byte-optimize.el index ff6edde..f591e82 100644 --- a/lisp/byte-optimize.el +++ b/lisp/byte-optimize.el @@ -473,12 +473,12 @@ (if (and (cdr form) (null backwards)) (byte-compile-log " all subforms of %s called for effect; deleted" form)) - (and backwards - ;; Now optimize the rest of the forms. We need the return - ;; values. We already did the car. - (setcdr backwards - (mapcar 'byte-optimize-form (cdr backwards))) - (cons fn (nreverse backwards)))) + (when backwards + ;; Now optimize the rest of the forms. We need the return + ;; values. We already did the car. + (setcdr backwards + (mapcar 'byte-optimize-form (cdr backwards)))) + (cons fn (nreverse backwards))) (cons fn (mapcar 'byte-optimize-form (cdr form))))) ((eq fn 'interactive) diff --git a/lisp/cl-macs.el b/lisp/cl-macs.el index 5a9ab08..05d88da 100644 --- a/lisp/cl-macs.el +++ b/lisp/cl-macs.el @@ -150,11 +150,41 @@ ARGLIST allows full Common Lisp conventions." (defvar bind-block) (defvar bind-defs) (defvar bind-enquote) (defvar bind-inits) (defvar bind-lets) (defvar bind-forms) +;; npak@ispras.ru +(defun cl-upcase-arg (arg) + ;; Changes all non-keyword sysmbols in `arg' to symbols + ;; with name in upper case. + ;; arg is either symbol or list of symbols or lists + (cond ((symbolp arg) + (if (memq arg lambda-list-keywords) + ;; Do not upcase &optional, &key etc. + arg + (intern (upcase (symbol-name arg))))) + ((listp arg) + (mapcar 'cl-upcase-arg arg)))) + +;; npak@ispras.ru +(defun cl-function-arglist (function agrlist) + "Returns string with printed representation of arguments list. +Supports Common Lisp lambda lists." + (prin1-to-string + (cons function (cl-upcase-arg agrlist)))) + (defun cl-transform-lambda (form bind-block) (let* ((args (car form)) (body (cdr form)) (bind-defs nil) (bind-enquote nil) (bind-inits nil) (bind-lets nil) (bind-forms nil) - (header nil) (simple-args nil)) + (header nil) (simple-args nil) + (doc "")) + ;; Add CL lambda list to documentation. npak@ispras.ru + (if (stringp (car body)) + (setq doc (cl-pop body))) + (cl-push (concat "\nCommon Lisp lambda list:\n" + " " (cl-function-arglist bind-block args) + "\n\n" + doc) + header) + (while (or (stringp (car body)) (eq (car-safe (car body)) 'interactive)) (cl-push (cl-pop body) header)) (setq args (if (listp args) (copy-list args) (list '&rest args))) diff --git a/lisp/faces.el b/lisp/faces.el index d14b45b..568c7ae 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -907,6 +907,12 @@ the function to be called on it." (setq inst-list (cdr inst-list))) (or result first-valid))) +(defcustom face-frob-from-locale-first nil + "*If non nil, use kludgy way of frobbing fonts suitable for non-mule +multi-charset environments." + :group 'faces + :type 'boolean) + (defun frob-face-font-2 (face locale tags unfrobbed-face frobbed-face tty-thunk ws-thunk standard-face-mapping) ;; another kludge to make things more intuitive. If we're @@ -924,14 +930,20 @@ the function to be called on it." (let* ((the-locale (cond ((null locale) 'global) ((valid-specifier-locale-p locale) locale) (t nil))) - (specs (and the-locale (face-font face the-locale nil t))) - (change-it (and specs (cdr (assoc specs standard-face-mapping))))) + (spec-list + (and + the-locale + (specifier-spec-list (get (get-face face) 'font) the-locale tags t))) + (change-it + (and + spec-list + (cdr (assoc (cdadar spec-list) standard-face-mapping))))) (if (and change-it (not (memq (face-name (find-face face)) '(default bold italic bold-italic)))) (progn (or (equal change-it t) - (set-face-property face 'font change-it the-locale)) + (set-face-property face 'font change-it the-locale tags)) (funcall tty-thunk)) (let* ((domain (cond ((null the-locale) nil) ((valid-specifier-domain-p the-locale) the-locale) @@ -942,20 +954,34 @@ the function to be called on it." (selected-device)) (t nil))) (inst (and domain (face-property-instance face 'font domain)))) - (funcall tty-thunk) - (funcall ws-thunk) ;; If it's reasonable to do the inherit-from-standard-face trick, ;; and it's called for, then do it now. - (or (null domain) - (not (equal inst (face-property-instance face 'font domain))) - ;; don't do it for standard faces, or you'll get inheritance loops. - ;; #### This makes XEmacs seg fault! fix this bug. - (memq (face-name (find-face face)) - '(default bold italic bold-italic)) - (not (equal (face-property-instance face 'font domain) - (face-property-instance unfrobbed-face 'font domain))) + (if (and + face-frob-from-locale-first + (eq the-locale 'global) + domain + (equal inst (face-property-instance face 'font domain)) + ;; don't do it for standard faces, or you'll get inheritance loops. + ;; #### This makes XEmacs seg fault! fix this bug. + (not (memq (face-name (find-face face)) + '(default bold italic bold-italic))) + (equal (face-property-instance face 'font domain) + (face-property-instance unfrobbed-face 'font domain))) (set-face-property face 'font (vector frobbed-face) - the-locale tags)))))) + the-locale tags) + ;; and only otherwise try to build new property value artificially + (funcall tty-thunk) + (funcall ws-thunk) + (and + domain + (equal inst (face-property-instance face 'font domain)) + ;; don't do it for standard faces, or you'll get inheritance loops. + ;; #### This makes XEmacs seg fault! fix this bug. + (not (memq (face-name (find-face face)) + '(default bold italic bold-italic))) + (equal (face-property-instance face 'font domain) + (face-property-instance unfrobbed-face 'font domain)) + (set-face-property face 'font (vector frobbed-face) the-locale tags))))))) (defun make-face-bold (face &optional locale tags) "Make FACE bold in LOCALE, if possible. diff --git a/lisp/gutter-items.el b/lisp/gutter-items.el index fab1de4..b63504a 100644 --- a/lisp/gutter-items.el +++ b/lisp/gutter-items.el @@ -277,7 +277,7 @@ redefining the function `format-buffers-menu-line'." (and (integerp buffers-tab-max-size) (> buffers-tab-max-size 1) (> (length buffers) buffers-tab-max-size) - (setcdr (nthcdr buffers-tab-max-size buffers) nil)) + (setcdr (nthcdr (1- buffers-tab-max-size) buffers) nil)) ;; sort buffers in group (default is most-recently-selected) (when buffers-tab-sort-function (setq buffers (funcall buffers-tab-sort-function buffers))) diff --git a/lisp/mule/auto-autoloads.el b/lisp/mule/auto-autoloads.el index 54ca28f..78c9da6 100644 --- a/lisp/mule/auto-autoloads.el +++ b/lisp/mule/auto-autoloads.el @@ -1,10 +1,7 @@ ;;; DO NOT MODIFY THIS FILE (if (featurep 'mule-autoloads) (error "Already loaded")) -;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program declare-ccl-program ccl-dump ccl-compile ccl-program-p) "mule-ccl" "mule/mule-ccl.el") - -(autoload 'ccl-program-p "mule-ccl" "\ -Return t if OBJECT is a valid CCL compiled code." nil nil) +;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program declare-ccl-program ccl-dump ccl-compile) "mule-ccl" "mule/mule-ccl.el") (autoload 'ccl-compile "mule-ccl" "\ Return a compiled code of CCL-PROGRAM as a vector of integer." nil nil) @@ -15,25 +12,233 @@ Disassemble compiled CCL-CODE." nil nil) (autoload 'declare-ccl-program "mule-ccl" "\ Declare NAME as a name of CCL program. -To compile a CCL program which calls another CCL program not yet -defined, it must be declared as a CCL program in advance. +This macro exists for backward compatibility. In the old version of +Emacs, to compile a CCL program which calls another CCL program not +yet defined, it must be declared as a CCL program in advance. But, +now CCL program names are resolved not at compile time but before +execution. + Optional arg VECTOR is a compiled CCL code of the CCL program." nil 'macro) (autoload 'define-ccl-program "mule-ccl" "\ Set NAME the compiled code of CCL-PROGRAM. -CCL-PROGRAM is `eval'ed before being handed to the CCL compiler `ccl-compile'. -The compiled code is a vector of integers." nil 'macro) + +CCL-PROGRAM has this form: + (BUFFER_MAGNIFICATION + CCL_MAIN_CODE + [ CCL_EOF_CODE ]) + +BUFFER_MAGNIFICATION is an integer value specifying the approximate +output buffer magnification size compared with the bytes of input data +text. If the value is zero, the CCL program can't execute `read' and +`write' commands. + +CCL_MAIN_CODE and CCL_EOF_CODE are CCL program codes. CCL_MAIN_CODE +executed at first. If there's no more input data when `read' command +is executed in CCL_MAIN_CODE, CCL_EOF_CODE is executed. If +CCL_MAIN_CODE is terminated, CCL_EOF_CODE is not executed. + +Here's the syntax of CCL program code in BNF notation. The lines +starting by two semicolons (and optional leading spaces) describe the +semantics. + +CCL_MAIN_CODE := CCL_BLOCK + +CCL_EOF_CODE := CCL_BLOCK + +CCL_BLOCK := STATEMENT | (STATEMENT [STATEMENT ...]) + +STATEMENT := + SET | IF | BRANCH | LOOP | REPEAT | BREAK | READ | WRITE | CALL + | TRANSLATE | END + +SET := (REG = EXPRESSION) + | (REG ASSIGNMENT_OPERATOR EXPRESSION) + ;; The following form is the same as (r0 = integer). + | integer + +EXPRESSION := ARG | (EXPRESSION OPERATOR ARG) + +;; Evaluate EXPRESSION. If the result is nonzeor, execute +;; CCL_BLOCK_0. Otherwise, execute CCL_BLOCK_1. +IF := (if EXPRESSION CCL_BLOCK_0 CCL_BLOCK_1) + +;; Evaluate EXPRESSION. Provided that the result is N, execute +;; CCL_BLOCK_N. +BRANCH := (branch EXPRESSION CCL_BLOCK_0 [CCL_BLOCK_1 ...]) + +;; Execute STATEMENTs until (break) or (end) is executed. +LOOP := (loop STATEMENT [STATEMENT ...]) + +;; Terminate the most inner loop. +BREAK := (break) + +REPEAT := + ;; Jump to the head of the most inner loop. + (repeat) + ;; Same as: ((write [REG | integer | string]) + ;; (repeat)) + | (write-repeat [REG | integer | string]) + ;; Same as: ((write REG [ARRAY]) + ;; (read REG) + ;; (repeat)) + | (write-read-repeat REG [ARRAY]) + ;; Same as: ((write integer) + ;; (read REG) + ;; (repeat)) + | (write-read-repeat REG integer) + +READ := ;; Set REG_0 to a byte read from the input text, set REG_1 + ;; to the next byte read, and so on. + (read REG_0 [REG_1 ...]) + ;; Same as: ((read REG) + ;; (if (REG OPERATOR ARG) CCL_BLOCK_0 CCL_BLOCK_1)) + | (read-if (REG OPERATOR ARG) CCL_BLOCK_0 CCL_BLOCK_1) + ;; Same as: ((read REG) + ;; (branch REG CCL_BLOCK_0 [CCL_BLOCK_1 ...])) + | (read-branch REG CCL_BLOCK_0 [CCL_BLOCK_1 ...]) + ;; Read a character from the input text while parsing + ;; multibyte representation, set REG_0 to the charset ID of + ;; the character, set REG_1 to the code point of the + ;; character. If the dimension of charset is two, set REG_1 + ;; to ((CODE0 << 8) | CODE1), where CODE0 is the first code + ;; point and CODE1 is the second code point. + | (read-multibyte-character REG_0 REG_1) + +WRITE := + ;; Write REG_0, REG_1, ... to the output buffer. If REG_N is + ;; a multibyte character, write the corresponding multibyte + ;; representation. + (write REG_0 [REG_1 ...]) + ;; Same as: ((r7 = EXPRESSION) + ;; (write r7)) + | (write EXPRESSION) + ;; Write the value of `integer' to the output buffer. If it + ;; is a multibyte character, write the corresponding multibyte + ;; representation. + | (write integer) + ;; Write the byte sequence of `string' as is to the output + ;; buffer. It is encoded by binary coding system, thus, + ;; by this operation, you cannot write multibyte string + ;; as it is. + | (write string) + ;; Same as: (write string) + | string + ;; Provided that the value of REG is N, write Nth element of + ;; ARRAY to the output buffer. If it is a multibyte + ;; character, write the corresponding multibyte + ;; representation. + | (write REG ARRAY) + ;; Write a multibyte representation of a character whose + ;; charset ID is REG_0 and code point is REG_1. If the + ;; dimension of the charset is two, REG_1 should be ((CODE0 << + ;; 8) | CODE1), where CODE0 is the first code point and CODE1 + ;; is the second code point of the character. + | (write-multibyte-character REG_0 REG_1) + +;; Call CCL program whose name is ccl-program-name. +CALL := (call ccl-program-name) + +;; Terminate the CCL program. +END := (end) + +;; CCL registers that can contain any integer value. As r7 is also +;; used by CCL interpreter, its value is changed unexpectedly. +REG := r0 | r1 | r2 | r3 | r4 | r5 | r6 | r7 + +ARG := REG | integer + +OPERATOR := + ;; Normal arithmethic operators (same meaning as C code). + + | - | * | / | % + + ;; Bitwize operators (same meaning as C code) + | & | `|' | ^ + + ;; Shifting operators (same meaning as C code) + | << | >> + + ;; (REG = ARG_0 <8 ARG_1) means: + ;; (REG = ((ARG_0 << 8) | ARG_1)) + | <8 + + ;; (REG = ARG_0 >8 ARG_1) means: + ;; ((REG = (ARG_0 >> 8)) + ;; (r7 = (ARG_0 & 255))) + | >8 + + ;; (REG = ARG_0 // ARG_1) means: + ;; ((REG = (ARG_0 / ARG_1)) + ;; (r7 = (ARG_0 % ARG_1))) + | // + + ;; Normal comparing operators (same meaning as C code) + | < | > | == | <= | >= | != + + ;; If ARG_0 and ARG_1 are higher and lower byte of Shift-JIS + ;; code, and CHAR is the corresponding JISX0208 character, + ;; (REG = ARG_0 de-sjis ARG_1) means: + ;; ((REG = CODE0) + ;; (r7 = CODE1)) + ;; where CODE0 is the first code point of CHAR, CODE1 is the + ;; second code point of CHAR. + | de-sjis + + ;; If ARG_0 and ARG_1 are the first and second code point of + ;; JISX0208 character CHAR, and SJIS is the correponding + ;; Shift-JIS code, + ;; (REG = ARG_0 en-sjis ARG_1) means: + ;; ((REG = HIGH) + ;; (r7 = LOW)) + ;; where HIGH is the higher byte of SJIS, LOW is the lower + ;; byte of SJIS. + | en-sjis + +ASSIGNMENT_OPERATOR := + ;; Same meaning as C code + += | -= | *= | /= | %= | &= | `|=' | ^= | <<= | >>= + + ;; (REG <8= ARG) is the same as: + ;; ((REG <<= 8) + ;; (REG |= ARG)) + | <8= + + ;; (REG >8= ARG) is the same as: + ;; ((r7 = (REG & 255)) + ;; (REG >>= 8)) + + ;; (REG //= ARG) is the same as: + ;; ((r7 = (REG % ARG)) + ;; (REG /= ARG)) + | //= + +ARRAY := `[' integer ... `]' + + +TRANSLATE := + (translate-character REG(table) REG(charset) REG(codepoint)) + | (translate-character SYMBOL REG(charset) REG(codepoint)) +MAP := + (iterate-multiple-map REG REG MAP-IDs) + | (map-multiple REG REG (MAP-SET)) + | (map-single REG REG MAP-ID) +MAP-IDs := MAP-ID ... +MAP-SET := MAP-IDs | (MAP-IDs) MAP-SET +MAP-ID := integer +" nil 'macro) (autoload 'check-ccl-program "mule-ccl" "\ Check validity of CCL-PROGRAM. -If CCL-PROGRAM is a symbol denoting a valid CCL program, return +If CCL-PROGRAM is a symbol denoting a CCL program, return CCL-PROGRAM, else return nil. If CCL-PROGRAM is a vector and optional arg NAME (symbol) is supplied, register CCL-PROGRAM by name NAME, and return NAME." nil 'macro) (autoload 'ccl-execute-with-args "mule-ccl" "\ Execute CCL-PROGRAM with registers initialized by the remaining args. -The return value is a vector of resulting CCL registers." nil nil) +The return value is a vector of resulting CCL registers. + +See the documentation of `define-ccl-program' for the detail of CCL program." nil nil) ;;;*** diff --git a/lisp/package-net.el b/lisp/package-net.el index fbc36ff..63199c5 100644 --- a/lisp/package-net.el +++ b/lisp/package-net.el @@ -27,6 +27,61 @@ ;; Manipulate packages for the netinstall setup utility +;; The process should be so: + +;; 1. The package maintainer or release manager makes a release +;; announcement. +;; +;; 2. For a new package releases the netinstall maintainer simply +;; needs to update `ftp://ftp.xemacs.org/pub/xemacs/setup.ini'. This is +;; harder than it sounds because the file also includes information +;; about the binary releases. At the moment going to the netinstall +;; directory and typing: +;; +;; `make XEMACS= setup.ini' +;; +;; will do the right thing provided that: +;; +;; (a) `package-net-cygwin32-binary-size' and +;; `package-net-win32-binary-size' are set correctly. +;; +;; (b) The binary pointed to by `XEMACS' has a current +;; `package-index.LATEST.pgp' file. If you don't specify the XEMACS= +;; part then you will get whatever is current for your build tree - +;; which is probably not what you want. +;; +;; You can run `package-net-convert-index-to-ini' manually and specify +;; REMOTE but I generally found that to be inconvenient and error-prone. +;; +;; 3. For package releases that's all you need to do. For binary +;; releases you need to build both cygwin and win32 binaries and put +;; them in appropriate tarballs: +;; +;; For cygwin, configure, make and install and then do (this is for +;; 21.1.13): +;; +;; cd +;; tar cvzf xemacs-i686-pc-cygwin32-21.1.13.tar.gz \ +;; ./bin/i686-pc-cygwin32 ./lib/xemacs-21.1.13 \ +;; ./lib/xemacs/lock ./man/man1/xemacs.1 \ +;; ./man/man1/ctags.1 ./man/man1/gnu*.1' +;; +;; Note that the naming of the package is important. Don't be tempted +;; to change the order in any way. +;; +;; For win32 build and install the release and then (again for +;; 21.1.13): +;; +;; cd +;; tar cvzf xemacs-i386-pc-win32-21.1.13.tar.gz ./XEmacs-21.1.13 +;; +;; The binaries should be uploaded to +;; `ftp://ftp.xemacs.org/pub/xemacs/binaries/cygwin32' and +;; `ftp://ftp.xemacs.org/pub/xemacs/binaries/win32' respectively. Take +;; a note of their sizes and set `package-net-cygwin32-binary-size' +;; and `package-net-win32-binary-size' appropriately in this file and +;; then follow step 2. + (require 'package-admin) (require 'package-get) @@ -35,6 +90,22 @@ ;; bootstrap the process. This will be: ;; /setup/ for native windows ;; /lib/xemacs/setup for cygwin. +;; +;;; To Do: +;; +;; 1. Package update functions should also update the installed +;; database so that running setup.exe again does not reinstall +;; packages. +;; +;; 2. Generating setup.ini should be more automatic. + +(defvar package-net-cygwin32-binary-size 6917126 + "The size in bytes of the cygwin32 binary distribution.") + +(defvar package-net-win32-binary-size 6563941 + "The size in bytes of the win32 binary distribution.") + +;;;###autoload (defun package-net-setup-directory () (file-truename (concat data-directory "../../" (if (eq system-type 'cygwin32) "xemacs/setup/" "setup/")))) @@ -59,31 +130,34 @@ DESTDIR defaults to the value of `data-directory'." (+ (* (car (current-time)) 65536) (car (cdr (current-time)))))) (insert (format "setup-version: %s\n\n" (or version "1.0"))) ;; Native version - ;; We give the package a capitalised name so that it appears at the top - (insert (format "@ %s\n" "xemacs-i586-pc-win32")) + (insert (format "@ %s\n" "xemacs-i386-pc-win32")) (insert (format "version: %s\n" emacs-program-version)) (insert "type: native\n") (insert (format "install: binaries/win32/%s %d\n\n" (concat emacs-program-name - "-i586-pc-win32-" - emacs-program-version ".tar.gz") 0)) + "-i386-pc-win32-" + emacs-program-version ".tar.gz") + package-net-win32-binary-size)) ;; Cygwin version - ;; We give the package a capitalised name so that it appears at the top (insert (format "@ %s\n" "xemacs-i686-pc-cygwin32")) (insert (format "version: %s\n" emacs-program-version)) (insert "type: cygwin\n") (insert (format "install: binaries/cygwin32/%s %d\n\n" (concat emacs-program-name "-i686-pc-cygwin32-" - emacs-program-version ".tar.gz") 6779200)) + emacs-program-version ".tar.gz") + package-net-cygwin32-binary-size)) ;; Standard packages (while entries (setq entry (car entries)) (setq plist (car (cdr entry))) - (insert (format "@ %s\n" (symbol-name (car entry)))) - (insert (format "version: %s\n" (plist-get plist 'version))) - (insert (format "install: packages/%s %s\n" (plist-get plist 'filename) - (plist-get plist 'size))) + ;; ignore mule packages + (unless (or (memq 'mule-base (plist-get plist 'requires)) + (eq 'mule-base (car entry))) + (insert (format "@ %s\n" (symbol-name (car entry)))) + (insert (format "version: %s\n" (plist-get plist 'version))) + (insert (format "install: packages/%s %s\n" (plist-get plist 'filename) + (plist-get plist 'size))) ;; These are not supported as yet ;; ;; (insert (format "source: %s\n" (plist-get plist 'source))) @@ -91,12 +165,22 @@ DESTDIR defaults to the value of `data-directory'." ;; (insert (format "version: %s\n" (plist-get plist 'version))) ;; (insert (format "install: %s\n" (plist-get plist 'filename))) ;; (insert (format "source: %s\n" (plist-get plist 'source))) - (insert "\n") + (insert "\n")) (setq entries (cdr entries)))) (insert "# setup.ini file ends here\n") (write-region (point-min) (point-max) (concat destdir "setup.ini"))) (kill-buffer buf)))) +(defun package-net-batch-convert-index-to-ini () + "Convert the package index to ini file format." + (unless noninteractive + (error "`package-net-batch-convert-index-to-ini' is to be used only with -batch")) + (let ((dir (car command-line-args-left)) + (version (car (cdr command-line-args-left))) + (package-get-require-signed-base-updates nil)) + (package-net-convert-index-to-ini dir nil version))) + +;;;###autoload (defun package-net-update-installed-db (&optional destdir) "Write out the installed package index in a net install suitable format. If DESTDIR is non-nil then use that as the destination directory. diff --git a/lisp/setup-paths.el b/lisp/setup-paths.el index f26dad8..d22ba46 100644 --- a/lisp/setup-paths.el +++ b/lisp/setup-paths.el @@ -38,9 +38,12 @@ ;;; Code: -(defvar paths-load-path-depth 1 +(defvar paths-core-load-path-depth 1 "Depth of load-path searches in core Lisp paths.") +(defvar paths-site-load-path-depth 1 + "Depth of load-path searches in site Lisp paths.") + (defvar paths-default-info-directories (mapcar (function (lambda (dirlist) @@ -87,11 +90,11 @@ (site-lisp-load-path (and site-lisp-directory (paths-find-recursive-load-path (list site-lisp-directory) - paths-load-path-depth))) + paths-site-load-path-depth))) (lisp-load-path (and lisp-directory (paths-find-recursive-load-path (list lisp-directory) - paths-load-path-depth)))) + paths-core-load-path-depth)))) (append env-load-path early-package-load-path site-lisp-load-path @@ -109,11 +112,11 @@ (site-module-load-path (and site-module-directory (paths-find-recursive-load-path (list site-module-directory) - paths-load-path-depth))) + paths-site-load-path-depth))) (module-load-path (and module-directory (paths-find-recursive-load-path (list module-directory) - paths-load-path-depth)))) + paths-core-load-path-depth)))) (append env-module-path site-module-load-path module-load-path))) diff --git a/lisp/startup.el b/lisp/startup.el index 49985b7..27298b9 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -77,9 +77,9 @@ The frame system uses this to open frames to display messages while XEmacs loads the user's initialization file.") (defvar after-init-hook nil - "*Functions to call after loading the init file (`.emacs'). + "*Functions to call after loading the init file. The call is not protected by a condition-case, so you can set `debug-on-error' -in `.emacs', and put all the actual code on `after-init-hook'.") +in the init file, and put all the actual code on `after-init-hook'.") (defvar term-setup-hook nil "*Functions to be called after loading terminal-specific Lisp code. @@ -238,7 +238,7 @@ In addition, the") -debug-init Enter the debugger if an error in the init file occurs. -unmapped Do not map the initial frame. -no-site-file Do not load the site-specific init file (site-start.el). - -no-init-file Do not load the user-specific init file (~/.emacs). + -no-init-file Do not load the user-specific init file. -no-early-packages Do not process early packages. -no-autoloads Do not load global symbol files (auto-autoloads) at startup. Also implies `-vanilla'. @@ -247,8 +247,6 @@ In addition, the") -user-init-file Use as init file. -user-init-directory Use as init directory. -user Load user's init file instead of your own. - Equivalent to -user-init-file ~/.emacs - -user-init-directory ~/.xemacs/ -u Same as -user.\n") (let ((l command-switch-alist) (insert (lambda (&rest x) @@ -437,7 +435,7 @@ Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n") (unwind-protect (command-line) - ;; Do this again, in case .emacs defined more abbreviations. + ;; Do this again, in case the init file defined more abbreviations. (setq default-directory (abbreviate-file-name default-directory)) ;; Specify the file for recording all the auto save files of ;; this session. This is used by recover-session. @@ -452,7 +450,7 @@ Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n") (and term-setup-hook (run-hooks 'term-setup-hook)) (setq term-setup-hook nil) - ;; ;; Modify the initial frame based on what .emacs puts into + ;; ;; Modify the initial frame based on what the init file puts into ;; ;; ...-frame-alist. (frame-notice-user-settings) ;; ;;####FSFmacs junk @@ -705,6 +703,9 @@ After the migration, init.el/init.elc holds user-written initialization code. Moreover the customize settings will be in custom.el. +You can undo the migration at any time with +M-x maybe-unmigrate-user-init-file. + If you choose not to do this now, XEmacs will not ask you this question in the future. However, you can still make XEmacs perform the migration at any time with M-x migrate-user-init-file.") @@ -712,9 +713,26 @@ perform the migration at any time with M-x migrate-user-init-file.") (yes-or-no-p-minibuf (concat "Migrate init file to " user-init-directory "? ")))) - (migrate-user-init-file) + (progn + (migrate-user-init-file) + (maybe-create-compatibility-dot-emacs)) (customize-save-variable 'load-home-init-file t)))) +(defun maybe-create-compatibility-dot-emacs () + "Ask user if she wants to create a .emacs compatibility file." + (if (with-output-to-temp-buffer (help-buffer-name nil) + (progn + (princ "The initialization code has now been migrated to the ") + (princ user-init-directory) + (princ "directory. + +For backwards compatibility with, for example, older versions of XEmacs, +XEmacs can create a special old-style .emacs file in your home +directory which will load the relocated initialization code.") + (show-temp-buffer-in-current-frame standard-output) + (yes-or-no-p-minibuf "Create compatibility .emacs? "))) + (create-compatibility-dot-emacs))) + (defun migrate-user-init-file () "Migrate the init file from the home directory." (interactive) @@ -723,14 +741,54 @@ perform the migration at any time with M-x migrate-user-init-file.") (message "Creating %s directory..." user-init-directory) (make-directory user-init-directory))) (message "Migrating custom file...") + (customize-set-value 'load-home-init-file nil) (custom-migrate-custom-file (make-custom-file-name user-init-file 'force-new)) (message "Moving init file...") - (rename-file user-init-file - (expand-file-name user-init-file-base - user-init-directory)) + (let ((new-user-init-file (expand-file-name user-init-file-base + user-init-directory))) + (rename-file user-init-file new-user-init-file) + (setq user-init-file new-user-init-file)) (message "Migration done.")) +(defun create-compatibility-dot-emacs () + "Create .emacs compatibility file for migrated setup." + (message "Creating .emacs compatibility file.") + (with-temp-file (expand-file-name ".emacs" "~") + (insert ";;; XEmacs backwards compatibility file\n") + (insert "(setq user-init-file\n") + (insert " (expand-file-name \"init.el\"\n") + (insert " (expand-file-name \".xemacs\" \"~\")))\n") + (insert "(setq custom-file\n") + (insert " (expand-file-name \"custom.el\"\n") + (insert " (expand-file-name \".xemacs\" \"~\")))\n") + (insert "\n") + (insert "(load-file user-init-file)\n") + (insert "(load-file custom-file)")) + (message "Created .emacs compatibility file.")) + +(defun maybe-unmigrate-user-init-file () + "Possibly unmigrate the user's init and custom files." + (interactive) + (let ((dot-emacs-file-name (expand-file-name ".emacs" "~"))) + (if (and (not load-home-init-file) + (or (not (file-exists-p dot-emacs-file-name)) + (yes-or-no-p-minibuf (concat "Overwrite " dot-emacs-file-name + "? ")))) + (unmigrate-user-init-file dot-emacs-file-name)))) + +(defun unmigrate-user-init-file (&optional target-file-name) + "Unmigrate the user's init and custom files." + (interactive) + (let ((target-file-name + (or target-file-name (expand-file-name ".emacs" "~")))) + (rename-file user-init-file target-file-name 'ok-if-already-exists) + (setq user-init-file target-file-name) + (let ((old-custom-file custom-file)) + (custom-migrate-custom-file target-file-name) + (customize-save-variable 'load-home-init-file t) + (delete-file old-custom-file)))) + (defun load-user-init-file () "This function actually reads the init file." (if (not user-init-file) diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 9c8c6e8..39bf349 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,7 @@ +2001-01-17 Martin Buchholz + + * XEmacs 21.2.41 "Polyhymnia" is released. + 2001-01-08 Martin Buchholz * XEmacs 21.2.40 is released. diff --git a/man/ChangeLog b/man/ChangeLog index 1816c40..18db821 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,27 @@ +2001-01-17 Martin Buchholz + + * XEmacs 21.2.41 "Polyhymnia" is released. + +2001-01-12 Martin Buchholz + + * internals/internals.texi: A little post-pdump-rename fixup. + +2001-01-13 Martin Buchholz + + * internals/internals.texi: See `pdump-rename' in src/ChangeLog. + +2001-01-10 Martin Buchholz + + * internals/internals.texi: Update for pdump changes. + +2001-01-04 Adrian Aichner + + * texinfo.texi (Using Texinfo): Change reference from GNU Emacs to + XEmacs. + * texinfo.texi (First Node): Fixing grammar. + * texinfo.texi (Multitable Rows): Change reference from GNU Emacs + to XEmacs. + 2001-01-08 Martin Buchholz * XEmacs 21.2.40 is released. diff --git a/man/internals/internals.texi b/man/internals/internals.texi index d4bbfd2..8cc49ad 100644 --- a/man/internals/internals.texi +++ b/man/internals/internals.texi @@ -4867,7 +4867,7 @@ shown in their processed order: @itemize @bullet @item all constant symbols and static variables that are registered via -@code{staticpro}@ in the array @code{staticvec}. +@code{staticpro}@ in the dynarr @code{staticpros}. @xref{Adding Global Lisp Variables}. @item all Lisp objects that are created in C functions and that must be @@ -5877,9 +5877,9 @@ follow pointers to C structures and opaque data in addition to Lisp_Object members. @end enumerate -This is done by @code{pdump_register_object}, which handles Lisp_Object -variables, and pdump_register_struct which handles C structures, which -both delegate the description management to pdump_register_sub. +This is done by @code{pdump_register_object()}, which handles Lisp_Object +variables, and @code{pdump_register_struct()} which handles C structures, +which both delegate the description management to @code{pdump_register_sub()}. The hash table doubles as a map object to pdump_entry_list_elmt (i.e. allows us to look up a pdump_entry_list_elmt with the object it points @@ -5896,11 +5896,13 @@ the @code{staticpro}'ed variables (there is a special @code{staticpro_nodump()} call for protected variables we do not want to dump). @item -the @code{pdump_wire}'d variables (@code{staticpro()} is equivalent to -@code{staticpro_nodump()} + @code{pdump_wire()}). +the variables registered via @code{dump_add_root_object} +(@code{staticpro()} is equivalent to @code{staticpro_nodump()} + +@code{dump_add_root_object()}). @item -the @code{dumpstruct}'ed variables, which points to C structures. +the variables registered via @code{dump_add_root_struct_ptr}, each of +which points to a C structure. @end enumerate This does not include the GCPRO'ed variables, the specbinds, the @@ -5953,11 +5955,10 @@ alignments happy). @subsection The header The next step creates the file and writes a header with a signature and -some random information in it (number of staticpro, number of assigned -lrecord types, etc...). The reloc_address field, which indicates at -which address the file should be loaded if we want to avoid post-reload -relocation, is set to 0. It then seeks to offset 256 (base offset for -the objects). +some random information in it. The @code{reloc_address} field, which +indicates at which address the file should be loaded if we want to avoid +post-reload relocation, is set to 0. It then seeks to offset 256 (base +offset for the objects). @node Data dumping, Pointers dumping, The header, Dumping phase @subsection Data dumping @@ -5979,29 +5980,32 @@ then written. They are: @enumerate @item -the staticpro array +the pdump_root_struct_ptrs dynarr @item -the dumpstruct array -@item -the lrecord_implementation_table array +the pdump_opaques dynarr @item a vector of all the offsets to the objects in the file that include a description (for faster relocation at reload time) @item -the pdump_wire and pdump_wire_list arrays +the pdump_root_objects and pdump_weak_object_chains dynarrs. @end enumerate -For each of the arrays we write both the pointer to the variables and +For each of the dynarrs we write both the pointer to the variables and the relocated offset of the object they point to. Since these variables are global, the pointers are still valid when restarting the program and are used to regenerate the global pointers. -The @code{pdump_wire_list} array is a special case. The variables it -points to are the head of weak linked lists of lisp objects of the same -type. Not all objects of this list are dumped so the relocated pointer -we associate with them points to the first dumped object of the list, or -Qnil if none is available. This is also the reason why they are not -used as roots for the purpose of object enumeration. +The @code{pdump_weak_object_chains} dynarr is a special case. The +variables it points to are the head of weak linked lists of lisp objects +of the same type. Not all objects of this list are dumped so the +relocated pointer we associate with them points to the first dumped +object of the list, or Qnil if none is available. This is also the +reason why they are not used as roots for the purpose of object +enumeration. + +Some very important information like the @code{staticpros} and +@code{lrecord_implementations_table} are handled indirectly using +@code{dump_add_opaque} or @code{dump_add_root_struct_ptr}. This is the end of the dumping part. @@ -6020,22 +6024,15 @@ The difference between the actual loading address and the reloc_address is computed and will be used for all the relocations. -@subsection Putting back the staticvec - -The staticvec array is memcpy'd from the file and the variables it -points to are reset to the relocated objects addresses. - - -@subsection Putting back the dumpstructed variables +@subsection Putting back the pdump_opaques -The variables pointed to by dumpstruct in the dump phase are reset to -the right relocated object addresses. +The memory contents are restored in the obvious and trivial way. -@subsection lrecord_implementations_table +@subsection Putting back the pdump_root_struct_ptrs -The lrecord_implementations_table is reset to its dump time state and -the right lrecord_type_index values are put in. +The variables pointed to by pdump_root_struct_ptrs in the dump phase are +reset to the right relocated object addresses. @subsection Object relocation @@ -6045,9 +6042,9 @@ by @code{pdump_reloc_one}. This step is unnecessary if the reloc_address is equal to the file loading address. -@subsection Putting back the pdump_wire and pdump_wire_list variables +@subsection Putting back the pdump_root_objects and pdump_weak_object_chains -Same as Putting back the dumpstructed variables. +Same as Putting back the pdump_root_struct_ptrs. @subsection Reorganize the hash tables diff --git a/man/texinfo.texi b/man/texinfo.texi index 121589e..d683f64 100644 --- a/man/texinfo.texi +++ b/man/texinfo.texi @@ -1,5 +1,5 @@ \input texinfo.tex @c -*-texinfo-*- -@c $Id: texinfo.texi,v 1.8.2.6 2001/01/06 07:51:28 stephent Exp $ +@c $Id: texinfo.texi,v 1.8.2.7 2001/01/09 20:52:53 adrian Exp $ @c %**start of header @c All text is ignored before the setfilename. @@ -743,8 +743,8 @@ menu-driven, on-line Info file with nodes, menus, cross references, and indices. You can, if you wish, make the chapters and sections of the printed document correspond to the nodes of the on-line information; and you use the same cross references and indices for -both the Info file and the printed work. @cite{The GNU -Emacs Manual} is a good example of a Texinfo file, as is this manual.@refill +both the Info file and the printed work. @cite{The XEmacs User's +Manual} is a good example of a Texinfo file, as is this manual.@refill To make a printed document, you process a Texinfo source file with the @TeX{} typesetting program. This creates a DVI file that you can @@ -4768,9 +4768,9 @@ utility to insert these pointers automatically.) @cindex Previous node of Top node Do not define the `Previous' node of the Top node to be @samp{(dir)}, as it causes confusing behavior for users: if you are in the Top node and -hits @key{DEL} to go backwards, you wind up in the middle of the -some other entry in the @file{dir} file, which has nothing to do with -what you were reading. +hit @key{DEL} to go backwards, you wind up in the middle of some other +entry in the @file{dir} file, which has nothing to do with what you were +reading. @xref{Install an Info File}, for more information about installing an Info file in the @file{info} directory. @@ -8226,7 +8226,7 @@ Line breaks are not special within the table body, and you may break input lines in your source file as necessary. Here is a complete example of a multi-column table (the text is from -@cite{The GNU Emacs Manual}, @pxref{Split Window,, Splitting Windows, +@cite{The XEmacs Users' Manual}, @pxref{Split Window,, Splitting Windows, xemacs, XEmacs User's Manual}): @example diff --git a/netinstall/ChangeLog b/netinstall/ChangeLog index 45de799..1d8a0b0 100644 --- a/netinstall/ChangeLog +++ b/netinstall/ChangeLog @@ -1,3 +1,41 @@ +2001-01-17 Martin Buchholz + + * XEmacs 21.2.41 "Polyhymnia" is released. + +2001-01-12 Andy Piper + + * postinstall.cc (do_postinstall): don't pick up shells if cygwin + isn't installed. + +2001-01-10 Andy Piper + + * README.xemacs: deleted. + + * README: updated. + + * tar.cc (tar_gzctell): new function picked up from some internal + cygnus version of zlib. + + * Makefile.in.in (LOCALCFLAGS): use -O2 + (OBJS): reinstate autoload. + +2001-01-09 Andy Piper + + * root.cc (dialog_cmd): backslash root dir. + + * desktop.cc (do_desktop): runemacs.exe is the exe to run. + + * package-net.el (package-net-batch-convert-index-to-ini): new + batch command. + + * Makefile.in.in (setup.ini): new target. Automatically create. + (LOCALCFLAGS): use extra_includes. + (setup.ini): new target. + + * regedit.cc (create_xemacs_root): write out the package path. + + * reginfo.h (XEMACS_NATIVE_ARCH_NAME): arch dir is i386 not i586 + 2001-01-08 Martin Buchholz * XEmacs 21.2.40 is released. @@ -128,5 +166,5 @@ * all: port from cygwin setup. -%%% $Id: ChangeLog,v 1.1.2.5 2000/12/31 12:03:34 martinb Exp $ -$Revision: 1.1.2.5 $ +%%% $Id: ChangeLog,v 1.1.2.9 2001/01/12 16:11:12 andyp Exp $ +$Revision: 1.1.2.9 $ diff --git a/netinstall/Makefile.in.in b/netinstall/Makefile.in.in index 59dfb83..200fe36 100644 --- a/netinstall/Makefile.in.in +++ b/netinstall/Makefile.in.in @@ -13,8 +13,6 @@ ## ## Makefile for Cygwin installer -## FIXME: integrate autoload.c so that wininet doesn't have to be linked. - ## For performance and consistency, no built-in rules .SUFFIXES: .SUFFIXES: .c .cc .h .o @@ -60,6 +58,8 @@ archlibdir=@archlibdir@ configuration=@configuration@ moduledir=@moduledir@ sitemoduledir=@sitemoduledir@ +extra_includes=@extra_includes@ +blddir=@blddir@ ## ==================== Utility Programs for the Build ================= @@ -78,7 +78,8 @@ program_transform_name = @program_transform_name@ CC = @CC@ CC_FOR_TARGET = $(CC) -LOCALCFLAGS = $(CFLAGS) -DMINGW +## -O3 has problems so fix this locally +LOCALCFLAGS = $(CFLAGS) -O2 -DMINGW $(extra_includes) CXXFLAGS = $(LOCALCFLAGS) -fno-exceptions -nostdinc++ -fno-rtti WINDRES = windres @@ -88,10 +89,12 @@ MINGW_CFLAGS = $(LOCALCFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows MINGW_ZLIB_DIR = /usr/local/lib PROGS = setup.exe +XEMACS=${blddir}/src/${PROGNAME} CONFIG_H = ../src/config.h OBJS = \ + autoload.o \ choose.o \ concat.o \ desktop.o \ @@ -141,10 +144,17 @@ all: Makefile $(PROGS) setup.exe: $(OBJS) $(CXX) $(MINGW_CXXFLAGS) -o $@ $(OBJS) \ -lole32 -lwsock32 -lnetapi32 -ladvapi32 \ - -luuid -lkernel32 -luser32 -lwininet \ + -luuid -lkernel32 -luser32 \ -L$(MINGW_ZLIB_DIR) -lz -lmingw32 @chmod a-x $@ +setup.ini: setup.exe + V=`grep '^\$$Revision.*' $(srcdir)/ChangeLog \ + | sed -e 's/\$$Revision:* *//' \ + -e 's/ *$$.*//'` ;\ + $(XEMACS) -batch -vanilla -l ${srcdir}/../lisp/package-net.el \ + -f package-net-batch-convert-index-to-ini . $$V + install: @echo; echo "Installing net setup." for file in ${INSTALLABLES} ; do \ diff --git a/netinstall/README b/netinstall/README index 21d1877..8548349 100644 --- a/netinstall/README +++ b/netinstall/README @@ -1,25 +1,16 @@ -This directory contains the source for the setup program for the cygwin +This directory contains the source for the setup program for the XEmacs net releases. +For commentary on how to do a release please see `package-net.el' +This code has been adapted from the cygwin net release installer. In +particular note that the cygwin net release installer is actively +maintained and therefore we will want to incorporate improvements from +that. I have therefore tried to use the cygwin way wherever +possible. I have however cleaned up the code somewhat so that there +are not billions of warnings. -To-Do list: - -ini.cc: add field in setup.ini to specify whether package is installed -by default, or not. - -install.cc: scan newly installed files for README files, show list to -user, let them read them if they want. - -download.cc: add a "total progress" indicator, like the install one. - -add a "category" field to setup.ini, let user choose which categories -of packages to install, perhaps with a "custom..." button to lead to -the current chooser. - -remember which packages were selected to be skipped, and which prev/curr/exp -option was last selected, and recall them each time the chooser runs. - -Add friendly error reporting to simpsock.cc - -Add option to download sources also. +This program should get built as part of the standard XEmacs +make. Note however that if you use trhe cygwin build you will need a +NON CYGWIN VERSION OF ZLIB. + diff --git a/netinstall/README.xemacs b/netinstall/README.xemacs index f962e65..e69de29 100644 --- a/netinstall/README.xemacs +++ b/netinstall/README.xemacs @@ -1,23 +0,0 @@ -This directory contains the source for the setup program for the -XEmacs net releases. - -This code has been adapted from the cygwin net release installer. In -particular note that the cygwin net release installer is actively -maintained and therefore we will want to incorporate improvements from -that. I have therefore tried to use the cygwin way wherever -possible. I have however cleaned up the code somewhat so that there -are not billions of warnings. - -This program should get built as part of the standard XEmacs -make. Note however that if you use trhe cygwin build you will need a -NON CYGWIN VERSION OF ZLIB. - -New files: - regedit.cc: - regedit.h - reginfo.h - Makefile.in.in: - -Deleted files: - mount.cc: moved to regedit.cc - mount.h: moved to regedit.h diff --git a/netinstall/desktop.cc b/netinstall/desktop.cc index 0a7c993..10e195a 100644 --- a/netinstall/desktop.cc +++ b/netinstall/desktop.cc @@ -420,7 +420,12 @@ do_desktop (HINSTANCE h) if (xemacs_package != 0 && xemacs_package->type != TY_GENERIC) { batname = concat (find_xemacs_exe_path (), "\\", - find_xemacs_exe_name (), 0); +#if 0 + find_xemacs_exe_name (), +#else + "runemacs.exe", +#endif + 0); root_desktop = check_desktop ("XEmacs", batname); root_menu = check_startmenu ("XEmacs", batname); } diff --git a/netinstall/postinstall.cc b/netinstall/postinstall.cc index bf26f66..23f656e1 100644 --- a/netinstall/postinstall.cc +++ b/netinstall/postinstall.cc @@ -102,13 +102,19 @@ do_postinstall (HINSTANCE h) next_dialog = 0; char* cygroot = find_cygwin_root (&issystem); int i; - for (i=0; shells[i]; i++) + + sh = 0; + + if (cygroot) { - sh = backslash (concat (cygroot, shells[i], 0)); - if (_access (sh, 0) == 0) - break; - free (sh); - sh = 0; + for (i=0; shells[i]; i++) + { + sh = backslash (concat (cygroot, shells[i], 0)); + if (_access (sh, 0) == 0) + break; + free (sh); + sh = 0; + } } char old_path[_MAX_PATH]; diff --git a/netinstall/regedit.cc b/netinstall/regedit.cc index 0c69495..a99624e 100644 --- a/netinstall/regedit.cc +++ b/netinstall/regedit.cc @@ -175,6 +175,11 @@ create_xemacs_root (char *path, int issystem, int isnative) 0, REG_SZ, (BYTE *)path, strlen (path)+1); RegSetValueEx (key, XEMACS_INFO_XEMACS_ROOT_TYPE, 0, REG_DWORD, (BYTE *)&itype, sizeof (itype)); + // write out the package path + sprintf (buf, "~\\.xemacs;%s\\site-packages;%s\\xemacs-packages", + path, path); + RegSetValueEx (key, XEMACS_INFO_XEMACS_PACKAGE_KEY, + 0, REG_SZ, (BYTE *)buf, strlen (buf)+1); } void diff --git a/netinstall/reginfo.h b/netinstall/reginfo.h index 36c0cd2..29c8c08 100644 --- a/netinstall/reginfo.h +++ b/netinstall/reginfo.h @@ -20,7 +20,7 @@ Copyright (C) 2000 Andy Piper. */ #define XEMACS_PACKAGE_DIR \ ((char*)(install_type == IDC_INSTALL_NATIVE ? "\\xemacs-packages\\" \ : "/lib/xemacs/xemacs-packages/")) -#define XEMACS_NATIVE_ARCH_NAME "i586-pc-win32" +#define XEMACS_NATIVE_ARCH_NAME "i386-pc-win32" #define XEMACS_CYGWIN_ARCH_NAME "i686-pc-cygwin32" /* @@ -36,7 +36,7 @@ Copyright (C) 2000 Andy Piper. */ * \site-packages * \mule-packages * \XEmacs-21.2 - * \i586-pc-win32 + * \i386-pc-win32 * \etc * \info * \lisp diff --git a/netinstall/root.cc b/netinstall/root.cc index 2378151..fb09b60 100644 --- a/netinstall/root.cc +++ b/netinstall/root.cc @@ -273,7 +273,7 @@ dialog_cmd (HWND h, int id, HWND hwndctl, UINT code) if (IDNO == yesno (IDS_ROOT_NOCYGWIN)) break; - create_xemacs_root (root_dir, + create_xemacs_root (backslash (root_dir), root_scope == IDC_ROOT_SYSTEM ? 1 : 0, install_type == IDC_INSTALL_NATIVE ? 1 : 0); diff --git a/netinstall/tar.cc b/netinstall/tar.cc index 8be129e..6149dd4 100644 --- a/netinstall/tar.cc +++ b/netinstall/tar.cc @@ -116,10 +116,37 @@ tar_open (char *pathname) return g ? 0 : 1; } +/* For some reason the cygwin version uses a function that is not in + the original source. We duplicate it here - although this does mean + revealing some internals. */ +extern "C" { + z_off_t ZEXPORT tar_gzctell (gzFile file); + typedef struct gz_stream { + z_stream stream; + int z_err; /* error code for last stream operation */ + int z_eof; /* set if end of input file */ + FILE *file; /* .gz file */ + Byte *inbuf; /* input buffer */ + Byte *outbuf; /* output buffer */ + uLong crc; /* crc32 of uncompressed data */ + char *msg; /* error message */ + char *path; /* path name for debugging only */ + int transparent; /* 1 if input file is not a .gz file */ + char mode; /* 'w' or 'r' */ + long startpos; /* start of compressed data in file (header skipped) */ + } gz_stream; +}; + +z_off_t ZEXPORT tar_gzctell (gzFile file) +{ + gz_stream *s = (gz_stream *)file; + return ftell(s->file); +} + int tar_ftell () { - return gztell (g); + return tar_gzctell (g); } static void @@ -482,7 +509,7 @@ tar_auto (char *pathname, char **maplist) if ((tar_open (pathname))) return 1; - while (c = tar_next_file ()) + while ((c = tar_next_file ())) { int l = strlen (c); for (i=0; i + + * XEmacs 21.2.41 "Polyhymnia" is released. + 2001-01-08 Martin Buchholz * XEmacs 21.2.40 is released. diff --git a/src/.dbxrc b/src/.dbxrc index 46c21a4..13a52eb 100644 --- a/src/.dbxrc +++ b/src/.dbxrc @@ -169,7 +169,7 @@ end function run-temacs { environment-to-run-temacs - run -batch -l ../lisp/loadup.el run-temacs -q ${1+"$@"} + run -nd -batch -l ../lisp/loadup.el run-temacs -q ${1+"$@"} } document check-xemacs << 'end' @@ -201,7 +201,7 @@ end function update-elc { environment-to-run-temacs - run -batch -l ../lisp/update-elc.el + run -nd -batch -l ../lisp/update-elc.el } document dump-temacs << 'end' @@ -213,7 +213,7 @@ end function dump-temacs { environment-to-run-temacs - run -batch -l ../lisp/loadup.el dump + run -nd -batch -l ../lisp/loadup.el dump } function pstruct { # pstruct foo.c struct-name diff --git a/src/.gdbinit b/src/.gdbinit index 13ff77d..4cf1c3e 100644 --- a/src/.gdbinit +++ b/src/.gdbinit @@ -123,7 +123,7 @@ end define run-temacs environment-to-run-temacs - run -batch -l ../lisp/loadup.el run-temacs -q + run -nd -batch -l ../lisp/loadup.el run-temacs -q end document run-temacs @@ -144,7 +144,7 @@ end define check-temacs environment-to-run-temacs - run -batch -l ../lisp/loadup.el run-temacs -q -batch -l ../tests/automated/test-harness.el -f batch-test-emacs ../tests/automated + run -nd -batch -l ../lisp/loadup.el run-temacs -q -batch -l ../tests/automated/test-harness.el -f batch-test-emacs ../tests/automated end document check-temacs @@ -156,7 +156,7 @@ end define update-elc environment-to-run-temacs - run -batch -l ../lisp/update-elc.el + run -nd -batch -l ../lisp/update-elc.el end document update-elc @@ -168,7 +168,7 @@ end define dump-temacs environment-to-run-temacs - run -batch -l ../lisp/loadup.el dump + run -nd -batch -l ../lisp/loadup.el dump end document dump-temacs diff --git a/src/ChangeLog b/src/ChangeLog index cc565f8..e05dae0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,182 @@ +2001-01-17 Martin Buchholz + + * XEmacs 21.2.41 "Polyhymnia" is released. + +2001-01-16 Didier Verna + + * glyphs.c (image_instantiate): don't use fallbacks when + instantiating a face's background pixmap by inheritance. + +2001-01-14 Mike Sperber + + * sysdep.c (start_of_data): PDUMP implies ORDINARY_LINK. + Conditionalize accordingly. + +2001-01-16 Martin Buchholz + + * dumper.c (pdump_file_get): Fix a compiler warning. + +2001-01-15 Martin Buchholz + + Make Purify happy when pdumping. + * symbols.c (Fmake_variable_buffer_local): Make Purify happy, by + iniitalizing all bits of new lisp object memory. + * symbols.c (Fmake_local_variable): Likewise. + * symbols.c (Fdontusethis_set_symbol_value_handler): Likewise. + * symbols.c (Fdefvaralias): Likewise. + * mule-charset.c (vars_of_mule_charset): Likewise. + +2001-01-15 Martin Buchholz + Add the `-nd' flag when running pre-dump operations under the debugger. + * .dbxrc (run-temacs): Add `-nd'. + * .dbxrc (update-elc): Likewise. + * .dbxrc (dump-temacs): Likewise. + * .gdbinit (run-temacs): Likewise. + * .gdbinit (check-temacs): Likewise. + * .gdbinit (update-elc): Likewise. + * .gdbinit (dump-temacs): Likewise. + +2001-01-14 Martin Buchholz + + Allow building 64-bit executables on AIX with GNU malloc, e.g. + export OBJECT_MODE=64 + configure --pdump --use-union-type=no + * m/ibmrs6000.h (DATA_START): Define for 64-bit world. + * gmalloc.c (__default_morecore): Remove pre-ANSI cruft. + + * miscplay.c (sndcnv8U_2mono): + Avoid two uses of `++' in the same expression. + Suppresses a GCC warning. + +2001-01-13 Martin Buchholz + + Make sure future compilers don't miscompile alloc.c. + * alloc.c: + (MARK_STRUCT_AS_FREE): Make aliasing-optimization-resistant. + (MARK_STRUCT_AS_NOT_FREE): Make aliasing-optimization-resistant. + +2001-01-12 Martin Buchholz + + * dumper.c: A little post-pdump-rename comment fixup. + +2001-01-09 Jerry James + + * lisp-disunion.h: Change LISP_TO_CVOID arg to match its use. + +2001-01-13 Martin Buchholz + + * *.[ch]: Globally rename symbols using the following `pdump-rename' + script: + #!/bin/sh + replace_symbol () { + (findn texi$; findn [ch]$) | xargs g -lw "$1" | xargs global-replace 's/(? + + * s/aix4.h: Keep the C for AIX compiler from overaggressively + optimizing bytecount_to_charcount(). + +2001-01-06 Golubev I. N. + + * config.h.in: + (HAVE_DLFCN_H): Removed. + * sysdll.c: Remove HAVE__DLOPEN, HAVE_DLFCN_H. + +2001-01-06 Martin Buchholz + + Portable dumper maintainability improvements. + * alloc.c (staticpro): + * alloc.c (staticpro_nodump): + * alloc.c (garbage_collect_1): + * alloc.c (reinit_alloc_once_early): + * alloc.c (init_alloc_once_early): + * alloc.c: Move dumper functions to alloc.c. + * dumper.c (pdump_backtrace): + * dumper.c (pdump_dump_structs): + * dumper.c (pdump_dump_opaques): + * dumper.c (pdump_dump_rtables): + * dumper.c (pdump_dump_wired): + * dumper.c (pdump): + * dumper.c (pdump_load_check): + * dumper.c (pdump_load_finish): + * dumper.c (pdump_file_unmap): + * dumper.c (pdump_file_get): + * dumper.c (pdump_resource_free): + * dumper.c (pdump_resource_get): + * dumper.c (pdump_file_free): + * dumper.c (pdump_file_try): + * dumper.c (pdump_load): + Remove fixed size limits on staticpro(), staticpro_nodump(), + dumpopaque(), dumpstruct() by using Dynarrs instead of static C arrays. + Remove custom code for dumping lrecord_implementations_table - use + dumpopaque instead. + Remove (most of the) custom code for dumping staticpros - dump it + like any other dynarr. + + * alloc.h: Removed. No longer useful, since dumper now more self-contained. + * dumper.c: Moved functions from alloc.c. + * alloc.c (dumpstruct): Moved to dumper.c. + * alloc.c (dumpopaque): Likewise. + * alloc.c (pdump_wire): Likewise. + * alloc.c (pdump_wire_list): Likewise. + + * lisp.h (Dynarr_sizeof): New. + * lisp.h (Dynarr_begin): New. Very slightly C++oid. + * lisp.h (Dynarr_end): New. Very slightly C++oid. + * lisp.h (Lisp_Object_ptr_dynarr): New. For staticpros. + + * lisp.h (dumpstruct): Define to nothing if not PDUMPing. + * lisp.h (dumpopaque): ditto. + * lisp.h (pdump_wire): ditto. + * lisp.h (pdump_wire_list): ditto. + +2001-01-09 Martin Buchholz + + * make-src-depend (PrintPatternDeps): + Use `sort' to make output independent of perl version. + +2001-01-08 Martin Buchholz + + Port to Netbsd 1.5. + * unexelf.c: Remove (never used) bogus Netbsd-specific cruft. + * s/netbsd.c: Use unexelf.o if __ELF__ is defined. + +2001-01-03 Didier Verna + + * event-stream.c (emacs_handle_focus_change_preliminary): ensure + that `focus_frame' is alive before thinking of calling + `redisplay_redraw_cursor' on it. + 2001-01-08 Martin Buchholz * XEmacs 21.2.40 is released. @@ -277,7 +456,7 @@ * buffer.c: Make find-file-compare-truenames default to true on windows. - * realpath.c (win32_abs_start): + * realpath.c (win32_abs_start): (cygwin_readlink): (win32_readlink): New functions. (xrealpath): Return really real filenames on windows. diff --git a/src/alloc.c b/src/alloc.c index 86f7861..311eea9 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -42,7 +42,6 @@ Boston, MA 02111-1307, USA. */ #include #include "lisp.h" -#include "alloc.h" #include "backtrace.h" #include "buffer.h" #include "bytecode.h" @@ -779,16 +778,18 @@ You have some weird system and need to supply a reasonable value here. /* The construct (* (void **) (ptr)) would cause aliasing problems with modern optimizing compilers like `gcc -O3 -fstrict-aliasing'. - But `char *' can legally alias any pointer. Hence this union trick. */ + But `char *' can legally alias any pointer. Hence this union trick... + + It turned out that the union trick was not good enough for xlC -O3; + and it is questionable whether it really complies with the C standard. + so we use memset instead, which should be safe from optimizations. */ typedef union { char c; void *p; } *aliasing_voidpp; #define ALIASING_VOIDPP_DEREFERENCE(ptr) \ (((aliasing_voidpp) (ptr))->p) #define FREE_STRUCT_P(ptr) \ (ALIASING_VOIDPP_DEREFERENCE (ptr) == (void *) INVALID_POINTER_VALUE) -#define MARK_STRUCT_AS_FREE(ptr) \ - (ALIASING_VOIDPP_DEREFERENCE (ptr) = (void *) INVALID_POINTER_VALUE) -#define MARK_STRUCT_AS_NOT_FREE(ptr) \ - (ALIASING_VOIDPP_DEREFERENCE (ptr) = 0) +#define MARK_STRUCT_AS_FREE(ptr) memset (ptr, 0xff, sizeof (void *)) +#define MARK_STRUCT_AS_NOT_FREE(ptr) memset (ptr, 0x00, sizeof (void *)) #ifdef ERROR_CHECK_GC @@ -2347,98 +2348,47 @@ Lisp_Object (*lrecord_markers[countof (lrecord_implementations_table)]) (Lisp_Ob struct gcpro *gcprolist; -/* 415 used Mly 29-Jun-93 */ -/* 1327 used slb 28-Feb-98 */ -/* 1328 used og 03-Oct-99 (moving slowly, heh?) */ -#ifdef HAVE_SHLIB -#define NSTATICS 4000 -#else -#define NSTATICS 2000 -#endif - -/* Not "static" because used by dumper.c */ -Lisp_Object *staticvec[NSTATICS]; -int staticidx; - -/* Put an entry in staticvec, pointing at the variable whose address is given - */ -void -staticpro (Lisp_Object *varaddress) -{ - /* #### This is now a dubious assert() since this routine may be called */ - /* by Lisp attempting to load a DLL. */ - assert (staticidx < countof (staticvec)); - staticvec[staticidx++] = varaddress; -} - - -Lisp_Object *staticvec_nodump[200]; -int staticidx_nodump; - -/* Put an entry in staticvec_nodump, pointing at the variable whose address is given - */ -void -staticpro_nodump (Lisp_Object *varaddress) -{ - /* #### This is now a dubious assert() since this routine may be called */ - /* by Lisp attempting to load a DLL. */ - assert (staticidx_nodump < countof (staticvec_nodump)); - staticvec_nodump[staticidx_nodump++] = varaddress; -} - - -struct pdump_dumpstructinfo dumpstructvec[200]; -int dumpstructidx; - -/* Put an entry in dumpstructvec, pointing at the variable whose address is given - */ -void -dumpstruct (void *varaddress, const struct struct_description *desc) -{ - assert (dumpstructidx < countof (dumpstructvec)); - dumpstructvec[dumpstructidx].data = varaddress; - dumpstructvec[dumpstructidx].desc = desc; - dumpstructidx++; -} +/* We want the staticpros relocated, but not the pointers found therein. + Hence we use a trivial description, as for pointerless objects. */ +static const struct lrecord_description staticpro_description_1[] = { + { XD_END } +}; -struct pdump_dumpopaqueinfo dumpopaquevec[250]; -int dumpopaqueidx; +static const struct struct_description staticpro_description = { + sizeof (Lisp_Object *), + staticpro_description_1 +}; -/* Put an entry in dumpopaquevec, pointing at the variable whose address is given - */ -void -dumpopaque (void *varaddress, size_t size) -{ - assert (dumpopaqueidx < countof (dumpopaquevec)); +static const struct lrecord_description staticpros_description_1[] = { + XD_DYNARR_DESC (Lisp_Object_ptr_dynarr, &staticpro_description), + { XD_END } +}; - dumpopaquevec[dumpopaqueidx].data = varaddress; - dumpopaquevec[dumpopaqueidx].size = size; - dumpopaqueidx++; -} +static const struct struct_description staticpros_description = { + sizeof (Lisp_Object_ptr_dynarr), + staticpros_description_1 +}; -Lisp_Object *pdump_wirevec[50]; -int pdump_wireidx; +Lisp_Object_ptr_dynarr *staticpros; -/* Put an entry in pdump_wirevec, pointing at the variable whose address is given - */ +/* Mark the Lisp_Object at non-heap VARADDRESS as a root object for + garbage collection, and for dumping. */ void -pdump_wire (Lisp_Object *varaddress) +staticpro (Lisp_Object *varaddress) { - assert (pdump_wireidx < countof (pdump_wirevec)); - pdump_wirevec[pdump_wireidx++] = varaddress; + Dynarr_add (staticpros, varaddress); + dump_add_root_object (varaddress); } -Lisp_Object *pdump_wirevec_list[50]; -int pdump_wireidx_list; +Lisp_Object_ptr_dynarr *staticpros_nodump; -/* Put an entry in pdump_wirevec_list, pointing at the variable whose address is given - */ +/* Mark the Lisp_Object at non-heap VARADDRESS as a root object for + garbage collection, but not for dumping. */ void -pdump_wire_list (Lisp_Object *varaddress) +staticpro_nodump (Lisp_Object *varaddress) { - assert (pdump_wireidx_list < countof (pdump_wirevec_list)); - pdump_wirevec_list[pdump_wireidx_list++] = varaddress; + Dynarr_add (staticpros_nodump, varaddress); } #ifdef ERROR_CHECK_GC @@ -3429,11 +3379,17 @@ garbage_collect_1 (void) /* Mark all the special slots that serve as the roots of accessibility. */ { /* staticpro() */ - int i; - for (i = 0; i < staticidx; i++) - mark_object (*(staticvec[i])); - for (i = 0; i < staticidx_nodump; i++) - mark_object (*(staticvec_nodump[i])); + Lisp_Object **p = Dynarr_begin (staticpros); + size_t count; + for (count = Dynarr_length (staticpros); count; count--) + mark_object (**p++); + } + + { /* staticpro_nodump() */ + Lisp_Object **p = Dynarr_begin (staticpros_nodump); + size_t count; + for (count = Dynarr_length (staticpros_nodump); count; count--) + mark_object (**p++); } { /* GCPRO() */ @@ -3470,7 +3426,7 @@ garbage_collect_1 (void) int i; mark_object (*backlist->function); - if (nargs == UNEVALLED || nargs == MANY) + if (nargs < 0 /* nargs == UNEVALLED || nargs == MANY */) mark_object (backlist->args[0]); else for (i = 0; i < nargs; i++) @@ -3897,9 +3853,10 @@ reinit_alloc_once_early (void) ignore_malloc_warnings = 0; - staticidx_nodump = 0; - dumpstructidx = 0; - pdump_wireidx = 0; + if (staticpros_nodump) + Dynarr_free (staticpros_nodump); + staticpros_nodump = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *); + Dynarr_resize (staticpros_nodump, 100); /* merely a small optimization */ consing_since_gc = 0; #if 1 @@ -3941,7 +3898,9 @@ init_alloc_once_early (void) INIT_LRECORD_IMPLEMENTATION (string); INIT_LRECORD_IMPLEMENTATION (lcrecord_list); - staticidx = 0; + staticpros = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *); + Dynarr_resize (staticpros, 1410); /* merely a small optimization */ + dump_add_root_struct_ptr (&staticpros, &staticpros_description); } void diff --git a/src/buffer.c b/src/buffer.c index 6c83a67..df789f2 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2551,8 +2551,8 @@ complex_vars_of_buffer (void) syms = XBUFFER (Vbuffer_local_symbols); buffer_defaults_saved_slots = &defs->BUFFER_SLOTS_FIRST_NAME; buffer_local_symbols_saved_slots = &syms->BUFFER_SLOTS_FIRST_NAME; - dumpstruct (&buffer_defaults_saved_slots, &buffer_slots_description); - dumpstruct (&buffer_local_symbols_saved_slots, &buffer_slots_description); + dump_add_root_struct_ptr (&buffer_defaults_saved_slots, &buffer_slots_description); + dump_add_root_struct_ptr (&buffer_local_symbols_saved_slots, &buffer_slots_description); DEFVAR_BUFFER_DEFAULTS ("default-modeline-format", modeline_format /* Default value of `modeline-format' for buffers that don't override it. diff --git a/src/chartab.c b/src/chartab.c index 8743a77..ec6ab0f 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -1847,7 +1847,7 @@ vars_of_chartab (void) { /* DO NOT staticpro this. It works just like Vweak_hash_tables. */ Vall_syntax_tables = Qnil; - pdump_wire_list (&Vall_syntax_tables); + dump_add_weak_object_chain (&Vall_syntax_tables); } void diff --git a/src/config.h.in b/src/config.h.in index 1c31170..81d0e55 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -245,7 +245,6 @@ void *alloca (); #undef HAVE_SHL_LOAD #undef HAVE_DLD_INIT #undef HAVE_SHLIB -#undef HAVE_DLFCN_H #undef HAVE_LIBINTL #undef HAVE_LIBDNET diff --git a/src/console.c b/src/console.c index 8e79a8d..0d4b8be 100644 --- a/src/console.c +++ b/src/console.c @@ -1150,7 +1150,7 @@ void console_type_create (void) { the_console_type_entry_dynarr = Dynarr_new (console_type_entry); - dumpstruct(&the_console_type_entry_dynarr, &cted_description); + dump_add_root_struct_ptr (&the_console_type_entry_dynarr, &cted_description); Vconsole_type_list = Qnil; staticpro (&Vconsole_type_list); @@ -1368,8 +1368,8 @@ complex_vars_of_console (void) syms = XCONSOLE (Vconsole_local_symbols); console_defaults_saved_slots = &defs->CONSOLE_SLOTS_FIRST_NAME; console_local_symbols_saved_slots = &syms->CONSOLE_SLOTS_FIRST_NAME; - dumpstruct (&console_defaults_saved_slots, &console_slots_description); - dumpstruct (&console_local_symbols_saved_slots, &console_slots_description); + dump_add_root_struct_ptr (&console_defaults_saved_slots, &console_slots_description); + dump_add_root_struct_ptr (&console_local_symbols_saved_slots, &console_slots_description); DEFVAR_CONSOLE_DEFAULTS ("default-function-key-map", function_key_map /* Default value of `function-key-map' for consoles that don't override it. diff --git a/src/console.h b/src/console.h index 8bf8ab5..ae47a43 100644 --- a/src/console.h +++ b/src/console.h @@ -387,7 +387,7 @@ struct console_methods * type##_console_methods add_entry_to_console_type_list (Q##type, type##_console_methods); \ type##_console_methods->image_conversion_list = Qnil; \ staticpro_nodump (&type##_console_methods->image_conversion_list); \ - dumpstruct (&type##_console_methods, &console_methods_description); \ + dump_add_root_struct_ptr (&type##_console_methods, &console_methods_description); \ } while (0) #define REINITIALIZE_CONSOLE_TYPE(type) do { \ diff --git a/src/data.c b/src/data.c index fca3e0e..6239dd7 100644 --- a/src/data.c +++ b/src/data.c @@ -2229,7 +2229,7 @@ vars_of_data (void) { /* This must not be staticpro'd */ Vall_weak_lists = Qnil; - pdump_wire_list (&Vall_weak_lists); + dump_add_weak_object_chain (&Vall_weak_lists); #ifdef DEBUG_XEMACS DEFVAR_BOOL ("debug-issue-ebola-notices", &debug_issue_ebola_notices /* diff --git a/src/depend b/src/depend index 67586d4..f56ff6c 100644 --- a/src/depend +++ b/src/depend @@ -5,7 +5,7 @@ LISP_UNION_H=lisp-union.h #else LISP_UNION_H=lisp-disunion.h #endif -LISP_H=lisp.h lrecord.h config.h general-slots.h symsinit.h symeval.h $(LISP_UNION_H) +LISP_H=lisp.h config.h general-slots.h lrecord.h symeval.h symsinit.h $(LISP_UNION_H) #if defined(HAVE_MS_WINDOWS) console-msw.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console-msw.h console.h events.h mule-charset.h opaque.h syscommctrl.h systime.h syswindows.h device-msw.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console-msw.h console-stream.h console.h device.h events.h faces.h frame.h frameslots.h glyphs.h gui.h mule-charset.h objects-msw.h objects.h redisplay.h scrollbar.h specifier.h syscommctrl.h sysdep.h systime.h syswindows.h toolbar.h window.h winslots.h @@ -67,7 +67,7 @@ EmacsManager.o: EmacsManager.h EmacsManagerP.h config.h xintrinsicp.h xmmanagerp EmacsShell-sub.o: EmacsShell.h EmacsShellP.h config.h xintrinsic.h xintrinsicp.h EmacsShell.o: EmacsShell.h ExternalShell.h config.h xintrinsicp.h abbrev.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h insdel.h mule-charset.h redisplay.h scrollbar.h syntax.h window.h winslots.h -alloc.o: $(LISP_H) alloc.h backtrace.h buffer.h bufslots.h bytecode.h casetab.h chartab.h conslots.h console-stream.h console.h device.h dumper.h elhash.h events.h extents.h frame.h frameslots.h glyphs.h gui.h mule-charset.h opaque.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h systime.h toolbar.h window.h winslots.h +alloc.o: $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h casetab.h chartab.h conslots.h console-stream.h console.h device.h dumper.h elhash.h events.h extents.h frame.h frameslots.h glyphs.h gui.h mule-charset.h opaque.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h systime.h toolbar.h window.h winslots.h alloca.o: config.h balloon_help.o: balloon_help.h config.h xintrinsic.h blocktype.o: $(LISP_H) blocktype.h @@ -92,7 +92,7 @@ dired.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h elhash.h m doc.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h chartab.h insdel.h keymap.h mule-charset.h sysfile.h doprnt.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h lstream.h mule-charset.h dragdrop.o: $(LISP_H) dragdrop.h -dumper.o: $(LISP_H) alloc.h conslots.h console-stream.h console.h dump-id.h dumper.h elhash.h nt.h specifier.h sysfile.h syswindows.h +dumper.o: $(LISP_H) conslots.h console-stream.h console.h dump-id.h dumper.h elhash.h nt.h specifier.h sysfile.h syswindows.h dynarr.o: $(LISP_H) ecrt0.o: config.h editfns.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h conslots.h console.h device.h events.h extents.h frame.h frameslots.h glyphs.h gui.h insdel.h line-number.h mule-charset.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h syspwd.h systime.h toolbar.h window.h winslots.h diff --git a/src/dumper.c b/src/dumper.c index 93083da..4118809 100644 --- a/src/dumper.c +++ b/src/dumper.c @@ -25,7 +25,6 @@ Boston, MA 02111-1307, USA. */ #include "dump-id.h" #include "specifier.h" -#include "alloc.h" #include "elhash.h" #include "sysfile.h" #include "console-stream.h" @@ -45,6 +44,80 @@ Boston, MA 02111-1307, USA. */ typedef struct { + void *varaddress; + size_t size; +} pdump_opaque; + +typedef struct +{ + Dynarr_declare (pdump_opaque); +} pdump_opaque_dynarr; + +typedef struct +{ + void **ptraddress; + const struct struct_description *desc; +} pdump_root_struct_ptr; + +typedef struct +{ + Dynarr_declare (pdump_root_struct_ptr); +} pdump_root_struct_ptr_dynarr; + +static pdump_opaque_dynarr *pdump_opaques; +static pdump_root_struct_ptr_dynarr *pdump_root_struct_ptrs; +static Lisp_Object_ptr_dynarr *pdump_root_objects; +static Lisp_Object_ptr_dynarr *pdump_weak_object_chains; + +/* Mark SIZE bytes at non-heap address VARADDRESS for dumping as is, + without any bit-twiddling. */ +void +dump_add_opaque (void *varaddress, size_t size) +{ + pdump_opaque info; + info.varaddress = varaddress; + info.size = size; + if (pdump_opaques == NULL) + pdump_opaques = Dynarr_new (pdump_opaque); + Dynarr_add (pdump_opaques, info); +} + +/* Mark the struct described by DESC and pointed to by the pointer at + non-heap address VARADDRESS for dumping. + All the objects reachable from this pointer will also be dumped. */ +void +dump_add_root_struct_ptr (void *ptraddress, const struct struct_description *desc) +{ + pdump_root_struct_ptr info; + info.ptraddress = (void **) ptraddress; + info.desc = desc; + if (pdump_root_struct_ptrs == NULL) + pdump_root_struct_ptrs = Dynarr_new (pdump_root_struct_ptr); + Dynarr_add (pdump_root_struct_ptrs, info); +} + +/* Mark the Lisp_Object at non-heap address VARADDRESS for dumping. + All the objects reachable from this var will also be dumped. */ +void +dump_add_root_object (Lisp_Object *varaddress) +{ + if (pdump_root_objects == NULL) + pdump_root_objects = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *); + Dynarr_add (pdump_root_objects, varaddress); +} + +/* Mark the list pointed to by the Lisp_Object at VARADDRESS for dumping. */ +void +dump_add_weak_object_chain (Lisp_Object *varaddress) +{ + if (pdump_weak_object_chains == NULL) + pdump_weak_object_chains = Dynarr_new2 (Lisp_Object_ptr_dynarr, Lisp_Object *); + Dynarr_add (pdump_weak_object_chains, varaddress); +} + + +typedef struct +{ const struct lrecord_description *desc; int count; } pdump_reloc_table; @@ -80,42 +153,39 @@ pdump_objects_unmark (void) * * 0 - header * 256 - dumped objects - * stab_offset - nb_staticpro*(Lisp_Object *) from staticvec - * - nb_staticpro*(relocated Lisp_Object) pointed to by staticpro - * - nb_structdmp*pair(void *, adr) for pointers to structures - * - lrecord_implementations_table[] + * stab_offset - nb_root_struct_ptrs*pair(void *, adr) for pointers to structures + * - nb_opaques*pair(void *, size) for raw bits to restore * - relocation table * - wired variable address/value couples with the count preceding the list */ -#define DUMP_SIGNATURE "XEmacsDP" -#define DUMP_SIGNATURE_LEN (sizeof (DUMP_SIGNATURE) - 1) +#define PDUMP_SIGNATURE "XEmacsDP" +#define PDUMP_SIGNATURE_LEN (sizeof (PDUMP_SIGNATURE) - 1) typedef struct { - char signature[DUMP_SIGNATURE_LEN]; + char signature[PDUMP_SIGNATURE_LEN]; unsigned int id; EMACS_UINT stab_offset; EMACS_UINT reloc_address; - int nb_staticpro; - int nb_structdmp; - int nb_opaquedmp; -} dump_header; + int nb_root_struct_ptrs; + int nb_opaques; +} pdump_header; char *pdump_start, *pdump_end; static size_t pdump_length; #ifdef WIN32_NATIVE -// Handle for the dump file +/* Handle for the dump file */ HANDLE pdump_hFile = INVALID_HANDLE_VALUE; -// Handle for the file mapping object for the dump file +/* Handle for the file mapping object for the dump file */ HANDLE pdump_hMap = INVALID_HANDLE_VALUE; #endif void (*pdump_free) (void); -static const unsigned char align_table[256] = +static const unsigned char pdump_align_table[256] = { 8, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, @@ -236,7 +306,7 @@ pdump_add_entry (pdump_entry_list *list, const void *obj, size_t size, int count list->count += count; pdump_hash[pos] = e; - align = align_table[size & 255]; + align = pdump_align_table[size & 255]; if (align < 2 && is_lrecord) align = 2; @@ -279,7 +349,8 @@ static struct static int depth; -static void pdump_backtrace (void) +static void +pdump_backtrace (void) { int i; stderr_out ("pdump backtrace :\n"); @@ -738,7 +809,7 @@ pdump_scan_by_alignment (void (*f)(pdump_entry_list_elmt *, const struct lrecord elmt = pdump_opaque_data_list.first; while (elmt) { - if (align_table[elmt->size & 255] == align) + if (pdump_align_table[elmt->size & 255] == align) f (elmt, 0); elmt = elmt->next; } @@ -746,58 +817,35 @@ pdump_scan_by_alignment (void (*f)(pdump_entry_list_elmt *, const struct lrecord } static void -pdump_dump_staticvec (void) -{ - EMACS_INT *reloc = xnew_array (EMACS_INT, staticidx); - int i; - write (pdump_fd, staticvec, staticidx*sizeof (Lisp_Object *)); - - for (i=0; isave_offset; - else - reloc[i] = *(EMACS_INT *)(staticvec[i]); - } - write (pdump_fd, reloc, staticidx*sizeof (Lisp_Object)); - free (reloc); -} - -static void -pdump_dump_structvec (void) +pdump_dump_from_root_struct_ptrs (void) { int i; - for (i=0; isave_offset; + pdump_root_struct_ptr *info = Dynarr_atp (pdump_root_struct_ptrs, i); + write (pdump_fd, &info->ptraddress, sizeof (info->ptraddress)); + adr = pdump_get_entry (*(info->ptraddress))->save_offset; write (pdump_fd, &adr, sizeof (adr)); } } static void -pdump_dump_opaquevec (void) +pdump_dump_opaques (void) { int i; - for (i=0; ivaraddress, info->size); } } static void -pdump_dump_itable (void) -{ - write (pdump_fd, lrecord_implementations_table, lrecord_type_count*sizeof (lrecord_implementations_table[0])); -} - -static void pdump_dump_rtables (void) { - int i, j; + int i; pdump_entry_list_elmt *elmt; pdump_reloc_table rt; @@ -830,6 +878,7 @@ pdump_dump_rtables (void) while (elmt) { EMACS_INT rdata = pdump_get_entry (elmt->obj)->save_offset; + int j; for (j=0; jcount; j++) { write (pdump_fd, &rdata, sizeof (rdata)); @@ -844,25 +893,26 @@ pdump_dump_rtables (void) } static void -pdump_dump_wired (void) +pdump_dump_from_root_objects (void) { - EMACS_INT count = pdump_wireidx + pdump_wireidx_list; - int i; + size_t count = Dynarr_length (pdump_root_objects) + Dynarr_length (pdump_weak_object_chains); + size_t i; write (pdump_fd, &count, sizeof (count)); - for (i=0; isave_offset; - write (pdump_fd, &pdump_wirevec[i], sizeof (pdump_wirevec[i])); + Lisp_Object obj = * Dynarr_at (pdump_root_objects, i); + if (POINTER_TYPE_P (XTYPE (obj))) + obj = wrap_object ((void *) pdump_get_entry (XRECORD_LHEADER (obj))->save_offset); + write (pdump_fd, Dynarr_atp (pdump_root_objects, i), sizeof (Dynarr_atp (pdump_root_objects, i))); write (pdump_fd, &obj, sizeof (obj)); } - for (i=0; isave_offset; + obj = wrap_object ((void *) elmt->save_offset); - write (pdump_fd, &pdump_wirevec_list[i], sizeof (pdump_wirevec_list[i])); - write (pdump_fd, &res, sizeof (res)); + write (pdump_fd, Dynarr_atp (pdump_weak_object_chains, i), sizeof (Lisp_Object *)); + write (pdump_fd, &obj, sizeof (obj)); } } @@ -890,18 +940,19 @@ pdump (void) int i; Lisp_Object t_console, t_device, t_frame; int none; - dump_header hd; + pdump_header hd; flush_all_buffer_local_cache (); /* These appear in a DEFVAR_LISP, which does a staticpro() */ - t_console = Vterminal_console; - t_frame = Vterminal_frame; - t_device = Vterminal_device; + t_console = Vterminal_console; Vterminal_console = Qnil; + t_frame = Vterminal_frame; Vterminal_frame = Qnil; + t_device = Vterminal_device; Vterminal_device = Qnil; - Vterminal_console = Qnil; - Vterminal_frame = Qnil; - Vterminal_device = Qnil; + dump_add_opaque (&lrecord_implementations_table, + lrecord_type_count * sizeof (lrecord_implementations_table[0])); + dump_add_opaque (&lrecord_markers, + lrecord_type_count * sizeof (lrecord_markers[0])); pdump_hash = xnew_array_and_zero (pdump_entry_list_elmt *, PDUMP_HASHSIZE); @@ -920,10 +971,8 @@ pdump (void) pdump_opaque_data_list.count = 0; depth = 0; - for (i=0; isignature, DUMP_SIGNATURE, DUMP_SIGNATURE_LEN) - && ((dump_header *)pdump_start)->id == dump_id); + return (!memcmp (((pdump_header *)pdump_start)->signature, + PDUMP_SIGNATURE, PDUMP_SIGNATURE_LEN) + && ((pdump_header *)pdump_start)->id == dump_id); } -static int pdump_load_finish (void) +static int +pdump_load_finish (void) { int i; char *p; @@ -1000,46 +1052,24 @@ static int pdump_load_finish (void) #define PDUMP_READ(p, type) (p = (char*) (((type *) p) + 1), *((type *) p - 1)) - staticidx = ((dump_header *)(pdump_start))->nb_staticpro; - delta = ((EMACS_INT)pdump_start) - ((dump_header *)pdump_start)->reloc_address; - p = pdump_start + ((dump_header *)pdump_start)->stab_offset; + delta = ((EMACS_INT)pdump_start) - ((pdump_header *)pdump_start)->reloc_address; + p = pdump_start + ((pdump_header *)pdump_start)->stab_offset; - /* Put back the staticvec in place */ - memcpy (staticvec, p, staticidx*sizeof (Lisp_Object *)); - p += staticidx*sizeof (Lisp_Object *); - for (i=0; inb_structdmp; i++) + /* Put back the pdump_root_struct_ptrs */ + for (i=0; i<((pdump_header *)pdump_start)->nb_root_struct_ptrs; i++) { void **adr = PDUMP_READ (p, void **); *adr = (void *) (PDUMP_READ (p, char *) + delta); } - /* Put back the opaques */ - for (i=0; i<((dump_header *)pdump_start)->nb_opaquedmp; i++) + /* Put back the pdump_opaques */ + for (i=0; i<((pdump_header *)pdump_start)->nb_opaques; i++) { - struct pdump_dumpopaqueinfo di = PDUMP_READ (p, struct pdump_dumpopaqueinfo); - memcpy (di.data, p, di.size); - p += di.size; + pdump_opaque info = PDUMP_READ (p, pdump_opaque); + memcpy (info.varaddress, p, info.size); + p += info.size; } - /* Put back the lrecord_implementations_table */ - /* The (void *) cast is there to make Ben happy. */ - memcpy ((void *) lrecord_implementations_table, p, lrecord_type_count*sizeof (lrecord_implementations_table[0])); - p += lrecord_type_count*sizeof (lrecord_implementations_table[0]); - - /* Reinitialize lrecord_markers from lrecord_implementations_table */ - for (i=0; i < lrecord_type_count; i++) - if (lrecord_implementations_table[i]) - lrecord_markers[i] = lrecord_implementations_table[i]->marker; - /* Do the relocations */ pdump_rt_list = p; count = 2; @@ -1060,16 +1090,14 @@ static int pdump_load_finish (void) break; } - /* Put the pdump_wire variables in place */ - count = PDUMP_READ (p, EMACS_INT); - - for (i=0; isymbol = Q##format; \ - format##_image_instantiator_methods->device = Qnil; \ - format##_image_instantiator_methods->keywords = \ - Dynarr_new (ii_keyword_entry); \ - format##_image_instantiator_methods->consoles = \ - Dynarr_new (console_type_entry); \ - add_entry_to_image_instantiator_format_list \ - (Q##format, format##_image_instantiator_methods); \ - dumpstruct (&format##_image_instantiator_methods, \ - &iim_description); \ +do { \ + format##_image_instantiator_methods = \ + xnew_and_zero (struct image_instantiator_methods); \ + format##_image_instantiator_methods->symbol = Q##format; \ + format##_image_instantiator_methods->device = Qnil; \ + format##_image_instantiator_methods->keywords = \ + Dynarr_new (ii_keyword_entry); \ + format##_image_instantiator_methods->consoles = \ + Dynarr_new (console_type_entry); \ + add_entry_to_image_instantiator_format_list \ + (Q##format, format##_image_instantiator_methods); \ + dump_add_root_struct_ptr (&format##_image_instantiator_methods, \ + &iim_description); \ } while (0) #define INITIALIZE_IMAGE_INSTANTIATOR_FORMAT(format, obj_name) \ @@ -300,19 +300,19 @@ IIFORMAT_VALID_GENERIC_KEYWORD(format, keyw, validate_fun, 0, 0) DECLARE_IMAGE_INSTANTIATOR_FORMAT(format); \ struct image_instantiator_methods *type##_##format##_image_instantiator_methods -#define INITIALIZE_DEVICE_IIFORMAT(type, format) \ -do { \ - type##_##format##_image_instantiator_methods = \ - xnew_and_zero (struct image_instantiator_methods); \ - type##_##format##_image_instantiator_methods->symbol = Q##format; \ - type##_##format##_image_instantiator_methods->device = Q##type; \ - type##_##format##_image_instantiator_methods->keywords = \ - Dynarr_new (ii_keyword_entry); \ - add_entry_to_device_ii_format_list \ - (Q##type, Q##format, type##_##format##_image_instantiator_methods); \ - IIFORMAT_VALID_CONSOLE(type,format); \ - dumpstruct (&type##_##format##_image_instantiator_methods, \ - &iim_description); \ +#define INITIALIZE_DEVICE_IIFORMAT(type, format) \ +do { \ + type##_##format##_image_instantiator_methods = \ + xnew_and_zero (struct image_instantiator_methods); \ + type##_##format##_image_instantiator_methods->symbol = Q##format; \ + type##_##format##_image_instantiator_methods->device = Q##type; \ + type##_##format##_image_instantiator_methods->keywords = \ + Dynarr_new (ii_keyword_entry); \ + add_entry_to_device_ii_format_list \ + (Q##type, Q##format, type##_##format##_image_instantiator_methods); \ + IIFORMAT_VALID_CONSOLE(type,format); \ + dump_add_root_struct_ptr (&type##_##format##_image_instantiator_methods, \ + &iim_description); \ } while (0) /* Declare that image-instantiator format FORMAT has method M; used in diff --git a/src/gmalloc.c b/src/gmalloc.c index dd0f948..a65e78e 100644 --- a/src/gmalloc.c +++ b/src/gmalloc.c @@ -1232,23 +1232,9 @@ extern __ptr_t __sbrk __P ((int increment)); and return the start of data space, or NULL on errors. If INCREMENT is negative, shrink data space. */ __ptr_t -__default_morecore ( -#ifdef __STDC__ - ptrdiff_t increment -#else -#ifdef OSF1 - long increment -#else - int increment -#endif -#endif - ) +__default_morecore (ptrdiff_t increment) { -#ifdef OSF1 - __ptr_t result = (__ptr_t) __sbrk ((ssize_t) increment); -#else - __ptr_t result = (__ptr_t) __sbrk ((int) increment); -#endif + __ptr_t result = (__ptr_t) __sbrk (increment); if (result == (__ptr_t) -1) return NULL; return result; diff --git a/src/gpmevent.c b/src/gpmevent.c index 40ebaca..20c45ec 100644 --- a/src/gpmevent.c +++ b/src/gpmevent.c @@ -635,8 +635,8 @@ void vars_of_gpmevent (void) gpm_event_queue_tail = Qnil; staticpro (&gpm_event_queue); staticpro (&gpm_event_queue_tail); - pdump_wire (&gpm_event_queue); - pdump_wire (&gpm_event_queue_tail); + dump_add_root_object (&gpm_event_queue); + dump_add_root_object (&gpm_event_queue_tail); } void syms_of_gpmevent (void) diff --git a/src/lisp-disunion.h b/src/lisp-disunion.h index 4c8c69e..a42cad6 100644 --- a/src/lisp-disunion.h +++ b/src/lisp-disunion.h @@ -103,7 +103,7 @@ typedef EMACS_INT Lisp_Object; #define VOID_TO_LISP(larg,varg) ((void) ((larg) = ((Lisp_Object) (varg)))) #define CVOID_TO_LISP VOID_TO_LISP #define LISP_TO_VOID(larg) ((void *) (larg)) -#define LISP_TO_CVOID(varg) ((const void *) (larg)) +#define LISP_TO_CVOID(larg) ((const void *) (larg)) /* Convert a Lisp_Object into something that can't be used as an lvalue. Useful for type-checking. */ diff --git a/src/lisp.h b/src/lisp.h index ab54479..8352b17 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -70,6 +70,9 @@ void Dynarr_free (void *d); ((dynarr_type *) Dynarr_newf (sizeof (type))) #define Dynarr_at(d, pos) ((d)->base[pos]) #define Dynarr_atp(d, pos) (&Dynarr_at (d, pos)) +#define Dynarr_begin(d) Dynarr_atp (d, 0) +#define Dynarr_end(d) Dynarr_atp (d, Dynarr_length (d)) +#define Dynarr_sizeof(d) ((d)->cur * (d)->elsize) #define Dynarr_length(d) ((d)->cur) #define Dynarr_largest(d) ((d)->largest) #define Dynarr_reset(d) ((d)->cur = 0) @@ -570,6 +573,11 @@ typedef struct Dynarr_declare (Lisp_Object); } Lisp_Object_dynarr; +typedef struct +{ + Dynarr_declare (Lisp_Object *); +} Lisp_Object_ptr_dynarr; + /* Close your eyes now lest you vomit or spontaneously combust ... */ #define HACKEQ_UNSAFE(obj1, obj2) \ @@ -2097,6 +2105,8 @@ void debug_ungcpro(char *, int, struct gcpro *); RETURN_SANS_WARNINGS ret_nunb_val; \ } while (0) +extern Lisp_Object_ptr_dynarr *staticpros; + /* Call staticpro (&var) to protect static variable `var'. */ void staticpro (Lisp_Object *); @@ -2104,19 +2114,35 @@ void staticpro (Lisp_Object *); /* var will not be saved at dump time */ void staticpro_nodump (Lisp_Object *); -/* Call dumpstruct(&var, &desc) to dump the structure pointed to by `var'. */ -void dumpstruct (void *, const struct struct_description *); +/* Call dump_add_root_struct_ptr (&var, &desc) to dump the structure pointed to by `var'. */ +#ifdef PDUMP +void dump_add_root_struct_ptr (void *, const struct struct_description *); +#else +#define dump_add_root_struct_ptr(varaddr,descaddr) DO_NOTHING +#endif -/* Call dumpopaque(&var, size) to dump the opaque static structure `var'. */ -void dumpopaque (void *, size_t); +/* Call dump_add_opaque (&var, size) to dump the opaque static structure `var'. */ +#ifdef PDUMP +void dump_add_opaque (void *, size_t); +#else +#define dump_add_opaque(varaddr,size) DO_NOTHING +#endif -/* Call pdump_wire(&var) to ensure that var is properly updated after pdump. */ -void pdump_wire (Lisp_Object *); +/* Call dump_add_root_object (&var) to ensure that var is properly updated after pdump. */ +#ifdef PDUMP +void dump_add_root_object (Lisp_Object *); +#else +#define dump_add_root_object(varaddr) DO_NOTHING +#endif -/* Call pdump_wire(&var) to ensure that var is properly updated after - pdump. var must point to a linked list of objects out of which +/* Call dump_add_root_object (&var) to ensure that var is properly updated after + pdump. var must point to a linked list of objects out of which some may not be dumped */ -void pdump_wire_list (Lisp_Object *); +#ifdef PDUMP +void dump_add_weak_object_chain (Lisp_Object *); +#else +#define dump_add_weak_object_chain(varaddr) DO_NOTHING +#endif /* Nonzero means Emacs has already been initialized. Used during startup to detect startup of dumped Emacs. */ diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 7b2a2e1..ca5ffe8 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h @@ -47,7 +47,11 @@ Boston, MA 02111-1307, USA. */ #ifndef USG5_4 #define TEXT_START 0x10000000 #define TEXT_END 0 +#ifdef __64BIT__ +#define DATA_START 0x110000000 /* empirically determined */ +#else #define DATA_START 0x20000000 +#endif #define DATA_END 0 #endif diff --git a/src/make-src-depend b/src/make-src-depend index ace1007..aaa3155 100644 --- a/src/make-src-depend +++ b/src/make-src-depend @@ -93,7 +93,7 @@ LISP_UNION_H=lisp-disunion.h #endif "; -my @LISP_H = ('lisp.h', keys %{$uses{'lisp.h'}}); +my @LISP_H = ('lisp.h', sort keys %{$uses{'lisp.h'}}); print "LISP_H=@{[grep (!/lisp-(dis)?union\.h/, @LISP_H)]} \$(LISP_UNION_H)\n"; sub PrintDeps { diff --git a/src/miscplay.c b/src/miscplay.c index e2366b7..2257634 100644 --- a/src/miscplay.c +++ b/src/miscplay.c @@ -360,8 +360,11 @@ size_t sndcnv8U_2mono(void **data,size_t *sz,void **outbuf) *outbuf = dest = miscplay_sndbuf; while (count--) - *dest++ = (unsigned char)(((int)*(src)++ + - (int)*(src)++) / 2); + { + *dest++ = (unsigned char)(((int)*(src) + + (int)*(src+1)) / 2); + src += 2; + } *data = src; return(rc); } diff --git a/src/mule-charset.c b/src/mule-charset.c index 86b1652..a0ccd35 100644 --- a/src/mule-charset.c +++ b/src/mule-charset.c @@ -1320,8 +1320,8 @@ vars_of_mule_charset (void) { int i, j, k; - chlook = xnew (struct charset_lookup); - dumpstruct (&chlook, &charset_lookup_description); + chlook = xnew_and_zero (struct charset_lookup); /* zero for Purify. */ + dump_add_root_struct_ptr (&chlook, &charset_lookup_description); /* Table of charsets indexed by leading byte. */ for (i = 0; i < countof (chlook->charset_by_leading_byte); i++) diff --git a/src/s/aix4.h b/src/s/aix4.h index bb3a15d..8837db7 100644 --- a/src/s/aix4.h +++ b/src/s/aix4.h @@ -30,3 +30,12 @@ struct sockaddr_dl; -- Mike Sperber */ #undef HAVE_GETADDRINFO + +#ifdef __xlC__ +/* IBM's C compiler miscompiles this function. From IBM's docs: + -qstrict turns off the following optimizations: + + Performing code motion and scheduling on computations such as loads + and floating-point computations that may trigger an exception. */ +#pragma option_override (bytecount_to_charcount, "opt(strict,yes)") +#endif /* IBM's C compiler */ diff --git a/src/s/netbsd.h b/src/s/netbsd.h index 6b84bd0..682ff74 100644 --- a/src/s/netbsd.h +++ b/src/s/netbsd.h @@ -53,7 +53,15 @@ #define HAVE_TEXT_START /* No need to define `start_of_text'. */ #define ORDINARY_LINK + +/* As of this writing (Netbsd 1.5 was just released), Netbsd is + converting from a.out to elf - x86 and Sparc are using ELF. + But we're clever and let the compiler tell us which one to use. */ +#ifdef __ELF__ +#define UNEXEC "unexelf.o" +#else #define UNEXEC "unexfreebsd.o" /* ironic, considering history of unexfreebsd */ +#endif #if 0 /* Try to make this work for both 0.9 and >0.9. */ diff --git a/src/specifier.c b/src/specifier.c index 9bdf57e..8f2055b 100644 --- a/src/specifier.c +++ b/src/specifier.c @@ -3267,7 +3267,7 @@ void specifier_type_create (void) { the_specifier_type_entry_dynarr = Dynarr_new (specifier_type_entry); - dumpstruct (&the_specifier_type_entry_dynarr, &sted_description); + dump_add_root_struct_ptr (&the_specifier_type_entry_dynarr, &sted_description); Vspecifier_type_list = Qnil; staticpro (&Vspecifier_type_list); @@ -3311,7 +3311,7 @@ vars_of_specifier (void) /* Do NOT mark through this, or specifiers will never be GC'd. This is the same deal as for weak hash tables. */ Vall_specifiers = Qnil; - pdump_wire_list (&Vall_specifiers); + dump_add_weak_object_chain (&Vall_specifiers); Vuser_defined_tags = Qnil; staticpro (&Vuser_defined_tags); diff --git a/src/specifier.h b/src/specifier.h index 8c82331..a483ff6 100644 --- a/src/specifier.h +++ b/src/specifier.h @@ -300,14 +300,15 @@ extern struct specifier_methods * type##_specifier_methods #define DEFINE_SPECIFIER_TYPE(type) \ struct specifier_methods * type##_specifier_methods -#define INITIALIZE_SPECIFIER_TYPE(type, obj_name, pred_sym) do { \ - type##_specifier_methods = xnew_and_zero (struct specifier_methods); \ - type##_specifier_methods->name = obj_name; \ - type##_specifier_methods->extra_description = \ - specifier_empty_extra_description; \ - defsymbol_nodump (&type##_specifier_methods->predicate_symbol, pred_sym); \ - add_entry_to_specifier_type_list (Q##type, type##_specifier_methods); \ - dumpstruct (&type##_specifier_methods, &specifier_methods_description); \ +#define INITIALIZE_SPECIFIER_TYPE(type, obj_name, pred_sym) do { \ + type##_specifier_methods = xnew_and_zero (struct specifier_methods); \ + type##_specifier_methods->name = obj_name; \ + type##_specifier_methods->extra_description = \ + specifier_empty_extra_description; \ + defsymbol_nodump (&type##_specifier_methods->predicate_symbol, pred_sym); \ + add_entry_to_specifier_type_list (Q##type, type##_specifier_methods); \ + dump_add_root_struct_ptr (&type##_specifier_methods, \ + &specifier_methods_description); \ } while (0) #define REINITIALIZE_SPECIFIER_TYPE(type) do { \ diff --git a/src/symbols.c b/src/symbols.c index bb0fae0..906637c 100644 --- a/src/symbols.c +++ b/src/symbols.c @@ -2163,6 +2163,7 @@ sets it. = alloc_lcrecord_type (struct symbol_value_buffer_local, &lrecord_symbol_value_buffer_local); Lisp_Object foo; + zero_lcrecord (&bfwd->magic); bfwd->magic.type = SYMVAL_BUFFER_LOCAL; bfwd->default_value = find_symbol_value (variable); @@ -2270,6 +2271,7 @@ Use `make-local-hook' instead. /* Make sure variable is set up to hold per-buffer values */ bfwd = alloc_lcrecord_type (struct symbol_value_buffer_local, &lrecord_symbol_value_buffer_local); + zero_lcrecord (&bfwd->magic); bfwd->magic.type = SYMVAL_SOME_BUFFER_LOCAL; bfwd->current_buffer = Qnil; @@ -2990,6 +2992,7 @@ pity, thereby invalidating your code. { bfwd = alloc_lcrecord_type (struct symbol_value_lisp_magic, &lrecord_symbol_value_lisp_magic); + zero_lcrecord (&bfwd->magic); bfwd->magic.type = SYMVAL_LISP_MAGIC; for (i = 0; i < MAGIC_HANDLER_MAX; i++) { @@ -3126,6 +3129,7 @@ has a buffer-local value in any buffer, or the symbols nil or t. bfwd = alloc_lcrecord_type (struct symbol_value_varalias, &lrecord_symbol_value_varalias); + zero_lcrecord (&bfwd->magic); bfwd->magic.type = SYMVAL_VARALIAS; bfwd->aliasee = alias; bfwd->shadowed = valcontents; @@ -3259,9 +3263,9 @@ init_symbols_once_early (void) XSYMBOL (Qt)->value = Qt; /* Veritas aeterna */ Vquit_flag = Qnil; - pdump_wire (&Qnil); - pdump_wire (&Qunbound); - pdump_wire (&Vquit_flag); + dump_add_root_object (&Qnil); + dump_add_root_object (&Qunbound); + dump_add_root_object (&Vquit_flag); } void diff --git a/src/symeval.h b/src/symeval.h index df25cab..44a5849 100644 --- a/src/symeval.h +++ b/src/symeval.h @@ -345,7 +345,7 @@ void defvar_magic (const char *symbol_name, const struct symbol_value_forward *m #define DEFVAR_SYMVAL_FWD_INT(lname, c_location, forward_type, magicfun) do{ \ DEFVAR_SYMVAL_FWD (lname, c_location, forward_type, magicfun); \ - dumpopaque (c_location, sizeof(int)); \ + dump_add_opaque (c_location, sizeof(int)); \ } while (0) #define DEFVAR_SYMVAL_FWD_OBJECT(lname, c_location, forward_type, magicfun) do{ \ diff --git a/src/sysdep.c b/src/sysdep.c index 1ac4834..12cd3de 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -2204,7 +2204,7 @@ start_of_data (void) #ifdef DATA_START return ((char *) DATA_START); #else -#ifdef ORDINARY_LINK +#if defined (ORDINARY_LINK) || defined(PDUMP) /* * This is a hack. Since we're not linking crt0.c or pre_crt0.c, * data_start isn't defined. We take the address of environ, which diff --git a/src/sysdll.c b/src/sysdll.c index 1504961..1e2807c 100644 --- a/src/sysdll.c +++ b/src/sysdll.c @@ -30,14 +30,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #ifdef HAVE_SHLIB /* Thankfully, most systems follow the ELFish dlopen() method. -** HAVE__DLOPEN is lame, but SCO has their dl* functions as _dl*, and -** unless you include dlfcn.h you don't get the macros to mask them, and -** autoconf fails to find them. No longer true as of 5.0.5. -** -** Anybody who wants to use this on SCO needs to have their configure.in -** look for _dlopen() as well as dlopen() */ -#if defined(HAVE_DLOPEN) || defined(HAVE__DLOPEN) || defined(HAVE_DLFCN_H) +#if defined(HAVE_DLOPEN) #include #ifndef RTLD_LAZY diff --git a/src/unexelf.c b/src/unexelf.c index 54c48e1..66d889c 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -471,36 +471,6 @@ typedef struct { #define hdrNil ((pHDRR)0) #endif -#ifdef __NetBSD__ -/* - * NetBSD does not have normal-looking user-land ELF support. - */ -# ifdef __alpha__ -# define ELFSIZE 64 -# else -# define ELFSIZE 32 -# endif -# include - -# define PT_LOAD Elf_pt_load -# define SHT_SYMTAB Elf_sht_symtab -# define SHT_DYNSYM Elf_sht_dynsym -# define SHT_NULL Elf_sht_null -# define SHT_NOBITS Elf_sht_nobits -# define SHT_REL Elf_sht_rel -# define SHT_RELA Elf_sht_rela - -# define SHN_UNDEF Elf_eshn_undefined -# define SHN_ABS Elf_eshn_absolute -# define SHN_COMMON Elf_eshn_common - -# ifdef __alpha__ -# include -# define HDRR struct ecoff_symhdr -# define pHDRR HDRR * -# endif -#endif /* __NetBSD__ */ - #ifdef __OpenBSD__ # include #endif diff --git a/tests/ChangeLog b/tests/ChangeLog index 74bfcd5..fa9cb3a 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,12 @@ +2001-01-17 Martin Buchholz + + * XEmacs 21.2.41 "Polyhymnia" is released. + +2001-01-15 Martin Buchholz + + * automated/byte-compiler-tests.el ((let ((z 1)) (or (setq z 42)) z)): + Add regression test for mis-byte-compilation. + 2001-01-08 Martin Buchholz * XEmacs 21.2.40 is released. diff --git a/tests/automated/byte-compiler-tests.el b/tests/automated/byte-compiler-tests.el index 11f355a..e4b2520 100644 --- a/tests/automated/byte-compiler-tests.el +++ b/tests/automated/byte-compiler-tests.el @@ -119,6 +119,8 @@ (before-and-after-compile-equal (- simplyamarker 1)) (before-and-after-compile-equal (- simplyamarker)) +(before-and-after-compile-equal (let ((z 1)) (or (setq z 42)) z)) + ;; byte-after-unbind-ops ;; byte-constant diff --git a/version.sh b/version.sh index 503b883..4b4f863 100644 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ emacs_is_beta=t emacs_major_version=21 emacs_minor_version=2 -emacs_beta_version=40 -xemacs_codename="Persephone" +emacs_beta_version=41 +xemacs_codename="Polyhymnia" infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8 -- 1.7.10.4