Mercurial > hg > xemacs-beta
changeset 1123:37bdd24225ef
[xemacs-hg @ 2002-11-27 07:15:02 by ben]
bug fixes, profiling debugging improvements
configure.in: Check for GCC version and only use -Wpacked in v3.
.cvsignore: Add .idb, .ilk for MS Windows VC++.
cl-macs.el: Document better.
cmdloop.el: Removed.
Remove nonworking breakpoint-on-error now that debug-on-error
works as documented.
help.el: Extract out with-displaying-help-buffer into a more general
mechanism.
lib-complete.el: Support thunks in find-library-source-path.
startup.el: Don't catch errors when noninteractive, because that makes
stack traces from stack-trace-on-error useless.
.cvsignore: Windows shit.
alloc.c: Better redisplay-related assert.
elhash.c: Comment change.
eval.c: Don't generate large warning strings (e.g. backtraces) when they will
be discarded.
Implement debug-on-error as documented -- it will enter the
debugger and crash when an uncaught signal happens noninteractively
and we are --debug.
Better redisplay-related asserts.
frame-msw.c, frame.c, lisp.h, redisplay.c, scrollbar-gtk.c, scrollbar-x.c, signal.c, sysdep.c: Fix up documentation related to QUIT (which CANNOT garbage-collect
under any circumstances), and to redisplay critical sections.
lread.c: Add load-ignore-out-of-date-elc-files,
load-always-display-messages, load-show-full-path-in-messages for
more robust package compilation and debugging.
profile.c: Overhaul profile code. Change format to include call count and be
extensible for further info. Remove call-count-profile-table.
Add set-profiling-info. See related profile.el changes (which
SHOULD ABSOLUTELY be in the core! Get rid of xemacs-devel and
xemacs-base packages *yesterday*!).
| author | ben |
|---|---|
| date | Wed, 27 Nov 2002 07:15:36 +0000 |
| parents | 7abc2b15a990 |
| children | 56d2fe0796c0 |
| files | ChangeLog configure configure.in lib-src/.cvsignore lib-src/ChangeLog lisp/ChangeLog lisp/cl-macs.el lisp/cmdloop.el lisp/cus-start.el lisp/help.el lisp/lib-complete.el lisp/startup.el nt/.cvsignore nt/ChangeLog src/.cvsignore src/ChangeLog src/alloc.c src/elhash.c src/eval.c src/fileio.c src/frame-msw.c src/frame.c src/lisp.h src/lread.c src/profile.c src/redisplay.c src/scrollbar-gtk.c src/scrollbar-x.c src/signal.c src/sysdep.c |
| diffstat | 30 files changed, 1687 insertions(+), 1221 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Nov 26 22:52:59 2002 +0000 +++ b/ChangeLog Wed Nov 27 07:15:36 2002 +0000 @@ -1,3 +1,9 @@ +2002-11-27 Ben Wing <ben@xemacs.org> + + * configure.in (CANONICALIZE_PATH): + * configure.in (TAB): + Check for GCC version and only use -Wpacked in v3. + 2002-10-14 Jerry James <james@xemacs.org> * configure.in: Remove LISP_FLOAT_TYPE definition.
--- a/configure Tue Nov 26 22:52:59 2002 +0000 +++ b/configure Wed Nov 27 07:15:36 2002 +0000 @@ -2300,13 +2300,40 @@ fi CFLAGS="$xe_save_CFLAGS" +if test "$GCC" = "yes"; then +cat > conftest.$ac_ext <<EOF +#line 2306 "configure" +#include "confdefs.h" +int main () { +#if __GNUC__ >= 3 +return 11; +#else +return 0; +#endif +} +EOF +if { (eval echo configure:2316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +then + : +else + conftest_rc="$?" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + case "$conftest_rc" in + 11) echo "You appear to be using GCC version 3 or above."; __GCC3=yes ;; +esac +fi +rm -fr conftest* +fi + test -n "$CPP" -a -d "$CPP" && CPP= test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2310: checking how to run the C preprocessor" >&5 +echo "configure:2337: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2319,13 +2346,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2323 "configure" +#line 2350 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2329: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2336,13 +2363,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2340 "configure" +#line 2367 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2373: \"$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 : @@ -2353,13 +2380,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2357 "configure" +#line 2384 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2363: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2390: \"$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 : @@ -2385,9 +2412,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2389: checking for AIX" >&5 -cat > conftest.$ac_ext <<EOF -#line 2391 "configure" +echo "configure:2416: checking for AIX" >&5 +cat > conftest.$ac_ext <<EOF +#line 2418 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -2414,9 +2441,9 @@ echo $ac_n "checking for GNU libc""... $ac_c" 1>&6 -echo "configure:2418: checking for GNU libc" >&5 -cat > conftest.$ac_ext <<EOF -#line 2420 "configure" +echo "configure:2445: checking for GNU libc" >&5 +cat > conftest.$ac_ext <<EOF +#line 2447 "configure" #include "confdefs.h" #include <features.h> int main() { @@ -2428,7 +2455,7 @@ ; return 0; } EOF -if { (eval echo configure:2432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_glibc=yes else @@ -2505,7 +2532,7 @@ esac cat > conftest.$ac_ext <<EOF -#line 2509 "configure" +#line 2536 "configure" #include "confdefs.h" int main () { #if defined __SUNPRO_C @@ -2519,7 +2546,7 @@ #endif } EOF -if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -2771,17 +2798,17 @@ if test "$__USLC__" = yes; then echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6 -echo "configure:2775: checking for whether the -Kalloca compiler flag is needed" >&5 +echo "configure:2802: checking for whether the -Kalloca compiler flag is needed" >&5 need_kalloca=no cat > conftest.$ac_ext <<EOF -#line 2778 "configure" +#line 2805 "configure" #include "confdefs.h" int main() { void *x = alloca(4); ; return 0; } EOF -if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2792,14 +2819,14 @@ xe_save_c_switch_system="$c_switch_system" c_switch_system="$c_switch_system -Kalloca" cat > conftest.$ac_ext <<EOF -#line 2796 "configure" +#line 2823 "configure" #include "confdefs.h" int main() { void *x = alloca(4); ; return 0; } EOF -if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* need_kalloca=yes else @@ -2815,7 +2842,7 @@ fi if test "$cflags_specified" = "no"; then - if test "$GCC" = "yes"; then + if test "$GCC" = "yes"; then CFLAGS="-g -O3" elif test "$__SUNPRO_C" = "yes"; then case "$opsys" in @@ -2832,10 +2859,13 @@ if test "$cflags_warning_specified" = "no"; then - if test "$GCC" = "yes"; then + if test "$GCC" = "yes"; then cflags_warning="-Wall -Wno-switch -Winline -Wmissing-prototypes" cflags_warning="$cflags_warning -Wsign-compare" - cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes -Wpacked" + cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes" + if test "$__GCC3" = "yes"; then + cflags_warning="$cflags_warning -Wpacked" + fi if test "$xemacs_compiler" != "g++"; then cflags_warning="$cflags_warning -Wshadow -Wmissing-declarations" else @@ -2856,7 +2886,7 @@ if test "$GCC" = "yes"; then echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6 -echo "configure:2860: checking for buggy gcc versions" >&5 +echo "configure:2890: 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.*) @@ -2914,7 +2944,7 @@ if test "$pdump" != "yes"; then echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6 -echo "configure:2918: checking for \"-z nocombreloc\" linker flag" >&5 +echo "configure:2948: 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 ;; @@ -3003,7 +3033,7 @@ fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:3007: checking for dynodump" >&5 +echo "configure:3037: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -3041,12 +3071,12 @@ done echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6 -echo "configure:3045: checking for terminateAndUnload in -lC" >&5 +echo "configure:3075: checking for terminateAndUnload in -lC" >&5 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'` xe_check_libs=" -lC " cat > conftest.$ac_ext <<EOF -#line 3050 "configure" +#line 3080 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3057,7 +3087,7 @@ terminateAndUnload() ; return 0; } EOF -if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3091: \"$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 @@ -3165,7 +3195,7 @@ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:3169: checking "for runtime libraries flag"" >&5 +echo "configure:3199: checking "for runtime libraries flag"" >&5 case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; @@ -3187,14 +3217,14 @@ done fi cat > conftest.$ac_ext <<EOF -#line 3191 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 3221 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:3228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* dash_r="$try_dash_r" else @@ -3295,10 +3325,10 @@ fi after_morecore_hook_exists=yes echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:3299: checking for malloc_set_state" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3302 "configure" +echo "configure:3329: checking for malloc_set_state" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3332 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char malloc_set_state(); below. */ @@ -3321,7 +3351,7 @@ ; return 0; } EOF -if { (eval echo configure:3325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3355: \"$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 @@ -3341,16 +3371,16 @@ fi echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:3345: checking whether __after_morecore_hook exists" >&5 -cat > conftest.$ac_ext <<EOF -#line 3347 "configure" +echo "configure:3375: checking whether __after_morecore_hook exists" >&5 +cat > conftest.$ac_ext <<EOF +#line 3377 "configure" #include "confdefs.h" extern void (* __after_morecore_hook)(); int main() { __after_morecore_hook = 0 ; return 0; } EOF -if { (eval echo configure:3354: \"$ac_link\") 1>&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* echo "$ac_t""yes" 1>&6 else @@ -3406,7 +3436,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:3410: checking for $ac_word" >&5 +echo "configure:3440: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -3461,7 +3491,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:3465: checking for a BSD compatible install" >&5 +echo "configure:3495: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -3515,7 +3545,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:3519: checking for $ac_word" >&5 +echo "configure:3549: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -3547,15 +3577,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3551: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3554 "configure" +echo "configure:3581: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3584 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3589: \"$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* @@ -3585,10 +3615,10 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3589: checking for sys/wait.h that is POSIX.1 compatible" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3592 "configure" +echo "configure:3619: checking for sys/wait.h that is POSIX.1 compatible" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3622 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -3604,7 +3634,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3628,10 +3658,10 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3632: checking for ANSI C header files" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3635 "configure" +echo "configure:3662: checking for ANSI C header files" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3665 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -3639,7 +3669,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3643: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3673: \"$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* @@ -3656,7 +3686,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 -#line 3660 "configure" +#line 3690 "configure" #include "confdefs.h" #include <string.h> EOF @@ -3674,7 +3704,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 -#line 3678 "configure" +#line 3708 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -3692,7 +3722,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 <<EOF -#line 3696 "configure" +#line 3726 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3703,7 +3733,7 @@ exit (0); } EOF -if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:3737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -3729,10 +3759,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3733: checking whether time.h and sys/time.h may both be included" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3736 "configure" +echo "configure:3763: checking whether time.h and sys/time.h may both be included" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3766 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3741,7 +3771,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3765,10 +3795,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3769: checking for sys_siglist declaration in signal.h or unistd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3772 "configure" +echo "configure:3799: checking for sys_siglist declaration in signal.h or unistd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3802 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3780,7 +3810,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -3806,9 +3836,9 @@ echo $ac_n "checking for utime""... $ac_c" 1>&6 -echo "configure:3810: checking for utime" >&5 -cat > conftest.$ac_ext <<EOF -#line 3812 "configure" +echo "configure:3840: checking for utime" >&5 +cat > conftest.$ac_ext <<EOF +#line 3842 "configure" #include "confdefs.h" #include <sys/types.h> #include <utime.h> @@ -3816,7 +3846,7 @@ struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x); ; return 0; } EOF -if { (eval echo configure:3820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3850: \"$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 @@ -3835,10 +3865,10 @@ for ac_func in utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3839: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3842 "configure" +echo "configure:3869: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3872 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3861,7 +3891,7 @@ ; return 0; } EOF -if { (eval echo configure:3865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3895: \"$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 @@ -3893,10 +3923,10 @@ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3897: checking return type of signal handlers" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3900 "configure" +echo "configure:3927: checking return type of signal handlers" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3930 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3913,7 +3943,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3935,10 +3965,10 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3939: checking for size_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3942 "configure" +echo "configure:3969: checking for size_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3972 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3969,10 +3999,10 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3973: checking for pid_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3976 "configure" +echo "configure:4003: checking for pid_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4006 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4003,10 +4033,10 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:4007: checking for uid_t in sys/types.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4010 "configure" +echo "configure:4037: checking for uid_t in sys/types.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4040 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -4042,10 +4072,10 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:4046: checking for mode_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4049 "configure" +echo "configure:4076: checking for mode_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4079 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4076,10 +4106,10 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4080: checking for off_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4083 "configure" +echo "configure:4110: checking for off_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4113 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4110,10 +4140,10 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:4114: checking for ssize_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4117 "configure" +echo "configure:4144: checking for ssize_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4147 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4145,9 +4175,9 @@ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4149: checking for socklen_t" >&5 -cat > conftest.$ac_ext <<EOF -#line 4151 "configure" +echo "configure:4179: checking for socklen_t" >&5 +cat > conftest.$ac_ext <<EOF +#line 4181 "configure" #include "confdefs.h" #include <sys/socket.h> socklen_t x; @@ -4156,7 +4186,7 @@ ; return 0; } EOF -if { (eval echo configure:4160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4165,7 +4195,7 @@ rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4169 "configure" +#line 4199 "configure" #include "confdefs.h" #include <sys/socket.h> int accept (int, struct sockaddr *, size_t *); @@ -4174,7 +4204,7 @@ ; return 0; } EOF -if { (eval echo configure:4178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""size_t" 1>&6 @@ -4206,9 +4236,9 @@ rm -f conftest* echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:4210: checking for struct timeval" >&5 -cat > conftest.$ac_ext <<EOF -#line 4212 "configure" +echo "configure:4240: checking for struct timeval" >&5 +cat > conftest.$ac_ext <<EOF +#line 4242 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -4224,7 +4254,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:4228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -4246,10 +4276,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:4250: checking whether struct tm is in sys/time.h or time.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4253 "configure" +echo "configure:4280: checking whether struct tm is in sys/time.h or time.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4283 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -4257,7 +4287,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4281,10 +4311,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4285: checking for tm_zone in struct tm" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4288 "configure" +echo "configure:4315: checking for tm_zone in struct tm" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4318 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -4292,7 +4322,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4315,10 +4345,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4319: checking for tzname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4322 "configure" +echo "configure:4349: checking for tzname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4352 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -4328,7 +4358,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4354,10 +4384,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4358: checking for working const" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4361 "configure" +echo "configure:4388: checking for working const" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4391 "configure" #include "confdefs.h" int main() { @@ -4406,7 +4436,7 @@ ; return 0; } EOF -if { (eval echo configure:4410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4431,7 +4461,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:4435: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:4465: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -4456,12 +4486,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4460: checking whether byte ordering is bigendian" >&5 +echo "configure:4490: 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 <<EOF -#line 4465 "configure" +#line 4495 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4472,11 +4502,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:4476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4506: \"$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 <<EOF -#line 4480 "configure" +#line 4510 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -4487,7 +4517,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:4491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4504,7 +4534,7 @@ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 4508 "configure" +#line 4538 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -4517,7 +4547,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_bigendian=no else @@ -4544,10 +4574,10 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4548: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4551 "configure" +echo "configure:4578: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4581 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4558,7 +4588,7 @@ exit(0); } EOF -if { (eval echo configure:4562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -4586,10 +4616,10 @@ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4590: checking size of int" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4593 "configure" +echo "configure:4620: checking size of int" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4623 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4600,7 +4630,7 @@ exit(0); } EOF -if { (eval echo configure:4604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -4622,10 +4652,10 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4626: checking size of long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4629 "configure" +echo "configure:4656: checking size of long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4659 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4636,7 +4666,7 @@ exit(0); } EOF -if { (eval echo configure:4640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -4658,10 +4688,10 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4662: checking size of long long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4665 "configure" +echo "configure:4692: checking size of long long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4695 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4672,7 +4702,7 @@ exit(0); } EOF -if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4706: \"$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 @@ -4694,10 +4724,10 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4698: checking size of void *" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4701 "configure" +echo "configure:4728: checking size of void *" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4731 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -4708,7 +4738,7 @@ exit(0); } EOF -if { (eval echo configure:4712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4742: \"$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 @@ -4731,7 +4761,7 @@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:4735: checking for long file names" >&5 +echo "configure:4765: 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: @@ -4777,10 +4807,10 @@ echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:4781: checking for sin" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4784 "configure" +echo "configure:4811: checking for sin" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4814 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char sin(); below. */ @@ -4803,7 +4833,7 @@ ; return 0; } EOF -if { (eval echo configure:4807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4837: \"$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 @@ -4821,12 +4851,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:4825: checking for sin in -lm" >&5 +echo "configure:4855: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` xe_check_libs=" -lm " cat > conftest.$ac_ext <<EOF -#line 4830 "configure" +#line 4860 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4837,7 +4867,7 @@ sin() ; return 0; } EOF -if { (eval echo configure:4841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4871: \"$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 @@ -4871,24 +4901,15 @@ fi -{ test "$extra_verbose" = "yes" && cat << \EOF - Defining LISP_FLOAT_TYPE -EOF -cat >> confdefs.h <<\EOF -#define LISP_FLOAT_TYPE 1 -EOF -} - - -cat > conftest.$ac_ext <<EOF -#line 4885 "configure" +cat > conftest.$ac_ext <<EOF +#line 4906 "configure" #include "confdefs.h" #include <math.h> int main() { return atanh(1.0) + asinh(1.0) + acosh(1.0); ; return 0; } EOF -if { (eval echo configure:4892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4913: \"$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 @@ -4907,10 +4928,10 @@ for ac_func in mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4911: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4914 "configure" +echo "configure:4932: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4935 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4933,7 +4954,7 @@ ; return 0; } EOF -if { (eval echo configure:4937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4958: \"$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 @@ -4962,14 +4983,14 @@ echo "checking type of mail spool file locking" 1>&6 -echo "configure:4966: checking type of mail spool file locking" >&5 +echo "configure:4987: 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:4970: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4973 "configure" +echo "configure:4991: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4994 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4992,7 +5013,7 @@ ; return 0; } EOF -if { (eval echo configure:4996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5017: \"$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 @@ -5074,12 +5095,12 @@ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:5078: checking for cma_open in -lpthreads" >&5 +echo "configure:5099: 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 <<EOF -#line 5083 "configure" +#line 5104 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5090,7 +5111,7 @@ cma_open() ; return 0; } EOF -if { (eval echo configure:5094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5115: \"$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 @@ -5127,7 +5148,7 @@ echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:5131: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:5152: 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; @@ -5139,7 +5160,7 @@ if test "$opsys" = "sol2"; then if test "$os_release" -ge 56; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:5143: checking for \"-z ignore\" linker flag" >&5 +echo "configure:5164: 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 ;; @@ -5150,7 +5171,7 @@ echo "checking "for specified window system"" 1>&6 -echo "configure:5154: checking "for specified window system"" >&5 +echo "configure:5175: checking "for specified window system"" >&5 GNOME_CONFIG=no @@ -5158,7 +5179,7 @@ if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5162: checking for GNOME configuration script" >&5 +echo "configure:5183: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` @@ -5189,7 +5210,7 @@ if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5193: checking for GTK configuration script" >&5 +echo "configure:5214: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` @@ -5211,18 +5232,18 @@ if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5215: checking gtk version" >&5 +echo "configure:5236: 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:5220: checking gtk libs" >&5 +echo "configure:5241: 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:5226: checking gtk cflags" >&5 +echo "configure:5247: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` if test "$GCC" = "yes"; then GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" @@ -5232,19 +5253,19 @@ echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5236: checking for main in -lgdk_imlib" >&5 +echo "configure:5257: 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 <<EOF -#line 5241 "configure" +#line 5262 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5269: \"$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 @@ -5266,12 +5287,12 @@ echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5270: checking for Imlib_init in -lImlib" >&5 +echo "configure:5291: 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 <<EOF -#line 5275 "configure" +#line 5296 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5282,7 +5303,7 @@ Imlib_init() ; return 0; } EOF -if { (eval echo configure:5286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5307: \"$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 @@ -5305,10 +5326,10 @@ for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5309: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5312 "configure" +echo "configure:5330: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5333 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5331,7 +5352,7 @@ ; return 0; } EOF -if { (eval echo configure:5335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5356: \"$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 @@ -5397,15 +5418,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5401: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5404 "configure" +echo "configure:5422: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5425 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5430: \"$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* @@ -5436,19 +5457,19 @@ echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5440: checking for main in -lxml" >&5 +echo "configure:5461: checking for main in -lxml" >&5 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lxml " cat > conftest.$ac_ext <<EOF -#line 5445 "configure" +#line 5466 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5473: \"$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 @@ -5470,19 +5491,19 @@ echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5474: checking for main in -lglade" >&5 +echo "configure:5495: checking for main in -lglade" >&5 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade " cat > conftest.$ac_ext <<EOF -#line 5479 "configure" +#line 5500 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5507: \"$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 @@ -5504,19 +5525,19 @@ echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5508: checking for main in -lglade-gnome" >&5 +echo "configure:5529: 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 <<EOF -#line 5513 "configure" +#line 5534 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5541: \"$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 @@ -5537,7 +5558,7 @@ cat > conftest.$ac_ext <<EOF -#line 5541 "configure" +#line 5562 "configure" #include "confdefs.h" #include <glade/glade-xml.h> EOF @@ -5596,7 +5617,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:5600: checking for X" >&5 +echo "configure:5621: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5656,12 +5677,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 5660 "configure" +#line 5681 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5686: \"$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* @@ -5730,14 +5751,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 5734 "configure" +#line 5755 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:5741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5762: \"$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. @@ -5846,17 +5867,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:5850: checking whether -R must be followed by a space" >&5 +echo "configure:5871: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 5853 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:5860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 5874 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:5881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -5872,14 +5893,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 5876 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:5883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +#line 5897 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:5904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -5915,12 +5936,12 @@ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5919: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:5940: 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 <<EOF -#line 5924 "configure" +#line 5945 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5931,7 +5952,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5956: \"$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 @@ -5955,12 +5976,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:5959: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:5980: 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 <<EOF -#line 5964 "configure" +#line 5985 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5971,7 +5992,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:5975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5996: \"$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 @@ -6000,10 +6021,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:6004: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6007 "configure" +echo "configure:6025: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6028 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -6026,7 +6047,7 @@ ; return 0; } EOF -if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6051: \"$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 @@ -6047,12 +6068,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6051: checking for gethostbyname in -lnsl" >&5 +echo "configure:6072: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <<EOF -#line 6056 "configure" +#line 6077 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6063,7 +6084,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:6067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6088: \"$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 @@ -6093,10 +6114,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:6097: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6100 "configure" +echo "configure:6118: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6121 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -6119,7 +6140,7 @@ ; return 0; } EOF -if { (eval echo configure:6123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6144: \"$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 @@ -6142,12 +6163,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:6146: checking "$xe_msg_checking"" >&5 +echo "configure:6167: 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 <<EOF -#line 6151 "configure" +#line 6172 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6158,7 +6179,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:6162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6183: \"$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 @@ -6182,10 +6203,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:6186: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6189 "configure" +echo "configure:6207: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6210 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -6208,7 +6229,7 @@ ; return 0; } EOF -if { (eval echo configure:6212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -6229,12 +6250,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6233: checking for remove in -lposix" >&5 +echo "configure:6254: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <<EOF -#line 6238 "configure" +#line 6259 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6245,7 +6266,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:6249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6270: \"$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 @@ -6269,10 +6290,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6273: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6276 "configure" +echo "configure:6294: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6297 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -6295,7 +6316,7 @@ ; return 0; } EOF -if { (eval echo configure:6299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6320: \"$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 @@ -6316,12 +6337,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6320: checking for shmat in -lipc" >&5 +echo "configure:6341: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <<EOF -#line 6325 "configure" +#line 6346 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6332,7 +6353,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:6336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6357: \"$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 @@ -6368,12 +6389,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:6372: checking "$xe_msg_checking"" >&5 +echo "configure:6393: 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 <<EOF -#line 6377 "configure" +#line 6398 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6384,7 +6405,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:6388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6409: \"$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 @@ -6551,7 +6572,7 @@ echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6555: checking for X defines extracted by xmkmf" >&5 +echo "configure:6576: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -6600,15 +6621,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:6604: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6607 "configure" +echo "configure:6625: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6628 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6633: \"$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* @@ -6632,12 +6653,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6636: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6657: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 6641 "configure" +#line 6662 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6648,7 +6669,7 @@ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6673: \"$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 @@ -6673,12 +6694,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:6677: checking "$xe_msg_checking"" >&5 +echo "configure:6698: 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 <<EOF -#line 6682 "configure" +#line 6703 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6689,7 +6710,7 @@ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:6693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6714: \"$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 @@ -6716,12 +6737,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:6720: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:6741: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <<EOF -#line 6725 "configure" +#line 6746 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6732,7 +6753,7 @@ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:6736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6757: \"$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 @@ -6755,12 +6776,12 @@ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:6759: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:6780: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <<EOF -#line 6764 "configure" +#line 6785 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6771,7 +6792,7 @@ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:6775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6796: \"$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 @@ -6794,14 +6815,14 @@ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:6798: checking the version of X11 being used" >&5 +echo "configure:6819: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 6800 "configure" +#line 6821 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:6805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else @@ -6832,10 +6853,10 @@ for ac_func in XConvertCase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6836: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6839 "configure" +echo "configure:6857: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6860 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6858,7 +6879,7 @@ ; return 0; } EOF -if { (eval echo configure:6862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6890,15 +6911,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6894: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6897 "configure" +echo "configure:6915: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6918 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6923: \"$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* @@ -6931,10 +6952,10 @@ for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6935: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6938 "configure" +echo "configure:6956: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6959 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6957,7 +6978,7 @@ ; return 0; } EOF -if { (eval echo configure:6961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6982: \"$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 @@ -6985,9 +7006,9 @@ done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:6989: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:7010: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <<EOF -#line 6991 "configure" +#line 7012 "configure" #include "confdefs.h" #define NeedFunctionPrototypes 1 @@ -6999,7 +7020,7 @@ ; return 0; } EOF -if { (eval echo configure:7003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -7020,12 +7041,12 @@ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:7024: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:7045: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <<EOF -#line 7029 "configure" +#line 7050 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7036,7 +7057,7 @@ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:7040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7061: \"$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 @@ -7075,19 +7096,19 @@ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:7079: checking for main in -lXbsd" >&5 +echo "configure:7100: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lXbsd " cat > conftest.$ac_ext <<EOF -#line 7084 "configure" +#line 7105 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7112: \"$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 @@ -7124,22 +7145,22 @@ fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:7128: checking for MS-Windows" >&5 +echo "configure:7149: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:7131: checking for main in -lgdi32" >&5 +echo "configure:7152: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdi32 " cat > conftest.$ac_ext <<EOF -#line 7136 "configure" +#line 7157 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7164: \"$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 @@ -7190,12 +7211,12 @@ test "$with_widgets" != "no" && with_widgets=msw fi cat > conftest.$ac_ext <<EOF -#line 7194 "configure" +#line 7215 "configure" #include "confdefs.h" #include <fcntl.h> int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7220: \"$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 @@ -7256,15 +7277,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:7260: checking for X11/extensions/shape.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7263 "configure" +echo "configure:7281: checking for X11/extensions/shape.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7284 "configure" #include "confdefs.h" #include <X11/extensions/shape.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7289: \"$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* @@ -7314,7 +7335,7 @@ esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7318: checking for WM_COMMAND option" >&5; +echo "configure:7339: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND @@ -7329,15 +7350,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:7333: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7336 "configure" +echo "configure:7354: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7357 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7362: \"$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* @@ -7360,12 +7381,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7364: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7385: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <<EOF -#line 7369 "configure" +#line 7390 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7376,7 +7397,7 @@ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:7380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7401: \"$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 @@ -7423,22 +7444,22 @@ if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:7427: checking for module support" >&5 +echo "configure:7448: checking for module support" >&5 if test "$with_msw" = "yes"; then have_dl=yes; else ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:7434: checking for dlfcn.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7437 "configure" +echo "configure:7455: checking for dlfcn.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7458 "configure" #include "confdefs.h" #include <dlfcn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7463: \"$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* @@ -7455,16 +7476,16 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:7459: checking for dlopen in -lc" >&5 +echo "configure:7480: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext <<EOF -#line 7461 "configure" +#line 7482 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -7473,18 +7494,18 @@ rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7477: checking for dlopen in -ldl" >&5 +echo "configure:7498: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 7481 "configure" +#line 7502 "configure" #include "confdefs.h" #include <dlfcn.h> int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:7488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -7513,12 +7534,12 @@ else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:7517: checking for shl_load in -ldld" >&5 +echo "configure:7538: 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 <<EOF -#line 7522 "configure" +#line 7543 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7529,7 +7550,7 @@ shl_load() ; return 0; } EOF -if { (eval echo configure:7533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7554: \"$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 @@ -7556,12 +7577,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:7560: checking for dld_init in -ldld" >&5 +echo "configure:7581: 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 <<EOF -#line 7565 "configure" +#line 7586 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7572,7 +7593,7 @@ dld_init() ; return 0; } EOF -if { (eval echo configure:7576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7597: \"$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 @@ -7617,7 +7638,7 @@ xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:7621: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:7642: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; @@ -7645,9 +7666,9 @@ XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:7649: checking checking whether we are using GNU C" >&5 +echo "configure:7670: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <<EOF -#line 7651 "configure" +#line 7672 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -7669,7 +7690,7 @@ fi echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6 -echo "configure:7673: checking how to produce PIC code" >&5 +echo "configure:7694: checking how to produce PIC code" >&5 wl= can_build_shared=yes @@ -7775,18 +7796,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:7779: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:7800: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <<EOF -#line 7783 "configure" +#line 7804 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:7790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7811: \"$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 @@ -7821,7 +7842,7 @@ xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:7825: checking if C compiler can produce shared libraries" >&5 +echo "configure:7846: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes; then xcldf="-shared" xldf="-shared" @@ -7872,14 +7893,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 <<EOF -#line 7876 "configure" +#line 7897 "configure" #include "confdefs.h" int main() { int x=0; ; return 0; } EOF -if { (eval echo configure:7883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else @@ -7904,7 +7925,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:7908: checking for ld used by GCC" >&5 +echo "configure:7929: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -7930,7 +7951,7 @@ esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:7934: checking for GNU ld" >&5 +echo "configure:7955: checking for GNU ld" >&5 fi if test -z "$LTLD"; then @@ -7968,7 +7989,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:7972: checking if the linker is GNU ld" >&5 +echo "configure:7993: 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 </dev/null | egrep '(GNU|with BFD)' 1>&5; then xe_gnu_ld=yes @@ -7996,7 +8017,7 @@ # 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:8000: checking whether the linker supports shared libraries" >&5 +echo "configure:8021: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes @@ -8204,10 +8225,10 @@ for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8208: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8211 "configure" +echo "configure:8229: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8232 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8230,7 +8251,7 @@ ; return 0; } EOF -if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8255: \"$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 @@ -8292,15 +8313,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:8296: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8299 "configure" +echo "configure:8317: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8320 "configure" #include "confdefs.h" #include <${dir}tt_c.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8325: \"$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* @@ -8336,12 +8357,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:8340: checking "$xe_msg_checking"" >&5 +echo "configure:8361: 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 <<EOF -#line 8345 "configure" +#line 8366 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8352,7 +8373,7 @@ tt_message_create() ; return 0; } EOF -if { (eval echo configure:8356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8377: \"$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 @@ -8406,15 +8427,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:8410: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8413 "configure" +echo "configure:8431: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8434 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8437,12 +8458,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:8441: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:8462: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <<EOF -#line 8446 "configure" +#line 8467 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8453,7 +8474,7 @@ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:8457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8478: \"$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 @@ -8534,7 +8555,7 @@ if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:8538: checking if drag and drop API is needed" >&5 +echo "configure:8559: 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 @@ -8554,19 +8575,19 @@ fi echo "checking for LDAP" 1>&6 -echo "configure:8558: checking for LDAP" >&5 +echo "configure:8579: 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:8562: checking for ldap.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8565 "configure" +echo "configure:8583: checking for ldap.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8586 "configure" #include "confdefs.h" #include <ldap.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8591: \"$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* @@ -8589,15 +8610,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:8593: checking for lber.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8596 "configure" +echo "configure:8614: checking for lber.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8617 "configure" #include "confdefs.h" #include <lber.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8622: \"$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* @@ -8621,12 +8642,12 @@ if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:8625: checking for ldap_search in -lldap" >&5 +echo "configure:8646: 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 <<EOF -#line 8630 "configure" +#line 8651 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8637,7 +8658,7 @@ ldap_search() ; return 0; } EOF -if { (eval echo configure:8641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8662: \"$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 @@ -8662,12 +8683,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:8666: checking "$xe_msg_checking"" >&5 +echo "configure:8687: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber" cat > conftest.$ac_ext <<EOF -#line 8671 "configure" +#line 8692 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8678,7 +8699,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:8682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8703: \"$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 @@ -8703,12 +8724,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:8707: checking "$xe_msg_checking"" >&5 +echo "configure:8728: 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 <<EOF -#line 8712 "configure" +#line 8733 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8719,7 +8740,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:8723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8744: \"$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 @@ -8744,12 +8765,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:8748: checking "$xe_msg_checking"" >&5 +echo "configure:8769: 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 <<EOF -#line 8753 "configure" +#line 8774 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8760,7 +8781,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:8764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8785: \"$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 @@ -8809,10 +8830,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:8813: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8816 "configure" +echo "configure:8834: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8837 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8835,7 +8856,7 @@ ; return 0; } EOF -if { (eval echo configure:8839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8860: \"$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 @@ -8874,20 +8895,20 @@ postgresql_libs= if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:8878: checking for PostgreSQL" >&5 +echo "configure:8899: 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:8883: checking for ${header_dir}libpq-fe.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8886 "configure" +echo "configure:8904: checking for ${header_dir}libpq-fe.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8907 "configure" #include "confdefs.h" #include <${header_dir}libpq-fe.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8912: \"$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* @@ -8911,12 +8932,12 @@ test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:8915: checking for PQconnectdb in -lpq" >&5 +echo "configure:8936: checking for PQconnectdb in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 8920 "configure" +#line 8941 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8927,7 +8948,7 @@ PQconnectdb() ; return 0; } EOF -if { (eval echo configure:8931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8952: \"$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 @@ -8960,12 +8981,12 @@ echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:8964: checking for PQconnectStart in -lpq" >&5 +echo "configure:8985: checking for PQconnectStart in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <<EOF -#line 8969 "configure" +#line 8990 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8976,7 +8997,7 @@ PQconnectStart() ; return 0; } EOF -if { (eval echo configure:8980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9001: \"$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 @@ -9027,7 +9048,7 @@ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:9031: checking for graphics libraries" >&5 +echo "configure:9052: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= @@ -9053,10 +9074,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:9057: checking for Xpm - no older than 3.4f" >&5 +echo "configure:9078: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9060 "configure" +#line 9081 "configure" #include "confdefs.h" #define XPM_NUMBERS #include <X11/xpm.h> @@ -9065,7 +9086,7 @@ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:9069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9090: \"$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 @@ -9109,17 +9130,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:9113: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:9134: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 9116 "configure" +#line 9137 "configure" #include "confdefs.h" int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:9123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else @@ -9145,15 +9166,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:9149: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9152 "configure" +echo "configure:9170: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9173 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9178: \"$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* @@ -9176,12 +9197,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9180: checking for UnGenFace in -lcompface" >&5 +echo "configure:9201: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 9185 "configure" +#line 9206 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9192,7 +9213,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:9196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9217: \"$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 @@ -9241,12 +9262,12 @@ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:9245: checking for inflate in -lc" >&5 +echo "configure:9266: checking for inflate in -lc" >&5 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <<EOF -#line 9250 "configure" +#line 9271 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9257,7 +9278,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:9261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9282: \"$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 @@ -9276,12 +9297,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:9280: checking for inflate in -lz" >&5 +echo "configure:9301: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lz " cat > conftest.$ac_ext <<EOF -#line 9285 "configure" +#line 9306 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9292,7 +9313,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:9296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9317: \"$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 @@ -9311,12 +9332,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:9315: checking for inflate in -lgz" >&5 +echo "configure:9336: checking for inflate in -lgz" >&5 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lgz " cat > conftest.$ac_ext <<EOF -#line 9320 "configure" +#line 9341 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9327,7 +9348,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:9331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9352: \"$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 @@ -9357,15 +9378,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:9361: checking for jpeglib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9364 "configure" +echo "configure:9382: checking for jpeglib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9385 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9390: \"$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* @@ -9388,12 +9409,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:9392: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:9413: 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 <<EOF -#line 9397 "configure" +#line 9418 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9404,7 +9425,7 @@ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:9408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9429: \"$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 @@ -9440,10 +9461,10 @@ png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:9444: checking for pow" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9447 "configure" +echo "configure:9465: checking for pow" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9468 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ @@ -9466,7 +9487,7 @@ ; return 0; } EOF -if { (eval echo configure:9470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9491: \"$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 @@ -9487,15 +9508,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:9491: checking for png.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9494 "configure" +echo "configure:9512: checking for png.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9515 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9518,12 +9539,12 @@ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:9522: checking for png_read_image in -lpng" >&5 +echo "configure:9543: 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 <<EOF -#line 9527 "configure" +#line 9548 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9534,7 +9555,7 @@ png_read_image() ; return 0; } EOF -if { (eval echo configure:9538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9559: \"$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 @@ -9557,10 +9578,10 @@ } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:9561: checking for workable png version information" >&5 +echo "configure:9582: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext <<EOF -#line 9564 "configure" +#line 9585 "configure" #include "confdefs.h" #include <png.h> int main(int c, char **v) { @@ -9568,7 +9589,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:9572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9593: \"$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 @@ -9611,15 +9632,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:9615: checking for tiffio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9618 "configure" +echo "configure:9636: checking for tiffio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9639 "configure" #include "confdefs.h" #include <tiffio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9644: \"$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* @@ -9642,12 +9663,12 @@ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:9646: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:9667: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <<EOF -#line 9651 "configure" +#line 9672 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9658,7 +9679,7 @@ TIFFClientOpen() ; return 0; } EOF -if { (eval echo configure:9662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9683: \"$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 @@ -9697,15 +9718,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:9701: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9704 "configure" +echo "configure:9722: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9725 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9730: \"$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* @@ -9728,12 +9749,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:9732: checking for UnGenFace in -lcompface" >&5 +echo "configure:9753: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 9737 "configure" +#line 9758 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9744,7 +9765,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:9748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9769: \"$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 @@ -9783,7 +9804,7 @@ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:9787: checking for X11 graphics libraries" >&5 +echo "configure:9808: checking for X11 graphics libraries" >&5 fi case "$with_widgets" in @@ -9793,7 +9814,7 @@ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then echo "checking for the Athena widgets" 1>&6 -echo "configure:9797: checking for the Athena widgets" >&5 +echo "configure:9818: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; @@ -9807,12 +9828,12 @@ if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9811: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:9832: 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 <<EOF -#line 9816 "configure" +#line 9837 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9823,7 +9844,7 @@ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:9827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9848: \"$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 @@ -9839,12 +9860,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9843: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:9864: 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 <<EOF -#line 9848 "configure" +#line 9869 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9855,7 +9876,7 @@ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:9859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9880: \"$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 @@ -9886,12 +9907,12 @@ else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:9890: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:9911: 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 <<EOF -#line 9895 "configure" +#line 9916 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9902,7 +9923,7 @@ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:9906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9927: \"$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 @@ -9920,12 +9941,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:9924: checking for threeDClassRec in -lXaw" >&5 +echo "configure:9945: checking for threeDClassRec in -lXaw" >&5 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 9929 "configure" +#line 9950 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9936,7 +9957,7 @@ threeDClassRec() ; return 0; } EOF -if { (eval echo configure:9940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9961: \"$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 @@ -9967,15 +9988,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:9971: checking for X11/Xaw/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9974 "configure" +echo "configure:9992: checking for X11/Xaw/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9995 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10000: \"$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* @@ -9995,15 +10016,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:9999: checking for X11/Xaw/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10002 "configure" +echo "configure:10020: checking for X11/Xaw/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10023 "configure" #include "confdefs.h" #include <X11/Xaw/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10028: \"$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* @@ -10029,15 +10050,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:10033: checking for X11/$athena_variant/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10036 "configure" +echo "configure:10054: checking for X11/$athena_variant/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10057 "configure" #include "confdefs.h" #include <X11/$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10062: \"$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* @@ -10054,15 +10075,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:10058: checking for X11/$athena_variant/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10061 "configure" +echo "configure:10079: checking for X11/$athena_variant/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10082 "configure" #include "confdefs.h" #include <X11/$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10087: \"$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* @@ -10090,15 +10111,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:10094: checking for $athena_variant/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10097 "configure" +echo "configure:10115: checking for $athena_variant/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10118 "configure" #include "confdefs.h" #include <$athena_variant/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10123: \"$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* @@ -10115,15 +10136,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:10119: checking for $athena_variant/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10122 "configure" +echo "configure:10140: checking for $athena_variant/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10143 "configure" #include "confdefs.h" #include <$athena_variant/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10148: \"$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* @@ -10152,15 +10173,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:10156: checking for X11/Xaw3d/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10159 "configure" +echo "configure:10177: checking for X11/Xaw3d/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10180 "configure" #include "confdefs.h" #include <X11/Xaw3d/XawInit.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10185: \"$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* @@ -10177,15 +10198,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:10181: checking for X11/Xaw3d/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10184 "configure" +echo "configure:10202: checking for X11/Xaw3d/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10205 "configure" #include "confdefs.h" #include <X11/Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10210: \"$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 +10238,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:10221: checking for Xaw3d/XawInit.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10224 "configure" +echo "configure:10242: checking for Xaw3d/XawInit.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10245 "configure" #include "confdefs.h" #include <Xaw3d/XawInit.h> 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:10250: \"$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* @@ -10242,15 +10263,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:10246: checking for Xaw3d/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10249 "configure" +echo "configure:10267: checking for Xaw3d/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10270 "configure" #include "confdefs.h" #include <Xaw3d/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10275: \"$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* @@ -10282,15 +10303,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:10286: checking for X11/Xaw/ThreeD.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10289 "configure" +echo "configure:10307: checking for X11/Xaw/ThreeD.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10310 "configure" #include "confdefs.h" #include <X11/Xaw/ThreeD.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10315: \"$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* @@ -10329,15 +10350,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:10333: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10336 "configure" +echo "configure:10354: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10357 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10362: \"$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* @@ -10354,12 +10375,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:10358: checking for XmStringFree in -lXm" >&5 +echo "configure:10379: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 10363 "configure" +#line 10384 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -10370,7 +10391,7 @@ XmStringFree() ; return 0; } EOF -if { (eval echo configure:10374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10395: \"$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 @@ -10399,9 +10420,9 @@ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:10403: checking for Lesstif" >&5 +echo "configure:10424: checking for Lesstif" >&5 cat > conftest.$ac_ext <<EOF -#line 10405 "configure" +#line 10426 "configure" #include "confdefs.h" #include <Xm/Xm.h> #ifdef LESSTIF_VERSION @@ -10774,7 +10795,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:10778: checking for Mule-related features" >&5 +echo "configure:10799: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -10788,15 +10809,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10792: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10795 "configure" +echo "configure:10813: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10816 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10821: \"$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* @@ -10827,12 +10848,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:10831: checking for strerror in -lintl" >&5 +echo "configure:10852: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <<EOF -#line 10836 "configure" +#line 10857 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -10843,7 +10864,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:10847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10868: \"$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 @@ -10876,18 +10897,18 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:10880: checking for Mule input methods" >&5 +echo "configure:10901: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:10883: checking for XIM" >&5 +echo "configure:10904: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:10886: checking for XOpenIM in -lX11" >&5 +echo "configure:10907: checking for XOpenIM in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 10891 "configure" +#line 10912 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -10898,7 +10919,7 @@ XOpenIM() ; return 0; } EOF -if { (eval echo configure:10902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10923: \"$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 @@ -10922,12 +10943,12 @@ if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:10926: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:10947: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 10931 "configure" +#line 10952 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -10938,7 +10959,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:10942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10963: \"$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 @@ -11003,15 +11024,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:11007: checking for XFontSet" >&5 +echo "configure:11028: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:11010: checking for XmbDrawString in -lX11" >&5 +echo "configure:11031: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 11015 "configure" +#line 11036 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11022,7 +11043,7 @@ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:11026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11047: \"$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 @@ -11062,15 +11083,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:11066: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11069 "configure" +echo "configure:11087: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11090 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11074: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11095: \"$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* @@ -11093,15 +11114,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:11097: checking for wnn/commonhd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11100 "configure" +echo "configure:11118: checking for wnn/commonhd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11121 "configure" #include "confdefs.h" #include <wnn/commonhd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11126: \"$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* @@ -11126,10 +11147,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11130: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11133 "configure" +echo "configure:11151: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11154 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11152,7 +11173,7 @@ ; return 0; } EOF -if { (eval echo configure:11156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11177: \"$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 @@ -11181,12 +11202,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:11185: checking for crypt in -lcrypt" >&5 +echo "configure:11206: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <<EOF -#line 11190 "configure" +#line 11211 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11197,7 +11218,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:11201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11222: \"$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 @@ -11232,12 +11253,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:11236: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:11257: 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 <<EOF -#line 11241 "configure" +#line 11262 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11248,7 +11269,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11273: \"$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 @@ -11266,12 +11287,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:11270: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:11291: 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 <<EOF -#line 11275 "configure" +#line 11296 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11282,7 +11303,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11307: \"$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 @@ -11300,12 +11321,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:11304: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:11325: 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 <<EOF -#line 11309 "configure" +#line 11330 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11316,7 +11337,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:11320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11341: \"$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 @@ -11334,12 +11355,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:11338: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:11359: 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 <<EOF -#line 11343 "configure" +#line 11364 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11350,7 +11371,7 @@ dic_list_e() ; return 0; } EOF -if { (eval echo configure:11354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11375: \"$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 +11416,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:11399: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:11420: 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 <<EOF -#line 11404 "configure" +#line 11425 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11411,7 +11432,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:11415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11436: \"$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 @@ -11446,15 +11467,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:11450: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11453 "configure" +echo "configure:11471: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11474 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11479: \"$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* @@ -11481,15 +11502,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:11485: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11488 "configure" +echo "configure:11506: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11509 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11514: \"$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* @@ -11517,15 +11538,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:11521: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11524 "configure" +echo "configure:11542: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11545 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11550: \"$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* @@ -11548,12 +11569,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:11552: checking for RkBgnBun in -lRKC" >&5 +echo "configure:11573: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <<EOF -#line 11557 "configure" +#line 11578 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11564,7 +11585,7 @@ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:11568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11589: \"$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 @@ -11587,12 +11608,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:11591: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:11612: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <<EOF -#line 11596 "configure" +#line 11617 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11603,7 +11624,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:11607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11628: \"$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 @@ -11649,12 +11670,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:11653: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:11674: 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 <<EOF -#line 11658 "configure" +#line 11679 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11665,7 +11686,7 @@ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:11669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11690: \"$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 @@ -11752,10 +11773,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 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:11756: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11759 "configure" +echo "configure:11777: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11780 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11778,7 +11799,7 @@ ; return 0; } EOF -if { (eval echo configure:11782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11803: \"$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 @@ -11819,10 +11840,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:11823: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11826 "configure" +echo "configure:11844: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11847 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11845,7 +11866,7 @@ ; return 0; } EOF -if { (eval echo configure:11849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11870: \"$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 @@ -11874,10 +11895,10 @@ echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:11878: checking for openpty" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11881 "configure" +echo "configure:11899: checking for openpty" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11902 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char openpty(); below. */ @@ -11900,7 +11921,7 @@ ; return 0; } EOF -if { (eval echo configure:11904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11925: \"$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 @@ -11919,12 +11940,12 @@ echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:11923: checking for openpty in -lutil" >&5 +echo "configure:11944: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` xe_check_libs=" -lutil " cat > conftest.$ac_ext <<EOF -#line 11928 "configure" +#line 11949 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11935,7 +11956,7 @@ openpty() ; return 0; } EOF -if { (eval echo configure:11939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11960: \"$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 @@ -11970,15 +11991,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11974: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11977 "configure" +echo "configure:11995: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11998 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12003: \"$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* @@ -12015,15 +12036,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12019: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12022 "configure" +echo "configure:12040: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12043 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12048: \"$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* @@ -12056,15 +12077,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12060: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12063 "configure" +echo "configure:12081: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12084 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12089: \"$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* @@ -12097,15 +12118,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12101: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12104 "configure" +echo "configure:12122: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12125 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12130: \"$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* @@ -12141,15 +12162,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12145: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12148 "configure" +echo "configure:12166: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12169 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12174: \"$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* @@ -12182,10 +12203,10 @@ for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12186: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12189 "configure" +echo "configure:12207: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12210 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12208,7 +12229,7 @@ ; return 0; } EOF -if { (eval echo configure:12212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12233: \"$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 @@ -12239,15 +12260,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12243: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12246 "configure" +echo "configure:12264: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12267 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12272: \"$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* @@ -12280,10 +12301,10 @@ for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12284: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12287 "configure" +echo "configure:12305: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12308 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12306,7 +12327,7 @@ ; return 0; } EOF -if { (eval echo configure:12310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12331: \"$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 @@ -12339,15 +12360,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12343: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12346 "configure" +echo "configure:12364: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12367 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12372: \"$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* @@ -12383,12 +12404,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:12387: checking for kstat_open in -lkstat" >&5 +echo "configure:12408: 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 <<EOF -#line 12392 "configure" +#line 12413 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -12399,7 +12420,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:12403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12424: \"$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 @@ -12434,15 +12455,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12438: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12441 "configure" +echo "configure:12459: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12462 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12467: \"$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* @@ -12474,12 +12495,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:12478: checking for kvm_read in -lkvm" >&5 +echo "configure:12499: 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 <<EOF -#line 12483 "configure" +#line 12504 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -12490,7 +12511,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:12494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12515: \"$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 @@ -12524,16 +12545,16 @@ fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:12528: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 12530 "configure" +echo "configure:12549: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 12551 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:12537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12558: \"$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 @@ -12553,16 +12574,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:12557: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 12559 "configure" +echo "configure:12578: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 12580 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:12566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12587: \"$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 @@ -12582,11 +12603,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:12586: checking whether localtime caches TZ" >&5 +echo "configure:12607: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 12590 "configure" +#line 12611 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -12621,7 +12642,7 @@ exit (0); } EOF -if { (eval echo configure:12625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -12651,9 +12672,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:12655: checking whether gettimeofday accepts one or two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 12657 "configure" +echo "configure:12676: checking whether gettimeofday accepts one or two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 12678 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -12674,7 +12695,7 @@ ; return 0; } EOF -if { (eval echo configure:12678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12699: \"$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 @@ -12696,19 +12717,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:12700: checking for inline" >&5 +echo "configure:12721: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 12705 "configure" +#line 12726 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:12712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -12749,17 +12770,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:12753: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12756 "configure" +echo "configure:12774: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12777 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:12763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12784: \"$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 @@ -12783,10 +12804,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:12787: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12790 "configure" +echo "configure:12808: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12811 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -12814,7 +12835,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:12818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12839: \"$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 @@ -12853,10 +12874,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:12857: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12860 "configure" +echo "configure:12878: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12881 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -12880,10 +12901,10 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12884: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12887 "configure" +echo "configure:12905: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12908 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12906,7 +12927,7 @@ ; return 0; } EOF -if { (eval echo configure:12910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12931: \"$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 @@ -12936,10 +12957,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:12940: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12943 "configure" +echo "configure:12961: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 12964 "configure" #include "confdefs.h" find_stack_direction () { @@ -12958,7 +12979,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:12962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -12987,10 +13008,10 @@ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:12991: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 12994 "configure" +echo "configure:13012: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13015 "configure" #include "confdefs.h" #include <string.h> main () @@ -13000,7 +13021,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:13004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -13028,10 +13049,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13032: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13035 "configure" +echo "configure:13053: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13056 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13054,7 +13075,7 @@ ; return 0; } EOF -if { (eval echo configure:13058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13079: \"$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 @@ -13082,10 +13103,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:13086: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13089 "configure" +echo "configure:13107: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13110 "configure" #include "confdefs.h" /* @@ -13140,7 +13161,7 @@ } EOF -if { (eval echo configure:13144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -13167,10 +13188,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:13171: checking for working mmap" >&5 +echo "configure:13192: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 13174 "configure" +#line 13195 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -13203,7 +13224,7 @@ return 1; } EOF -if { (eval echo configure:13207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:13228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -13232,9 +13253,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:13236: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:13257: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext <<EOF -#line 13238 "configure" +#line 13259 "configure" #include "confdefs.h" #include <malloc.h> int main() { @@ -13246,7 +13267,7 @@ ; return 0; } EOF -if { (eval echo configure:13250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -13271,15 +13292,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:13275: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13278 "configure" +echo "configure:13296: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13299 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13304: \"$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* @@ -13322,15 +13343,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:13326: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13329 "configure" +echo "configure:13347: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13350 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13355: \"$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* @@ -13362,10 +13383,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:13366: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13369 "configure" +echo "configure:13387: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13390 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -13388,7 +13409,7 @@ ; return 0; } EOF -if { (eval echo configure:13392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13413: \"$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 @@ -13403,15 +13424,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:13407: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13410 "configure" +echo "configure:13428: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13431 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13436: \"$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* @@ -13428,15 +13449,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:13432: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13435 "configure" +echo "configure:13453: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13456 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13461: \"$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* @@ -13461,9 +13482,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:13465: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:13486: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 13467 "configure" +#line 13488 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13474,7 +13495,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:13478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13499: \"$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 @@ -13492,9 +13513,9 @@ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:13496: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:13517: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 13498 "configure" +#line 13519 "configure" #include "confdefs.h" #include <sys/types.h> @@ -13504,7 +13525,7 @@ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:13508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13529: \"$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 @@ -13535,10 +13556,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:13539: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13542 "configure" +echo "configure:13560: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13563 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -13561,7 +13582,7 @@ ; return 0; } EOF -if { (eval echo configure:13565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13586: \"$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 @@ -13576,15 +13597,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:13580: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13583 "configure" +echo "configure:13601: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13604 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13609: \"$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* @@ -13601,15 +13622,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:13605: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13608 "configure" +echo "configure:13626: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13629 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13634: \"$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* @@ -13647,15 +13668,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:13651: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13654 "configure" +echo "configure:13672: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13675 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13680: \"$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* @@ -13682,15 +13703,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:13686: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13689 "configure" +echo "configure:13707: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13710 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13715: \"$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* @@ -13723,15 +13744,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:13727: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13730 "configure" +echo "configure:13748: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13751 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13756: \"$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* @@ -13761,22 +13782,22 @@ echo "checking "for sound support"" 1>&6 -echo "configure:13765: checking "for sound support"" >&5 +echo "configure:13786: 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:13772: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13775 "configure" +echo "configure:13793: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13796 "configure" #include "confdefs.h" #include <multimedia/audio_device.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13801: \"$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* @@ -13824,12 +13845,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:13828: checking for ALopenport in -laudio" >&5 +echo "configure:13849: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 13833 "configure" +#line 13854 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13840,7 +13861,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:13844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13865: \"$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 @@ -13871,12 +13892,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:13875: checking for AOpenAudio in -lAlib" >&5 +echo "configure:13896: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <<EOF -#line 13880 "configure" +#line 13901 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -13887,7 +13908,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:13891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13912: \"$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 @@ -13935,15 +13956,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:13939: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 13942 "configure" +echo "configure:13960: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 13963 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13968: \"$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* @@ -13997,15 +14018,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:14001: checking for audio/audiolib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14004 "configure" +echo "configure:14022: checking for audio/audiolib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14025 "configure" #include "confdefs.h" #include <audio/audiolib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14030: \"$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* @@ -14023,12 +14044,12 @@ echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:14027: checking for AuOpenServer in -laudio" >&5 +echo "configure:14048: checking for AuOpenServer in -laudio" >&5 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 14032 "configure" +#line 14053 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14039,7 +14060,7 @@ AuOpenServer() ; return 0; } EOF -if { (eval echo configure:14043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14064: \"$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 @@ -14078,7 +14099,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 -#line 14082 "configure" +#line 14103 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -14109,7 +14130,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:14113: checking for $ac_word" >&5 +echo "configure:14134: 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. @@ -14138,10 +14159,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:14142: checking for esd_play_stream" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14145 "configure" +echo "configure:14163: checking for esd_play_stream" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14166 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char esd_play_stream(); below. */ @@ -14164,7 +14185,7 @@ ; return 0; } EOF -if { (eval echo configure:14168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14189: \"$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 @@ -14215,7 +14236,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:14219: checking for TTY-related features" >&5 +echo "configure:14240: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -14228,12 +14249,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:14232: checking for tgetent in -lncurses" >&5 +echo "configure:14253: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <<EOF -#line 14237 "configure" +#line 14258 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14244,7 +14265,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:14248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14269: \"$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 @@ -14277,15 +14298,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:14281: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14284 "configure" +echo "configure:14302: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14305 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14310: \"$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* @@ -14307,15 +14328,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:14311: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14314 "configure" +echo "configure:14332: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14335 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14340: \"$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* @@ -14345,15 +14366,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:14349: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14352 "configure" +echo "configure:14370: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14373 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14378: \"$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* @@ -14388,12 +14409,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:14392: checking for tgetent in -l$lib" >&5 +echo "configure:14413: 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 <<EOF -#line 14397 "configure" +#line 14418 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14404,7 +14425,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:14408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14429: \"$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 @@ -14435,12 +14456,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:14439: checking for tgetent in -lcurses" >&5 +echo "configure:14460: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <<EOF -#line 14444 "configure" +#line 14465 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14451,7 +14472,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:14455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14476: \"$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 @@ -14469,12 +14490,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:14473: checking for tgetent in -ltermcap" >&5 +echo "configure:14494: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <<EOF -#line 14478 "configure" +#line 14499 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14485,7 +14506,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:14489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14510: \"$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 @@ -14533,15 +14554,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:14537: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14540 "configure" +echo "configure:14558: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14561 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14566: \"$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* @@ -14564,12 +14585,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:14568: checking for Gpm_Open in -lgpm" >&5 +echo "configure:14589: 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 <<EOF -#line 14573 "configure" +#line 14594 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14580,7 +14601,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:14584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14605: \"$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 @@ -14623,20 +14644,20 @@ test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:14627: checking for database support" >&5 +echo "configure:14648: 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:14632: checking for ndbm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14635 "configure" +echo "configure:14653: checking for ndbm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14656 "configure" #include "confdefs.h" #include <ndbm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14661: \"$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* @@ -14666,12 +14687,12 @@ if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:14670: checking for dbm_open in -lgdbm" >&5 +echo "configure:14691: 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 <<EOF -#line 14675 "configure" +#line 14696 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14682,7 +14703,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:14686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14707: \"$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,10 +14731,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:14714: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14717 "configure" +echo "configure:14735: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14738 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -14736,7 +14757,7 @@ ; return 0; } EOF -if { (eval echo configure:14740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14761: \"$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 @@ -14755,12 +14776,12 @@ echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:14759: checking for dbm_open in -ldbm" >&5 +echo "configure:14780: 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 <<EOF -#line 14764 "configure" +#line 14785 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14771,7 +14792,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:14775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14796: \"$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 @@ -14812,10 +14833,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:14816: checking for Berkeley db.h" >&5 +echo "configure:14837: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 14819 "configure" +#line 14840 "configure" #include "confdefs.h" #include <stdlib.h> @@ -14837,7 +14858,7 @@ ; return 0; } EOF -if { (eval echo configure:14841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -14853,9 +14874,9 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:14857: checking for Berkeley DB version" >&5 +echo "configure:14878: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext <<EOF -#line 14859 "configure" +#line 14880 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 1 @@ -14867,7 +14888,7 @@ egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 14871 "configure" +#line 14892 "configure" #include "confdefs.h" #include <$db_h_file> #if DB_VERSION_MAJOR > 2 @@ -14894,10 +14915,10 @@ rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:14898: checking for $dbfunc" >&5 - -cat > conftest.$ac_ext <<EOF -#line 14901 "configure" +echo "configure:14919: checking for $dbfunc" >&5 + +cat > conftest.$ac_ext <<EOF +#line 14922 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $dbfunc(); below. */ @@ -14920,7 +14941,7 @@ ; return 0; } EOF -if { (eval echo configure:14924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14945: \"$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 @@ -14939,12 +14960,12 @@ echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:14943: checking for $dbfunc in -ldb" >&5 +echo "configure:14964: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 14948 "configure" +#line 14969 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -14955,7 +14976,7 @@ $dbfunc() ; return 0; } EOF -if { (eval echo configure:14959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14980: \"$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 @@ -15016,12 +15037,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:15020: checking for SOCKSinit in -lsocks" >&5 +echo "configure:15041: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <<EOF -#line 15025 "configure" +#line 15046 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -15032,7 +15053,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:15036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15057: \"$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 @@ -15086,11 +15107,11 @@ fi cat > conftest.$ac_ext <<EOF -#line 15090 "configure" +#line 15111 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:15094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else
--- a/configure.in Tue Nov 26 22:52:59 2002 +0000 +++ b/configure.in Wed Nov 27 07:15:36 2002 +0000 @@ -1675,6 +1675,20 @@ fi CFLAGS="$xe_save_CFLAGS" +dnl Determine GCC version. +if test "$GCC" = "yes"; then +AC_TRY_RUN([int main () { +#if __GNUC__ >= 3 +return 11; +#else +return 0; +#endif +}], [], +[case "$conftest_rc" in + 11) echo "You appear to be using GCC version 3 or above."; __GCC3=yes ;; +esac]) +fi + dnl Figure out what C preprocessor to use. dnl On Sun systems, people sometimes set up the variable CPP @@ -1945,7 +1959,7 @@ if test "$cflags_specified" = "no"; then dnl Following values of CFLAGS are known to work well. dnl Should we take debugging options into consideration? - if test "$GCC" = "yes"; then + if test "$GCC" = "yes"; then CFLAGS="-g -O3" dnl I'm not convinced this is a good idea any more. -sb dnl test "$opsys $machine" = "linux intel386" && \ @@ -1971,14 +1985,17 @@ if test "$cflags_warning_specified" = "no"; then dnl Following warning flags are known to work well. - if test "$GCC" = "yes"; then + if test "$GCC" = "yes"; then cflags_warning="-Wall -Wno-switch -Winline -Wmissing-prototypes" dnl Yuck, bad compares have been worth at least 3 crashes! cflags_warning="$cflags_warning -Wsign-compare" dnl NOTE: The following three, as well as -Wmissing-declarations and dnl -Weffc++ below, have been recently added. If you are getting dnl grief from them, please notify ben@xemacs.org! - cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes -Wpacked" + cflags_warning="$cflags_warning -Wundef -Wstrict-prototypes" + if test "$__GCC3" = "yes"; then + cflags_warning="$cflags_warning -Wpacked" + fi dnl With g++, -Wshadow produces five zillion utterly random warnings -- dnl a local var named `buffer' conflicts with `struct buffer' for dnl example. Even with gcc, -Wshadow is questionable because of its
--- a/lib-src/.cvsignore Tue Nov 26 22:52:59 2002 +0000 +++ b/lib-src/.cvsignore Wed Nov 27 07:15:36 2002 +0000 @@ -24,3 +24,5 @@ ellcc DOC *.pdb +*.idb +*.ilk
--- a/lib-src/ChangeLog Tue Nov 26 22:52:59 2002 +0000 +++ b/lib-src/ChangeLog Wed Nov 27 07:15:36 2002 +0000 @@ -1,3 +1,8 @@ +2002-11-27 Ben Wing <ben@xemacs.org> + + * .cvsignore: + Add .idb, .ilk for MS Windows VC++. + 2002-11-17 Ben Wing <ben@xemacs.org> * ellcc.c (do_init_mode):
--- a/lisp/ChangeLog Tue Nov 26 22:52:59 2002 +0000 +++ b/lisp/ChangeLog Wed Nov 27 07:15:36 2002 +0000 @@ -1,3 +1,32 @@ +2002-11-27 Ben Wing <ben@xemacs.org> + + * cl-macs.el (loop): Document better. + + * cmdloop.el: + * cmdloop.el (command-error): + * cmdloop.el (breakpoint-on-error): Removed. + Remove nonworking breakpoint-on-error now that debug-on-error + works as documented. + + * help.el: + * help.el (temp-buffer-mode): New. + * help.el (Commands): New. + * help.el (temp-buffer-mode-map): New. + * help.el (mode-for-temp-buffer): New. + * help.el (with-displaying-help-buffer): Removed. + * help.el (with-displaying-temp-buffer): New. + Extract out with-displaying-help-buffer into a more general + mechanism. + + * lib-complete.el: + * lib-complete.el (find-library-source-path): + * lib-complete.el (find-library): + Support thunks in find-library-source-path. + + * startup.el (normal-top-level): + Don't catch errors when noninteractive, because that makes + stack traces from stack-trace-on-error useless. + 2002-11-17 Ben Wing <ben@xemacs.org> * code-files.el (load):
--- a/lisp/cl-macs.el Tue Nov 26 22:52:59 2002 +0000 +++ b/lisp/cl-macs.el Wed Nov 27 07:15:36 2002 +0000 @@ -740,7 +740,25 @@ Destructuring is forgiving in that mismatches in the number of elements on either size will be handled gracefully, either by ignoring or initializing -to nil. +to nil. Destructuring is extremely powerful, and is probably the single +most useful feature of `loop'. + +Other useful features of loops are iterating over hash-tables, collecting values into lists, and being able to modify lists in-place as you iterate over them. As an example of the first two, + +\(loop for x being the hash-key in table using (hash-value y) + collect (cons x y)) + +converts hash-table TABLE to an alist. (What `collect' actually does is +push its value onto the end of an internal list and establish this list as +the default return value of the loop. See below for more information.) + +An example of in-place modification is + +\(setq foo '(1 3 5)) +\(loop for x in-ref foo do + (setf x (* x x))) + +after which foo will contain '(1 9 25). If you don't understand how a particular loop clause works, create an example and use `macroexpand-sexp' to expand the macro.
--- a/lisp/cmdloop.el Tue Nov 26 22:52:59 2002 +0000 +++ b/lisp/cmdloop.el Wed Nov 27 07:15:36 2002 +0000 @@ -1,7 +1,7 @@ ;;; cmdloop.el --- support functions for the top-level command loop. ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc. -;; Copyright (C) 2001 Ben Wing. +;; Copyright (C) 2001, 2002 Ben Wing. ;; Author: Richard Mlynarik ;; Date: 8-Jul-92 @@ -130,20 +130,6 @@ :type 'boolean :group 'editing-basics) -(defvar breakpoint-on-error nil - "Break into the C debugger when an unhandled error occurs noninteractively. -This happens by calling `force-debugging-signal'. This can be very -useful when debugging noninteractive errors in tricky situations, -e.g. makefiles, since you can set this variable using an environment -variable, like this: - -\(using csh) setenv XEMACSDEBUG '(setq breakpoint-on-error t)' -\(using bash) export XEMACSDEBUG='(setq breakpoint-on-error t)' - -XEMACSDEBUG is also useful for setting `stack-trace-on-error'. which will -display a Lisp backtrace when exiting noninteractively due to an unhandled -error.") - (defun command-error (error-object) ;; if you want a backtrace before exiting, set stack-trace-on-error. (let* ((inhibit-quit t) @@ -177,9 +163,7 @@ (if (noninteractive) (progn - (when breakpoint-on-error - (force-debugging-signal)) - (message "%s exiting\n." emacs-program-name) + (message "%s exiting.\n" emacs-program-name) (kill-emacs -1))) t))
--- a/lisp/cus-start.el Tue Nov 26 22:52:59 2002 +0000 +++ b/lisp/cus-start.el Wed Nov 27 07:15:36 2002 +0000 @@ -51,6 +51,9 @@ (delete-exited-processes processes-basics boolean) (indent-tabs-mode editing-basics boolean) (load-ignore-elc-files maint boolean) + (load-ignore-out-of-date-elc-files maint boolean) + (load-show-full-path-in-messages maint boolean) + (load-always-display-messages maint boolean) (load-warn-when-source-newer maint boolean) (load-warn-when-source-only maint boolean) (modifier-keys-are-sticky keyboard boolean)
--- a/lisp/help.el Tue Nov 26 22:52:59 2002 +0000 +++ b/lisp/help.el Wed Nov 27 07:15:36 2002 +0000 @@ -155,6 +155,18 @@ (define-key help-mode-map "n" 'help-next-section) (define-key help-mode-map "p" 'help-prev-section) +(define-derived-mode temp-buffer-mode view-major-mode "Temp" + "Major mode for viewing temporary buffers. +Exit using \\<temp-buffer-mode-map>\\[help-mode-quit]. + +Entry to this mode runs the normal hook `temp-buffer-mode-hook'. +Commands: +\\{temp-buffer-mode-map}" + ) + +(define-key temp-buffer-mode-map "q" 'help-mode-quit) +(define-key temp-buffer-mode-map "Q" 'help-mode-bury) + (defun describe-function-at-point () "Describe directly the function at point in the other window." (interactive) @@ -500,6 +512,9 @@ (defcustom mode-for-help 'help-mode "*Mode that help buffers are put into.") +(defcustom mode-for-temp-buffer 'temp-buffer-mode + "*Mode that help buffers are put into.") + (defvar help-sticky-window nil ;; Window into which help buffers will be displayed, rather than ;; always searching for a new one. This is INTERNAL and liable to @@ -512,23 +527,22 @@ (make-variable-buffer-local 'help-window-config) (put 'help-window-config 'permanent-local t) -(defun with-displaying-help-buffer (thunk &optional name) +(defmacro with-displaying-temp-buffer (name &rest body) "Form which makes a help buffer with given NAME and evaluates BODY there. -The actual name of the buffer is generated by the function `help-buffer-name'. + +Use this function for displaying information in temporary buffers, where the +user will typically view the information and then exit using +\\<temp-buffer-mode-map>\\[help-mode-quit]. -Use this function for displaying help when C-h something is pressed or -in similar situations. Do *not* use it when you are displaying a help -message and then prompting for input in the minibuffer -- this macro -usually selects the help buffer, which is not what you want in those -situations." - (let* ((winconfig (current-window-configuration)) - (was-one-window (one-window-p)) - (buffer-name (help-buffer-name name)) - (help-not-visible - (not (and (windows-of-buffer buffer-name) ;shortcut - (memq (selected-frame) - (mapcar 'window-frame - (windows-of-buffer buffer-name))))))) +The buffer is put into the mode specified in `mode-for-temp-buffer'." + `(let* ((winconfig (current-window-configuration)) + (was-one-window (one-window-p)) + (buffer-name ,name) + (help-not-visible + (not (and (windows-of-buffer buffer-name) ;shortcut + (memq (selected-frame) + (mapcar 'window-frame + (windows-of-buffer buffer-name))))))) (help-register-and-maybe-prune-excess buffer-name) ;; if help-sticky-window is bogus or deleted, get rid of it. (if (and help-sticky-window (or (not (windowp help-sticky-window)) @@ -541,13 +555,13 @@ (set-window-buffer help-sticky-window buffer)) temp-buffer-show-function))) (with-output-to-temp-buffer buffer-name - (prog1 (funcall thunk) + (prog1 (progn ,@body) (save-excursion (set-buffer standard-output) - (funcall mode-for-help))))) + (funcall mode-for-temp-buffer))))) (let ((helpwin (get-buffer-window buffer-name))) (when helpwin - ;; If the *Help* buffer is already displayed on this + ;; If the temp buffer is already displayed on this ;; frame, don't override the previous configuration (when help-not-visible (with-current-buffer (window-buffer helpwin) @@ -556,13 +570,28 @@ (select-window helpwin)) (cond ((eq helpwin (selected-window)) (display-message 'command - (substitute-command-keys "Type \\[help-mode-quit] to remove help window, \\[scroll-up] to scroll the help."))) + (substitute-command-keys "Type \\[help-mode-quit] to remove window, \\[scroll-up] to scroll the text."))) (was-one-window (display-message 'command - (substitute-command-keys "Type \\[delete-other-windows] to remove help window, \\[scroll-other-window] to scroll the help."))) + (substitute-command-keys "Type \\[delete-other-windows] to remove window, \\[scroll-other-window] to scroll the text."))) (t (display-message 'command - (substitute-command-keys "Type \\[switch-to-buffer-other-window] to restore the other window, \\[scroll-other-window] to scroll the help."))))))))) + (substitute-command-keys "Type \\[switch-to-buffer-other-window] to restore the other window, \\[scroll-other-window] to scroll the text."))))))))) + +(put 'with-displaying-temp-buffer 'lisp-indent-function 1) + +(defun with-displaying-help-buffer (thunk &optional name) + "Form which makes a help buffer with given NAME and evaluates BODY there. +The actual name of the buffer is generated by the function `help-buffer-name'. + +Use this function for displaying help when C-h something is pressed or +in similar situations. Do *not* use it when you are displaying a help +message and then prompting for input in the minibuffer -- this macro +usually selects the help buffer, which is not what you want in those +situations." + (let ((mode-for-temp-buffer mode-for-help)) + (with-displaying-temp-buffer (help-buffer-name name) + (funcall thunk)))) (defun describe-key (key) "Display documentation of the function invoked by KEY.
--- a/lisp/lib-complete.el Tue Nov 26 22:52:59 2002 +0000 +++ b/lisp/lib-complete.el Wed Nov 27 07:15:36 2002 +0000 @@ -1,7 +1,8 @@ ;;; lib-complete.el --- Completion on the lisp search path ;; Copyright (C) 1997 Free Software Foundation, Inc. -;; Copyright (C) Mike Williams <mike-w@cs.aukuni.ac.nz> 1991 +;; Copyright (C) 1991 Mike Williams <mike-w@cs.aukuni.ac.nz>. +;; Copyright (C) 2002 Ben Wing. ;; Author: Mike Williams <mike-w@cs.aukuni.ac.nz> ;; Maintainer: XEmacs Development Team @@ -31,28 +32,9 @@ ;; This file is dumped with XEmacs. -;; ======================================================================== -;; lib-complete.el -- Completion on a search path -;; Author : Mike Williams <mike-w@cs.aukuni.ac.nz> -;; Created On : Sat Apr 20 17:47:21 1991 -;; Last Modified By: Heiko M|nkel <muenkel@tnt.uni-hannover.de> -;; Additional XEmacs integration By: Chuck Thompson <cthomp@cs.uiuc.edu> -;; Last Modified On: Thu Jul 1 14:23:00 1994 -;; ======================================================================== -;; NOTE: XEmacs must be redumped if this file is changed. -;; -;; Copyright (C) Mike Williams <mike-w@cs.aukuni.ac.nz> 1991 -;; -;; Keywords: utility, lisp - ;; Many thanks to Hallvard Furuseth <hallvard@ifi.uio.no> for his ;; helpful suggestions. -;; The function locate-file is removed, because of its incompatibility -;; with the buildin function of the lemacs 19.10 (Heiko M|nkel). - -;; There is now the new function find-library in this package. - ;;; ChangeLog: ;; 4/26/97: sb Mule-ize. @@ -295,17 +277,23 @@ ;;=== find-library with completion (Author: Bob Weiner) =================== +;; should be called find-lisp-source-path! (defcustom find-library-source-path nil "The default list of directories where find-library searches. If this variable is `nil' then find-library searches `load-path' by default. +If this is set to a function, it will be called the first time this value +is needed, to compute the actual list, which will then be substituted into +the variable. + A good way to set this variable is like this: \(setq find-library-source-path - (paths-find-recursive-load-path - (list lisp-directory \"/src/xemacs/xemacs-packages-src/\"))) + #'(lambda () + (paths-find-recursive-load-path + (list lisp-directory \"/src/xemacs/xemacs-packages-src/\")))) " :type '(repeat directory) :group 'find-function) @@ -327,6 +315,11 @@ (read-coding-system "Coding System: ")))) (let ((path (if (or (null library) (equal library "")) nil + (when (functionp find-library-source-path) + (message "Computing find-library-source-path...") + (setq find-library-source-path + (funcall find-library-source-path)) + (message "Computing find-library-source-path... done.")) (locate-file library (or find-library-source-path load-path) ":.el:.el.gz:.el.Z:.elc")))) (if path (funcall (if (fboundp display-function)
--- a/lisp/startup.el Tue Nov 26 22:52:59 2002 +0000 +++ b/lisp/startup.el Wed Nov 27 07:15:36 2002 +0000 @@ -538,10 +538,23 @@ (startup-load-autoloads) (let (error-data) - (condition-case data + ;; if noninteractive, an error will kill us. by catching and + ;; resignalling, we don't accomplish much, but do make it difficult + ;; to determine where the error really occurred. when interactive, + ;; however, an error processing the command line does NOT kill us; + ;; instead, the error handler tries to display an error on the frame. + ;; In that case, we must make sure that all the remaining initialization + ;; gets done!!! + ;; + ;; #### A better solution in the interactive case is to use + ;; call-with-condition-handler, which would let us do the rest of + ;; the initialization AND allow the user to get an accurate backtrace. + (if (noninteractive) (command-line) - ;; catch non-error signals, especially quit - (t (setq error-data data))) + (condition-case data + (command-line) + ;; catch non-error signals, especially quit + (t (setq error-data data)))) ;; Do this again, in case the init file defined more abbreviations. (setq default-directory (abbreviate-file-name default-directory)) ;; Specify the file for recording all the auto save files of
--- a/nt/.cvsignore Tue Nov 26 22:52:59 2002 +0000 +++ b/nt/.cvsignore Wed Nov 27 07:15:36 2002 +0000 @@ -3,3 +3,4 @@ xemacs.opt xemacs.plg obj +nma[0-9][0-9][0-9][0-9][0-9]
--- a/nt/ChangeLog Tue Nov 26 22:52:59 2002 +0000 +++ b/nt/ChangeLog Wed Nov 27 07:15:36 2002 +0000 @@ -1,3 +1,8 @@ +2002-11-27 Ben Wing <ben@xemacs.org> + + * .cvsignore: + Windows shit. + 2002-10-13 Adrian Aichner <adrian@xemacs.org> * xemacs.mak (OS): Remove obsolete quoting of double-quote in the
--- a/src/.cvsignore Tue Nov 26 22:52:59 2002 +0000 +++ b/src/.cvsignore Wed Nov 27 07:15:36 2002 +0000 @@ -14,11 +14,15 @@ sheap-adjust.h temacs temacs.bsc +temacs.ilk temacs.map +temacs.opt temacs.pdb -temacs.opt update-elc.stamp xemacs xemacs.dmp +xemacs.ilk +xemacs.map xemacs.opt *.tmp +makeinfo_test.bat
--- a/src/ChangeLog Tue Nov 26 22:52:59 2002 +0000 +++ b/src/ChangeLog Wed Nov 27 07:15:36 2002 +0000 @@ -1,3 +1,74 @@ +2002-11-27 Ben Wing <ben@xemacs.org> + + * alloc.c: + * alloc.c (garbage_collect_1): + Better redisplay-related assert. + + * elhash.c (xhash_table): Comment change. + + * eval.c: + * eval.c (signal_call_debugger): + * eval.c (throw_or_bomb_out): + * eval.c (check_proper_critical_section_gc_protection): + * eval.c (Fsignal): + * eval.c (Feval): + * eval.c (Ffuncall): + * eval.c (flagged_a_squirmer): + * eval.c (call_trapping_problems): + * eval.c (warning_will_be_discarded): + * eval.c (warn_when_safe_lispobj): + * eval.c (warn_when_safe): + * eval.c (vars_of_eval): + Don't generate large warning strings (e.g. backtraces) when they will + be discarded. + + Implement debug-on-error as documented -- it will enter the + debugger and crash when an uncaught signal happens noninteractively + and we are --debug. + + Better redisplay-related asserts. + + * frame-msw.c (mswindows_init_frame_1): + * frame.c (enter_redisplay_critical_section): + * lisp.h: + * redisplay.c (redisplay_frame): + * scrollbar-gtk.c (gtk_update_frame_scrollbars): + * scrollbar-x.c (x_update_frame_scrollbars): + * signal.c (check_quit): + * sysdep.c: + * sysdep.c (qxe_interruptible_open): + + Fix up documentation related to QUIT (which CANNOT garbage-collect + under any circumstances), and to redisplay critical sections. + + * lread.c: + * lread.c (Fload_internal): + * lread.c (PRINT_LOADING_MESSAGE_1): + * lread.c (locate_file_open_or_access_file): + * lread.c (locate_file_in_directory_mapper): + * lread.c (vars_of_lread): + Add load-ignore-out-of-date-elc-files, + load-always-display-messages, load-show-full-path-in-messages for + more robust package compilation and debugging. + + * profile.c: + * profile.c (create_call_count_profile_table): + * profile.c (profile_increase_call_count): + * profile.c (Fstart_profiling): + * profile.c (Fclear_profiling_info): + * profile.c (get_profiling_info_timing_maphash): + * profile.c (Fget_profiling_info): + * profile.c (set_profiling_info_timing_maphash): + * profile.c (Fset_profiling_info): + * profile.c (Fprofiling_active_p): + * profile.c (syms_of_profile): + * profile.c (vars_of_profile): + Overhaul profile code. Change format to include call count and be + extensible for further info. Remove call-count-profile-table. + Add set-profiling-info. See related profile.el changes (which + SHOULD ABSOLUTELY be in the core! Get rid of xemacs-devel and + xemacs-base packages *yesterday*!). + 2002-11-22 Ben Wing <ben@xemacs.org> * fileio.c: Fix crashes due to incorrectly ported code from
--- a/src/alloc.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/alloc.c Wed Nov 27 07:15:36 2002 +0000 @@ -180,7 +180,7 @@ /* Nonzero when calling certain hooks or doing other things where a GC would be bad */ -static int gc_currently_forbidden; +int gc_currently_forbidden; /* Hooks. */ Lisp_Object Vpre_gc_hook, Qpre_gc_hook; @@ -4239,6 +4239,8 @@ Lisp_Object pre_gc_cursor; struct gcpro gcpro1; + assert (!in_display || gc_currently_forbidden); + if (gc_in_progress || gc_currently_forbidden || in_display
--- a/src/elhash.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/elhash.c Wed Nov 27 07:15:36 2002 +0000 @@ -449,6 +449,7 @@ static Lisp_Hash_Table * xhash_table (Lisp_Object hash_table) { + /* #### What's going on here? Why the gc_in_progress check? */ if (!gc_in_progress) CHECK_HASH_TABLE (hash_table); check_hash_table_invariants (XHASH_TABLE (hash_table));
--- a/src/eval.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/eval.c Wed Nov 27 07:15:36 2002 +0000 @@ -413,6 +413,9 @@ static int throw_level; #endif +static int warning_will_be_discarded (Lisp_Object level); +static void check_proper_critical_section_nonlocal_exit_protection (void); + /************************************************************************/ /* The subr object type */ @@ -744,6 +747,12 @@ && !skip_debugger (conditions, temp_data)) { debug_on_quit &= ~2; /* reset critical bit */ + +#ifdef DEBUG_XEMACS + if (noninteractive) + Fforce_debugging_signal (Qt); +#endif + specbind (Qdebug_on_error, Qnil); specbind (Qstack_trace_on_error, Qnil); specbind (Qdebug_on_signal, Qnil); @@ -779,6 +788,12 @@ : wants_debugger (Vdebug_on_signal, conditions))) { debug_on_quit &= ~2; /* reset critical bit */ + +#ifdef DEBUG_XEMACS + if (noninteractive) + Fforce_debugging_signal (Qt); +#endif + specbind (Qdebug_on_error, Qnil); specbind (Qstack_trace_on_error, Qnil); specbind (Qdebug_on_signal, Qnil); @@ -1592,6 +1607,8 @@ abort (); #endif + check_proper_critical_section_nonlocal_exit_protection (); + /* If bomb_out_p is t, this is being called from Fsignal as a "last resort" when there is no handler for this error and the debugger couldn't be invoked, so we are throwing to @@ -2113,6 +2130,7 @@ } extern int in_display; +extern int gc_currently_forbidden; /************************************************************************/ @@ -2131,6 +2149,24 @@ { } +static void +check_proper_critical_section_gc_protection (void) +{ + assert_with_message + (!in_display || gc_currently_forbidden, + "Potential GC from within redisplay without being properly wrapped"); +} + +static void +check_proper_critical_section_nonlocal_exit_protection (void) +{ + assert_with_message + (!in_display + || ((get_inhibit_flags () & INTERNAL_INHIBIT_ERRORS) + && (get_inhibit_flags () & INTERNAL_INHIBIT_THROWS)), + "Attempted non-local exit from within redisplay without being properly wrapped"); +} + /* #### This function has not been synched with FSF. It diverges significantly. */ @@ -2181,20 +2217,14 @@ abort (); } - if (gc_in_progress) - /* We used to abort if in_display: - - [[This is one of many reasons why you can't run lisp code from - redisplay. There is no sensible way to handle errors there.]] - - The above comment is not correct. - - Inhibit GC until the redisplay code is careful enough to properly - GCPRO their structures; - - Surround all calls to Lisp code with error-trapping wrappers that - catch all errors. --ben */ - abort (); + assert (!gc_in_progress); + + /* We abort if in_display and we are not protected, as garbage + collections and non-local exits will invariably be fatal, but in + messy, difficult-to-debug ways. See enter_redisplay_critical_section(). + */ + + check_proper_critical_section_nonlocal_exit_protection (); conditions = Fget (error_symbol, Qerror_conditions, Qnil); @@ -3462,6 +3492,9 @@ } QUIT; +#ifdef ERROR_CHECK_TRAPPING_PROBLEMS + check_proper_critical_section_gc_protection (); +#endif if (need_to_garbage_collect) { struct gcpro gcpro1; @@ -3706,6 +3739,9 @@ if (funcall_allocation_flag) { +#ifdef ERROR_CHECK_TRAPPING_PROBLEMS + check_proper_critical_section_gc_protection (); +#endif if (need_to_garbage_collect) /* Callers should gcpro lexpr args */ garbage_collect_1 (); @@ -4750,7 +4786,8 @@ Lisp_Object errstr; int speccount = specpdl_depth (); - if (! (inhibit_flags & INHIBIT_WARNING_ISSUE)) + if (!(inhibit_flags & INHIBIT_WARNING_ISSUE) + && !warning_will_be_discarded (current_warning_level ())) { /* We're no longer protected against errors or quit here, so at least let's temporarily inhibit quit. We definitely do not @@ -4781,7 +4818,6 @@ errstr); unbind_to (speccount); - } else p->backtrace = Qnil; @@ -4847,8 +4883,7 @@ higher-level caller. If FLAGS contains INHIBIT_GC, garbage collection is inhibited. - This is useful for Lisp called within redisplay or inside of the - QUIT macro (where GC is generally not expected), for example. + This is useful for Lisp called within redisplay, for example. If FLAGS contains INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION, Lisp code is not allowed to delete any window, buffers, frames, devices, @@ -5022,7 +5057,8 @@ tem = (fun) (arg); if (thrown && !EQ (thrown_tag, package.catchtag) - && (!flags & INHIBIT_WARNING_ISSUE)) + && (!flags & INHIBIT_WARNING_ISSUE) + && !warning_will_be_discarded (current_warning_level ())) { Lisp_Object errstr; @@ -6186,16 +6222,22 @@ /* Warnings */ /************************************************************************/ +static int +warning_will_be_discarded (Lisp_Object level) +{ + /* Don't even generate debug warnings if they're going to be discarded, + to avoid excessive consing. */ + return (EQ (level, Qdebug) && !NILP (Vlog_warning_minimum_level) && + !EQ (Vlog_warning_minimum_level, Qdebug)); +} + void warn_when_safe_lispobj (Lisp_Object class, Lisp_Object level, Lisp_Object obj) { - /* Don't even generate debug warnings if they're going to be discarded, - to avoid excessive consing. */ - if (EQ (level, Qdebug) && !NILP (Vlog_warning_minimum_level) && - !EQ (Vlog_warning_minimum_level, Qdebug)) + if (warning_will_be_discarded (level)) return; - + obj = list1 (list3 (class, level, obj)); if (NILP (Vpending_warnings)) Vpending_warnings = Vpending_warnings_tail = obj; @@ -6219,12 +6261,9 @@ Lisp_Object obj; va_list args; - /* Don't even generate debug warnings if they're going to be discarded, - to avoid excessive consing. */ - if (EQ (level, Qdebug) && !NILP (Vlog_warning_minimum_level) && - !EQ (Vlog_warning_minimum_level, Qdebug)) + if (warning_will_be_discarded (level)) return; - + va_start (args, fmt); obj = emacs_vsprintf_string (CGETTEXT (fmt), args); va_end (args); @@ -6421,12 +6460,21 @@ if one of its condition symbols appears in the list. This variable is overridden by `debug-ignored-errors'. See also variables `debug-on-quit' and `debug-on-signal'. -If this variable is set while XEmacs is running noninteractively, -an unhandled error will cause a backtrace to be output and the C -debugger entered using `force-debugging-signal'. This can be very -useful when debugging noninteractive errors in tricky situations, -e.g. makefiles, since you can set this variable using an environment -variable, like this: + +If this variable is set while XEmacs is running noninteractively (using +`-batch'), and XEmacs was configured with `--debug' (#define XEMACS_DEBUG +in the C code), instead of trying to invoke the Lisp debugger (which +obviously won't work), XEmacs will break out to a C debugger using +\(force-debugging-signal t). This is useful because debugging +noninteractive runs of XEmacs is often very difficult, since they typically +happen as part of sometimes large and complex make suites (e.g. rebuilding +the XEmacs packages). NOTE: This runs abort()!!! (As well as and after +executing INT 3 under MS Windows, which should invoke a debugger if it's +active.) This is guaranteed to kill XEmacs! (But in this situation, XEmacs +is about to die anyway, and if no debugger is present, this will usefully +dump core.) The most useful way to set this flag when debugging +noninteractive runs, especially in makefiles, is using the environment +variable XEMACSDEBUG, like this: \(using csh) setenv XEMACSDEBUG '(setq debug-on-error t)' \(using bash) export XEMACSDEBUG='(setq debug-on-error t)' @@ -6440,6 +6488,9 @@ If the value is a list, an error only means to enter the debugger if one of its condition symbols appears in the list. See also variable `debug-on-quit'. + +This will attempt to enter a C debugger when XEmacs is run noninteractively +and under the same conditions as described in `debug-on-error'. */ ); Vdebug_on_signal = Qnil;
--- a/src/fileio.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/fileio.c Wed Nov 27 07:15:36 2002 +0000 @@ -3328,7 +3328,6 @@ Lisp_Object desc_locative = Fcons (make_int (desc), Qnil); Lisp_Object instream = Qnil, outstream = Qnil; struct gcpro nngcpro1, nngcpro2; - /* need to gcpro; QUIT could happen out of call to retry_write() */ NNGCPRO2 (instream, outstream); record_unwind_protect (close_file_unwind, desc_locative);
--- a/src/frame-msw.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/frame-msw.c Wed Nov 27 07:15:36 2002 +0000 @@ -152,10 +152,10 @@ FRAME_MSWINDOWS_TOOLBAR_HASH_TABLE (f) = make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL); #endif - /* hashtable of instantiated glyphs on the frame. - make them EQ because we only use ints as keys. - otherwise we run into stickiness in redisplay because - internal_equal() can QUIT. */ + /* hashtable of instantiated glyphs on the frame. Make them EQ because + we only use ints as keys. Otherwise we run into stickiness in + redisplay because internal_equal() can QUIT. See + enter_redisplay_critical_section(). */ FRAME_MSWINDOWS_WIDGET_HASH_TABLE1 (f) = make_lisp_hash_table (50, HASH_TABLE_VALUE_WEAK, HASH_TABLE_EQ); FRAME_MSWINDOWS_WIDGET_HASH_TABLE2 (f) =
--- a/src/frame.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/frame.c Wed Nov 27 07:15:36 2002 +0000 @@ -647,8 +647,14 @@ { int depth = specpdl_depth (); + /* NOTE NOTE NOTE: Inside the redisplay critical section, every place + that could QUIT or call Lisp code needs to be wrapped, since GC + or a non-local exit will be fatal. The way to do this is with + call_trapping_problems(..., INHIBIT_GC), or the like. */ + #ifdef ERROR_CHECK_TRAPPING_PROBLEMS - /* force every call to QUIT to check for in_displayness */ + /* Force every call to QUIT to check for in_displayness. This will + verify proper wrapping, as in the previous comment, aborting if not. */ something_happened++; record_unwind_protect (commit_ritual_suicide, Qnil); #endif
--- a/src/lisp.h Tue Nov 26 22:52:59 2002 +0000 +++ b/src/lisp.h Wed Nov 27 07:15:36 2002 +0000 @@ -2843,6 +2843,18 @@ /* Checking for QUIT */ /************************************************************************/ +/* NOTE NOTE NOTE: Invoking QUIT can cause random Lisp code to be executed! + This can happen in numerous ways. For example, on many platforms, QUIT + needs to drain the event queue to see whether there's a C-g in the works. + A side effect of this is that, if there's a menu-press event, menu filters + (i.e. Lisp code) will be invoked. Lisp code could also happen if there's + an asynchronous timeout, or if the debugger is invoked as a result of + debug-on-quit and the user returns by hitting `r', etc. etc. + + However, GC CANNOT HAPPEN. It is forbidden everywhere within the QUIT- + processing code, because most callers cannot tolerate GC during QUIT + since it's just too prevalent. */ + /* The exact workings of this mechanism are described in detail in signal.c. */ /* Asynchronous events set something_happened, and then are processed @@ -2897,8 +2909,9 @@ However, this mechanism is inherently approximate, so it really doesn't matter much.) In the future, it might also include doing a thread context switch. Callers of QUITP generally don't except - random side effects to happen, so we have this different - version. */ + random side effects to happen (#### unfortunately, random side effects + can happen anyway, e.g. through menu filters -- see comment above), + so we have this different version. */ #define INTERNAL_QUITP \ ((something_happened ? check_what_happened () : (void) 0), \ QUIT_FLAG_SAYS_SHOULD_QUIT) @@ -3005,6 +3018,16 @@ NNGCPROn(). If you need to nest yet another level, create the appropriate macros. */ +/* NOTE: About comments like "This function does not GC": These are there to + try to track whether GCPROing is necessary. Strictly speaking, some + functions that say this might actually GC, but only when it is never + possible to return (more specifically, in the process of signalling an + error, the debugger may be invoked, and could GC). For GCPRO purposes, + you only have to worry about functions that can GC and then return. + The QUIT macro cannot GC any more, although this wasn't true at some point, + and so some "This function can GC" comments may be inaccurate. +*/ + #ifdef DEBUG_GCPRO void debug_gcpro1 (char *, int, struct gcpro *, Lisp_Object *); @@ -3684,6 +3707,7 @@ /* Defined in emacs.c */ EXFUN (Fkill_emacs, 1); EXFUN (Frunning_temacs_p, 0); +EXFUN (Fforce_debugging_signal, 1); SIGTYPE fatal_error_signal (int); Lisp_Object make_arg_list (int, Extbyte **);
--- a/src/lread.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/lread.c Wed Nov 27 07:15:36 2002 +0000 @@ -89,6 +89,14 @@ int load_warn_when_source_only; /* Whether Fload_internal() should ignore .elc files when no suffix is given */ int load_ignore_elc_files; +/* Whether Fload_internal() should ignore out-of-date .elc files when no + suffix is given */ +int load_ignore_out_of_date_elc_files; +/* Always display messages showing when a file is loaded, regardless of + whether the flag to `load' tries to suppress them. */ +int load_always_display_messages; +/* Show the full path in loading messages. */ +int load_show_full_path_in_messages; /* Search path for files to be loaded. */ Lisp_Object Vload_path; @@ -199,6 +207,7 @@ static int saved_doc_string_position; #endif +static int locate_file_open_or_access_file (Ibyte *fn, int access_mode); EXFUN (Fread_from_string, 3); /* When errors are signaled, the actual readcharfun should not be used @@ -482,18 +491,22 @@ int fd = -1; int speccount = specpdl_depth (); int source_only = 0; + /* NEWER and OLDER are filenames w/o directory, used in loading messages + to e.g. warn of newer .el files when the .elc is being loaded. */ Lisp_Object newer = Qnil; + Lisp_Object older = Qnil; Lisp_Object handler = Qnil; Lisp_Object found = Qnil; - struct gcpro gcpro1, gcpro2, gcpro3; + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; int reading_elc = 0; int from_require = EQ (nomessage, Qrequire); - int message_p = NILP (nomessage) || from_require; + int message_p = + NILP (nomessage) || from_require || load_always_display_messages; /*#ifdef DEBUG_XEMACS*/ static Lisp_Object last_file_loaded; /*#endif*/ struct stat s1, s2; - GCPRO3 (file, newer, found); + GCPRO4 (file, newer, older, found); CHECK_STRING (file); @@ -551,10 +564,9 @@ /* The omniscient JWZ thinks this is worthless, but I beg to differ. --ben */ if (load_ignore_elc_files) - { - newer = Ffile_name_nondirectory (found); - } - else if (load_warn_when_source_newer && + newer = Ffile_name_nondirectory (found); + else if ((load_warn_when_source_newer || + load_ignore_out_of_date_elc_files) && !memcmp (".elc", foundstr + foundlen - 4, 4)) { if (! qxe_fstat (fd, &s1)) /* can't fail, right? */ @@ -565,14 +577,28 @@ result = qxe_stat (foundstr, &s2); if (result >= 0 && (unsigned) s1.st_mtime < (unsigned) s2.st_mtime) - { - Lisp_Object newer_name = make_string (foundstr, - foundlen - 1); - struct gcpro nngcpro1; - NNGCPRO1 (newer_name); - newer = Ffile_name_nondirectory (newer_name); - NNUNGCPRO; - } + { + /* .elc exists and is out-of-date wrt .el */ + Lisp_Object el_name = make_string (foundstr, foundlen - 1); + struct gcpro nngcpro1; + NNGCPRO1 (el_name); + newer = Ffile_name_nondirectory (el_name); + if (load_ignore_out_of_date_elc_files) + { + int newfd = + locate_file_open_or_access_file + (XSTRING_DATA (el_name), -1); + + if (newfd >= 0) + { + older = Ffile_name_nondirectory (found); + found = el_name; + retry_close (fd); + fd = newfd; + } + } + NNUNGCPRO; + } /* put the 'c' back on (kludge-o-rama) */ foundstr[foundlen - 1] = 'c'; } @@ -584,30 +610,43 @@ memcmp (".el", XSTRING_DATA (file) + XSTRING_LENGTH (file) - 3, 3)) - { - source_only = 1; - } + source_only = 1; if (!memcmp (".elc", foundstr + foundlen - 4, 4)) reading_elc = 1; } -#define PRINT_LOADING_MESSAGE_1(loading, done) do { \ - if (load_ignore_elc_files) \ - { \ - if (message_p) \ - message (loading done, XSTRING_DATA (newer)); \ - } \ - else if (!NILP (newer)) \ - message (loading done " (file %s is newer)", \ - XSTRING_DATA (file), \ - XSTRING_DATA (newer)); \ - else if (source_only) \ - message (loading done " (file %s.elc does not exist)", \ - XSTRING_DATA (file), \ - XSTRING_DATA (Ffile_name_nondirectory (file))); \ - else if (message_p) \ - message (loading done, XSTRING_DATA (file)); \ +#define PRINT_LOADING_MESSAGE_1(loading, done) \ + do { \ + if (load_ignore_elc_files) \ + { \ + if (message_p) \ + message (loading done, \ + XSTRING_DATA (load_show_full_path_in_messages ? \ + found : newer)); \ + } \ + else if (!NILP (older)) \ + { \ + assert (load_ignore_out_of_date_elc_files); \ + message (loading done " (file %s is out-of-date)", \ + XSTRING_DATA (load_show_full_path_in_messages ? \ + found : newer), \ + XSTRING_DATA (older)); \ + } \ + else if (!NILP (newer)) \ + message (loading done " (file %s is newer)", \ + XSTRING_DATA (load_show_full_path_in_messages ? \ + found : file), \ + XSTRING_DATA (newer)); \ + else if (source_only) \ + message (loading done " (file %s.elc does not exist)", \ + XSTRING_DATA (load_show_full_path_in_messages ? \ + found : file), \ + XSTRING_DATA (Ffile_name_nondirectory (file))); \ + else if (message_p) \ + message (loading done, \ + XSTRING_DATA (load_show_full_path_in_messages ? \ + found : file)); \ } while (0) #define PRINT_LOADING_MESSAGE(done) \ @@ -694,10 +733,8 @@ /* via `load-path' search. */ Lisp_Object name = file; - if (!NILP(Ffile_name_absolute_p(file))) - { - name = Ffile_name_nondirectory(file); - } + if (!NILP (Ffile_name_absolute_p (file))) + name = Ffile_name_nondirectory (file); { struct gcpro ngcpro1; @@ -718,13 +755,13 @@ } } -/*#ifdef DEBUG_XEMACS*/ +/* #ifdef DEBUG_XEMACS */ if (purify_flag && noninteractive) { if (!EQ (last_file_loaded, file)) message ("Loading %s ...done", XSTRING_DATA (file)); } -/*#endif / * DEBUG_XEMACS */ +/* #endif / * DEBUG_XEMACS */ if (!noninteractive) PRINT_LOADING_MESSAGE ("done"); @@ -948,6 +985,35 @@ int mode; }; +/* open() or access() a file to be returned by locate_file(). if + ACCESS_MODE >= 0, do an access() with that mode, else open(). Does + various magic, e.g. opening the file read-only and binary and setting + the close-on-exec flag on the file. */ + +static int +locate_file_open_or_access_file (Ibyte *fn, int access_mode) +{ + int val; + + /* Check that we can access or open it. */ + if (access_mode >= 0) + val = qxe_access (fn, access_mode); + else + { + val = qxe_open (fn, O_RDONLY | OPEN_BINARY, 0); + +#ifndef WIN32_NATIVE + if (val >= 0) + /* If we actually opened the file, set close-on-exec flag + on the new descriptor so that subprocesses can't whack + at it. */ + (void) fcntl (val, F_SETFD, FD_CLOEXEC); +#endif + } + + return val; +} + static int locate_file_in_directory_mapper (Ibyte *fn, void *arg) { @@ -960,10 +1026,7 @@ && (st.st_mode & S_IFMT) != S_IFDIR) { /* Check that we can access or open it. */ - if (closure->mode >= 0) - closure->fd = qxe_access (fn, closure->mode); - else - closure->fd = qxe_open (fn, O_RDONLY | OPEN_BINARY, 0); + closure->fd = locate_file_open_or_access_file (fn, closure->mode); if (closure->fd >= 0) { @@ -971,14 +1034,6 @@ if (closure->storeptr) *closure->storeptr = build_intstring (fn); -#ifndef WIN32_NATIVE - /* If we actually opened the file, set close-on-exec flag - on the new descriptor so that subprocesses can't whack - at it. */ - if (closure->mode < 0) - (void) fcntl (closure->fd, F_SETFD, FD_CLOEXEC); -#endif - return 1; } } @@ -3078,6 +3133,30 @@ */ ); load_ignore_elc_files = 0; + DEFVAR_BOOL ("load-ignore-out-of-date-elc-files", + &load_ignore_out_of_date_elc_files /* +*Whether `load' should ignore out-of-date `.elc' files when no suffix is given. +This is normally used when compiling packages of elisp files that may have +complex dependencies. Ignoring all elc files with `load-ignore-elc-files' +would also be safe, but much slower. +*/ ); + load_ignore_out_of_date_elc_files = 0; + + DEFVAR_BOOL ("load-always-display-messages", + &load_always_display_messages /* +*Whether `load' should always display loading messages. +If this is true, every file loaded will be shown, regardless of the setting +of the NOMESSAGE parameter, and even when files are loaded indirectly, e.g. +due to `requre'. +*/ ); + load_always_display_messages = 0; + + DEFVAR_BOOL ("load-show-full-path-in-messages", + &load_show_full_path_in_messages /* +*Whether `load' should show the full path in all loading messages. +*/ ); + load_show_full_path_in_messages = 0; + #ifdef LOADHIST DEFVAR_LISP ("load-history", &Vload_history /* Alist mapping source file names to symbols and features.
--- a/src/profile.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/profile.c Wed Nov 27 07:15:36 2002 +0000 @@ -1,5 +1,5 @@ /* Why the hell is XEmacs so fucking slow? - Copyright (C) 1996 Ben Wing. + Copyright (C) 1996, 2002 Ben Wing. Copyright (C) 1998 Free Software Foundation, Inc. This file is part of XEmacs. @@ -51,7 +51,6 @@ safe, and trying to make it safe would be much more work than it's worth. - Jan 1998: In addition to this, I have added code to remember call counts of Lisp funcalls. The profile_increase_call_count() function is called from Ffuncall(), and serves to add data to @@ -77,12 +76,34 @@ static Lisp_Object QSprocessing_events_at_top_level; static Lisp_Object QSunknown; +static Lisp_Object Qtiming, Qcall_count; + /* We use inside_profiling to prevent the handler from writing to the table while another routine is operating on it. We also set inside_profiling in case the timeout between signal calls is short enough to catch us while we're already in there. */ static volatile int inside_profiling; +static void +create_call_count_profile_table (void) +{ + if (NILP (Vcall_count_profile_table)) + Vcall_count_profile_table = + make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); +} + +static void +create_timing_profile_table (void) +{ + /* #### The hash code can safely be called from a signal handler + except when it has to grow the hash table. In this case, it calls + realloc(), which is not (in general) re-entrant. We'll just be + sleazy and make the table large enough that it (hopefully) won't + need to be realloc()ed. */ + if (!big_profile_table) + big_profile_table = make_hash_table (10000); +} + /* Increase the value of OBJ in Vcall_count_profile_table hash table. If the hash table is nil, create it first. */ void @@ -90,9 +111,7 @@ { Lisp_Object count; - if (NILP (Vcall_count_profile_table)) - Vcall_count_profile_table = - make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQ); + create_call_count_profile_table (); count = Fgethash (obj, Vcall_count_profile_table, Qzero); if (!INTP (count)) @@ -159,6 +178,7 @@ If MICROSECS is nil or omitted, the value of `default-profiling-interval' is used. +Information on function timings and call counts is currently recorded. You can retrieve the recorded profiling info using `get-profiling-info'. Starting and stopping profiling does not clear the currently recorded @@ -176,8 +196,7 @@ realloc(), which is not (in general) re-entrant. We'll just be sleazy and make the table large enough that it (hopefully) won't need to be realloc()ed. */ - if (!big_profile_table) - big_profile_table = make_hash_table (10000); + create_timing_profile_table (); if (NILP (microsecs)) msecs = default_profiling_interval; @@ -217,15 +236,34 @@ return Qnil; } +DEFUN ("clear-profiling-info", Fclear_profiling_info, 0, 0, "", /* +Clear out the recorded profiling info. +This clears both the internal timing information and the call counts in +`call-count-profile-table'. +*/ + ()) +{ + /* This function does not GC */ + if (big_profile_table) + { + inside_profiling = 1; + clrhash (big_profile_table); + inside_profiling = 0; + } + if (!NILP (Vcall_count_profile_table)) + Fclrhash (Vcall_count_profile_table); + return Qnil; +} + struct get_profiling_info_closure { - Lisp_Object accum; + Lisp_Object timing; }; static int -get_profiling_info_maphash (const void *void_key, - void *void_val, - void *void_closure) +get_profiling_info_timing_maphash (const void *void_key, + void *void_val, + void *void_closure) { /* This function does not GC */ Lisp_Object key; @@ -236,26 +274,98 @@ key = VOID_TO_LISP (void_key); val = (EMACS_INT) void_val; - closure->accum = Fcons (Fcons (key, make_int (val)), closure->accum); + Fputhash (key, make_int (val), closure->timing); return 0; } DEFUN ("get-profiling-info", Fget_profiling_info, 0, 0, 0, /* -Return the profiling info as an alist. +Return the currently recorded profiling info. +The format is a plist of symbols describing type of info recorded and +an associated type-specific entry. Currently, the following info types +are recorded + +`timing' + A hash table of funcallable objects or strings describing internal processing + operations \(redisplay, garbage collection, etc.), along with associated + tick counts (the frequency of ticks is controlled by + `default-profiling-interval' or the argument to `start-profiling'). + +`call-count' + A hash table of funcallable objects and associated call counts. */ ()) { /* This function does not GC */ struct get_profiling_info_closure closure; - closure.accum = Qnil; + closure.timing = + make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, HASH_TABLE_EQUAL); + if (big_profile_table) { int count = internal_bind_int ((int *) &inside_profiling, 1); - maphash (get_profiling_info_maphash, big_profile_table, &closure); + maphash (get_profiling_info_timing_maphash, big_profile_table, &closure); unbind_to (count); } - return closure.accum; + + return list4 (Qtiming, closure.timing, Qcall_count, + !NILP (Vcall_count_profile_table) ? + Fcopy_hash_table (Vcall_count_profile_table) : + make_lisp_hash_table (100, HASH_TABLE_NON_WEAK, + HASH_TABLE_EQ)); +} + +struct set_profiling_info_closure +{ + Lisp_Object timing; +}; + +static int +set_profiling_info_timing_maphash (Lisp_Object key, + Lisp_Object val, + void *void_closure) +{ + /* This function does not GC */ + if (!INTP (val)) + invalid_argument_2 + ("Function timing count is not an integer in given entry", + key, val); + + puthash (LISP_TO_VOID (key), (void *) XINT (val), big_profile_table); + + return 0; +} + +DEFUN ("set-profiling-info", Fset_profiling_info, 1, 1, 0, /* +Set the currently recorded profiling info. +INFO should be in the same format returned by `get-profiling-info', +as described there. +*/ + (info)) +{ + /* This function does not GC */ + Fclear_profiling_info (); + + { + EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, info) + { + if (EQ (key, Qtiming)) + { + CHECK_HASH_TABLE (value); + create_timing_profile_table (); + elisp_maphash_unsafe (set_profiling_info_timing_maphash, value, + NULL); + } + else if (EQ (key, Qcall_count)) + { + Vcall_count_profile_table = Fcopy_hash_table (value); + } + else + invalid_constant ("Unrecognized profiling-info keyword", key); + } + } + + return Qnil; } static int @@ -282,23 +392,6 @@ } } -DEFUN ("clear-profiling-info", Fclear_profiling_info, 0, 0, "", /* -Clear out the recorded profiling info. -*/ - ()) -{ - /* This function does not GC */ - if (big_profile_table) - { - inside_profiling = 1; - clrhash (big_profile_table); - inside_profiling = 0; - } - if (!NILP (Vcall_count_profile_table)) - Fclrhash (Vcall_count_profile_table); - return Qnil; -} - DEFUN ("profiling-active-p", Fprofiling_active_p, 0, 0, 0, /* Return non-nil if profiling information is currently being recorded. */ @@ -313,6 +406,7 @@ DEFSUBR (Fstart_profiling); DEFSUBR (Fstop_profiling); DEFSUBR (Fget_profiling_info); + DEFSUBR (Fset_profiling_info); DEFSUBR (Fclear_profiling_info); DEFSUBR (Fprofiling_active_p); } @@ -324,15 +418,12 @@ Default CPU time in microseconds between profiling sampling. Used when the argument to `start-profiling' is nil or omitted. Note that the time in question is CPU time (when the program is executing -or the kernel is executing on behalf of the program) and not real time. +or the kernel is executing on behalf of the program) and not real time, and +there is usually a machine-dependent limit on how small this value can be. */ ); default_profiling_interval = 1000; - DEFVAR_LISP ("call-count-profile-table", &Vcall_count_profile_table /* -The table where call-count information is stored by the profiling primitives. -This is a hash table whose keys are funcallable objects, and whose -values are their call counts (integers). -*/ ); + staticpro (&Vcall_count_profile_table); Vcall_count_profile_table = Qnil; inside_profiling = 0; @@ -346,4 +437,7 @@ QSprocessing_events_at_top_level = build_msg_string ("(processing events at top level)"); staticpro (&QSprocessing_events_at_top_level); + + DEFSYMBOL (Qtiming); + DEFSYMBOL (Qcall_count); }
--- a/src/redisplay.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/redisplay.c Wed Nov 27 07:15:36 2002 +0000 @@ -6564,8 +6564,9 @@ /* The menubar, toolbar, and icon updates must be done before enter_redisplay_critical_section is called and we are officially - 'in_display'. They may eval lisp code which may call Fsignal. - If in_display is set Fsignal will abort. */ + 'in_display'. They may eval lisp code which may call QUIT. + If in_display is set, QUIT will abort (unless the code is wrapped + to protect against errors). */ #ifdef HAVE_MENUBARS /* Update the menubar. It is done first since it could change @@ -6614,21 +6615,25 @@ following cannot happen: 1) garbage collection - 2) Lisp code evaluation - 3) frame size changes - - We ensure (3) by calling enter_redisplay_critical_section(), which + 2) QUIT + 3) Any non-local exits + 4) frame size changes + + We ensure (4) by calling enter_redisplay_critical_section(), which will cause any pending frame size changes to get put on hold - till after the end of the critical section. (1) follows - automatically if (2) is met. #### Unfortunately, there are - some places where Lisp code can be called within this section. - We need to remove them. - - If Fsignal() is called during this critical section, we - will abort(). - - If garbage collection is called during this critical section, - we simply return. #### We should abort instead. + till after the end of the critical section. (2) is required because + of the possibility of (3). (2) and (3) mean that any place that + can execute QUIT (e.g. internal_equal()), and especially any place + that executes Lisp code, need to be properly wrapped to protect + against these possibilities. This wrapping happens using + call_trapping_problems(..., INHIBIT_GC), or related functions. + + To help debug potential problems, we arrange (when + ERROR_CHECK_TRAPPING_PROBLEMS is set) to crash automatically every + time we execute QUIT or check to see whether garbage collection is + necessary, inside of an unprotected critical section, as well as + further checks when we actually Fsignal(), Fthrow(), + garbage_collect_1(). #### If a frame-size change does occur we should probably actually be preempting redisplay. */
--- a/src/scrollbar-gtk.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/scrollbar-gtk.c Wed Nov 27 07:15:36 2002 +0000 @@ -436,8 +436,9 @@ void gtk_update_frame_scrollbars (struct frame *f) { - /* Consider this code to be "in_display" so that we abort() if Fsignal() - gets called. */ + /* Consider this code to be "in_display" (in a critical section) so we + abort() if elisp or QUIT is not properly wrapped -- see + enter_redisplay_critical_section(). */ in_display++; gtk_scrollbar_loop (GTK_UPDATE_FRAME_SCROLLBARS, f->root_window, XWINDOW_MIRROR (f->root_mirror),
--- a/src/scrollbar-x.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/scrollbar-x.c Wed Nov 27 07:15:36 2002 +0000 @@ -686,8 +686,9 @@ void x_update_frame_scrollbars (struct frame *f) { - /* Consider this code to be "in_display" so that we abort() if Fsignal() - gets called. */ + /* Consider this code to be "in_display" (in a critical section) so we + abort() if elisp or QUIT is not properly wrapped -- see + enter_redisplay_critical_section(). */ in_display++; x_scrollbar_loop (X_UPDATE_FRAME_SCROLLBARS, f->root_window, XWINDOW_MIRROR (f->root_mirror), 0, (Window) NULL);
--- a/src/signal.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/signal.c Wed Nov 27 07:15:36 2002 +0000 @@ -977,7 +977,8 @@ if (quit_check_signal_happened) { - /* Since arbitrary Lisp code may be executed, GC might happen, + /* Since arbitrary Lisp code may be executed (e.g. through a menu + filter, see backtrace directly above), GC might happen, which would majorly fuck a lot of things, e.g. re_match() [string gets relocated] and lots of other code that's not prepared to handle GC in QUIT. */
--- a/src/sysdep.c Tue Nov 26 22:52:59 2002 +0000 +++ b/src/sysdep.c Wed Nov 27 07:15:36 2002 +0000 @@ -2576,7 +2576,8 @@ /* Like qxe_open, only when open() is interrupted by EINTR, check for QUIT. This allows the callers of this function to be interrupted with C-g when, say, reading from named pipes. However, this should - be used with caution, as it can GC. + be used with caution, as it can run random Lisp code (although it + cannot GC). This function will not function as expected on systems where open() is not interrupted by C-g. However, the worst that can happen is