Index: CHANGES-beta =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/CHANGES-beta,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- CHANGES-beta 4 Sep 2003 00:05:04 -0000 1.215 +++ CHANGES-beta 26 Sep 2003 05:56:29 -0000 1.216 @@ -1,3 +1,65 @@ +to 21.5.16 "celeriac" + +Build + +-- Don't detect GNU DLD - James. +-- Better detection of sound on Solaris9 - Buchholz. +-- Add support detecting SunOS 5.10 in configure - Buchholz. +-- Use '-bundle' when testing ability to build shared libs, but use + '-bundle_loader' in ellcc - Begel. +-- Output separate declaration and definition for dump_id - James. +-- Add Makefile targets to build PDF docs - Wambold. +-- Don't mangle the unload function in `unload_postgresql' and + `unload_ldap' when compiling with C++ - James. +-- Use extern "C" for C++ builds - James. +-- Conditionally compile messages missing from the Cygwin headers - James. +-- Add cast to quiet compiler in unexcw.c - James. +-- Quiet compiler warnings about struct stat in syswindows.h - James. +-- Test \{m,n\} in regexp-tests - Turnbull. + +Documentation + +-- Propose bash as workaround for buggy Solaris sh in PROBLEMS - Sparapani. +-- Fix the PRINTED-MANUAL-TITLE arg for cross ref to "The XEmacs User's Manual" + - Aichner. +-- New node: "A Reader's Guide to XEmacs Coding Conventions" - Turnbull. +-- New node: "Customizing Message Display" - Golubev. + +Internals + +-- In ellcc.c don't mangle external symbols in generated doc file - James. +-- Add PARTIALLY parameter to support Fpos_visible_in_window_p parameter in + redisplay - James. +-- Use 'point_would_be_visible' parameter in `scrollbar_reset_cursor' - James. +-- Add PARTIALLY parameter fo `Fpos_visible_in_window_p' - James. +-- Use new 'point_would_be_visible' parameter in `window_scroll' - James. +-- dll_open now takes a Lisp_Object - James. +-- Remove useless call to dll_init - James. +-- char to CIbyte conversion in emodules.c, sysdll.c - James. +-- Do not mangle module initialisation function names - James. +-- char to Extbyte conversion in sysdll.c - James. +-- Return a Lisp_Object instead of a string in `dll_error' - James. +-- Make eval-related functions visible to modules - James. +-- Allow specifying elisp function for waithing user input while displaying + message while in minibuffer - Golubev. +-- Use OS_RELEASE=os_release_major*100+os_release_minor in s/sol2.h - Buchholz. +-- Add lrecord_memory_descriptions - Crestani. +-- Remove GetLongPathNameW - Harris. +-- A couple of new macros to compare w32api versions - James. +-- KKCC fixes - Crestani. + +Lisp API + +-- Allow user to specify alternative function for displaying message - Golubev. +-- New var to specify the maximum received fonts - LewisMoss. +-- Allow gnuserv to fallback to GTK if X device fails - LewisMoss. +-- Eval the initialisation value of `eol-detection-enabled-p' - Alexander. +-- Make sure `setbuffer-file-coding-system' sets the eol type - Alexander. +-- Remove unnecessary definitions of 'null-device' - Turnbull. +-- Actually implement the specified semantics for 'defvar' - Sperber. +-- Fix `shrink-to-fit' by calling `shrink-window-if-larger-than-buffer' - Aichner. + + to 21.5.15 "celery" Build Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.377 retrieving revision 1.383 diff -u -r1.377 -r1.383 --- ChangeLog 4 Sep 2003 00:05:04 -0000 1.377 +++ ChangeLog 26 Sep 2003 05:56:29 -0000 1.383 @@ -1,3 +1,44 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + +2003-09-21 Jerry James + + * configure.in: Remove detection of GNU DLD. + * configure: Regenerate. + +2003-09-20 Rodney Sparapani + + * PROBLEMS: Propose bash as an alternative to buggy Solaris + /bin/sh. + +2003-09-20 Steve Youngs + + * configure: Re-generate after Martin's configure.in patch. + +2003-09-20 Martin Buchholz + + * configure.in: XEmacs failed to build on Solaris9. + Solaris9 comes with /usr/demo/SOUND, but no headers or libraries + therein. + +2003-09-18 Steve Youngs + + * configure: Re-generate after Martin's configure.in patch. + +2003-09-13 Martin Buchholz + + * configure.in (OS_RELEASE): Add support for SunOS 5.10. + On current OSes produced by Sun, `uname -r' prints "5.9". + It seems likely that on future OSes, `uname -r' will print "5.10". + We need to accept multi-digit release numbers. + +2003-05-10 Andrew Begel + + * aclocal.m4 (XE_SHLIB_STUFF): Use -bundle when testing the + ability to build shared libraries, but use -bundle_loader in + ellcc. Properly handle other flags for MacOS X. + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: PROBLEMS =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/PROBLEMS,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- PROBLEMS 2 May 2003 06:00:41 -0000 1.67 +++ PROBLEMS 19 Sep 2003 16:24:33 -0000 1.68 @@ -428,7 +428,14 @@ This only occurs if you have LANG != C. This is a known bug with /bin/sh fixed by installing Patch-ID# 101613-01. Or, you can use -bash, as a workaround. +bash by setting the environment variable CONFIG_SHELL to /bin/bash + +*** Solaris 2.x configure fails: ./config.status: test: argument expected + +This is a known bug with /bin/sh and /bin/test, i.e. they do not +support the XPG4 standard. You can use bash as a workaround or an +XPG4-compliant Bourne shell such as the Sun-supplied /usr/xpg4/bin/sh +by setting the environment variable CONFIG_SHELL to /usr/xpg4/bin/sh *** On SunOS, you get linker errors ld: Undefined symbol Index: aclocal.m4 =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/aclocal.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aclocal.m4 19 Aug 2003 02:11:47 -0000 1.8 +++ aclocal.m4 12 Sep 2003 02:02:07 -0000 1.9 @@ -92,6 +92,9 @@ # PIC is the default for these OSes. ;; + *darwin*) dll_cflags='-dynamic' + ;; + os2*) # We can build DLLs from non-PIC. ;; @@ -244,8 +247,16 @@ xcldf= AC_MSG_CHECKING(if C compiler can produce shared libraries) if test "$XEGCC" = yes; then - xcldf="-shared" - xldf="-shared" + case "$xehost_os" in + *darwin*) + xcldf='-bundle' + xldf='-bundle -bundle_loader ../../src/xemacs' + ;; + *) + xcldf="-shared" + xldf="-shared" + ;; + esac else # Not using GCC case "$xehost_os" in aix[[3-9]]*) @@ -393,7 +404,15 @@ if test "$cc_produces_so" = "yes"; then dll_ld=$CC - dll_ldflags=$xcldf + case "$xehost_os" in + *darwin*) + dnl On Darwin, we test with xcldf, but we use xldf + dll_ldflags=$xldf + ;; + *) + dll_ldflags=$xcldf + ;; + esac can_build_shared=yes ld_shlibs=yes else @@ -539,6 +558,10 @@ if test -z "$ld_dynamic_link_flags"; then case "$xehost_os" in aix[[3-9]]*) + ld_dynamic_link_flags= + ;; + + *darwin*) ld_dynamic_link_flags= ;; Index: configure =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v retrieving revision 1.203 retrieving revision 1.206 diff -u -r1.203 -r1.206 --- configure 28 Aug 2003 15:45:21 -0000 1.203 +++ configure 22 Sep 2003 03:22:14 -0000 1.206 @@ -1461,9 +1461,14 @@ esac case "$canonical" in - *-solaris* ) + *-solaris* ) opsys=sol2 - os_release=`uname -r | sed -e 's/^\([0-9]\)\.\([0-9]\).*/\1\2/'` + os_release_major=`uname -r | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1/'` + os_release_minor=`uname -r | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\2/'` + case "$os_release_minor" in [0-9]) + os_release_minor="0${os_release_minor}";; + esac + os_release="${os_release_major}${os_release_minor}" { test "$extra_verbose" = "yes" && cat << EOF Defining OS_RELEASE = $os_release EOF @@ -1687,7 +1692,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1691: checking for $ac_word" >&5 +echo "configure:1696: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1714,7 +1719,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1718: checking for $ac_word" >&5 +echo "configure:1723: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1762,7 +1767,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1766: checking for $ac_word" >&5 +echo "configure:1771: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1791,7 +1796,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1795: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1800: 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' @@ -1804,12 +1809,12 @@ cat > conftest.$ac_ext << EOF -#line 1808 "configure" +#line 1813 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1818: \"$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 @@ -1837,19 +1842,19 @@ { 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:1841: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1846: 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:1846: checking whether we are using GNU C" >&5 +echo "configure:1851: 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:1858: \"$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 @@ -1867,7 +1872,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1871: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1876: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1900,7 +1905,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1904: checking for $ac_word" >&5 +echo "configure:1909: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1927,7 +1932,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1931: checking for $ac_word" >&5 +echo "configure:1936: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1975,7 +1980,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1979: checking for $ac_word" >&5 +echo "configure:1984: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2004,7 +2009,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2008: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2013: 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' @@ -2017,12 +2022,12 @@ cat > conftest.$ac_ext << EOF -#line 2021 "configure" +#line 2026 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2031: \"$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 @@ -2050,19 +2055,19 @@ { 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:2054: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2059: 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:2059: checking whether we are using GNU C" >&5 +echo "configure:2064: 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:2071: \"$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 @@ -2080,7 +2085,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2084: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2089: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2113,7 +2118,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2117: checking for $ac_word" >&5 +echo "configure:2122: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2140,7 +2145,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2144: checking for $ac_word" >&5 +echo "configure:2149: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2188,7 +2193,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2192: checking for $ac_word" >&5 +echo "configure:2197: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2217,7 +2222,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2221: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2226: 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' @@ -2230,12 +2235,12 @@ cat > conftest.$ac_ext << EOF -#line 2234 "configure" +#line 2239 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2244: \"$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 @@ -2263,19 +2268,19 @@ { 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:2267: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2272: 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:2272: checking whether we are using GNU C" >&5 +echo "configure:2277: 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:2284: \"$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 @@ -2293,7 +2298,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2297: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2302: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2326,7 +2331,7 @@ if test "$GCC" = "yes"; then cat > conftest.$ac_ext <= 3 @@ -2336,7 +2341,7 @@ #endif } EOF -if { (eval echo configure:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -2357,7 +2362,7 @@ 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:2361: checking how to run the C preprocessor" >&5 +echo "configure:2366: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2370,13 +2375,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2385: \"$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 : @@ -2387,13 +2392,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2402: \"$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 : @@ -2404,13 +2409,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2419: \"$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 : @@ -2436,9 +2441,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2440: checking for AIX" >&5 +echo "configure:2445: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:2469: checking for GNU libc" >&5 +echo "configure:2474: checking for GNU libc" >&5 cat > conftest.$ac_ext < int main() { @@ -2479,7 +2484,7 @@ ; return 0; } EOF -if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_glibc=yes else @@ -2509,7 +2514,7 @@ EOF } - if test "$os_release" -ge 55; then + if test "$os_release" -ge 505; then { test "$extra_verbose" = "yes" && cat << \EOF Defining _XOPEN_SOURCE = 500 EOF @@ -2556,7 +2561,7 @@ esac cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -2822,17 +2827,17 @@ if test "$__USLC__" = yes; then echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6 -echo "configure:2826: checking for whether the -Kalloca compiler flag is needed" >&5 +echo "configure:2831: 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:2841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2843,14 +2848,14 @@ 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:2859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* need_kalloca=yes else @@ -2910,7 +2915,7 @@ if test "$GCC" = "yes"; then echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6 -echo "configure:2914: checking for buggy gcc versions" >&5 +echo "configure:2919: 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.*) @@ -2968,7 +2973,7 @@ if test "$pdump" != "yes"; then echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6 -echo "configure:2972: checking for \"-z nocombreloc\" linker flag" >&5 +echo "configure:2977: checking for \"-z nocombreloc\" linker flag" >&5 case "`ld --help 2>&1`" in *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6 ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;; @@ -3057,7 +3062,7 @@ fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:3061: checking for dynodump" >&5 +echo "configure:3066: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -3095,12 +3100,12 @@ done echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6 -echo "configure:3099: checking for terminateAndUnload in -lC" >&5 +echo "configure:3104: 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:3120: \"$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 @@ -3219,7 +3224,7 @@ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:3223: checking "for runtime libraries flag"" >&5 +echo "configure:3228: checking "for runtime libraries flag"" >&5 case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; @@ -3241,14 +3246,14 @@ done fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* dash_r="$try_dash_r" else @@ -3349,10 +3354,10 @@ fi after_morecore_hook_exists=yes echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:3353: checking for malloc_set_state" >&5 +echo "configure:3358: 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:3384: \"$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 @@ -3395,16 +3400,16 @@ fi echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:3399: checking whether __after_morecore_hook exists" >&5 +echo "configure:3404: 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:3413: \"$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 @@ -3460,7 +3465,7 @@ # 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:3464: checking for $ac_word" >&5 +echo "configure:3469: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -3515,7 +3520,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3519: checking for a BSD compatible install" >&5 +echo "configure:3524: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -3569,7 +3574,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3573: checking for $ac_word" >&5 +echo "configure:3578: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -3601,15 +3606,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3605: checking for $ac_hdr" >&5 +echo "configure:3610: 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:3613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3618: \"$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* @@ -3639,10 +3644,10 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3643: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3648: checking for sys/wait.h that is POSIX.1 compatible" >&5 cat > conftest.$ac_ext < #include @@ -3658,7 +3663,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3682,10 +3687,10 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3686: checking for ANSI C header files" >&5 +echo "configure:3691: checking for ANSI C header files" >&5 cat > conftest.$ac_ext < #include @@ -3693,7 +3698,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3702: \"$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* @@ -3710,7 +3715,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3728,7 +3733,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3746,7 +3751,7 @@ 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') @@ -3757,7 +3762,7 @@ exit (0); } EOF -if { (eval echo configure:3761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:3766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -3783,10 +3788,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3787: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3792: checking whether time.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext < #include @@ -3795,7 +3800,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3819,10 +3824,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3823: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:3828: checking for sys_siglist declaration in signal.h or unistd.h" >&5 cat > conftest.$ac_ext < #include @@ -3834,7 +3839,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -3860,9 +3865,9 @@ echo $ac_n "checking for utime""... $ac_c" 1>&6 -echo "configure:3864: checking for utime" >&5 +echo "configure:3869: checking for utime" >&5 cat > conftest.$ac_ext < #include @@ -3870,7 +3875,7 @@ struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x); ; return 0; } EOF -if { (eval echo configure:3874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3879: \"$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 @@ -3889,10 +3894,10 @@ for ac_func in utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3893: checking for $ac_func" >&5 +echo "configure:3898: 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:3924: \"$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 @@ -3947,10 +3952,10 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3951: checking return type of signal handlers" >&5 +echo "configure:3956: checking return type of signal handlers" >&5 cat > conftest.$ac_ext < #include @@ -3967,7 +3972,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3989,10 +3994,10 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3993: checking for size_t" >&5 +echo "configure:3998: checking for size_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4023,10 +4028,10 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4027: checking for pid_t" >&5 +echo "configure:4032: checking for pid_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4057,10 +4062,10 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4061: checking for uid_t in sys/types.h" >&5 +echo "configure:4066: checking for uid_t in sys/types.h" >&5 cat > conftest.$ac_ext < EOF @@ -4096,10 +4101,10 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4100: checking for mode_t" >&5 +echo "configure:4105: checking for mode_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4130,10 +4135,10 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4134: checking for off_t" >&5 +echo "configure:4139: checking for off_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4164,10 +4169,10 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:4168: checking for ssize_t" >&5 +echo "configure:4173: checking for ssize_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4200,9 +4205,9 @@ if test "$ac_cv_header_inttypes_h" != "yes"; then echo $ac_n "checking for intptr_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4204: checking for intptr_t in sys/types.h" >&5 +echo "configure:4209: checking for intptr_t in sys/types.h" >&5 cat > conftest.$ac_ext < intptr_t x; @@ -4211,7 +4216,7 @@ ; return 0; } EOF -if { (eval echo configure:4215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4220: \"$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 @@ -4232,9 +4237,9 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4236: checking for socklen_t" >&5 +echo "configure:4241: checking for socklen_t" >&5 cat > conftest.$ac_ext < #include @@ -4244,7 +4249,7 @@ ; return 0; } EOF -if { (eval echo configure:4248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4253,7 +4258,7 @@ rm -rf conftest* cat > conftest.$ac_ext < #include @@ -4263,7 +4268,7 @@ ; return 0; } EOF -if { (eval echo configure:4267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""size_t" 1>&6 @@ -4295,9 +4300,9 @@ rm -f conftest* echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:4299: checking for struct timeval" >&5 +echo "configure:4304: checking for struct timeval" >&5 cat > conftest.$ac_ext < @@ -4313,7 +4318,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:4317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -4335,10 +4340,10 @@ rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4339: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4344: checking whether struct tm is in sys/time.h or time.h" >&5 cat > conftest.$ac_ext < #include @@ -4346,7 +4351,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4370,10 +4375,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4374: checking for tm_zone in struct tm" >&5 +echo "configure:4379: checking for tm_zone in struct tm" >&5 cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -4381,7 +4386,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4404,10 +4409,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4408: checking for tzname" >&5 +echo "configure:4413: checking for tzname" >&5 cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -4417,7 +4422,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4443,10 +4448,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4447: checking for working const" >&5 +echo "configure:4452: checking for working const" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4520,7 +4525,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:4524: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:4529: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -4545,12 +4550,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4549: checking whether byte ordering is bigendian" >&5 +echo "configure:4554: 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 @@ -4561,11 +4566,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4570: \"$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 @@ -4576,7 +4581,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4593,7 +4598,7 @@ 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:4615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_bigendian=no else @@ -4633,10 +4638,10 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4637: checking size of short" >&5 +echo "configure:4642: checking size of short" >&5 cat > conftest.$ac_ext < int main() @@ -4647,7 +4652,7 @@ return(0); } EOF -if { (eval echo configure:4651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -4675,10 +4680,10 @@ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4679: checking size of int" >&5 +echo "configure:4684: checking size of int" >&5 cat > conftest.$ac_ext < int main() @@ -4689,7 +4694,7 @@ return(0); } EOF -if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -4711,10 +4716,10 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4715: checking size of long" >&5 +echo "configure:4720: checking size of long" >&5 cat > conftest.$ac_ext < int main() @@ -4725,7 +4730,7 @@ return(0); } EOF -if { (eval echo configure:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -4747,10 +4752,10 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4751: checking size of long long" >&5 +echo "configure:4756: checking size of long long" >&5 cat > conftest.$ac_ext < int main() @@ -4761,7 +4766,7 @@ return(0); } EOF -if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4770: \"$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 @@ -4783,10 +4788,10 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4787: checking size of void *" >&5 +echo "configure:4792: checking size of void *" >&5 cat > conftest.$ac_ext < int main() @@ -4797,7 +4802,7 @@ return(0); } EOF -if { (eval echo configure:4801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4806: \"$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 @@ -4820,7 +4825,7 @@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:4824: checking for long file names" >&5 +echo "configure:4829: 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: @@ -4866,10 +4871,10 @@ echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:4870: checking for sin" >&5 +echo "configure:4875: checking for sin" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4901: \"$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 @@ -4910,12 +4915,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:4914: checking for sin in -lm" >&5 +echo "configure:4919: 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:4935: \"$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 @@ -4961,14 +4966,14 @@ cat > conftest.$ac_ext < int main() { return atanh(1.0) + asinh(1.0) + acosh(1.0); ; return 0; } EOF -if { (eval echo configure:4972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4977: \"$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 @@ -4987,10 +4992,10 @@ for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4991: checking for $ac_func" >&5 +echo "configure:4996: 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:5022: \"$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 @@ -5042,14 +5047,14 @@ echo "checking type of mail spool file locking" 1>&6 -echo "configure:5046: checking type of mail spool file locking" >&5 +echo "configure:5051: 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:5050: checking for $ac_func" >&5 +echo "configure:5055: 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:5081: \"$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 @@ -5154,12 +5159,12 @@ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:5158: checking for cma_open in -lpthreads" >&5 +echo "configure:5163: 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:5179: \"$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 @@ -5207,7 +5212,7 @@ echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:5211: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:5216: 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; @@ -5217,9 +5222,9 @@ fi if test "$opsys" = "sol2"; then - if test "$os_release" -ge 56; then + if test "$os_release" -ge 506; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:5223: checking for \"-z ignore\" linker flag" >&5 +echo "configure:5228: 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 ;; @@ -5230,7 +5235,7 @@ echo "checking "for specified window system"" 1>&6 -echo "configure:5234: checking "for specified window system"" >&5 +echo "configure:5239: checking "for specified window system"" >&5 GNOME_CONFIG=no @@ -5238,7 +5243,7 @@ if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5242: checking for GNOME configuration script" >&5 +echo "configure:5247: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` @@ -5269,7 +5274,7 @@ if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5273: checking for GTK configuration script" >&5 +echo "configure:5278: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` @@ -5291,18 +5296,18 @@ if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5295: checking gtk version" >&5 +echo "configure:5300: checking gtk version" >&5 GTK_VERSION=`${GTK_CONFIG} --version` echo "$ac_t""${GTK_VERSION}" 1>&6 echo $ac_n "checking gtk libs""... $ac_c" 1>&6 -echo "configure:5300: checking gtk libs" >&5 +echo "configure:5305: checking gtk libs" >&5 GTK_LIBS=`${GTK_CONFIG} --libs` libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi echo "$ac_t""${GTK_LIBS}" 1>&6 echo $ac_n "checking gtk cflags""... $ac_c" 1>&6 -echo "configure:5306: checking gtk cflags" >&5 +echo "configure:5311: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` if test "$GCC" = "yes"; then GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" @@ -5312,19 +5317,19 @@ echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5316: checking for main in -lgdk_imlib" >&5 +echo "configure:5321: checking for main in -lgdk_imlib" >&5 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdk_imlib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5333: \"$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 @@ -5346,12 +5351,12 @@ echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5350: checking for Imlib_init in -lImlib" >&5 +echo "configure:5355: checking for Imlib_init in -lImlib" >&5 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'` xe_check_libs=" -lImlib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5371: \"$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 @@ -5385,10 +5390,10 @@ for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5389: checking for $ac_func" >&5 +echo "configure:5394: 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:5420: \"$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 @@ -5477,15 +5482,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5481: checking for $ac_hdr" >&5 +echo "configure:5486: 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:5489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5494: \"$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* @@ -5516,19 +5521,19 @@ echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5520: checking for main in -lxml" >&5 +echo "configure:5525: checking for main in -lxml" >&5 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lxml " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5537: \"$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 @@ -5550,19 +5555,19 @@ echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5554: checking for main in -lglade" >&5 +echo "configure:5559: checking for main in -lglade" >&5 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5571: \"$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 @@ -5584,19 +5589,19 @@ echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5588: checking for main in -lglade-gnome" >&5 +echo "configure:5593: checking for main in -lglade-gnome" >&5 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade-gnome " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5605: \"$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 @@ -5617,7 +5622,7 @@ cat > conftest.$ac_ext < EOF @@ -5676,7 +5681,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5680: checking for X" >&5 +echo "configure:5685: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5736,12 +5741,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5750: \"$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* @@ -5810,14 +5815,14 @@ 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:5826: \"$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. @@ -5926,17 +5931,17 @@ 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:5930: checking whether -R must be followed by a space" >&5 +echo "configure:5935: 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:5945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -5952,14 +5957,14 @@ 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:5968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -5995,12 +6000,12 @@ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5999: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:6004: 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:6020: \"$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 @@ -6035,12 +6040,12 @@ 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:6039: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:6044: 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:6060: \"$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 @@ -6080,10 +6085,10 @@ # 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:6084: checking for gethostbyname" >&5 +echo "configure:6089: checking for gethostbyname" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6115: \"$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 @@ -6127,12 +6132,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6131: checking for gethostbyname in -lnsl" >&5 +echo "configure:6136: 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:6152: \"$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 @@ -6173,10 +6178,10 @@ # -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:6177: checking for connect" >&5 +echo "configure:6182: checking for connect" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6208: \"$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 @@ -6222,12 +6227,12 @@ 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:6226: checking "$xe_msg_checking"" >&5 +echo "configure:6231: 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:6247: \"$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 @@ -6262,10 +6267,10 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:6266: checking for remove" >&5 +echo "configure:6271: checking for remove" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6297: \"$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 @@ -6309,12 +6314,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6313: checking for remove in -lposix" >&5 +echo "configure:6318: 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:6334: \"$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 @@ -6349,10 +6354,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6353: checking for shmat" >&5 +echo "configure:6358: checking for shmat" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6384: \"$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 @@ -6396,12 +6401,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6400: checking for shmat in -lipc" >&5 +echo "configure:6405: 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:6421: \"$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 @@ -6448,12 +6453,12 @@ 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:6452: checking "$xe_msg_checking"" >&5 +echo "configure:6457: 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:6473: \"$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 @@ -6510,15 +6515,15 @@ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:6514: checking for Xm/Xm.h" >&5 +echo "configure:6519: 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:6522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6527: \"$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* @@ -6535,12 +6540,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:6539: checking for XmStringFree in -lXm" >&5 +echo "configure:6544: 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:6560: \"$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 @@ -6703,7 +6708,7 @@ echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6707: checking for X defines extracted by xmkmf" >&5 +echo "configure:6712: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -6752,15 +6757,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:6756: checking for X11/Intrinsic.h" >&5 +echo "configure:6761: 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:6764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6769: \"$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* @@ -6784,12 +6789,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6788: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6793: 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:6809: \"$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 @@ -6825,12 +6830,12 @@ 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:6829: checking "$xe_msg_checking"" >&5 +echo "configure:6834: 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:6850: \"$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 @@ -6868,12 +6873,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:6872: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:6877: 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:6893: \"$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 @@ -6907,12 +6912,12 @@ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:6911: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:6916: 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:6932: \"$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 @@ -6946,14 +6951,14 @@ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:6950: checking the version of X11 being used" >&5 +echo "configure:6955: 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:6957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else @@ -6984,10 +6989,10 @@ for ac_func in XConvertCase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6988: checking for $ac_func" >&5 +echo "configure:6993: 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:7019: \"$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 @@ -7042,15 +7047,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7046: checking for $ac_hdr" >&5 +echo "configure:7051: 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:7054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7059: \"$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* @@ -7083,10 +7088,10 @@ for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7087: checking for $ac_func" >&5 +echo "configure:7092: 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:7118: \"$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 @@ -7137,9 +7142,9 @@ done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:7141: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:7146: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -7172,12 +7177,12 @@ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:7176: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:7181: 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:7197: \"$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 @@ -7227,19 +7232,19 @@ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:7231: checking for main in -lXbsd" >&5 +echo "configure:7236: 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:7248: \"$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 @@ -7276,22 +7281,22 @@ fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:7280: checking for MS-Windows" >&5 +echo "configure:7285: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:7283: checking for main in -lgdi32" >&5 +echo "configure:7288: 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:7300: \"$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 @@ -7342,12 +7347,12 @@ test "$with_widgets" != "no" && with_widgets=msw fi cat > conftest.$ac_ext < int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7356: \"$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 @@ -7408,15 +7413,15 @@ 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:7412: checking for X11/extensions/shape.h" >&5 +echo "configure:7417: 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:7420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7425: \"$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* @@ -7466,7 +7471,7 @@ esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7470: checking for WM_COMMAND option" >&5; +echo "configure:7475: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND @@ -7481,15 +7486,15 @@ 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:7485: checking for X11/Xauth.h" >&5 +echo "configure:7490: 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:7493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7498: \"$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* @@ -7512,12 +7517,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7516: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7521: 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:7537: \"$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 @@ -7582,7 +7587,7 @@ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:7586: checking for module support" >&5 +echo "configure:7591: checking for module support" >&5 if test "$with_msw" = "yes"; then have_dl=yes; @@ -7599,15 +7604,15 @@ * ) ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:7603: checking for dlfcn.h" >&5 +echo "configure:7608: 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:7611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7616: \"$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* @@ -7624,16 +7629,16 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:7628: checking for dlopen in -lc" >&5 +echo "configure:7633: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext < int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -7642,18 +7647,18 @@ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7646: checking for dlopen in -ldl" >&5 +echo "configure:7651: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext < int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -7679,99 +7684,6 @@ EOF } - else - -echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:7686: 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 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -xe_check_libs="" - -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then - echo "$ac_t""yes" 1>&6 - libdl=dld have_dl=yes; - { test "$extra_verbose" = "yes" && cat << \EOF - Defining HAVE_SHL_LOAD -EOF -cat >> confdefs.h <<\EOF -#define HAVE_SHL_LOAD 1 -EOF -} - -else - echo "$ac_t""no" 1>&6 - -echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:7729: 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 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -xe_check_libs="" - -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then - echo "$ac_t""yes" 1>&6 - libdl=dld have_dl=yes; - { test "$extra_verbose" = "yes" && cat << \EOF - Defining HAVE_DLD_INIT -EOF -cat >> confdefs.h <<\EOF -#define HAVE_DLD_INIT 1 -EOF -} - -else - echo "$ac_t""no" 1>&6 -fi - - -fi - - fi esac fi if test -n "$have_dl"; then @@ -7786,7 +7698,7 @@ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:7790: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:7702: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; @@ -7814,9 +7726,9 @@ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:7818: checking checking whether we are using GNU C" >&5 +echo "configure:7730: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <&6 -echo "configure:7842: checking how to produce PIC code" >&5 +echo "configure:7754: checking how to produce PIC code" >&5 wl= can_build_shared=yes @@ -7850,6 +7762,9 @@ # PIC is the default for these OSes. ;; + *darwin*) dll_cflags='-dynamic' + ;; + os2*) # We can build DLLs from non-PIC. ;; @@ -7939,18 +7854,18 @@ # 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:7943: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:7858: 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:7869: \"$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 @@ -7981,10 +7896,18 @@ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:7985: checking if C compiler can produce shared libraries" >&5 +echo "configure:7900: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes; then - xcldf="-shared" - xldf="-shared" + case "$xehost_os" in + *darwin*) + xcldf='-bundle' + xldf='-bundle -bundle_loader ../../src/xemacs' + ;; + *) + xcldf="-shared" + xldf="-shared" + ;; + esac else # Not using GCC case "$xehost_os" in aix[3-9]*) @@ -8032,14 +7955,14 @@ 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:7966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else @@ -8064,7 +7987,7 @@ 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:8068: checking for ld used by GCC" >&5 +echo "configure:7991: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -8090,7 +8013,7 @@ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:8094: checking for GNU ld" >&5 +echo "configure:8017: checking for GNU ld" >&5 fi if test -z "$LTLD"; then @@ -8128,7 +8051,7 @@ # 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:8132: checking if the linker is GNU ld" >&5 +echo "configure:8055: 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 @@ -8149,14 +8072,21 @@ if test "$cc_produces_so" = "yes"; then dll_ld=$CC - dll_ldflags=$xcldf + case "$xehost_os" in + *darwin*) + dll_ldflags=$xldf + ;; + *) + dll_ldflags=$xcldf + ;; + esac can_build_shared=yes ld_shlibs=yes 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:8160: checking whether the linker supports shared libraries" >&5 +echo "configure:8090: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes @@ -8285,6 +8215,10 @@ ld_dynamic_link_flags= ;; + *darwin*) + ld_dynamic_link_flags= + ;; + freebsd2.2*) ld_dynamic_link_flags= ;; @@ -8365,10 +8299,10 @@ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8369: checking for $ac_func" >&5 +echo "configure:8303: 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:8329: \"$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 @@ -8455,15 +8389,15 @@ 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:8459: checking for ${dir}tt_c.h" >&5 +echo "configure:8393: 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:8467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8401: \"$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* @@ -8499,12 +8433,12 @@ 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:8503: checking "$xe_msg_checking"" >&5 +echo "configure:8437: 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:8453: \"$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 @@ -8569,15 +8503,15 @@ 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:8573: checking for Dt/Dt.h" >&5 +echo "configure:8507: 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:8581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8515: \"$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,12 +8534,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:8604: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:8538: 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:8554: \"$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 @@ -8697,7 +8631,7 @@ if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:8701: checking if drag and drop API is needed" >&5 +echo "configure:8635: 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 @@ -8717,19 +8651,19 @@ fi echo "checking for LDAP" 1>&6 -echo "configure:8721: checking for LDAP" >&5 +echo "configure:8655: checking for LDAP" >&5 ldap_libs= 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:8725: checking for ldap.h" >&5 +echo "configure:8659: 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:8733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8667: \"$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* @@ -8752,15 +8686,15 @@ } 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:8756: checking for lber.h" >&5 +echo "configure:8690: 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:8764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8698: \"$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* @@ -8784,12 +8718,12 @@ if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:8788: checking for ldap_search in -lldap" >&5 +echo "configure:8722: 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:8738: \"$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 @@ -8825,12 +8759,12 @@ 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:8829: checking "$xe_msg_checking"" >&5 +echo "configure:8763: 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:8779: \"$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 @@ -8866,12 +8800,12 @@ 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:8870: checking "$xe_msg_checking"" >&5 +echo "configure:8804: 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:8820: \"$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 @@ -8907,12 +8841,12 @@ 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:8911: checking "$xe_msg_checking"" >&5 +echo "configure:8845: 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:8861: \"$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 @@ -8972,10 +8906,10 @@ 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:8976: checking for $ac_func" >&5 +echo "configure:8910: 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:8936: \"$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 @@ -9037,20 +8971,20 @@ postgresql_libs= if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:9041: checking for PostgreSQL" >&5 +echo "configure:8975: 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:9046: checking for ${header_dir}libpq-fe.h" >&5 +echo "configure:8980: 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:9054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8988: \"$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* @@ -9074,12 +9008,12 @@ test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:9078: checking for PQconnectdb in -lpq" >&5 +echo "configure:9012: 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:9028: \"$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 @@ -9123,12 +9057,12 @@ echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:9127: checking for PQconnectStart in -lpq" >&5 +echo "configure:9061: 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:9077: \"$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 @@ -9190,7 +9124,7 @@ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:9194: checking for graphics libraries" >&5 +echo "configure:9128: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= @@ -9216,10 +9150,10 @@ CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:9220: checking for Xpm - no older than 3.4f" >&5 +echo "configure:9154: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext < @@ -9228,7 +9162,7 @@ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:9232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9166: \"$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 @@ -9272,17 +9206,17 @@ libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:9276: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:9210: 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:9220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else @@ -9308,15 +9242,15 @@ 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:9312: checking for compface.h" >&5 +echo "configure:9246: 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:9320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9254: \"$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* @@ -9339,12 +9273,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9343: checking for UnGenFace in -lcompface" >&5 +echo "configure:9277: 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:9293: \"$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 @@ -9404,12 +9338,12 @@ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:9408: checking for inflate in -lc" >&5 +echo "configure:9342: 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:9358: \"$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 @@ -9439,12 +9373,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:9443: checking for inflate in -lz" >&5 +echo "configure:9377: 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:9393: \"$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 @@ -9474,12 +9408,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:9478: checking for inflate in -lgz" >&5 +echo "configure:9412: 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:9428: \"$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 @@ -9520,15 +9454,15 @@ test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:9524: checking for jpeglib.h" >&5 +echo "configure:9458: 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:9532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9466: \"$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* @@ -9551,12 +9485,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:9555: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:9489: 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:9505: \"$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 @@ -9603,10 +9537,10 @@ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:9607: checking for pow" >&5 +echo "configure:9541: checking for pow" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9567: \"$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 @@ -9650,15 +9584,15 @@ } test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:9654: checking for png.h" >&5 +echo "configure:9588: 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:9662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9596: \"$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* @@ -9681,12 +9615,12 @@ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:9685: checking for png_read_image in -lpng" >&5 +echo "configure:9619: 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:9635: \"$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 @@ -9720,10 +9654,10 @@ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:9724: checking for workable png version information" >&5 +echo "configure:9658: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext < int main(int c, char **v) { @@ -9731,7 +9665,7 @@ if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:9735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9669: \"$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 @@ -9774,15 +9708,15 @@ test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:9778: checking for tiffio.h" >&5 +echo "configure:9712: 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:9786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9720: \"$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* @@ -9805,12 +9739,12 @@ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:9809: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:9743: 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:9759: \"$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 @@ -9860,15 +9794,15 @@ if test "$with_gtk" = "yes"; then 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:9864: checking for compface.h" >&5 +echo "configure:9798: 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:9872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9806: \"$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* @@ -9891,12 +9825,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9895: checking for UnGenFace in -lcompface" >&5 +echo "configure:9829: 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:9845: \"$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 @@ -9946,7 +9880,7 @@ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:9950: checking for X11 graphics libraries" >&5 +echo "configure:9884: checking for X11 graphics libraries" >&5 fi case "$with_widgets" in @@ -9956,7 +9890,7 @@ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then echo "checking for the Athena widgets" 1>&6 -echo "configure:9960: checking for the Athena widgets" >&5 +echo "configure:9894: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; @@ -9970,12 +9904,12 @@ if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9974: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:9908: 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:9924: \"$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 @@ -10002,12 +9936,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10006: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:9940: 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:9956: \"$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 @@ -10049,12 +9983,12 @@ else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:10053: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:9987: 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:10003: \"$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 @@ -10083,12 +10017,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:10087: checking for threeDClassRec in -lXaw" >&5 +echo "configure:10021: 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:10037: \"$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 @@ -10130,15 +10064,15 @@ 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:10134: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:10068: 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:10142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10076: \"$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* @@ -10158,15 +10092,15 @@ 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:10162: checking for X11/Xaw/XawInit.h" >&5 +echo "configure:10096: 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:10170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10104: \"$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* @@ -10192,15 +10126,15 @@ 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:10196: checking for X11/$athena_variant/XawInit.h" >&5 +echo "configure:10130: 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:10204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10138: \"$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* @@ -10217,15 +10151,15 @@ 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:10221: checking for X11/$athena_variant/ThreeD.h" >&5 +echo "configure:10155: 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:10229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10163: \"$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* @@ -10253,15 +10187,15 @@ 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:10257: checking for $athena_variant/XawInit.h" >&5 +echo "configure:10191: 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:10265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10278,15 +10212,15 @@ 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:10282: checking for $athena_variant/ThreeD.h" >&5 +echo "configure:10216: 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:10290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10224: \"$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* @@ -10315,15 +10249,15 @@ 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:10319: checking for X11/Xaw3d/XawInit.h" >&5 +echo "configure:10253: 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:10327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10261: \"$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* @@ -10340,15 +10274,15 @@ 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:10344: checking for X11/Xaw3d/ThreeD.h" >&5 +echo "configure:10278: 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:10352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10286: \"$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* @@ -10380,15 +10314,15 @@ 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:10384: checking for Xaw3d/XawInit.h" >&5 +echo "configure:10318: 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:10392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10326: \"$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* @@ -10405,15 +10339,15 @@ 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:10409: checking for Xaw3d/ThreeD.h" >&5 +echo "configure:10343: 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:10417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10351: \"$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* @@ -10445,15 +10379,15 @@ 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:10449: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:10383: 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:10457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10391: \"$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* @@ -10492,15 +10426,15 @@ if test "$with_x11" = "yes"; then ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:10496: checking for Xm/Xm.h" >&5 +echo "configure:10430: 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:10504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10438: \"$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* @@ -10517,12 +10451,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:10521: checking for XmStringFree in -lXm" >&5 +echo "configure:10455: 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:10471: \"$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 @@ -10562,9 +10496,9 @@ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:10566: checking for Lesstif" >&5 +echo "configure:10500: checking for Lesstif" >&5 cat > conftest.$ac_ext < #ifdef LESSTIF_VERSION @@ -10937,7 +10871,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:10941: checking for Mule-related features" >&5 +echo "configure:10875: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -10951,15 +10885,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10955: checking for $ac_hdr" >&5 +echo "configure:10889: 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:10963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10897: \"$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* @@ -10990,12 +10924,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:10994: checking for strerror in -lintl" >&5 +echo "configure:10928: 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:10944: \"$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 @@ -11039,18 +10973,18 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:11043: checking for Mule input methods" >&5 +echo "configure:10977: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:11046: checking for XIM" >&5 +echo "configure:10980: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:11049: checking for XOpenIM in -lX11" >&5 +echo "configure:10983: 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:10999: \"$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 @@ -11085,12 +11019,12 @@ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:11089: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:11023: 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:11039: \"$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 @@ -11166,15 +11100,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:11170: checking for XFontSet" >&5 +echo "configure:11104: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:11173: checking for XmbDrawString in -lX11" >&5 +echo "configure:11107: 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:11123: \"$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 @@ -11225,15 +11159,15 @@ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:11229: checking for wnn/jllib.h" >&5 +echo "configure:11163: 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:11237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11171: \"$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* @@ -11256,15 +11190,15 @@ } test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6 -echo "configure:11260: checking for wnn/commonhd.h" >&5 +echo "configure:11194: checking for wnn/commonhd.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11202: \"$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* @@ -11289,10 +11223,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11293: checking for $ac_func" >&5 +echo "configure:11227: 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:11253: \"$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 @@ -11344,12 +11278,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:11348: checking for crypt in -lcrypt" >&5 +echo "configure:11282: 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:11298: \"$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 @@ -11395,12 +11329,12 @@ if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:11399: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:11333: 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:11349: \"$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 @@ -11429,12 +11363,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:11433: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:11367: 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:11383: \"$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 @@ -11463,12 +11397,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:11467: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:11401: 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:11417: \"$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 @@ -11497,12 +11431,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:11501: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:11435: 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:11451: \"$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 @@ -11558,12 +11492,12 @@ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:11562: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:11496: 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:11512: \"$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 @@ -11609,15 +11543,15 @@ if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:11613: checking for canna/jrkanji.h" >&5 +echo "configure:11547: 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:11621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11555: \"$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* @@ -11644,15 +11578,15 @@ c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:11648: checking for canna/jrkanji.h" >&5 +echo "configure:11582: 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:11656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11590: \"$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* @@ -11680,15 +11614,15 @@ test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:11684: checking for canna/RK.h" >&5 +echo "configure:11618: 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:11692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11626: \"$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* @@ -11711,12 +11645,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:11715: checking for RkBgnBun in -lRKC" >&5 +echo "configure:11649: 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:11665: \"$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 @@ -11750,12 +11684,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:11754: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:11688: 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:11704: \"$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 @@ -11812,12 +11746,12 @@ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:11816: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:11750: 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:11766: \"$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 @@ -11915,10 +11849,10 @@ for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strlwr strupr symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask wcslen wcscmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11919: checking for $ac_func" >&5 +echo "configure:11853: 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:11879: \"$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 @@ -11982,10 +11916,10 @@ 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:11986: checking for $ac_func" >&5 +echo "configure:11920: 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:11946: \"$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 @@ -12037,10 +11971,10 @@ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:12041: checking for openpty" >&5 +echo "configure:11975: checking for openpty" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12001: \"$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 @@ -12082,12 +12016,12 @@ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:12086: checking for openpty in -lutil" >&5 +echo "configure:12020: 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:12036: \"$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 @@ -12133,15 +12067,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12137: checking for $ac_hdr" >&5 +echo "configure:12071: 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:12145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12079: \"$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* @@ -12178,15 +12112,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12182: checking for $ac_hdr" >&5 +echo "configure:12116: 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:12190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12124: \"$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* @@ -12219,15 +12153,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12223: checking for $ac_hdr" >&5 +echo "configure:12157: 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:12231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12165: \"$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* @@ -12260,15 +12194,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12264: checking for $ac_hdr" >&5 +echo "configure:12198: 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:12272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12206: \"$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* @@ -12304,15 +12238,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12308: checking for $ac_hdr" >&5 +echo "configure:12242: 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:12316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12250: \"$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* @@ -12345,10 +12279,10 @@ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12349: checking for $ac_func" >&5 +echo "configure:12283: 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:12309: \"$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 @@ -12402,15 +12336,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12406: checking for $ac_hdr" >&5 +echo "configure:12340: 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:12414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12348: \"$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* @@ -12443,10 +12377,10 @@ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12447: checking for $ac_func" >&5 +echo "configure:12381: 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:12407: \"$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 @@ -12502,15 +12436,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12506: checking for $ac_hdr" >&5 +echo "configure:12440: 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:12514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12448: \"$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* @@ -12546,12 +12480,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:12550: checking for kstat_open in -lkstat" >&5 +echo "configure:12484: 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:12500: \"$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 @@ -12597,15 +12531,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12601: checking for $ac_hdr" >&5 +echo "configure:12535: 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:12609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12543: \"$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* @@ -12637,12 +12571,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:12641: checking for kvm_read in -lkvm" >&5 +echo "configure:12575: 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:12591: \"$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 @@ -12687,16 +12621,16 @@ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:12691: checking whether netdb declares h_errno" >&5 +echo "configure:12625: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext < int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:12700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12634: \"$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 @@ -12716,16 +12650,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:12720: checking for sigsetjmp" >&5 +echo "configure:12654: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:12729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12663: \"$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 @@ -12745,11 +12679,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:12749: checking whether localtime caches TZ" >&5 +echo "configure:12683: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext < #if STDC_HEADERS @@ -12784,7 +12718,7 @@ exit (0); } EOF -if { (eval echo configure:12788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -12814,9 +12748,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:12818: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:12752: 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:12775: \"$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 @@ -12859,19 +12793,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:12863: checking for inline" >&5 +echo "configure:12797: 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:12809: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -12912,17 +12846,17 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:12916: checking for working alloca.h" >&5 +echo "configure:12850: 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:12926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12860: \"$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 @@ -12946,10 +12880,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:12950: checking for alloca" >&5 +echo "configure:12884: checking for alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12915: \"$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 @@ -13016,10 +12950,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:13020: checking whether alloca needs Cray hooks" >&5 +echo "configure:12954: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <&6 -echo "configure:13047: checking for $ac_func" >&5 +echo "configure:12981: 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:13007: \"$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 @@ -13099,10 +13033,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:13103: checking stack direction for C alloca" >&5 +echo "configure:13037: 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:13059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -13150,9 +13084,9 @@ fi echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6 -echo "configure:13154: checking for working alloca in function calls" >&5 +echo "configure:13088: checking for working alloca in function calls" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then working_alloca_in_function_calls=yes else @@ -13228,10 +13162,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:13232: checking for working strcoll" >&5 +echo "configure:13166: checking for working strcoll" >&5 cat > conftest.$ac_ext < main () @@ -13241,7 +13175,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:13245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -13269,10 +13203,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13273: checking for $ac_func" >&5 +echo "configure:13207: 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:13233: \"$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 @@ -13323,10 +13257,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:13327: checking whether getpgrp takes no argument" >&5 +echo "configure:13261: 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:13319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -13408,10 +13342,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:13412: checking for working mmap" >&5 +echo "configure:13346: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext < #include @@ -13444,7 +13378,7 @@ return 1; } EOF -if { (eval echo configure:13448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -13473,9 +13407,9 @@ 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:13477: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:13411: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext < int main() { @@ -13487,7 +13421,7 @@ ; return 0; } EOF -if { (eval echo configure:13491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -13512,15 +13446,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:13516: checking for termios.h" >&5 +echo "configure:13450: 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:13524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13458: \"$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* @@ -13563,15 +13497,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:13567: checking for termio.h" >&5 +echo "configure:13501: 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:13575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13509: \"$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* @@ -13603,10 +13537,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:13607: checking for socket" >&5 +echo "configure:13541: checking for socket" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13567: \"$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 @@ -13644,15 +13578,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:13648: checking for netinet/in.h" >&5 +echo "configure:13582: 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:13656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13590: \"$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* @@ -13669,15 +13603,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:13673: checking for arpa/inet.h" >&5 +echo "configure:13607: 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:13681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13615: \"$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* @@ -13702,9 +13636,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:13706: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:13640: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext < @@ -13715,7 +13649,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:13719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13653: \"$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 @@ -13733,9 +13667,9 @@ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:13737: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:13671: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext < @@ -13745,7 +13679,7 @@ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:13749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13683: \"$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 @@ -13776,10 +13710,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:13780: checking for msgget" >&5 +echo "configure:13714: checking for msgget" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13740: \"$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 @@ -13817,15 +13751,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:13821: checking for sys/ipc.h" >&5 +echo "configure:13755: 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:13829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13763: \"$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* @@ -13842,15 +13776,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:13846: checking for sys/msg.h" >&5 +echo "configure:13780: 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:13854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13788: \"$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* @@ -13888,15 +13822,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:13892: checking for dirent.h" >&5 +echo "configure:13826: 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:13900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13834: \"$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* @@ -13923,15 +13857,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:13927: checking for sys/dir.h" >&5 +echo "configure:13861: 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:13935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13869: \"$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* @@ -13964,15 +13898,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:13968: checking for nlist.h" >&5 +echo "configure:13902: 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:13976: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13910: \"$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* @@ -14002,22 +13936,22 @@ echo "checking "for sound support"" 1>&6 -echo "configure:14006: checking "for sound support"" >&5 +echo "configure:13940: 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:14013: checking for multimedia/audio_device.h" >&5 +echo "configure:13947: 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:14021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13955: \"$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* @@ -14043,19 +13977,27 @@ fi if test -z "$sound_found" -a -d "/usr/demo/SOUND"; then - sound_found=yes - extra_objs="$extra_objs sunplay.o" && if test "$extra_verbose" = "yes"; then + if test -d "/usr/demo/SOUND/include/multimedia"; then + sun_sound_cflags="-I/usr/demo/SOUND/include" + elif test -d "/usr/demo/SOUND/multimedia"; then + sun_sound_cflags="-I/usr/demo/SOUND" + fi + + if test -n "$native_sound_lib"; then + sun_sound_lib="$native_sound_lib" + elif test -r "/usr/demo/SOUND/lib/libaudio.a"; then + sun_sound_lib="/usr/demo/SOUND/lib/libaudio.a" + elif test -r "/usr/demo/SOUND/libaudio.a"; then + sun_sound_lib="/usr/demo/SOUND/libaudio.a" + fi + + if test -n "$sun_sound_cflags" -a -n "$sun_sound_lib"; then + native_sound_lib="$sun_sound_lib" + sound_cflags="$sun_sound_cflags" + sound_found=yes + extra_objs="$extra_objs sunplay.o" && if test "$extra_verbose" = "yes"; then echo " xemacs will be linked with \"sunplay.o\"" fi - if test -d "/usr/demo/SOUND/include" - then sound_cflags="-I/usr/demo/SOUND/include" - else sound_cflags="-I/usr/demo/SOUND" - fi - if test -z "$native_sound_lib" ; then - if test -r "/usr/demo/SOUND/lib/libaudio.a" - then native_sound_lib="/usr/demo/SOUND/lib/libaudio.a" - else native_sound_lib="/usr/demo/SOUND/libaudio.a" - fi fi fi @@ -14065,12 +14007,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:14069: checking for ALopenport in -laudio" >&5 +echo "configure:14011: 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:14027: \"$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 @@ -14112,12 +14054,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:14116: checking for AOpenAudio in -lAlib" >&5 +echo "configure:14058: 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:14074: \"$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 @@ -14176,15 +14118,15 @@ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:14180: checking for ${dir}/soundcard.h" >&5 +echo "configure:14122: 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:14188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14130: \"$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* @@ -14238,15 +14180,15 @@ 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:14242: checking for audio/audiolib.h" >&5 +echo "configure:14184: 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:14250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14192: \"$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* @@ -14264,12 +14206,12 @@ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:14268: checking for AuOpenServer in -laudio" >&5 +echo "configure:14210: 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:14226: \"$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 @@ -14319,7 +14261,7 @@ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext < EOF @@ -14350,7 +14292,7 @@ # 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:14354: checking for $ac_word" >&5 +echo "configure:14296: 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. @@ -14379,10 +14321,10 @@ 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:14383: checking for esd_play_stream" >&5 +echo "configure:14325: 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:14351: \"$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 @@ -14456,7 +14398,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:14460: checking for TTY-related features" >&5 +echo "configure:14402: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -14469,12 +14411,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:14473: checking for tgetent in -lncurses" >&5 +echo "configure:14415: 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:14431: \"$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 @@ -14518,15 +14460,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:14522: checking for ncurses/curses.h" >&5 +echo "configure:14464: 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:14530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14472: \"$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* @@ -14548,15 +14490,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:14552: checking for ncurses/term.h" >&5 +echo "configure:14494: 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:14560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14502: \"$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* @@ -14586,15 +14528,15 @@ c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:14590: checking for ncurses/curses.h" >&5 +echo "configure:14532: 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:14598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14540: \"$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* @@ -14629,12 +14571,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:14633: checking for tgetent in -l$lib" >&5 +echo "configure:14575: 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:14591: \"$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 @@ -14676,12 +14618,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:14680: checking for tgetent in -lcurses" >&5 +echo "configure:14622: 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:14638: \"$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 @@ -14710,12 +14652,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:14714: checking for tgetent in -ltermcap" >&5 +echo "configure:14656: 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:14672: \"$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 @@ -14774,15 +14716,15 @@ test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:14778: checking for gpm.h" >&5 +echo "configure:14720: 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:14786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14728: \"$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* @@ -14805,12 +14747,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:14809: checking for Gpm_Open in -lgpm" >&5 +echo "configure:14751: 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:14767: \"$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 @@ -14864,20 +14806,20 @@ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:14868: checking for database support" >&5 +echo "configure:14810: 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:14873: checking for ndbm.h" >&5 +echo "configure:14815: 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:14881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14823: \"$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* @@ -14907,12 +14849,12 @@ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:14911: checking for dbm_open in -lgdbm" >&5 +echo "configure:14853: 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:14869: \"$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 @@ -14951,10 +14893,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:14955: checking for dbm_open" >&5 +echo "configure:14897: 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:14923: \"$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 @@ -14996,12 +14938,12 @@ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:15000: checking for dbm_open in -ldbm" >&5 +echo "configure:14942: 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:14958: \"$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 @@ -15053,10 +14995,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:15057: checking for Berkeley db.h" >&5 +echo "configure:14999: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext < @@ -15078,7 +15020,7 @@ ; return 0; } EOF -if { (eval echo configure:15082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -15094,9 +15036,9 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:15098: checking for Berkeley DB version" >&5 +echo "configure:15040: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 1 @@ -15108,7 +15050,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 2 @@ -15120,7 +15062,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 3 @@ -15154,10 +15096,10 @@ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:15158: checking for $dbfunc" >&5 +echo "configure:15100: checking for $dbfunc" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15126: \"$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 @@ -15199,12 +15141,12 @@ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15203: checking for $dbfunc in -ldb" >&5 +echo "configure:15145: 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:15161: \"$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 @@ -15249,12 +15191,12 @@ echo "configure: warning: "db_create is really $dbfunc"" 1>&2 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:15253: checking for $dbfunc in -ldb" >&5 +echo "configure:15195: 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:15211: \"$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 @@ -15324,12 +15266,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:15328: checking for SOCKSinit in -lsocks" >&5 +echo "configure:15270: 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:15286: \"$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 @@ -15394,11 +15336,11 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.204 retrieving revision 1.207 diff -u -r1.204 -r1.207 --- configure.in 28 Aug 2003 15:45:30 -0000 1.204 +++ configure.in 22 Sep 2003 03:22:16 -0000 1.207 @@ -1484,9 +1484,14 @@ esac case "$canonical" in - *-solaris* ) + *-solaris* ) opsys=sol2 - os_release=`uname -r | sed -e 's/^\([[0-9]]\)\.\([[0-9]]\).*/\1\2/'` + os_release_major=`uname -r | sed -e 's/^\([[0-9]]\{1,\}\)\.\([[0-9]]\{1,\}\).*/\1/'` + os_release_minor=`uname -r | sed -e 's/^\([[0-9]]\{1,\}\)\.\([[0-9]]\{1,\}\).*/\2/'` + case "$os_release_minor" in [[0-9]]) + os_release_minor="0${os_release_minor}";; + esac + os_release="${os_release_major}${os_release_minor}" AC_DEFINE_UNQUOTED(OS_RELEASE, $os_release) ;; dnl The last Sun386 ran 4.0. @@ -1756,7 +1761,7 @@ sol2) AC_DEFINE(__EXTENSIONS__) dnl Solaris 2 before 2.5 had some bugs with feature test macro interaction. - if test "$os_release" -ge 55; then + if test "$os_release" -ge 505; then AC_DEFINE(_XOPEN_SOURCE,500) AC_DEFINE(_XOPEN_SOURCE_EXTENDED) fi ;; @@ -2663,7 +2668,7 @@ dnl Link with "-z ignore" on Solaris if supported if test "$opsys" = "sol2"; then - if test "$os_release" -ge 56; then + if test "$os_release" -ge 506; then AC_MSG_CHECKING(for \"-z ignore\" linker flag) case "`ld -h 2>&1`" in *-z\ ignore\|record* ) AC_MSG_RESULT(yes) @@ -3220,13 +3225,6 @@ ac_save_LIBS=])]) if test -n "$have_dl"; then AC_DEFINE(HAVE_DLOPEN) - else - AC_CHECK_LIB(dld, shl_load, [ - libdl=dld have_dl=yes; - AC_DEFINE(HAVE_SHL_LOAD)], [ - AC_CHECK_LIB(dld, dld_init, [ - libdl=dld have_dl=yes; - AC_DEFINE(HAVE_DLD_INIT)])]) fi esac dnl end !darwin fi dnl end !MS-Windows @@ -4389,17 +4387,25 @@ dnl Autodetect Sun native sound from SUNWaudmo package if test -z "$sound_found" -a -d "/usr/demo/SOUND"; then - sound_found=yes - XE_ADD_OBJS(sunplay.o) - if test -d "/usr/demo/SOUND/include" - then sound_cflags="-I/usr/demo/SOUND/include" - else sound_cflags="-I/usr/demo/SOUND" - fi - if test -z "$native_sound_lib" ; then - if test -r "/usr/demo/SOUND/lib/libaudio.a" - then native_sound_lib="/usr/demo/SOUND/lib/libaudio.a" - else native_sound_lib="/usr/demo/SOUND/libaudio.a" - fi + if test -d "/usr/demo/SOUND/include/multimedia"; then + sun_sound_cflags="-I/usr/demo/SOUND/include" + elif test -d "/usr/demo/SOUND/multimedia"; then + sun_sound_cflags="-I/usr/demo/SOUND" + fi + + if test -n "$native_sound_lib"; then + sun_sound_lib="$native_sound_lib" + elif test -r "/usr/demo/SOUND/lib/libaudio.a"; then + sun_sound_lib="/usr/demo/SOUND/lib/libaudio.a" + elif test -r "/usr/demo/SOUND/libaudio.a"; then + sun_sound_lib="/usr/demo/SOUND/libaudio.a" + fi + + if test -n "$sun_sound_cflags" -a -n "$sun_sound_lib"; then + native_sound_lib="$sun_sound_lib" + sound_cflags="$sun_sound_cflags" + sound_found=yes + XE_ADD_OBJS(sunplay.o) fi fi Index: version.sh =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v retrieving revision 1.550 retrieving revision 1.573 diff -u -r1.550 -r1.573 --- version.sh 4 Sep 2003 00:05:04 -0000 1.550 +++ version.sh 26 Sep 2003 05:56:29 -0000 1.573 @@ -2,8 +2,8 @@ emacs_is_beta=t emacs_major_version=21 emacs_minor_version=5 -emacs_beta_version=15 -xemacs_codename="celery" +emacs_beta_version=16 +xemacs_codename="celeriac" xemacs_extra_name= emacs_kit_version= infodock_major_version=4 Index: etc/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- etc/ChangeLog 4 Sep 2003 00:05:06 -0000 1.32 +++ etc/ChangeLog 26 Sep 2003 05:56:33 -0000 1.33 @@ -1,3 +1,7 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: lib-src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v retrieving revision 1.164 retrieving revision 1.167 diff -u -r1.164 -r1.167 --- lib-src/ChangeLog 4 Sep 2003 00:05:07 -0000 1.164 +++ lib-src/ChangeLog 26 Sep 2003 05:56:34 -0000 1.167 @@ -1,3 +1,17 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + +2003-09-21 Jerry James + + * ellcc.c (do_init_mode): Do not mangle external symbols in the + generated doc file with C++ so that emodules.c can find them. + +2003-09-15 Jerry James + + * make-dump-id.c (main): Output separate declaration and + definition for dump_id. + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: lib-src/ellcc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ellcc.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lib-src/ellcc.c 29 May 2003 17:02:31 -0000 1.6 +++ lib-src/ellcc.c 22 Sep 2003 03:21:12 -0000 1.7 @@ -715,13 +715,20 @@ } fprintf (mout, "/* DO NOT EDIT - AUTOMATICALLY GENERATED */\n\n"); fprintf (mout, "#include \n\n"); + fprintf (mout, "#ifdef __cplusplus\n"); + fprintf (mout, "extern \"C\" {\n"); + fprintf (mout, "#endif\n"); + fprintf (mout, "extern const long emodule_compiler;\n"); + fprintf (mout, "extern const char *emodule_name, *emodule_version, *emodule_title;\n"); + fprintf (mout, "extern void docs_of_%s (void);\n", SSTR(mod_name)); + fprintf (mout, "#ifdef __cplusplus\n"); + fprintf (mout, "}\n"); + fprintf (mout, "#endif\n\n"); fprintf (mout, "const long emodule_compiler = %ld;\n", EMODULES_REVISION); fprintf (mout, "const char *emodule_name = \"%s\";\n", SSTR(mod_name)); fprintf (mout, "const char *emodule_version = \"%s\";\n", SSTR(mod_version)); - fprintf (mout, "const char *emodule_title = \"%s\";\n", SSTR(mod_title)); - fprintf (mout, "\n\n"); - fprintf (mout, "void docs_of_%s (void);\n", SSTR(mod_name)); - fprintf (mout, "void docs_of_%s (void)\n", SSTR(mod_name)); + fprintf (mout, "const char *emodule_title = \"%s\";\n\n", SSTR(mod_title)); + fprintf (mout, "void docs_of_%s ()\n", SSTR(mod_name)); if (fclose (mout) != 0) { fatal ("Failed to close output file %s", mod_output); Index: lib-src/make-dump-id.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/make-dump-id.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lib-src/make-dump-id.c 3 Sep 2003 20:43:46 -0000 1.3 +++ lib-src/make-dump-id.c 16 Sep 2003 03:57:54 -0000 1.4 @@ -64,10 +64,12 @@ return EXIT_FAILURE; } - /* dump_id is declared as extern "C" in lrecord.h */ - fprintf (f, "#if defined (__cplusplus)\n"); - fprintf (f, "extern \"C\"\n"); - fprintf (f, "#endif /* __cplusplus */\n"); + /* dump_id is declared as extern "C" in dumper.h */ + fputs ("extern\n", f); + fputs ("#ifdef __cplusplus\n", f); + fputs ("\"C\"\n", f); + fputs ("#endif\n", f); + fputs ("unsigned int dump_id;\n", f); fprintf (f, "unsigned int dump_id = %uU;\n", generate_dump_id ()); if ((fclose (f)) != 0) Index: lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.525 retrieving revision 1.534 diff -u -r1.525 -r1.534 --- lisp/ChangeLog 4 Sep 2003 00:05:08 -0000 1.525 +++ lisp/ChangeLog 26 Sep 2003 05:56:35 -0000 1.534 @@ -1,3 +1,56 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + +2003-09-20 Ilya N. Golubev + + * simple.el (raw-append-message): Allow user to specify + alternative function for displaying message. + (redisplay-echo-area-function): New. + (clear-message): Allow user to specify function for finishing + message display. + (undisplay-echo-area-function): New. + +2003-09-20 James LewisMoss + + * font-menu.el (font-menu-max-number): New variable to specify + the maximum recieved fonts. + + * x-font-menu.el (x-reset-device-font-menus): Use new variable + (font-menu-max-number) to list-fonts. + +2002-09-20 James LewisMoss + + * gnuserv.el (gnuserv-edit-files): fallback to gtk if x device + fails. Fixes problem where gnuclient fails for gtk instances when + gnuclient was built with X configure. + +2003-09-20 Mike Alexander + + * code-init.el (eol-detection-enabled-p): eval the initialization + value. + + * code-files.el (insert-file-contents): Make sure that + setbuffer-file-coding-system sets the eol style. + +2003-09-19 Stephen J. Turnbull + + * win32-native.el (grep-null-device): Defined in + xemacs-base/compile.el. + + * files.el (null-device): Defined in C, remove defvar. + +2003-09-06 Mike Sperber + + * bytecomp.el (byte-compile-defvar-or-defconst): Actually + implement the specified semantics for `defvar.' + +2003-09-07 Adrian Aichner + + * window-xemacs.el (display-buffer): Fix for `shrink-to-fit' by + Klaus Berndl, calling `shrink-window-if-larger-than-buffer' when + displaying buffer in question. + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: lisp/bytecomp.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/bytecomp.el,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- lisp/bytecomp.el 30 Jun 2003 09:24:47 -0000 1.17 +++ lisp/bytecomp.el 9 Sep 2003 13:37:19 -0000 1.18 @@ -3931,7 +3931,7 @@ ;; `defconst' sets `var' unconditionally. `(setq ,var ,value) ;; `defvar' sets `var' only when unbound. - `(if (not (boundp ',var)) (setq ,var ,value)))) + `(if (not (default-boundp ',var)) (set-default ',var ,value)))) `',var)))) (defun byte-compile-autoload (form) Index: lisp/code-files.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/code-files.el,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- lisp/code-files.el 18 Nov 2002 06:52:27 -0000 1.17 +++ lisp/code-files.el 19 Sep 2003 16:39:43 -0000 1.18 @@ -454,9 +454,9 @@ ;; set already. (set-buffer-file-coding-system (subsidiary-coding-system buffer-file-coding-system - (coding-system-eol-type coding-system))) + (coding-system-eol-type coding-system)) t) ;; otherwise actually set buffer-file-coding-system. - (set-buffer-file-coding-system coding-system))) + (set-buffer-file-coding-system coding-system t))) ;; ... and `buffer-file-coding-system-when-loaded'. the machinations ;; of set-buffer-file-coding-system cause the actual coding system ;; object to be stored, so do that here, too. Index: lisp/code-init.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/code-init.el,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lisp/code-init.el 10 May 2003 04:18:52 -0000 1.6 +++ lisp/code-init.el 19 Sep 2003 16:32:57 -0000 1.7 @@ -42,7 +42,7 @@ ;; set-eol-detection to be called. We will init everything appropriately ;; later in the same file, when reset-language-environment is called. :initialize #'(lambda (var val) - (setq eol-detection-enabled-p val)) + (setq eol-detection-enabled-p (eval val))) :set #'(lambda (var val) (set-eol-detection val) (setq eol-detection-enabled-p val))) Index: lisp/files.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/files.el,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- lisp/files.el 6 Aug 2003 09:11:40 -0000 1.65 +++ lisp/files.el 19 Sep 2003 09:50:09 -0000 1.66 @@ -233,9 +233,6 @@ by programs that create small temporary files. This is for systems that have fast storage with limited space, such as a RAM disk.") -;; The system null device. (Should reference NULL_DEVICE from C.) -(defvar null-device "/dev/null" "The system null device.") - ; (defvar file-name-invalid-regexp ; (cond ((and (eq system-type 'ms-dos) (not (msdos-long-file-names))) ; (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive Index: lisp/font-menu.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/font-menu.el,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lisp/font-menu.el 12 Nov 2002 03:52:24 -0000 1.5 +++ lisp/font-menu.el 20 Sep 2003 01:14:24 -0000 1.6 @@ -132,6 +132,11 @@ :type 'boolean :group 'font-menu) +(defcustom font-menu-max-number nil + "The maximum number of fonts retrieved from the server" + :type 'integer + :group 'font-menu) + (defvaralias 'font-menu-max-items 'menu-max-items) (defvaralias 'font-menu-submenu-name-format 'menu-submenu-name-format) Index: lisp/gnuserv.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/gnuserv.el,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- lisp/gnuserv.el 22 Dec 2001 07:20:58 -0000 1.12 +++ lisp/gnuserv.el 19 Sep 2003 17:07:07 -0000 1.13 @@ -408,6 +408,13 @@ (eval form)) + +(defun make-x-device-with-gtk-fallback (device) + (or (condition-case () + (make-x-device device) + (error nil)) + (make-gtk-device))) + ;; "Execute" a client connection, called by gnuclient. This is the ;; backbone of gnuserv.el. (defun gnuserv-edit-files (type list &rest flags) @@ -440,7 +447,7 @@ (case (car type) (tty (apply 'make-tty-device (cdr type))) (gtk (make-gtk-device)) - (x (make-x-device (cadr type))) + (x (make-x-device-with-gtk-fallback (cadr type))) (mswindows (make-mswindows-device)) (t (error "Invalid device type")))) (t Index: lisp/simple.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- lisp/simple.el 9 Mar 2003 02:27:33 -0000 1.46 +++ lisp/simple.el 20 Sep 2003 01:46:54 -0000 1.47 @@ -4052,6 +4052,16 @@ :type '(repeat (symbol :tag "Label")) :group 'log-message) +(defcustom redisplay-echo-area-function 'redisplay-echo-area + "The function to call to display echo area buffer." +:type 'function +:group 'log-message) + +(defcustom undisplay-echo-area-function nil + "The function to call to undisplay echo area buffer." +:type 'function +:group 'log-message) + ;;Subsumed by view-lossage ;; Not really, I'm adding it back by popular demand. -slb (defun show-message-log () @@ -4145,6 +4155,8 @@ (remove-message label frame) (let ((inhibit-read-only t)) (erase-buffer " *Echo Area*")) + (if undisplay-echo-area-function + (funcall undisplay-echo-area-function)) ;; If outputting to the terminal, make sure we clear the left side. (when (or clear-stream (and (eq 'stream (frame-type frame)) @@ -4226,7 +4238,7 @@ (if (not executing-kbd-macro) (if (eq 'stream (frame-type frame)) (send-string-to-terminal message stdout-p (frame-device frame)) - (redisplay-echo-area)))))) + (funcall redisplay-echo-area-function)))))) (defun display-message (label message &optional frame stdout-p) "Print a one-line message at the bottom of the frame. First argument Index: lisp/win32-native.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/win32-native.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lisp/win32-native.el 15 Mar 2002 07:43:22 -0000 1.4 +++ lisp/win32-native.el 19 Sep 2003 09:50:08 -0000 1.5 @@ -55,11 +55,6 @@ ;; Use ";" instead of ":" as a path separator (from files.el). (setq path-separator ";") -;; Set the null device (for compile.el). -;; #### There should be such a global thingy as null-device - kkm -(defvar grep-null-device) -(setq grep-null-device "NUL") - ;; Set the grep regexp to match entries with drive letters. (defvar grep-regexp-alist) (setq grep-regexp-alist Index: lisp/window-xemacs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/window-xemacs.el,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- lisp/window-xemacs.el 17 Jul 2003 14:41:24 -0000 1.18 +++ lisp/window-xemacs.el 7 Sep 2003 19:46:32 -0000 1.19 @@ -707,7 +707,7 @@ ;; and does `returns' all over the place and there's no sense ;; in trying to rewrite it to be more Lispy. (catch 'done - (let (window old-frame target-frame explicit-frame) + (let (window old-frame target-frame explicit-frame shrink-it) (setq old-frame (or (last-nonminibuf-frame) (selected-frame))) (setq buffer (get-buffer buffer)) (check-argument-type 'bufferp buffer) @@ -895,9 +895,7 @@ (and (window-leftmost-p window) (window-rightmost-p window)))) (setq window (split-window window)) - (let (upper -;; lower - other) + (let (upper other) (setq window (get-lru-window target-frame)) ;; If the LRU window is selected, and big enough, ;; and can be split, split it. @@ -927,11 +925,9 @@ ;; even out their heights. (if (window-previous-child window) (setq other (window-previous-child window) -;; lower window upper other)) (if (window-next-child window) (setq other (window-next-child window) -;; lower other upper window)) ;; Check that OTHER and WINDOW are vertically arrayed. (if (and other @@ -944,8 +940,11 @@ 2) (window-height upper)) nil upper)) - (if shrink-to-fit - (shrink-window-if-larger-than-buffer window))))) + ;; Klaus Berndl : Only in + ;; this situation we shrink-to-fit but we can do + ;; this first after we have displayed buffer in + ;; window (s.b. (set-window-buffer window buffer)) + (setq shrink-it shrink-to-fit)))) (setq window (get-lru-window target-frame))) @@ -957,6 +956,12 @@ (record-buffer (window-buffer window))))) (set-window-buffer window buffer) + + ;; Now window's previous buffer has been brought to the top + ;; of the MRU chain and window displays buffer - now we can + ;; shrink-to-fit if necessary + (if shrink-it + (shrink-window-if-larger-than-buffer window)) (display-buffer-1 window))))) (or (equal wconfig (current-window-configuration)) Index: lisp/x-font-menu.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-font-menu.el,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- lisp/x-font-menu.el 12 Nov 2002 18:58:17 -0000 1.10 +++ lisp/x-font-menu.el 20 Sep 2003 01:14:25 -0000 1.11 @@ -96,7 +96,8 @@ family size weight entry monospaced-p dev-cache cache families sizes weights) (dolist (name (cond ((null debug) ; debugging kludge - (list-fonts "*-*-*-*-*-*-*-*-*-*-*-*-*-*" device)) + (list-fonts "*-*-*-*-*-*-*-*-*-*-*-*-*-*" device + font-menu-max-number)) ((stringp debug) (split-string debug "\n")) (t debug))) (when (and (string-match x-font-regexp-ascii name) Index: lwlib/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- lwlib/ChangeLog 4 Sep 2003 00:05:09 -0000 1.56 +++ lwlib/ChangeLog 26 Sep 2003 05:56:37 -0000 1.57 @@ -1,3 +1,7 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: man/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.230 retrieving revision 1.235 diff -u -r1.230 -r1.235 --- man/ChangeLog 4 Sep 2003 00:05:10 -0000 1.230 +++ man/ChangeLog 26 Sep 2003 05:56:38 -0000 1.235 @@ -1,3 +1,32 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + +2003-09-22 Adrian Aichner + + * lispref/backups.texi (Reverting): Fix the PRINTED-MANUAL-TITLE + argument for a cross reference to "The XEmacs User's Manual". + +2003-08-15 Stephen J. Turnbull + + * internals/internals.texi: Update copyright notice. + (GCPROing): Add missing period. + (Adding Global Lisp Variables): general.c -> general-slots.h. + (A Reader's Guide to XEmacs Coding Conventions): New node. + +2003-09-20 Ilya N. Golubev + + * xemacs/mini.texi (Minibuffer): Add customizing message display + reference. + * lispref/display.texi (Customizing Message Display): New, + describe `redisplay-echo-area-function', + `undisplay-echo-area-function', `minibuffer-echo-wait-function'. + (The Echo Area): Add menu. + +2003-09-19 Sandra Wambold + + * Makefile: add targets to produce PDF files + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: man/Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/Makefile,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- man/Makefile 15 Mar 2002 07:43:28 -0000 1.29 +++ man/Makefile 20 Sep 2003 01:25:48 -0000 1.30 @@ -27,7 +27,7 @@ RM = rm -f .SUFFIXES: -.SUFFIXES: .html .info .texi .dvi +.SUFFIXES: .html .info .texi .dvi .pdf RECURSIVE_MAKE = $(MAKE) $(MFLAGS) MAKEINFO='$(MAKEINFO)' TEXI2DVI='$(TEXI2DVI)' @@ -89,6 +89,23 @@ xemacs.dvi \ xemacs-faq.dvi +pdf_files = \ + cl.pdf \ + custom.pdf \ + emodules.pdf \ + external-widget.pdf \ + info.pdf \ + lispref.pdf \ + internals.pdf \ + new-users-guide.pdf \ + standards.pdf \ + term.pdf \ + termcap.pdf \ + texinfo.pdf \ + widget.pdf \ + xemacs.pdf \ + xemacs-faq.pdf + xemacs-srcs = \ xemacs/abbrevs.texi \ xemacs/basic.texi \ @@ -281,7 +298,7 @@ internals : $(INFODIR)/internals.info new-users-guide.info : $(INFODIR)/new-users-guide.info -.PHONY : xemacs lispref internals new-users-guide info dvi +.PHONY : xemacs lispref internals new-users-guide info dvi pdf info : $(info_files) html : $(html_files) @@ -297,6 +314,9 @@ .texi.dvi: -$(TEXI2DVI) $< +.texi.pdf: + -$(TEXI2DVI) --pdf $< + xemacs.dvi : $(xemacs-srcs) $(TEXI2DVI) -I xemacs xemacs/xemacs.texi @@ -311,12 +331,26 @@ dvi : $(dvi_files) +xemacs.pdf: $(xemacs-srcs) + $(TEXI2DVI) --pdf -I xemacs xemacs/xemacs.texi + +lispref.pdf: $(lispref-srcs) + $(TEXI2DVI) --pdf -I lispref lispref/lispref.texi + +internals.pdf: $(internals-srcs) + $(TEXI2DVI) --pdf -I internals internals/internals.texi + +new-users-guide.pdf: $(new-users-guide-srcs) + $(TEXI2DVI) --pdf -I new-users-guide new-users-guide/new-users-guide.texi + +pdf: $(pdf_files) + .PHONY: mostlyclean clean distclean realclean extraclean mostlyclean: $(RM) *.toc *.aux *.log *.op *.cp *.cps *.fn *.fns $(RM) *.ky *.kys *.pg *.pgs *.tp *.tps *.vr *.vrs clean: mostlyclean - $(RM) core *.dvi + $(RM) core *.dvi *.pdf distclean: clean realclean: distclean extraclean: distclean Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- man/internals/internals.texi 22 May 2003 09:57:57 -0000 1.42 +++ man/internals/internals.texi 22 Sep 2003 11:53:23 -0000 1.43 @@ -12,7 +12,7 @@ Copyright @copyright{} 1992 - 1996 Ben Wing. Copyright @copyright{} 1996, 1997 Sun Microsystems. -Copyright @copyright{} 1994 - 1998 Free Software Foundation. +Copyright @copyright{} 1994 - 1998, 2002, 2003 Free Software Foundation. Copyright @copyright{} 1994, 1995 Board of Trustees, University of Illinois. @@ -2259,6 +2259,7 @@ situations, often in code far away from where the actual breakage is. @menu +* A Reader's Guide to XEmacs Coding Conventions:: * General Coding Rules:: * Writing Lisp Primitives:: * Writing Good Comments:: @@ -2268,6 +2269,99 @@ * Techniques for XEmacs Developers:: @end menu +@node A Reader's Guide to XEmacs Coding Conventions +@section A Reader's Guide to XEmacs Coding Conventions +@cindex coding conventions +@cindex reader's guide +@cindex coding rules, naming + +Of course the low-level implementation language of XEmacs is C, but much +of that uses the Lisp engine to do its work. However, because the code +is ``inside'' of the protective containment shell around the ``reactor +core,'' you'll see lots of complex ``plumbing'' needed to do the work +and ``safety mechanisms,'' whose failure results in a meltdown. This +section provides a quick overview (or review) of the various components +of the implementation of Lisp objects. + + Two typographic conventions help to identify C objects that implement +Lisp objects. The first is that capitalized identifiers, especially +beginning with the letters @samp{Q}, @samp{V}, @samp{F}, and @samp{S}, +for C variables and functions, and C macros with beginning with the +letter @samp{X}, are used to implement Lisp. The second is that where +Lisp uses the hyphen @samp{-} in symbol names, the corresponding C +identifiers use the underscore @samp{_}. Of course, since XEmacs Lisp +contains interfaces to many external libraries, those external names +will follow the coding conventions their authors chose, and may overlap +the ``XEmacs name space.'' However these cases are usually pretty +obvious. + + All Lisp objects are handled indirectly. The @code{Lisp_Object} +type is usually a pointer to a structure, except for a very small number +of types with immediate representations (currently characters and +integers). However, these types cannot be directly operated on in C +code, either, so they can also be considered indirect. Types that do +not have an immediate representation always have a C typedef +@code{Lisp_@var{type}} for a corresponding structure. +@c #### mention l(c)records here? + + In older code, it was common practice to pass around pointers to +@code{Lisp_@var{type}}, but this is now deprecated in favor of using +@code{Lisp_Object} for all function arguments and return values that are +Lisp objects. The @code{X@var{type}} macro is used to extract the +pointer and cast it to @code{(Lisp_@var{type} *)} for the desired type. + + @strong{Convention}: macros whose names begin with @samp{X} operate on +@code{Lisp_Object}s and do no type-checking. Many such macros are type +extractors, but others implement Lisp operations in C (@emph{e.g.}, +@code{XCAR} implements the Lisp @code{car} function). These are unsafe, +and must only be used where types of all data have already been checked. +Such macros are only applied to @code{Lisp_Object}s. In internal +implementations where the pointer has already been converted, the +structure is operated on directly using the C @code{->} member access +operator. + + The @code{@var{type}P}, @code{CHECK_@var{type}}, and +@code{CONCHECK_@var{type}} macros are used to test types. The first +returns a Boolean value, and the latter signal errors. (The +@samp{CONCHECK} variety allows execution to be CONtinued under some +circumstances, thus the name.) Functions which expect to be passed user +data invariably call @samp{CHECK} macros on arguments. + + There are many types of specialized Lisp objects implemented in C, but +the most pervasive type is the @dfn{symbol}. Symbols are used as +identifiers, variables, and functions. + + @strong{Convention}: Global variables whose names begin with @samp{Q} +are constants whose value is a symbol. The name of the variable should +be derived from the name of the symbol using the same rules as for Lisp +primitives. Such variables allow the C code to check whether a +particular @code{Lisp_Object} is equal to a given symbol. Symbols are +Lisp objects, so these variables may be passed to Lisp primitives. (An +alternative to the use of @samp{Q...} variables is to call the +@code{intern} function at initialization in the +@code{vars_of_@var{module}} function, which is hardly less efficient.) + + @strong{Convention}: Global variables whose names begin with @samp{V} +are variables that contain Lisp objects. The convention here is that +all global variables of type @code{Lisp_Object} begin with @samp{V}, and +no others do (not even integer and boolean variables that have Lisp +equivalents). Most of the time, these variables have equivalents in +Lisp, which are defined via the @samp{DEFVAR} family of macros, but some +don't. Since the variable's value is a @code{Lisp_Object}, it can be +passed to Lisp primitives. + + The implementation of Lisp primitives is more complex. +@strong{Convention}: Global variables with names beginning with @samp{S} +contain a structure that allows the Lisp engine to identify and call a C +function. In modern versions of XEmacs, these identifiers are almost +always completely hidden in the @code{DEFUN} and @code{SUBR} macros, but +you will encounter them if you look at very old versions of XEmacs or at +GNU Emacs. @strong{Convention}: Functions with names beginning with +@samp{F} implement Lisp primitives. Of course all their arguments and +their return values must be Lisp_Objects. (This is hidden in the +@code{DEFUN} macro.) + + @node General Coding Rules @section General Coding Rules @cindex coding rules, general @@ -2727,10 +2821,15 @@ @code{defsymbol()} are no problem, but some linkers will complain about multiply-defined symbols. The most insidious aspect of this is that often the link will succeed anyway, but then the resulting executable -will sometimes crash in obscure ways during certain operations! To -avoid this problem, declare any symbols with common names (such as +will sometimes crash in obscure ways during certain operations! + +To avoid this problem, declare any symbols with common names (such as @code{text}) that are not obviously associated with this particular -module in the module @file{general.c}. +module in the file @file{general-slots.h}. The ``-slots'' suffix +indicates that this is a file that is included multiple times in +@file{general.c}. Redefinition of preprocessor macros allows the +effects to be different in each context, so this is actually more +convenient and less error-prone than doing it in your module. Global variables whose names begin with @samp{V} are variables that contain Lisp objects. The convention here is that all global variables @@ -5948,7 +6047,7 @@ If you don't understand whether to @code{GCPRO} in a particular instance, ask on the mailing lists. A general hint is that @code{prog1} -is the canonical example +is the canonical example. @cindex garbage collection, conservative @cindex conservative garbage collection Index: man/lispref/backups.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/backups.texi,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- man/lispref/backups.texi 11 Feb 2003 19:13:55 -0000 1.5 +++ man/lispref/backups.texi 22 Sep 2003 20:15:13 -0000 1.6 @@ -579,7 +579,7 @@ If you have made extensive changes to a file and then change your mind about them, you can get rid of them by reading in the previous version of the file with the @code{revert-buffer} command. @xref{Reverting, , -Reverting a Buffer, xemacs, The XEmacs Lisp Reference Manual}. +Reverting a Buffer, xemacs, The XEmacs User's Manual}. @deffn Command revert-buffer &optional check-auto-save noconfirm preserve-modes This command replaces the buffer text with the text of the visited Index: man/lispref/display.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/display.texi,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- man/lispref/display.texi 13 Aug 2003 11:07:40 -0000 1.7 +++ man/lispref/display.texi 20 Sep 2003 01:46:59 -0000 1.8 @@ -170,6 +170,9 @@ @cite{XEmacs Lisp Reference Manual} specifies the rules for resolving conflicts between the echo area and the minibuffer for use of that screen space (@pxref{Minibuffer,, The Minibuffer, xemacs, The XEmacs Lisp Reference Manual}). +Such a conflicts may be avoided at all as described in @ref{Customizing Message +Display}. + Error messages appear in the echo area; see @ref{Errors}. You can write output in the echo area by using the Lisp printing @@ -347,6 +350,43 @@ The value is normally @code{nil}; Lisp programs bind it to @code{t} for brief periods of time. +@end defvar + +@menu +* Customizing Message Display:: +@end menu + +@node Customizing Message Display +@subsection Customizing Message Display + +Message display function specify message intended for echo area by +putting message text into @code{" *Echo Area*"} buffer. When event +loop code decides to update display after displaying the message, text +of this buffer is erased. How exactly the text will be displayed may +be affected by the following. + +@findex redisplay-echo-area +@defvar redisplay-echo-area-function +The function called to display echo area text. The default variable +value, @code{redisplay-echo-area} function, does that by displaying +the text in the same place on the screen as the echo area. So does +other redisplay code. User code can avoid this regardless of what +redisplay code will run afterwards by erasing text of @code{" *Echo +Area*"} buffer. +@end defvar + +@defvar undisplay-echo-area-function +The variable value, if non-@code{nil}, is called by command loop after +erasing text of @code{" *Echo Area*"} buffer. It must clean up data +created by @code{redisplay-echo-area-function} value. +@end defvar + +@defvar minibuffer-echo-wait-function +The function is called by command loop only when minibuffer was active +and message was displayed (text appeared in @code{" *Echo Area*"} +buffer). It must wait after displaying message so that user can read +it. By default, when the variable value is @code{nil}, the equivalent +of @code{(sit-for 2)} is run. @end defvar @node Warnings Index: man/xemacs/mini.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/mini.texi,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- man/xemacs/mini.texi 12 Apr 2001 18:22:28 -0000 1.2 +++ man/xemacs/mini.texi 20 Sep 2003 01:47:00 -0000 1.3 @@ -1,4 +1,5 @@ + @node Minibuffer, M-x, Undo, Top @chapter The Minibuffer @cindex minibuffer @@ -31,8 +32,10 @@ minibuffer, by typing @kbd{C-g}. Since the minibuffer uses the screen space of the echo area, it can -conflict with other ways XEmacs customarily uses the echo area. Here is -how XEmacs handles such conflicts: +conflict with other ways XEmacs customarily uses the echo area. One can +avoid such a conflict as described in @ref{Customizing Message +Display,,,lispref, The XEmacs Lisp Reference Manual}. Here is how +XEmacs handles such conflicts by default: @itemize @bullet @item Index: modules/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v retrieving revision 1.26 retrieving revision 1.28 diff -u -r1.26 -r1.28 --- modules/ChangeLog 4 Sep 2003 00:05:11 -0000 1.26 +++ modules/ChangeLog 26 Sep 2003 05:56:39 -0000 1.28 @@ -1,3 +1,13 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + +2003-09-21 Jerry James + + * postgresql/postgresql.c (unload_postgresql): Do not mangle the + unload function name when compiling with C++. + * ldap/eldap.c (unload_eldap): Ditto. + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: modules/ldap/eldap.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ldap/eldap.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- modules/ldap/eldap.c 19 Aug 2003 02:07:09 -0000 1.6 +++ modules/ldap/eldap.c 22 Sep 2003 03:21:15 -0000 1.7 @@ -856,7 +856,7 @@ } #ifdef HAVE_SHLIB -void unload_eldap (void); +EXTERN_C void unload_eldap (void); void unload_eldap (void) { Index: modules/postgresql/postgresql.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/postgresql/postgresql.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- modules/postgresql/postgresql.c 19 Aug 2003 02:07:12 -0000 1.4 +++ modules/postgresql/postgresql.c 22 Sep 2003 03:21:16 -0000 1.5 @@ -1862,7 +1862,7 @@ } #ifdef HAVE_SHLIB -void unload_postgresql (void); +EXTERN_C void unload_postgresql (void); void unload_postgresql (void) { Index: netinstall/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- netinstall/ChangeLog 4 Sep 2003 00:05:12 -0000 1.28 +++ netinstall/ChangeLog 26 Sep 2003 05:56:40 -0000 1.29 @@ -1,3 +1,7 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. @@ -487,6 +491,6 @@ * all: port from cygwin setup. -%%% $Id: ChangeLog,v 1.28 2003/09/04 00:05:12 youngs Exp $ -$Revision: 1.28 $ +%%% $Id: ChangeLog,v 1.29 2003/09/26 05:56:40 youngs Exp $ +$Revision: 1.29 $ Index: nt/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v retrieving revision 1.165 retrieving revision 1.167 diff -u -r1.165 -r1.167 --- nt/ChangeLog 4 Sep 2003 00:05:13 -0000 1.165 +++ nt/ChangeLog 26 Sep 2003 05:56:41 -0000 1.167 @@ -1,3 +1,14 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + +2003-09-13 Adrian Aichner + + * xemacs.mak (TEMACS_BATCH_PACKAGES): Removed. + * xemacs.mak (check-temacs): Reverting to run with -no-packages + since it would cause package lisp to shadow core lisp (as happened + with unicode.el). + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: nt/xemacs.mak =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/xemacs.mak,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- nt/xemacs.mak 31 Aug 2003 17:52:59 -0000 1.105 +++ nt/xemacs.mak 13 Sep 2003 12:54:35 -0000 1.106 @@ -1270,7 +1270,6 @@ BATCH = -no-packages -batch BATCH_PACKAGES = -vanilla -batch TEMACS_BATCH = $(DO_TEMACS) -nd $(BATCH) -TEMACS_BATCH_PACKAGES = $(DO_TEMACS) -nd $(BATCH_PACKAGES) XEMACS_BATCH = $(DO_XEMACS) $(BATCH) XEMACS_BATCH_PACKAGES = $(DO_XEMACS) $(BATCH_PACKAGES) temacs_loadup_args = -l $(LISP)/loadup.el @@ -1414,7 +1413,7 @@ check-temacs: cd $(BLDSRC) - $(TEMACS_BATCH_PACKAGES) $(run_temacs_args) $(batch_test_emacs) + $(TEMACS_BATCH) $(run_temacs_args) $(batch_test_emacs) check-features: all cd $(BLDSRC) Index: nt/installer/Wise/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/installer/Wise/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- nt/installer/Wise/ChangeLog 4 Sep 2003 00:05:14 -0000 1.17 +++ nt/installer/Wise/ChangeLog 26 Sep 2003 05:56:42 -0000 1.18 @@ -1,3 +1,7 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.618 retrieving revision 1.632 diff -u -r1.618 -r1.632 --- src/ChangeLog 4 Sep 2003 00:05:15 -0000 1.618 +++ src/ChangeLog 26 Sep 2003 05:56:43 -0000 1.632 @@ -1,3 +1,130 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + +2003-09-09 Jerry James + + * redisplay.c (point_would_be_visible): Add PARTIALLY parameter to + support new Fpos_visible_in_window_p parameter. + * redisplay.h: Ditto. + * scrollbar.c (scrollbar_reset_cursor): Use new + point_would_be_visible parameter. + * window.c (Fpos_visible_in_window_p): Add PARTALLY parameter for + Emacs compatibility. + (window_scroll): Use new point_would_be_visible parameter. + +2003-09-21 Jerry James + + * device-x.c (x_init_device): dll_open now takes a Lisp_Object. + * emacs.c (make_arg_list_1): Remove useless call to dll_init. + * emacs.c (main_1): Ditto. + * emodules.c: char to CIbyte conversion. + * emodules.c (Fload_module): Ditto. + * emodules.c (Funload_module): Ditto. + * emodules.c (find_make_module): Ditto, and use NULL. + * emodules.c (emodules_load): Ditto, and pass Lisp_Objects to and + from the sysdll routines. Be careful about string conversions. + * emodules.c (reinit_vars_of_module): Use NULL. + * objects-msw.c (mswindows_find_charset_font): Fix call to + mswindows_list_fonts broken by James LewisMoss' Sept 20 change. + * symsinit.h: Do not mangle module initialization function names. + * sysdll.c (MAYBE_PREPEND_UNDERSCORE): char to CIbyte conversion. + * sysdll.c (dll_init): char to Extbyte conversion. + * sysdll.c (dll_open): Take a Lisp_Object, possibly Qnil. + * sysdll.c (dll_function): char to CIbyte conversion. + * sysdll.c (dll_variable): Ditto. + * sysdll.c (dll_error): Return a Lisp_Object, not a string. + * sysdll.c (dll_close): Cast appropriately for C++. + * sysdll.h: Change prototypes as per sysdll.c changes. + * lisp.h: Make eval-related functions visible to modules. + * xemacs.def.in.in: Ditto. + +2003-09-20 Ilya N. Golubev + + * cmdloop.c (Fcommand_loop_1): Allow specifying elisp function for + waiting user input while displaying message while in minibuffer. + (Vminibuffer_echo_wait_function): New, associated variable... + (vars_of_cmdloop): ... initialize it. + +2003-09-20 James LewisMoss + + * console-impl.h (struct console_methods): add third arg to list_fonts + + * objects.c (Flist_fonts): Add third arg to list-fonts: maxnumber + + * objects-gtk.c (gtk_list_fonts): Add third (ignored) arg for + maxnumber. + + * objects-msw.c (mswindows_list_fonts): Add third (ignored) arg for + maxnumber. + + * objects-tty.c (tty_list_fonts): Add third (ignored) arg for + maxnumber. + + * objects-x.c (x_list_fonts): Add third arg to specify the maximum + fonts recieved from the server. + +2003-09-13 Martin Buchholz + + * s/sol2.h: Use OS_RELEASE=os_release_major*100+os_release_minor + +2003-09-16 Marcus Crestani + + * xemacs.def.in.in: Add lrecord_memory_descriptions. + +2003-09-15 Jerry James + + * depend: Regenerate. + * dumper.h: Use extern "C" for C++ builds. + * lrecord.h: Remove duplicated material from dumper.h and include + that instead. + +2003-09-15 Jerry James + + * event-msw.c (debug_mswin_messages): Conditionally compile + messages missing from the Cygwin headers. + +2003-09-15 Jerry James + + * event-msw.c (mswindows_wnd_proc): Use new w32api macros. + * syswindows.h: Define w32api macros as 0 for non-Cygwin. + * unexcw.c (CHECK_AOUT_POS): Add cast to quiet compiler. + * unexcw.c (copy_executable_and_dump_data_section): Ditto. + +2002-07-04 Jonathan Harris + + * intl-encap-win32.c: + * intl-auto-encap-win32.c: + * intl-auto-encap-win32.h: + Remove GetLongPathNameW - API not available on Win95/NT4 + +2003-09-15 Jerry James + + * syswindows.h: Quiet compiler warnings about struct stat. + (W32API_VER): + (W32API_INSTALLED_VER): New macros to compare w32api versions. + (_SHQUERYRBINFO): Define for w32api < 2.4 only. + +2003-09-11 Marcus Crestani + + * alloc.c: Clean up #ifdef USE_KKCC, move stack code to better + position. Add lrecord_memory_descriptions table. + (KKCC_GC_STACK_FULL): Replace functions with macros. + (KKCC_GC_STACK_EMPTY): + (kkcc_gc_stack_push): + (kkcc_gc_stack_pop): + (kkcc_gc_stack_push_lisp_object): + (mark_object): Add #ifdef to remove unused code. + (garbage_collect_1): Remove some #ifdefs. + * dumper.c (pdump): Dump lrecord_memory_descriptions table. + * lrecord.h: Add lrecord_memory_descriptions. + +2003-09-08 Mike Sperber + + * symbols.c (Fvariable_binding_locus): Add, as per suggestion from + RMS at: + http://article.gmane.org/gmane.emacs.pretest.bugs/1010 + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: src/alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/alloc.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- src/alloc.c 25 Aug 2003 20:53:59 -0000 1.93 +++ src/alloc.c 11 Sep 2003 09:11:08 -0000 1.94 @@ -2777,10 +2777,12 @@ room in `lrecord_implementations_table' for such new lisp object types. */ const struct lrecord_implementation *lrecord_implementations_table[(int)lrecord_type_last_built_in_type + MODULE_DEFINABLE_TYPE_COUNT]; int lrecord_type_count = lrecord_type_last_built_in_type; +#ifndef USE_KKCC /* Object marker functions are in the lrecord_implementation structure. But copying them to a parallel array is much more cache-friendly. This hack speeds up (garbage-collect) by about 5%. */ Lisp_Object (*lrecord_markers[countof (lrecord_implementations_table)]) (Lisp_Object); +#endif /* not USE_KKCC */ struct gcpro *gcprolist; @@ -2951,113 +2953,6 @@ #if defined (USE_KKCC) || defined (PDUMP) -/* the initial stack size in kkcc_gc_stack_entries */ -#define KKCC_INIT_GC_STACK_SIZE 16384 - -typedef struct -{ - void *data; - const struct memory_description *desc; -} kkcc_gc_stack_entry; - -static kkcc_gc_stack_entry *kkcc_gc_stack_ptr; -static kkcc_gc_stack_entry *kkcc_gc_stack_top; -static kkcc_gc_stack_entry *kkcc_gc_stack_last_entry; -static int kkcc_gc_stack_size; - -static void -kkcc_gc_stack_init (void) -{ - kkcc_gc_stack_size = KKCC_INIT_GC_STACK_SIZE; - kkcc_gc_stack_ptr = (kkcc_gc_stack_entry *) - malloc (kkcc_gc_stack_size * sizeof (kkcc_gc_stack_entry)); - if (!kkcc_gc_stack_ptr) - { - stderr_out ("stack init failed for size %d\n", kkcc_gc_stack_size); - exit(23); - } - kkcc_gc_stack_top = kkcc_gc_stack_ptr - 1; - kkcc_gc_stack_last_entry = kkcc_gc_stack_ptr + kkcc_gc_stack_size - 1; -} - -static void -kkcc_gc_stack_free (void) -{ - free (kkcc_gc_stack_ptr); - kkcc_gc_stack_ptr = 0; - kkcc_gc_stack_top = 0; - kkcc_gc_stack_size = 0; -} - -static void -kkcc_gc_stack_realloc (void) -{ - int current_offset = (int)(kkcc_gc_stack_top - kkcc_gc_stack_ptr); - kkcc_gc_stack_size *= 2; - kkcc_gc_stack_ptr = (kkcc_gc_stack_entry *) - realloc (kkcc_gc_stack_ptr, - kkcc_gc_stack_size * sizeof (kkcc_gc_stack_entry)); - if (!kkcc_gc_stack_ptr) - { - stderr_out ("stack realloc failed for size %d\n", kkcc_gc_stack_size); - exit(23); - } - kkcc_gc_stack_top = kkcc_gc_stack_ptr + current_offset; - kkcc_gc_stack_last_entry = kkcc_gc_stack_ptr + kkcc_gc_stack_size - 1; -} - -static int -kkcc_gc_stack_full (void) -{ - if (kkcc_gc_stack_top >= kkcc_gc_stack_last_entry) - return 1; - return 0; -} - -static int -kkcc_gc_stack_empty (void) -{ - if (kkcc_gc_stack_top < kkcc_gc_stack_ptr) - return 1; - return 0; -} - -static void -kkcc_gc_stack_push (void *data, const struct memory_description *desc) -{ - if (kkcc_gc_stack_full ()) - kkcc_gc_stack_realloc(); - kkcc_gc_stack_top++; - kkcc_gc_stack_top->data = data; - kkcc_gc_stack_top->desc = desc; -} - -static kkcc_gc_stack_entry * -kkcc_gc_stack_pop (void) //void *data, const struct memory_description *desc) -{ - if (kkcc_gc_stack_empty ()) - return 0; - kkcc_gc_stack_top--; - return kkcc_gc_stack_top + 1; -} - -void -kkcc_gc_stack_push_lisp_object (Lisp_Object obj) -{ - if (XTYPE (obj) == Lisp_Type_Record) - { - struct lrecord_header *lheader = XRECORD_LHEADER (obj); - const struct memory_description *desc; - GC_CHECK_LHEADER_INVARIANTS (lheader); - desc = LHEADER_IMPLEMENTATION (lheader)->description; - if (! MARKED_RECORD_HEADER_P (lheader)) - { - MARK_RECORD_HEADER (lheader); - kkcc_gc_stack_push((void*) lheader, desc); - } - } -} - /* This function extracts the value of a count variable described somewhere else in the description. It is converted corresponding to the type */ EMACS_INT @@ -3300,6 +3195,104 @@ They mark objects according to their descriptions. They are modeled on the corresponding pdumper procedures. */ +/* Object memory descriptions are in the lrecord_implementation structure. + But copying them to a parallel array is much more cache-friendly. */ +const struct memory_description *lrecord_memory_descriptions[countof (lrecord_implementations_table)]; + +/* the initial stack size in kkcc_gc_stack_entries */ +#define KKCC_INIT_GC_STACK_SIZE 16384 + +typedef struct +{ + void *data; + const struct memory_description *desc; +} kkcc_gc_stack_entry; + +static kkcc_gc_stack_entry *kkcc_gc_stack_ptr; +static kkcc_gc_stack_entry *kkcc_gc_stack_top; +static kkcc_gc_stack_entry *kkcc_gc_stack_last_entry; +static int kkcc_gc_stack_size; + +static void +kkcc_gc_stack_init (void) +{ + kkcc_gc_stack_size = KKCC_INIT_GC_STACK_SIZE; + kkcc_gc_stack_ptr = (kkcc_gc_stack_entry *) + malloc (kkcc_gc_stack_size * sizeof (kkcc_gc_stack_entry)); + if (!kkcc_gc_stack_ptr) + { + stderr_out ("stack init failed for size %d\n", kkcc_gc_stack_size); + exit(23); + } + kkcc_gc_stack_top = kkcc_gc_stack_ptr - 1; + kkcc_gc_stack_last_entry = kkcc_gc_stack_ptr + kkcc_gc_stack_size - 1; +} + +static void +kkcc_gc_stack_free (void) +{ + free (kkcc_gc_stack_ptr); + kkcc_gc_stack_ptr = 0; + kkcc_gc_stack_top = 0; + kkcc_gc_stack_size = 0; +} + +static void +kkcc_gc_stack_realloc (void) +{ + int current_offset = (int)(kkcc_gc_stack_top - kkcc_gc_stack_ptr); + kkcc_gc_stack_size *= 2; + kkcc_gc_stack_ptr = (kkcc_gc_stack_entry *) + realloc (kkcc_gc_stack_ptr, + kkcc_gc_stack_size * sizeof (kkcc_gc_stack_entry)); + if (!kkcc_gc_stack_ptr) + { + stderr_out ("stack realloc failed for size %d\n", kkcc_gc_stack_size); + exit(23); + } + kkcc_gc_stack_top = kkcc_gc_stack_ptr + current_offset; + kkcc_gc_stack_last_entry = kkcc_gc_stack_ptr + kkcc_gc_stack_size - 1; +} + +#define KKCC_GC_STACK_FULL (kkcc_gc_stack_top >= kkcc_gc_stack_last_entry) +#define KKCC_GC_STACK_EMPTY (kkcc_gc_stack_top < kkcc_gc_stack_ptr) + +static void +kkcc_gc_stack_push (void *data, const struct memory_description *desc) +{ + if (KKCC_GC_STACK_FULL) + kkcc_gc_stack_realloc(); + kkcc_gc_stack_top++; + kkcc_gc_stack_top->data = data; + kkcc_gc_stack_top->desc = desc; +} + +static kkcc_gc_stack_entry * +kkcc_gc_stack_pop (void) +{ + if (KKCC_GC_STACK_EMPTY) + return 0; + kkcc_gc_stack_top--; + return kkcc_gc_stack_top + 1; +} + +void +kkcc_gc_stack_push_lisp_object (Lisp_Object obj) +{ + if (XTYPE (obj) == Lisp_Type_Record) + { + struct lrecord_header *lheader = XRECORD_LHEADER (obj); + const struct memory_description *desc; + GC_CHECK_LHEADER_INVARIANTS (lheader); + desc = RECORD_DESCRIPTION (lheader); + if (! MARKED_RECORD_HEADER_P (lheader)) + { + MARK_RECORD_HEADER (lheader); + kkcc_gc_stack_push((void*) lheader, desc); + } + } +} + #ifdef ERROR_CHECK_GC #define KKCC_DO_CHECK_FREE(obj, allow_free) \ do \ @@ -3319,11 +3312,7 @@ mark_object_maybe_checking_free (Lisp_Object obj, int allow_free) { KKCC_DO_CHECK_FREE (obj, allow_free); -#ifdef USE_KKCC kkcc_gc_stack_push_lisp_object (obj); -#else /* NOT USE_KKCC */ - mark_object (obj); -#endif /* NOT USE_KKCC */ } #else #define mark_object_maybe_checking_free(obj, allow_free) \ @@ -3474,7 +3463,7 @@ stderr_out ("KKCC: Invalid mark_object call.\n"); stderr_out ("Replace mark_object with kkcc_gc_stack_push_lisp_object.\n"); abort (); -#endif /* USE_KKCC */ +#else /* not USE_KKCC */ tail_recurse: @@ -3505,6 +3494,7 @@ } } } +#endif /* not KKCC */ } @@ -4590,28 +4580,21 @@ #ifdef USE_KKCC /* initialize kkcc stack */ kkcc_gc_stack_init(); +#define mark_object kkcc_gc_stack_push_lisp_object #endif /* USE_KKCC */ { /* staticpro() */ Lisp_Object **p = Dynarr_begin (staticpros); Elemcount count; for (count = Dynarr_length (staticpros); count; count--) -#ifdef USE_KKCC - kkcc_gc_stack_push_lisp_object (**p++); -#else /* NOT USE_KKCC */ mark_object (**p++); -#endif /* NOT USE_KKCC */ } { /* staticpro_nodump() */ Lisp_Object **p = Dynarr_begin (staticpros_nodump); Elemcount count; for (count = Dynarr_length (staticpros_nodump); count; count--) -#ifdef USE_KKCC - kkcc_gc_stack_push_lisp_object (**p++); -#else /* NOT USE_KKCC */ mark_object (**p++); -#endif /* NOT USE_KKCC */ } { /* GCPRO() */ @@ -4619,24 +4602,15 @@ int i; for (tail = gcprolist; tail; tail = tail->next) for (i = 0; i < tail->nvars; i++) -#ifdef USE_KKCC - kkcc_gc_stack_push_lisp_object (tail->var[i]); -#else /* NOT USE_KKCC */ mark_object (tail->var[i]); -#endif /* NOT USE_KKCC */ } { /* specbind() */ struct specbinding *bind; for (bind = specpdl; bind != specpdl_ptr; bind++) { -#ifdef USE_KKCC - kkcc_gc_stack_push_lisp_object (bind->symbol); - kkcc_gc_stack_push_lisp_object (bind->old_value); -#else /* NOT USE_KKCC */ mark_object (bind->symbol); mark_object (bind->old_value); -#endif /* NOT USE_KKCC */ } } @@ -4644,15 +4618,9 @@ struct catchtag *catch; for (catch = catchlist; catch; catch = catch->next) { -#ifdef USE_KKCC - kkcc_gc_stack_push_lisp_object (catch->tag); - kkcc_gc_stack_push_lisp_object (catch->val); - kkcc_gc_stack_push_lisp_object (catch->actual_tag); -#else /* NOT USE_KKCC */ mark_object (catch->tag); mark_object (catch->val); mark_object (catch->actual_tag); -#endif /* NOT USE_KKCC */ } } @@ -4663,16 +4631,6 @@ int nargs = backlist->nargs; int i; -#ifdef USE_KKCC - kkcc_gc_stack_push_lisp_object (*backlist->function); - if (nargs < 0 /* nargs == UNEVALLED || nargs == MANY */ - /* might be fake (internal profiling entry) */ - && backlist->args) - kkcc_gc_stack_push_lisp_object (backlist->args[0]); - else - for (i = 0; i < nargs; i++) - kkcc_gc_stack_push_lisp_object (backlist->args[i]); -#else /* NOT USE_KKCC */ mark_object (*backlist->function); if (nargs < 0 /* nargs == UNEVALLED || nargs == MANY */ /* might be fake (internal profiling entry) */ @@ -4681,7 +4639,6 @@ else for (i = 0; i < nargs; i++) mark_object (backlist->args[i]); -#endif /* NOT USE_KKCC */ } } @@ -4717,6 +4674,7 @@ #ifdef USE_KKCC kkcc_marking (); kkcc_gc_stack_free (); +#undef mark_object #endif /* USE_KKCC */ /* And prune (this needs to be called after everything else has been Index: src/cmdloop.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/cmdloop.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- src/cmdloop.c 7 Feb 2003 11:50:52 -0000 1.19 +++ src/cmdloop.c 20 Sep 2003 01:47:03 -0000 1.20 @@ -68,6 +68,7 @@ Lisp_Object Qerrors_deactivate_region; Lisp_Object Qtop_level; +Lisp_Object Vminibuffer_echo_wait_function; static Lisp_Object command_loop_1 (Lisp_Object dummy); EXFUN (Fcommand_loop_1, 0); @@ -559,7 +560,10 @@ /* Bind dont_check_for_quit to 1 so that C-g gets read in rather than quitting back to the minibuffer. */ int count = begin_dont_check_for_quit (); - Fsit_for (make_int (2), Qnil); + if (!NILP (Vminibuffer_echo_wait_function)) + call0 (Vminibuffer_echo_wait_function); + else + Fsit_for (make_int (2), Qnil); clear_echo_area (selected_frame (), Qnil, 0); Vquit_flag = Qnil; /* see begin_dont_check_for_quit() */ unbind_to (count); @@ -625,6 +629,15 @@ Not yet implemented. */ ); Venter_window_hook = Qnil; + + DEFVAR_LISP ("minibuffer-echo-wait-function", + &Vminibuffer_echo_wait_function /* +The function called by command loop when minibuffer was active and +message was displayed (text appeared in \" *Echo Area*\" buffer). It +must wait after displaying message so that user can read it. If the +variable value is `nil', the equivalent of `(sit-for 2)' is run. +*/ ); + Vminibuffer_echo_wait_function = Qnil; #ifndef LISP_COMMAND_LOOP DEFVAR_LISP ("top-level", &Vtop_level /* Index: src/console-impl.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-impl.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- src/console-impl.h 21 Feb 2003 06:56:56 -0000 1.5 +++ src/console-impl.h 20 Sep 2003 01:14:29 -0000 1.6 @@ -207,7 +207,8 @@ Error_Behavior errb); Lisp_Object (*font_instance_properties_method) (Lisp_Font_Instance *); Lisp_Object (*list_fonts_method) (Lisp_Object pattern, - Lisp_Object device); + Lisp_Object device, + Lisp_Object maxnumber); Lisp_Object (*find_charset_font_method) (Lisp_Object device, Lisp_Object font, Lisp_Object charset, Index: src/depend =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/depend,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- src/depend 1 Sep 2003 02:50:45 -0000 1.41 +++ src/depend 16 Sep 2003 03:57:58 -0000 1.42 @@ -11,7 +11,7 @@ LISP_H= #else CONFIG_H=config.h -LISP_H=lisp.h config.h general-slots.h lrecord.h symeval.h symsinit.h text.h $(LISP_UNION_H) +LISP_H=lisp.h config.h dumper.h general-slots.h lrecord.h symeval.h symsinit.h text.h $(LISP_UNION_H) #endif #if defined(HAVE_MS_WINDOWS) Index: src/device-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- src/device-x.c 12 Jan 2003 11:08:11 -0000 1.49 +++ src/device-x.c 22 Sep 2003 03:21:18 -0000 1.50 @@ -538,7 +538,7 @@ { /* Get a dll handle to the main process. */ - dll_handle xaw_dll_handle = dll_open (NULL); + dll_handle xaw_dll_handle = dll_open (Qnil); /* Did that fail? If so, continue without error. * We could die here but, well, that's unfriendly and all -- plus I feel Index: src/dumper.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- src/dumper.c 9 May 2003 01:41:56 -0000 1.15 +++ src/dumper.c 11 Sep 2003 09:11:08 -0000 1.16 @@ -1162,8 +1162,14 @@ dump_add_opaque (&lrecord_implementations_table, lrecord_type_count * sizeof (lrecord_implementations_table[0])); +#ifdef USE_KKCC + dump_add_opaque (&lrecord_memory_descriptions, + lrecord_type_count + * sizeof (lrecord_memory_descriptions[0])); +#else /* not USE_KKCC */ dump_add_opaque (&lrecord_markers, lrecord_type_count * sizeof (lrecord_markers[0])); +#endif /* not USE_KKCC */ pdump_hash = xnew_array_and_zero (pdump_entry_list_elt *, PDUMP_HASHSIZE); Index: src/dumper.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/dumper.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- src/dumper.h 12 Apr 2001 18:23:35 -0000 1.2 +++ src/dumper.h 16 Sep 2003 03:57:58 -0000 1.3 @@ -23,9 +23,19 @@ #ifndef INCLUDED_dumper_h #define INCLUDED_dumper_h +#ifdef __cplusplus +extern "C" { +#endif + void pdump_objects_unmark (void); void pdump (void); int pdump_load (const char *argv0); +void pdump_backtrace (void); extern unsigned int dump_id; +extern char *pdump_start, *pdump_end; + +#ifdef __cplusplus +} +#endif #endif /* INCLUDED_dumper_h */ Index: src/emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- src/emacs.c 9 Mar 2003 02:27:42 -0000 1.136 +++ src/emacs.c 22 Sep 2003 03:21:19 -0000 1.137 @@ -524,17 +524,6 @@ fullpath = build_tstr_string (full_exe_path); xfree (full_exe_path); result = Fcons (fullpath, result); -#ifdef HAVE_SHLIB - { - Extbyte *fullpathext; - - /* Don't use full_exe_path directly because it's probably - in a different format. */ - LISP_STRING_TO_EXTERNAL (fullpath, fullpathext, - Qdll_filename_encoding); - (void) dll_init (fullpathext); - } -#endif } else #endif @@ -2355,23 +2344,6 @@ Vinvocation_name = Ffile_name_nondirectory (Vinvocation_directory); Vinvocation_directory = Ffile_name_directory (Vinvocation_directory); } - -#if defined (HAVE_SHLIB) && !defined (WIN32_NATIVE) - /* This is Unix only. MS Windows NT has a library call that does - The Right Thing on that system. Rumor has it, this must be - called for GNU dld in temacs and xemacs. */ - { - char *buf = (char *)ALLOCA (XSTRING_LENGTH (Vinvocation_directory) - + XSTRING_LENGTH (Vinvocation_name) - + 2); - sprintf (buf, "%s/%s", XSTRING_DATA (Vinvocation_directory), - XSTRING_DATA (Vinvocation_name)); - - C_STRING_TO_EXTERNAL (buf, buf, Qfile_name); - /* All we can do is cry if an error happens, so ignore it. */ - (void) dll_init (buf); - } -#endif #if defined (LOCALTIME_CACHE) && defined (HAVE_TZSET) /* sun's localtime() has a bug. it caches the value of the time Index: src/emodules.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emodules.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- src/emodules.c 19 Aug 2003 02:07:15 -0000 1.16 +++ src/emodules.c 22 Sep 2003 03:21:19 -0000 1.17 @@ -41,10 +41,10 @@ typedef struct _emodules_list { int used; /* Is this slot used? */ - char *soname; /* Name of the shared object loaded (full path) */ - char *modname; /* The name of the module */ - char *modver; /* The module version string */ - char *modtitle; /* How the module announces itself */ + CIbyte *soname; /* Name of the shared object loaded (full path) */ + CIbyte *modname; /* The name of the module */ + CIbyte *modver; /* The module version string */ + CIbyte *modtitle; /* How the module announces itself */ void (*unload)(void); /* Module cleanup function to run before unloading */ dll_handle dlhandle; /* Dynamic lib handle */ } emodules_list; @@ -56,8 +56,8 @@ static emodules_list *modules; static int modnum; -static int find_make_module (const char *mod, const char *name, - const char *ver, int make_or_find); +static int find_make_module (const CIbyte *mod, const CIbyte *name, + const CIbyte *ver, int make_or_find); static Lisp_Object module_load_unwind (Lisp_Object); static void attempt_module_delete (int mod); @@ -91,22 +91,22 @@ */ (file, name, version)) { - char *mod, *mname, *mver; + CIbyte *mod, *mname, *mver; int speccount = specpdl_depth(); CHECK_STRING(file); - mod = (char *)XSTRING_DATA (file); + mod = (CIbyte *) XSTRING_DATA (file); if (NILP (name)) mname = ""; else - mname = (char *)XSTRING_DATA (name); + mname = (CIbyte *) XSTRING_DATA (name); if (NILP (version)) mver = ""; else - mver = (char *)XSTRING_DATA (version); + mver = (CIbyte *) XSTRING_DATA (version); dlhandle = 0; record_unwind_protect (module_load_unwind, make_int(modnum)); @@ -131,7 +131,7 @@ (file, name, version)) { int x; - char *mod, *mname, *mver; + CIbyte *mod, *mname, *mver; Lisp_Object foundname = Qnil; struct gcpro gcpro1; @@ -141,18 +141,18 @@ if (locate_file (Vmodule_load_path, file, Vmodule_extensions, &foundname, 0) < 0) return Qt; - mod = (char *)XSTRING_DATA (foundname); + mod = (CIbyte *) XSTRING_DATA (foundname); UNGCPRO; if (NILP (name)) mname = ""; else - mname = (char *)XSTRING_DATA (name); + mname = (CIbyte *) XSTRING_DATA (name); if (NILP (version)) mver = ""; else - mver = (char *)XSTRING_DATA (version); + mver = (CIbyte *) XSTRING_DATA (version); x = find_make_module (mod, mname, mver, 1); if (x != -1) @@ -204,7 +204,8 @@ } static int -find_make_module (const char *mod, const char *name, const char *ver, int mof) +find_make_module (const CIbyte *mod, const CIbyte *name, const CIbyte *ver, + int mof) { int i, fs = -1; @@ -232,7 +233,7 @@ * We only get here if we haven't found a free slot and the module was * not previously loaded. */ - if (modules == (emodules_list *)0) + if (modules == NULL) modules = (emodules_list *) xmalloc (sizeof (emodules_list)); modnum++; modules = (emodules_list *) xrealloc (modules, modnum * sizeof (emodules_list)); @@ -324,16 +325,17 @@ * the cleaning up. */ void -emodules_load(const char *module, const char *modname, const char *modver) +emodules_load (const CIbyte *module, const CIbyte *modname, + const CIbyte *modver) { Lisp_Object old_load_list; Lisp_Object filename; Lisp_Object foundname, lisp_modname; int x, mpx; - char *soname; - const char **f; + CIbyte *soname; + const CIbyte **f; const long *ellcc_rev; - char *mver, *mname, *mtitle, *symname; + CIbyte *mver, *mname, *mtitle, *symname; void (*modload)(void) = 0; void (*modsyms)(void) = 0; void (*modvars)(void) = 0; @@ -348,7 +350,7 @@ emodules_depth++; dlhandle = 0; - if ((module == (const char *)0) || (module[0] == '\0')) + if (module == NULL || module[0] == '\0') invalid_argument ("Empty module name", Qunbound); GCPRO4(filename, foundname, old_load_list, lisp_modname); @@ -357,51 +359,47 @@ &foundname, 0) < 0) signal_error (Qdll_error, "Cannot open dynamic module", filename); - soname = (char *)ALLOCA (XSTRING_LENGTH (foundname) + 1); - strcpy (soname, (char *)XSTRING_DATA (foundname)); + LISP_STRING_TO_EXTERNAL (foundname, soname, Qfile_name); lisp_modname = call1 (Qfile_name_sans_extension, Ffile_name_nondirectory (foundname)); - dlhandle = dll_open (soname); - if (dlhandle == (dll_handle)0) + dlhandle = dll_open (foundname); + if (dlhandle == NULL) { - Ibyte *dllerrint; - - EXTERNAL_TO_C_STRING (dll_error (dlhandle), dllerrint, Qnative); signal_error (Qdll_error, "Opening dynamic module", - build_intstring (dllerrint)); + dll_error (dlhandle)); } ellcc_rev = (const long *)dll_variable (dlhandle, "emodule_compiler"); - if ((ellcc_rev == (const long *)0) || (*ellcc_rev <= 0)) + if (ellcc_rev == NULL || *ellcc_rev <= 0L) signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_compiler'", Qunbound); if (*ellcc_rev > EMODULES_REVISION) signal_ferror (Qdll_error, "Invalid dynamic module: Unsupported version `%ld(%ld)'", *ellcc_rev, EMODULES_REVISION); - f = (const char **)dll_variable (dlhandle, "emodule_name"); - if ((f == (const char **)0) || (*f == (const char *)0)) + f = (const CIbyte **) dll_variable (dlhandle, "emodule_name"); + if (f == NULL || *f == NULL) signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_name'", Qunbound); - mname = (char *)ALLOCA (strlen (*f) + 1); + mname = (CIbyte *) ALLOCA (strlen (*f) + 1); strcpy (mname, *f); if (mname[0] == '\0') signal_error (Qdll_error, "Invalid dynamic module: Empty value for `emodule_name'", Qunbound); - f = (const char **)dll_variable (dlhandle, "emodule_version"); - if ((f == (const char **)0) || (*f == (const char *)0)) + f = (const CIbyte **) dll_variable (dlhandle, "emodule_version"); + if (f == NULL || *f == NULL) signal_error (Qdll_error, "Missing symbol `emodule_version': Invalid dynamic module", Qunbound); - mver = (char *)ALLOCA (strlen (*f) + 1); + mver = (CIbyte *) ALLOCA (strlen (*f) + 1); strcpy (mver, *f); - f = (const char **)dll_variable (dlhandle, "emodule_title"); - if ((f == (const char **)0) || (*f == (const char *)0)) + f = (const CIbyte **) dll_variable (dlhandle, "emodule_title"); + if (f == NULL || *f == NULL) signal_error (Qdll_error, "Invalid dynamic module: Missing symbol `emodule_title'", Qunbound); - mtitle = (char *)ALLOCA (strlen (*f) + 1); + mtitle = (CIbyte *) ALLOCA (strlen (*f) + 1); strcpy (mtitle, *f); - symname = (char *)ALLOCA (strlen (mname) + 15); + symname = (CIbyte *) ALLOCA (strlen (mname) + 15); strcpy (symname, "modules_of_"); strcat (symname, mname); @@ -414,7 +412,7 @@ strcpy (symname, "syms_of_"); strcat (symname, mname); modsyms = (void (*)(void))dll_function (dlhandle, symname); - if (modsyms == (void (*)(void))0) + if (modsyms == NULL) { missing_symbol: signal_error (Qdll_error, "Invalid dynamic module: Missing symbol", @@ -424,13 +422,13 @@ strcpy (symname, "vars_of_"); strcat (symname, mname); modvars = (void (*)(void))dll_function (dlhandle, symname); - if (modvars == (void (*)(void))0) + if (modvars == NULL) goto missing_symbol; strcpy (symname, "docs_of_"); strcat (symname, mname); moddocs = (void (*)(void))dll_function (dlhandle, symname); - if (moddocs == (void (*)(void))0) + if (moddocs == NULL) goto missing_symbol; /* Now look for the optional unload function. */ @@ -574,7 +572,7 @@ reinit_vars_of_module (void) { emodules_depth = 0; - modules = (emodules_list *)0; + modules = NULL; modnum = 0; } Index: src/event-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-msw.c,v retrieving revision 1.95 retrieving revision 1.97 diff -u -r1.95 -r1.97 --- src/event-msw.c 13 Aug 2003 11:27:48 -0000 1.95 +++ src/event-msw.c 15 Sep 2003 22:04:10 -0000 1.97 @@ -3793,7 +3793,7 @@ But "cch" means "count of characters", not bytes. I'll assume the doc writers messed up and the programmer was correct. Also, this approach is safe even if it's actually the other way around. */ -#if defined (CYGWIN_HEADERS) && !defined (W32API_2_2) +#if defined (CYGWIN_HEADERS) && W32API_INSTALLED_VER < W32API_VER(2,2) /* Another Cygwin prototype error, fixed in v2.2 of w32api */ XECOMCALL4 (psl, GetPath, (LPSTR) resolved, @@ -4859,7 +4859,7 @@ FROB (WM_GETHOTKEY) FROB (WM_QUERYDRAGICON) FROB (WM_COMPAREITEM) -#if(WINVER >= 0x0500) +#if(WINVER >= 0x0500) && defined(WM_GETOBJECT) FROB (WM_GETOBJECT) #endif /* WINVER >= 0x0500 */ FROB (WM_COMPACTING) @@ -4942,10 +4942,18 @@ FROB (WM_ENTERIDLE) #if(WINVER >= 0x0500) FROB (WM_MENURBUTTONUP) +#ifdef WM_MENUDRAG FROB (WM_MENUDRAG) +#endif +#ifdef WM_MENUGETOBJECT FROB (WM_MENUGETOBJECT) +#endif +#ifdef WM_UNINITMENUPOPUP FROB (WM_UNINITMENUPOPUP) +#endif +#ifdef WM_MENUCOMMAND FROB (WM_MENUCOMMAND) +#endif #endif /* WINVER >= 0x0500 */ @@ -5021,7 +5029,7 @@ FROB (WM_IME_SELECT) FROB (WM_IME_CHAR) #endif /* WINVER >= 0x0400 */ -#if(WINVER >= 0x0500) +#if(WINVER >= 0x0500) && defined(WM_IME_REQUEST) FROB (WM_IME_REQUEST) #endif /* WINVER >= 0x0500 */ #if(WINVER >= 0x0400) Index: src/intl-auto-encap-win32.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/intl-auto-encap-win32.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- src/intl-auto-encap-win32.c 18 Nov 2002 06:52:39 -0000 1.7 +++ src/intl-auto-encap-win32.c 15 Sep 2003 20:21:46 -0000 1.8 @@ -2571,14 +2571,7 @@ return GetShortPathNameA ((LPCSTR) lpszLongPath, (LPSTR) lpszShortPath, cchBuffer); } -DWORD -qxeGetLongPathName (const Extbyte * lpszShortPath, Extbyte * lpszLongPath, DWORD cchBuffer) -{ - if (XEUNICODE_P) - return GetLongPathNameW ((LPCWSTR) lpszShortPath, (LPWSTR) lpszLongPath, cchBuffer); - else - return GetLongPathNameA ((LPCSTR) lpszShortPath, (LPSTR) lpszLongPath, cchBuffer); -} +/* Error if GetLongPathName used: Win98/2K+ only */ /* Skipping GetEnvironmentStrings because misnamed ANSI version of the function */ Index: src/intl-auto-encap-win32.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/intl-auto-encap-win32.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- src/intl-auto-encap-win32.h 18 Nov 2002 06:52:39 -0000 1.7 +++ src/intl-auto-encap-win32.h 15 Sep 2003 20:21:47 -0000 1.8 @@ -1825,11 +1825,8 @@ #endif DWORD qxeGetShortPathName (const Extbyte * lpszLongPath, Extbyte * lpszShortPath, DWORD cchBuffer); -#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED #undef GetLongPathName -#define GetLongPathName error use qxeGetLongPathName or GetLongPathNameA/GetLongPathNameW -#endif -DWORD qxeGetLongPathName (const Extbyte * lpszShortPath, Extbyte * lpszLongPath, DWORD cchBuffer); +#define GetLongPathName error Win98/2K+ only /* Skipping GetEnvironmentStrings because misnamed ANSI version of the function */ Index: src/intl-encap-win32.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/intl-encap-win32.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- src/intl-encap-win32.c 12 Jan 2003 11:08:17 -0000 1.9 +++ src/intl-encap-win32.c 15 Sep 2003 20:21:46 -0000 1.10 @@ -216,7 +216,7 @@ yes GetBinaryType yes GetShortPathName -yes GetLongPathName +no GetLongPathName Win98/2K+ only skip GetEnvironmentStrings misnamed ANSI version of the function yes FreeEnvironmentStrings yes FormatMessage Index: src/lisp.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- src/lisp.h 28 Aug 2003 15:44:28 -0000 1.106 +++ src/lisp.h 22 Sep 2003 03:21:19 -0000 1.107 @@ -3901,18 +3901,18 @@ #endif /* Defined in eval.c */ -EXFUN (Fapply, MANY); +MODULE_API EXFUN (Fapply, MANY); EXFUN (Fbacktrace, 2); EXFUN (Fcommand_execute, 3); EXFUN (Fcommandp, 1); -EXFUN (Feval, 1); -EXFUN (Ffuncall, MANY); +MODULE_API EXFUN (Feval, 1); +MODULE_API EXFUN (Ffuncall, MANY); EXFUN (Ffunctionp, 1); EXFUN (Finteractive_p, 0); EXFUN (Fprogn, UNEVALLED); -EXFUN (Fsignal, 2); -EXFUN (Fthrow, 2); -EXFUN (Fcall_with_condition_handler, MANY); +MODULE_API EXFUN (Fsignal, 2); +MODULE_API EXFUN (Fthrow, 2); +MODULE_API EXFUN (Fcall_with_condition_handler, MANY); EXFUN (Ffunction_max_args, 1); EXFUN (Ffunction_min_args, 1); @@ -4044,22 +4044,25 @@ void va_run_hook_with_args (Lisp_Object, int, ...); void va_run_hook_with_args_in_buffer (struct buffer *, Lisp_Object, int, ...); Lisp_Object run_hook (Lisp_Object); -Lisp_Object apply1 (Lisp_Object, Lisp_Object); -Lisp_Object call0 (Lisp_Object); -Lisp_Object call1 (Lisp_Object, Lisp_Object); -Lisp_Object call2 (Lisp_Object, Lisp_Object, Lisp_Object); -Lisp_Object call3 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); -Lisp_Object call4 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object); -Lisp_Object call5 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object); -Lisp_Object call6 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, Lisp_Object); -Lisp_Object call7 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object); -Lisp_Object call8 (Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object, Lisp_Object, Lisp_Object, Lisp_Object, - Lisp_Object); +MODULE_API Lisp_Object apply1 (Lisp_Object, Lisp_Object); +MODULE_API Lisp_Object call0 (Lisp_Object); +MODULE_API Lisp_Object call1 (Lisp_Object, Lisp_Object); +MODULE_API Lisp_Object call2 (Lisp_Object, Lisp_Object, Lisp_Object); +MODULE_API Lisp_Object call3 (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object); +MODULE_API Lisp_Object call4 (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object); +MODULE_API Lisp_Object call5 (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, Lisp_Object); +MODULE_API Lisp_Object call6 (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object); +MODULE_API Lisp_Object call7 (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object); +MODULE_API Lisp_Object call8 (Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, Lisp_Object, + Lisp_Object, Lisp_Object, Lisp_Object); Lisp_Object call0_in_buffer (struct buffer *, Lisp_Object); Lisp_Object call1_in_buffer (struct buffer *, Lisp_Object, Lisp_Object); Lisp_Object call2_in_buffer (struct buffer *, Lisp_Object, Lisp_Object, Index: src/lrecord.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lrecord.h,v retrieving revision 1.29 retrieving revision 1.31 diff -u -r1.29 -r1.31 --- src/lrecord.h 28 Aug 2003 15:44:29 -0000 1.29 +++ src/lrecord.h 16 Sep 2003 03:57:59 -0000 1.31 @@ -329,7 +329,12 @@ } while (0) #define SET_LISP_READONLY_RECORD_HEADER(lheader) \ ((void) ((lheader)->lisp_readonly = 1)) + +#ifdef USE_KKCC +#define RECORD_DESCRIPTION(lheader) lrecord_memory_descriptions[(lheader)->type] +#else /* not USE_KKCC */ #define RECORD_MARKER(lheader) lrecord_markers[(lheader)->type] +#endif /* not USE_KKCC */ #define RECORD_DUMPABLE(lheader) (lrecord_implementations_table[(lheader)->type])->dumpable @@ -924,6 +929,15 @@ getprop, putprop, remprop, plist, size, sizer, \ lrecord_type_last_built_in_type, basic_p } +#ifdef USE_KKCC +extern MODULE_API const struct memory_description *lrecord_memory_descriptions[]; + +#define INIT_LRECORD_IMPLEMENTATION(type) do { \ + lrecord_implementations_table[lrecord_type_##type] = &lrecord_##type; \ + lrecord_memory_descriptions[lrecord_type_##type] = \ + lrecord_implementations_table[lrecord_type_##type]->description; \ +} while (0) +#else /* not USE_KKCC */ extern MODULE_API Lisp_Object (*lrecord_markers[]) (Lisp_Object); #define INIT_LRECORD_IMPLEMENTATION(type) do { \ @@ -931,6 +945,7 @@ lrecord_markers[lrecord_type_##type] = \ lrecord_implementations_table[lrecord_type_##type]->marker; \ } while (0) +#endif /* not USE_KKCC */ #define INIT_EXTERNAL_LRECORD_IMPLEMENTATION(type) do { \ lrecord_type_##type = lrecord_type_count++; \ @@ -941,10 +956,17 @@ #ifdef HAVE_SHLIB /* Allow undefining types in order to support module unloading. */ +#ifdef USE_KKCC +#define UNDEF_LRECORD_IMPLEMENTATION(type) do { \ + lrecord_implementations_table[lrecord_type_##type] = NULL; \ + lrecord_memory_descriptions[lrecord_type_##type] = NULL; \ +} while (0) +#else /* not USE_KKCC */ #define UNDEF_LRECORD_IMPLEMENTATION(type) do { \ lrecord_implementations_table[lrecord_type_##type] = NULL; \ lrecord_markers[lrecord_type_##type] = NULL; \ } while (0) +#endif /* not USE_KKCC */ #define UNDEF_EXTERNAL_LRECORD_IMPLEMENTATION(type) do { \ if (lrecord_##type.lrecord_type_index == lrecord_type_count - 1) { \ @@ -1488,14 +1510,7 @@ extern MODULE_API int initialized; #ifdef PDUMP - -void pdump_objects_unmark (void); -void pdump (void); -int pdump_load (const char *argv0); -void pdump_backtrace (void); -extern unsigned int dump_id; -extern char *pdump_start, *pdump_end; - +#include "dumper.h" #define DUMPEDP(adr) ((((char *) (adr)) < pdump_end) && \ (((char *) (adr)) >= pdump_start)) #else Index: src/objects-gtk.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-gtk.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- src/objects-gtk.c 2 Aug 2002 15:18:46 -0000 1.10 +++ src/objects-gtk.c 20 Sep 2003 01:14:29 -0000 1.11 @@ -359,7 +359,7 @@ } static Lisp_Object -gtk_list_fonts (Lisp_Object pattern, Lisp_Object device) +gtk_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber) { const char *patternext; Index: src/objects-msw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-msw.c,v retrieving revision 1.38 retrieving revision 1.40 diff -u -r1.38 -r1.40 --- src/objects-msw.c 20 Jun 2002 21:18:39 -0000 1.38 +++ src/objects-msw.c 22 Sep 2003 03:21:19 -0000 1.40 @@ -1924,7 +1924,8 @@ } static Lisp_Object -mswindows_list_fonts (Lisp_Object pattern, Lisp_Object device) +mswindows_list_fonts (Lisp_Object pattern, Lisp_Object device, + Lisp_Object maxnumber) { struct device *d = XDEVICE (device); Lisp_Object font_list = Qnil, fonttail, result = Qnil; @@ -2184,7 +2185,7 @@ /* If FONT specifies a particular charset, this will only list fonts with that charset; otherwise, it will list fonts with all charsets. */ - fontlist = mswindows_list_fonts (font, device); + fontlist = mswindows_list_fonts (font, device, Qnil); if (!stage) { Index: src/objects-tty.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-tty.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- src/objects-tty.c 12 Jan 2003 11:08:19 -0000 1.10 +++ src/objects-tty.c 20 Sep 2003 01:14:30 -0000 1.11 @@ -291,7 +291,7 @@ } static Lisp_Object -tty_list_fonts (Lisp_Object pattern, Lisp_Object device) +tty_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber) { return list1 (build_string ("normal")); } Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- src/objects-x.c 12 Jan 2003 11:08:19 -0000 1.22 +++ src/objects-x.c 20 Sep 2003 01:14:30 -0000 1.23 @@ -853,17 +853,23 @@ } static Lisp_Object -x_list_fonts (Lisp_Object pattern, Lisp_Object device) +x_list_fonts (Lisp_Object pattern, Lisp_Object device, Lisp_Object maxnumber) { Extbyte **names; int count = 0; + int max_number = MAX_FONT_COUNT; Lisp_Object result = Qnil; const Extbyte *patternext; LISP_STRING_TO_EXTERNAL (pattern, patternext, Qx_font_name_encoding); + if (!NILP(maxnumber) && INTP(maxnumber)) + { + max_number = XINT(maxnumber); + } + names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)), - patternext, MAX_FONT_COUNT, &count); + patternext, max_number, &count); while (count--) result = Fcons (build_ext_string (names[count], Qx_font_name_encoding), result); Index: src/objects.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- src/objects.c 12 Jan 2003 11:08:19 -0000 1.18 +++ src/objects.c 20 Sep 2003 01:14:30 -0000 1.19 @@ -507,17 +507,18 @@ font_instance_properties, (f)); } -DEFUN ("list-fonts", Flist_fonts, 1, 2, 0, /* +DEFUN ("list-fonts", Flist_fonts, 1, 3, 0, /* Return a list of font names matching the given pattern. DEVICE specifies which device to search for names, and defaults to the currently selected device. */ - (pattern, device)) + (pattern, device, maxnumber)) { CHECK_STRING (pattern); device = wrap_device (decode_device (device)); - return MAYBE_LISP_DEVMETH (XDEVICE (device), list_fonts, (pattern, device)); + return MAYBE_LISP_DEVMETH (XDEVICE (device), list_fonts, (pattern, device, + maxnumber)); } Index: src/redisplay.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.c,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- src/redisplay.c 22 Feb 2003 02:08:33 -0000 1.88 +++ src/redisplay.c 22 Sep 2003 04:21:43 -0000 1.89 @@ -8083,10 +8083,13 @@ } /* Return a boolean indicating if POINT would be visible in window W - if display of the window was to begin at STARTP. */ - + if display of the window was to begin at STARTP. If PARTIALLY is + zero, then if POINT has fewer visible pixels than the window clip, + 0 is returned; otherwise, 1 is returned if POINT has any visible + pixels. */ int -point_would_be_visible (struct window *w, Charbpos startp, Charbpos point) +point_would_be_visible (struct window *w, Charbpos startp, Charbpos point, + int partially) { struct buffer *b = XBUFFER (w->buffer); int pixpos = -WINDOW_TEXT_TOP_CLIP(w); @@ -8145,7 +8148,7 @@ if (pixpos + height > bottom) { - if (bottom - pixpos < VERTICAL_CLIP (w, 0)) + if (bottom - pixpos < (partially ? 0 : VERTICAL_CLIP (w, 0))) { w->line_cache_validation_override--; return 0; Index: src/redisplay.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- src/redisplay.h 21 Feb 2003 06:56:59 -0000 1.19 +++ src/redisplay.h 22 Sep 2003 04:21:43 -0000 1.20 @@ -758,7 +758,7 @@ int point_in_line_start_cache (struct window *w, Charbpos point, int min_past); int point_would_be_visible (struct window *w, Charbpos startp, - Charbpos point); + Charbpos point, int partially); Charbpos start_of_last_line (struct window *w, Charbpos startp); Charbpos end_of_last_line (struct window *w, Charbpos startp); Charbpos start_with_line_at_pixpos (struct window *w, Charbpos point, Index: src/scrollbar.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/scrollbar.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- src/scrollbar.c 21 Feb 2003 06:57:00 -0000 1.30 +++ src/scrollbar.c 22 Sep 2003 04:21:43 -0000 1.31 @@ -692,7 +692,7 @@ else Fset_window_point (win, make_int (start_pos)); } - else if (!point_would_be_visible (XWINDOW (win), start_pos, ptint)) + else if (!point_would_be_visible (XWINDOW (win), start_pos, ptint, 0)) { Fmove_to_window_line (make_int (-1), win); Index: src/symbols.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- src/symbols.c 12 Jan 2003 11:08:21 -0000 1.43 +++ src/symbols.c 10 Sep 2003 08:40:41 -0000 1.44 @@ -3211,6 +3211,31 @@ return follow_varalias_pointers (object, follow_past_lisp_magic); } +DEFUN ("variable-binding-locus", Fvariable_binding_locus, 1, 1, 0, /* +Return a value indicating where VARIABLE's current binding comes from. +If the current binding is buffer-local, the value is the current buffer. +If the current binding is global (the default), the value is nil. +*/ + (variable)) +{ + Lisp_Object valcontents; + + CHECK_SYMBOL (variable); + variable = Findirect_variable (variable, Qnil); + + /* Make sure the current binding is actually swapped in. */ + find_symbol_value (variable); + + valcontents = XSYMBOL (variable)->value; + + if (SYMBOL_VALUE_MAGIC_P (valcontents) + && ((XSYMBOL_VALUE_MAGIC_TYPE (valcontents) == SYMVAL_BUFFER_LOCAL) + || (XSYMBOL_VALUE_MAGIC_TYPE (valcontents) == SYMVAL_SOME_BUFFER_LOCAL)) + && (!NILP (Flocal_variable_p (variable, Fcurrent_buffer (), Qnil)))) + return Fcurrent_buffer (); + else + return Qnil; +} /************************************************************************/ /* initialization */ @@ -3597,7 +3622,6 @@ DEFSYMBOL (Qsymbol_value_in_buffer); DEFSYMBOL (Qsymbol_value_in_console); DEFSYMBOL (Qlocal_variable_p); - DEFSYMBOL (Qconst_integer); DEFSYMBOL (Qconst_boolean); DEFSYMBOL (Qconst_object); @@ -3644,6 +3668,7 @@ DEFSUBR (Fdefvaralias); DEFSUBR (Fvariable_alias); DEFSUBR (Findirect_variable); + DEFSUBR (Fvariable_binding_locus); DEFSUBR (Fdontusethis_set_symbol_value_handler); } Index: src/symsinit.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- src/symsinit.h 15 Apr 2003 17:01:57 -0000 1.47 +++ src/symsinit.h 22 Sep 2003 03:21:19 -0000 1.48 @@ -95,7 +95,7 @@ void syms_of_doc (void); void syms_of_dragdrop (void); void syms_of_editfns (void); -void syms_of_eldap (void); +EXTERN_C void syms_of_eldap (void); void syms_of_elhash (void); void syms_of_emacs (void); void syms_of_eval (void); @@ -155,7 +155,7 @@ void syms_of_objects_mswindows (void); void syms_of_objects_tty (void); void syms_of_objects_x (void); -void syms_of_postgresql (void); +EXTERN_C void syms_of_postgresql (void); void syms_of_print (void); void syms_of_process (void); void syms_of_process_nt (void); @@ -433,8 +433,8 @@ void vars_of_win32 (void); void vars_of_select_x (void); void reinit_vars_of_select_x (void); -void vars_of_eldap (void); -void vars_of_postgresql (void); +EXTERN_C void vars_of_eldap (void); +EXTERN_C void vars_of_postgresql (void); void vars_of_gpmevent (void); /* Initialize specifier variables (dump-time only). */ Index: src/sysdll.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdll.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- src/sysdll.c 19 Aug 2003 02:07:16 -0000 1.14 +++ src/sysdll.c 22 Sep 2003 03:21:19 -0000 1.15 @@ -29,7 +29,7 @@ #ifdef DLSYM_NEEDS_UNDERSCORE #define MAYBE_PREPEND_UNDERSCORE(n) do { \ - char *buf = alloca_array (char, strlen (n) + 2); \ + CIbyte *buf = alloca_array (CIbyte, strlen (n) + 2); \ *buf = '_'; \ strcpy (buf + 1, n); \ n = buf; \ @@ -63,15 +63,25 @@ #endif int -dll_init (const char *arg) +dll_init (const Extbyte *arg) { return 0; } dll_handle -dll_open (const char *fname) +dll_open (Lisp_Object fname) { - return (dll_handle) dlopen (fname, RTLD_NOW); + Extbyte *soname; + + if (NILP (fname)) + { + soname = NULL; + } + else + { + LISP_STRING_TO_EXTERNAL (fname, soname, Qdll_filename_encoding); + } + return (dll_handle) dlopen (soname, RTLD_NOW); } int @@ -81,47 +91,56 @@ } dll_func -dll_function (dll_handle h, const char *n) +dll_function (dll_handle h, const CIbyte *n) { MAYBE_PREPEND_UNDERSCORE (n); return (dll_func) dlsym ((void *) h, n); } dll_var -dll_variable (dll_handle h, const char *n) +dll_variable (dll_handle h, const CIbyte *n) { MAYBE_PREPEND_UNDERSCORE (n); return (dll_var)dlsym ((void *)h, n); } -const char * +Lisp_Object dll_error (dll_handle h) { + const Extbyte *msg; #if defined(HAVE_DLERROR) || defined(dlerror) - return (const char *) dlerror (); + msg = (const Extbyte *) dlerror (); #elif defined(HAVE__DLERROR) - return (const char *) _dlerror(); + msg = (const Extbyte *) _dlerror(); #else - return "Shared library error"; + msg = (const Extbyte *) "Shared library error"; #endif + return build_ext_string (msg, Qnative); } #elif defined(HAVE_SHL_LOAD) /* This is the HP/UX version */ #include int -dll_init (const char *arg) +dll_init (const Extbyte *arg) { return 0; } dll_handle -dll_open (const char *fname) +dll_open (Lisp_Object fname) { - /* shl_load will hang hard if passed a NULL fname. */ - if (fname == NULL) return NULL; + Extbyte *soname; - return (dll_handle) shl_load (fname, BIND_DEFERRED, 0L); + if (NILP (fname)) + { + soname = NULL; + } + else + { + LISP_STRING_TO_EXTERNAL (fname, soname, Qdll_filename_encoding); + } + return (dll_handle) shl_load (soname, BIND_DEFERRED, 0L); } int @@ -131,7 +150,7 @@ } dll_func -dll_function (dll_handle h, const char *n) +dll_function (dll_handle h, const CIbyte *n) { long handle = 0L; @@ -142,7 +161,7 @@ } dll_var -dll_variable (dll_handle h, const char *n) +dll_variable (dll_handle h, const CIbyte *n) { long handle = 0L; @@ -152,109 +171,65 @@ return (dll_var) handle; } -const char * +Lisp_Object dll_error (dll_handle h) { /* #### WTF?! Shouldn't this at least attempt to get strerror or something? --hniksic */ - return "Generic shared library error"; -} - -#elif defined(HAVE_DLD_INIT) -#include -int -dll_init (const char *arg) -{ - char *real_exe = dld_find_executable (arg); - int rc; - - rc = dld_init (real_exe); - if (rc) - { - dld_perror (exe); - return -1; - } - return 0; + return build_string ("Generic shared library error", Qnative); } -dll_handle -dll_open (const char *fname) -{ - rc = dld_link (fname); - if (rc) - return NULL; - - return (dll_handle) 1; -} - -int -dll_close (dll_handle h) -{ - /* *sigh* DLD is pretty lame and doesn't return a handle that you can use - ** later on to free the file - you have to remember the filename and - ** use that as the unlinker. We should eventually keep a linked list - ** of loaded modules and then use the node pointer as the unique id - ** for the shared library. Wheeee. But not now. - */ - return 1; -} - -DLL_FUNC -dll_function (dll_handle h, const char *n) -{ - return dld_get_func (n); -} - -DLL_FUNC -dll_variable (dll_handle h, const char *n) -{ - return dld_get_symbol (n); -} #elif defined (WIN32_NATIVE) || defined (CYGWIN) #include "syswindows.h" #include "sysfile.h" int -dll_init (const char *arg) +dll_init (const Extbyte *arg) { return 0; } dll_handle -dll_open (const char *fname) +dll_open (Lisp_Object fname) { - Ibyte *winfname, *unifname; - LOCAL_TO_WIN32_FILE_FORMAT ((char *) fname, winfname); - C_STRING_TO_TSTR (winfname, unifname); - return (dll_handle) qxeLoadLibrary (unifname); + Extbyte *soname; + + if (NILP (fname)) + { + soname = NULL; + } + else + { + LOCAL_FILE_FORMAT_TO_TSTR (fname, soname); + } + return (dll_handle) qxeLoadLibrary (soname); } int dll_close (dll_handle h) { - return FreeLibrary (h); + return FreeLibrary ((HMODULE) h); } dll_func -dll_function (dll_handle h, const char *n) +dll_function (dll_handle h, const CIbyte *n) { - return (dll_func) GetProcAddress (h, n); + return (dll_func) GetProcAddress ((HINSTANCE) h, n); } dll_func -dll_variable (dll_handle h, const char *n) +dll_variable (dll_handle h, const CIbyte *n) { - return (dll_func) GetProcAddress (h, n); + return (dll_func) GetProcAddress ((HINSTANCE) h, n); } -const char * +Lisp_Object dll_error (dll_handle h) { - /* Since nobody frees the returned string, I have to make this ugly hack. */ - static char err[32] = "Windows DLL Error "; - snprintf (&err[18], 14, "%lu", GetLastError ()); - return err; + CIbyte err[32]; + snprintf (err, 32, "Windows DLL Error %lu", GetLastError ()); + return build_string (err); } #elif defined(HAVE_DYLD) /* This section supports MacOSX dynamic libraries. Dynamically @@ -264,22 +239,32 @@ #include int -dll_init (const char *arg) +dll_init (const Extbyte *arg) { return 0; } dll_handle -dll_open (const char *fname) +dll_open (Lisp_Object fname) { + Extbyte *soname; NSObjectFileImage file; NSModule out; - NSObjectFileImageReturnCode ret = - NSCreateObjectFileImageFromFile(fname, &file); + NSObjectFileImageReturnCode ret; + + if (NILP (fname)) + { + soname = NULL; + } + else + { + LISP_STRING_TO_EXTERNAL (fname, soname, Qdll_filename_encoding); + } + ret = NSCreateObjectFileImageFromFile(soname, &file); if (ret != NSObjectFileImageSuccess) { return NULL; } - out = NSLinkModule(file, fname, + out = NSLinkModule(file, soname, NSLINKMODULE_OPTION_BINDNOW | NSLINKMODULE_OPTION_PRIVATE | NSLINKMODULE_OPTION_RETURN_ON_ERROR); @@ -293,7 +278,7 @@ } dll_func -dll_function (dll_handle h, const char *n) +dll_function (dll_handle h, const CIbyte *n) { NSSymbol sym; MAYBE_PREPEND_UNDERSCORE (n); @@ -303,7 +288,7 @@ } dll_var -dll_variable (dll_handle h, const char *n) +dll_variable (dll_handle h, const CIbyte *n) { NSSymbol sym; MAYBE_PREPEND_UNDERSCORE (n); @@ -312,25 +297,25 @@ return (dll_var)NSAddressOfSymbol(sym); } -const char * +Lisp_Object dll_error (dll_handle h) { NSLinkEditErrors c; int errorNumber; - const char *fileNameWithError, *errorString; + const CIbyte *fileNameWithError, *errorString; NSLinkEditError(&c, &errorNumber, &fileNameWithError, &errorString); - return errorString; + return build_ext_string (errorString, Qnative); } #else -/* Catchall if we don't know about this systems method of dynamic loading */ +/* Catchall if we don't know about this system's method of dynamic loading */ int -dll_init (const char *arg) +dll_init (const Extbyte *arg) { return -1; } dll_handle -dll_open (const char *fname) +dll_open (Lisp_Object fname) { return NULL; } @@ -342,21 +327,21 @@ } dll_func -dll_function (dll_handle h, const char *n) +dll_function (dll_handle h, const CIbyte *n) { return NULL; } dll_func -dll_variable (dll_handle h, const char *n) +dll_variable (dll_handle h, const CIbyte *n) { return NULL; } -const char * +Lisp_Object dll_error (dll_handle h) { - return "Shared libraries not implemented on this system"; + return build_string ("Shared libraries not implemented on this system"); } #endif /* System conditionals */ Index: src/sysdll.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdll.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- src/sysdll.h 12 Apr 2001 18:24:22 -0000 1.3 +++ src/sysdll.h 22 Sep 2003 03:21:19 -0000 1.4 @@ -38,13 +38,13 @@ typedef void * dll_func; typedef void * dll_var; -int dll_init(const char *); -int dll_shutdown(void); -dll_handle dll_open(const char *); -int dll_close(dll_handle); -dll_func dll_function(dll_handle,const char *); -dll_var dll_variable(dll_handle,const char *); -const char *dll_error(dll_handle); +extern int dll_init(const Extbyte *); +extern int dll_shutdown(void); +extern dll_handle dll_open(Lisp_Object); +extern int dll_close(dll_handle); +extern dll_func dll_function(dll_handle, const CIbyte *); +extern dll_var dll_variable(dll_handle, const CIbyte *); +extern Lisp_Object dll_error(dll_handle); #ifdef __cplusplus } Index: src/syswindows.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syswindows.h,v retrieving revision 1.19 retrieving revision 1.21 diff -u -r1.19 -r1.21 --- src/syswindows.h 15 Feb 2003 11:20:40 -0000 1.19 +++ src/syswindows.h 15 Sep 2003 21:19:17 -0000 1.21 @@ -151,11 +151,13 @@ #ifdef CYGWIN_HEADERS +#include /* for struct stat */ #include /* for version info */ -#if __W32API_MAJOR_VERSION > 2 || (__W32API_MAJOR_VERSION == 2 && __W32API_MINOR_VERSION >= 2) -#define W32API_2_2 -#endif +/* Test for a specific version of w32api */ +#define W32API_VER(major,minor) (((major) << 16) + (minor)) +#define W32API_INSTALLED_VER \ + W32API_VER (__W32API_MAJOR_VERSION, __W32API_MINOR_VERSION) /* Various brokennesses in various versions of Cygwin */ @@ -362,7 +364,7 @@ WCHAR szDisplay[64]; } NMDATETIMEFORMATW, FAR * LPNMDATETIMEFORMATW; -#ifndef W32API_2_2 +#if W32API_INSTALLED_VER < W32API_VER(2,2) typedef struct tagNMTTDISPIFNOA { @@ -388,7 +390,7 @@ #endif } NMTTDISPINFOW, FAR *LPNMTTDISPINFOW; -#endif /* not W32API_2_2 */ +#endif /* W32API_INSTALLED_VER < W32API_VER(2,2) */ #endif /* (_WIN32_IE >= 0x0400) */ @@ -474,16 +476,21 @@ #include +#if W32API_INSTALLED_VER < W32API_VER(2,4) typedef struct _SHQUERYRBINFO { DWORD cbSize; __int64 i64Size; __int64 i64NumItems; } SHQUERYRBINFO, *LPSHQUERYRBINFO; +#endif typedef LPCDLGTEMPLATE LPCDLGTEMPLATEW; typedef LPCDLGTEMPLATE LPCDLGTEMPLATEA; +#else /* !CYGWIN_HEADERS */ +#define W32API_VER(major,minor) 0 +#define W32API_INSTALLED_VER 0 #endif /* CYGWIN_HEADERS */ /* Not in VC 6 */ Index: src/unexcw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/unexcw.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- src/unexcw.c 10 Jan 2003 14:12:41 -0000 1.13 +++ src/unexcw.c 15 Sep 2003 21:19:17 -0000 1.14 @@ -84,14 +84,15 @@ PEAOUTHDR f_ohdr; SCNHDR f_data, f_bss, f_text, f_nextdata; -#define CHECK_AOUT_POS(a) \ -do { \ - if (lseek (a_out, 0, SEEK_CUR) != a) \ - { \ - printf ("we are at %lx, should be at %lx\n", \ - lseek (a_out, 0, SEEK_CUR), a); \ - exit (-1); \ - } \ +#define CHECK_AOUT_POS(a) \ +do { \ + if (lseek (a_out, 0, SEEK_CUR) != a) \ + { \ + printf ("we are at %lx, should be at %lx\n", \ + (unsigned long) lseek (a_out, 0, SEEK_CUR), \ + (unsigned long) (a)); \ + exit (-1); \ + } \ } while (0) /* Dump out .data and .bss sections into a new executable. */ @@ -440,8 +441,8 @@ if (lseek (a_new, 0, SEEK_CUR) != (long) f_nextdata.s_scnptr) { printf ("at %lx should be at %lx\n", - lseek (a_new, 0, SEEK_CUR), - f_nextdata.s_scnptr); + (unsigned long) lseek (a_new, 0, SEEK_CUR), + (unsigned long) f_nextdata.s_scnptr); PERROR ("file positioning error\n"); } lseek (a_out, f_nextdata_s_scnptr, SEEK_SET); Index: src/window.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- src/window.c 9 Feb 2003 09:33:48 -0000 1.73 +++ src/window.c 22 Sep 2003 04:21:43 -0000 1.74 @@ -1413,12 +1413,14 @@ return window_is_rightmost (decode_window (window)) ? Qt : Qnil; } -DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p, 0, 2, 0, /* -Return t if position POS is currently on the frame in WINDOW. +DEFUN ("pos-visible-in-window-p", Fpos_visible_in_window_p, 0, 3, 0, /* +Returns t if position POS is currently on the frame in WINDOW. Returns nil if that position is scrolled vertically out of view. +If a character is only partially visible, nil is returned, unless the +optional argument PARTIALLY is non-nil. POS defaults to point in WINDOW's buffer; WINDOW, to the selected window. */ - (pos, window)) + (pos, window, partially)) { struct window *w = decode_window (window); Charbpos top = marker_position (w->start[CURRENT_DISP]); @@ -1440,7 +1442,8 @@ if (top < BUF_BEGV (buf) || top > BUF_ZV (buf)) return Qnil; - return point_would_be_visible (w, top, posint) ? Qt : Qnil; + return point_would_be_visible (w, top, posint, !NILP (partially)) + ? Qt : Qnil; } @@ -4459,7 +4462,7 @@ /* #### When the fuck does this happen? I'm so glad that history has completely documented the behavior of the scrolling functions under all circumstances. */ - tem = Fpos_visible_in_window_p (point, window); + tem = Fpos_visible_in_window_p (point, window, Qnil); if (NILP (tem)) { Fvertical_motion (make_int (-window_char_height (w, 0) / 2), @@ -4567,7 +4570,7 @@ w->start_at_line_beg = beginning_of_line_p (b, startp); MARK_WINDOWS_CHANGED (w); - if (!point_would_be_visible (w, startp, XINT (point))) + if (!point_would_be_visible (w, startp, XINT (point), 0)) Fset_window_point (wrap_window (w), make_int (startp)); } } @@ -4635,7 +4638,7 @@ WINDOW_TEXT_TOP_CLIP (w) = (dl->ascent + fheight * value); } - if (!point_would_be_visible (w, startp, XINT (point))) + if (!point_would_be_visible (w, startp, XINT (point), 0)) { Charbpos new_point; @@ -4680,7 +4683,7 @@ w->start_at_line_beg = beginning_of_line_p (b, startp); MARK_WINDOWS_CHANGED (w); - if (!point_would_be_visible (w, startp, XINT (point))) + if (!point_would_be_visible (w, startp, XINT (point), 0)) { Charbpos new_point = start_of_last_line (w, startp); Index: src/xemacs.def.in.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/xemacs.def.in.in,v retrieving revision 1.1 retrieving revision 1.3 diff -u -r1.1 -r1.3 --- src/xemacs.def.in.in 19 Aug 2003 02:07:16 -0000 1.1 +++ src/xemacs.def.in.in 22 Sep 2003 03:21:19 -0000 1.3 @@ -10,6 +10,7 @@ /* Exported functions */ acons alloc_automanaged_lcrecord /* alloc_lcrecord_type */ +apply1 #ifdef USE_ASSERTIONS assert_failed /* abort(), assert(), etc. */ #endif @@ -20,6 +21,17 @@ build_string #ifdef MULE bytecount_to_charcount_fun /* bytecount_to_charcount */ +#endif +call0 +call1 +call2 +call3 +call4 +call5 +call6 +call7 +call8 +#ifdef MULE charcount_to_bytecount_fun /* charcount_to_bytecount */ #endif check_quit /* QUITP */ @@ -137,12 +149,16 @@ Dynarr_newf /* Dynarr_new, Dynarr_new2 */ Dynarr_resize /* Dynarr_add */ Fappend +Fapply Fbuffer_modified_p Fbuffer_name +Fcall_with_condition_handler Fcons Fcurrent_buffer Fequal +Feval Fexpand_abbrev +Ffuncall Fget Fkill_buffer Flength @@ -156,6 +172,8 @@ Fput Freverse Fset_buffer +Fsignal +Fthrow Fvector /* Exported variables */ @@ -169,7 +187,11 @@ lrecord_cons /* CONSP */ lrecord_implementations_table /* RECORD_DUMPABLE */ lrecord_marker /* MARKERP */ +#ifdef USE_KKCC +lrecord_memory_descriptions /* INIT_LRECORD_IMPLEMENTATION */ +#else lrecord_markers /* INIT_LRECORD_IMPLEMENTATION */ +#endif lrecord_string /* STRINGP */ lrecord_symbol /* SYMBOLP */ lrecord_type_count /* INIT_EXTERNAL_LRECORD_IMPLEMENTATION */ Index: src/s/sol2.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/s/sol2.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- src/s/sol2.h 12 Apr 2001 18:24:44 -0000 1.11 +++ src/s/sol2.h 18 Sep 2003 05:14:00 -0000 1.12 @@ -11,7 +11,7 @@ #endif /* Fix understandable GCC lossage on Solaris 2.6 */ -#if defined(__GNUC__) && OS_RELEASE >= 56 && !defined(NOT_C_CODE) +#if defined(__GNUC__) && OS_RELEASE >= 506 && !defined(NOT_C_CODE) /* GCC va_list munging is a little messed up */ #define __GNUC_VA_LIST @@ -66,7 +66,7 @@ */ #undef UNEXEC -#if OS_RELEASE < 56 +#if OS_RELEASE < 506 #define UNEXEC "unexsol2.o" #else #define UNEXEC "unexsol2-6.o" @@ -74,7 +74,7 @@ #else /* C_CODE */ -#if OS_RELEASE <= 53 +#if OS_RELEASE <= 503 /* Solaris 2.3 has a bug in XListFontsWithInfo. */ #define BROKEN_XLISTFONTSWITHINFO #endif @@ -91,7 +91,7 @@ #define BROKEN_SIGCHLD #endif -#if OS_RELEASE < 55 +#if OS_RELEASE < 505 #if __STDC__ == 1 && defined(__SUNPRO_C) #define _POSIX_C_SOURCE 1 @@ -103,7 +103,7 @@ extern void *__builtin_alloca (size_t); #endif /* before SunOS 5.5 */ -#if OS_RELEASE == 55 +#if OS_RELEASE == 505 /* The following functions were added in Solaris 2.5, but they forgot to add prototypes to the system header files. */ int getpagesize (void); @@ -113,13 +113,13 @@ #endif /* SunOS 5.5 */ /* 2.5 now has `random' back in libc but we don't want to use it. */ -#if OS_RELEASE >= 55 +#if OS_RELEASE >= 505 #undef HAVE_RANDOM /* Apparently not necessary here, and it causes 10% CPU chewage. */ #undef BROKEN_SIGCHLD #endif /* >= SunOS 5.5 */ -#if OS_RELEASE < 56 +#if OS_RELEASE < 506 /* Missing prototypes, added in Solaris 2.6 */ struct timeval; int utimes (char *file, struct timeval *tvp); Index: tests/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v retrieving revision 1.40 retrieving revision 1.42 diff -u -r1.40 -r1.42 --- tests/ChangeLog 4 Sep 2003 00:05:17 -0000 1.40 +++ tests/ChangeLog 26 Sep 2003 05:56:46 -0000 1.42 @@ -1,3 +1,11 @@ +2003-09-26 Steve Youngs + + * XEmacs 21.5.16 "celeriac" is released. + +2003-09-25 Stephen J. Turnbull + + * automated/regexp-tests.el (multiple-match): Test \{m,n\}. + 2003-09-03 Steve Youngs * XEmacs 21.5.15 "celery" is released. Index: tests/automated/regexp-tests.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/regexp-tests.el,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- tests/automated/regexp-tests.el 11 Aug 2003 10:03:36 -0000 1.11 +++ tests/automated/regexp-tests.el 25 Sep 2003 11:59:24 -0000 1.12 @@ -152,6 +152,89 @@ (Assert (string-match "^\\(Ä\\)\\1$" "ÄÄ")) (Assert (not (string-match "^\\(Ä\\)\\1$" "Ää")))) +;; multiple-match +;; Thanks to Manfred Bartz +;; c.e.x +;; #### Need to do repetitions of more complex regexps +;; #### WASH ME! +(with-temp-buffer + (Assert (not (string-match "^a\\{4,4\\}$" "aaa"))) + (Assert (string-match "^a\\{4,4\\}$" "aaaa")) + (Assert (not (string-match "^a\\{4,4\\}$" "aaaaa"))) + (Assert (not (string-match "^[a]\\{4,4\\}$" "aaa"))) + (Assert (string-match "^[a]\\{4,4\\}$" "aaaa")) + (Assert (not (string-match "^[a]\\{4,4\\}$" "aaaaa"))) + (Assert (not (string-match "^\\(a\\)\\{4,4\\}$" "aaa"))) + (Assert (string-match "^\\(a\\)\\{4,4\\}$" "aaaa")) + (Assert (not (string-match "^\\(a\\)\\{4,4\\}$" "aaaaa"))) + ;; Use class because repetition of single char broken in 21.5.15 + (Assert (not (string-match "^[a]\\{3,5\\}$" "aa"))) + (Assert (string-match "^[a]\\{3,5\\}$" "aaa")) + (Assert (string-match "^[a]\\{3,5\\}$" "aaaa")) + (Assert (string-match "^[a]\\{3,5\\}$" "aaaaa")) + (Assert (not (string-match "^[a]\\{3,5\\}$" "aaaaaa"))) + (insert "\ +aa +aaa +aaaa +aaaaa +aaaaaa +baaaa +") + (goto-char (point-min)) + (forward-line 1) + (Assert (not (looking-at "^a\\{4,4\\}$"))) + (forward-line 1) + (Assert (looking-at "^a\\{4,4\\}$")) + (forward-line 1) + (Assert (not (looking-at "^a\\{4,4\\}$"))) + (goto-char (point-min)) + (forward-line 1) + (Assert (not (looking-at "^[a]\\{4,4\\}$"))) + (forward-line 1) + (Assert (looking-at "^[a]\\{4,4\\}$")) + (forward-line 1) + (Assert (not (looking-at "^[a]\\{4,4\\}$"))) + (goto-char (point-min)) + (forward-line 1) + (Assert (not (looking-at "^\\(a\\)\\{4,4\\}$"))) + (forward-line 1) + (Assert (looking-at "^\\(a\\)\\{4,4\\}$")) + (forward-line 1) + (Assert (not (looking-at "^\\(a\\)\\{4,4\\}$"))) + ;; Use class because repetition of single char broken in 21.5.15 + (goto-char (point-min)) + (Assert (not (looking-at "^[a]\\{3,5\\}$"))) + (forward-line 1) + (Assert (looking-at "^[a]\\{3,5\\}$")) + (forward-line 1) + (Assert (looking-at "^[a]\\{3,5\\}$")) + (forward-line 1) + (Assert (looking-at "^[a]\\{3,5\\}$")) + (forward-line 1) + (Assert (not (looking-at "^[a]\\{3,5\\}$"))) + (goto-char (point-min)) + (Assert (= 12 (re-search-forward "a\\{4,4\\}"))) + (goto-char (point-min)) + (Assert (= 12 (re-search-forward "b?a\\{4,4\\}"))) + (goto-char (point-min)) + (Assert (= 31 (re-search-forward "ba\\{4,4\\}"))) + (goto-char (point-min)) + (Assert (= 31 (re-search-forward "[b]a\\{4,4\\}"))) + (goto-char (point-min)) + (Assert (= 31 (re-search-forward "\\(b\\)a\\{4,4\\}"))) + (goto-char (point-min)) + (Assert (= 12 (re-search-forward "^a\\{4,4\\}"))) + (goto-char (point-min)) + (Assert (= 12 (re-search-forward "^a\\{4,4\\}$"))) + (goto-char (point-min)) + (Assert (= 12 (re-search-forward "[a]\\{4,4\\}"))) + (goto-char (point-min)) + (Assert (= 12 (re-search-forward "^[a]\\{4,4\\}"))) + (goto-char (point-min)) + (Assert (= 12 (re-search-forward "^[a]\\{4,4\\}$"))) + ) + ;; charset, charset_not ;; Not called because it takes too much time. (defun test-regexp-charset-paranoid ()