Mercurial > hg > xemacs-beta
changeset 294:4b85ae5eabfb r21-0b45
Import from CVS: tag r21-0b45
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 10:38:01 +0200 |
| parents | 403535bfea94 |
| children | 9d5da8baa111 |
| files | CHANGES-beta ChangeLog configure configure.in etc/BETA etc/FTP etc/HELLO etc/NEWS lib-src/ChangeLog lib-src/Makefile.in.in lib-src/gnuclient.c lisp/ChangeLog lisp/about.el lisp/auto-autoloads.el lisp/font-lock.el lisp/font.el lisp/info.el lisp/minibuf.el lisp/msw-faces.el lisp/msw-glyphs.el lisp/package-get-base.el lisp/package-get.el lisp/simple.el lisp/startup.el lisp/x-mouse.el man/ChangeLog man/lispref/os.texi man/texinfo.texi nt/ChangeLog nt/file.ico nt/lisp.ico nt/xemacs.mak nt/xemacs.rc src/ChangeLog src/Makefile.in.in src/console-msw.h src/device-msw.c src/editfns.c src/event-Xt.c src/event-msw.c src/fileio.c src/frame-msw.c src/lisp.h src/objects-msw.c src/redisplay-msw.c src/redisplay.c src/toolbar-msw.c src/unexaix.c version.sh |
| diffstat | 49 files changed, 2107 insertions(+), 1223 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGES-beta Mon Aug 13 10:37:16 2007 +0200 +++ b/CHANGES-beta Mon Aug 13 10:38:01 2007 +0200 @@ -1,4 +1,10 @@ -*- indented-text -*- +to 21.0 pre2 "Thuringian" +-- MS Windows native build fixes from Fabrice POPINEAU +-- Miscellaneous bug fixes +-- Documentation updates +-- credits updates + to 21.0 pre1 "Swedish Landrace" -- package-get-base synchronized with latest packages -- MULE-ize eldap.c from Hrvoje Niksic
--- a/ChangeLog Mon Aug 13 10:37:16 2007 +0200 +++ b/ChangeLog Mon Aug 13 10:38:01 2007 +0200 @@ -1,3 +1,11 @@ +1998-06-19 SL Baur <steve@altair.xemacs.org> + + * XEmacs 21.0-pre2 is released. + +1998-06-18 Michael Sperber [Mr. Preprocessor] <sperber@informatik.uni-tuebingen.de> + + * configure.in: Added -lC for static linking under AIX 4.2. + 1998-06-14 SL Baur <steve@altair.xemacs.org> * XEmacs 21.0-pre1 is released.
--- a/configure Mon Aug 13 10:37:16 2007 +0200 +++ b/configure Mon Aug 13 10:38:01 2007 +0200 @@ -2393,6 +2393,44 @@ for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp"; do if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; break; fi done + +echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6 +echo "configure:2399: 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 2404 "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 + builtin and then its argument prototype would still apply. */ +char terminateAndUnload(); + +int main() { +terminateAndUnload() +; return 0; } +EOF +if { (eval echo configure:2415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + libs_system="$libs_system -lC" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lC\" to \$libs_system"; fi +else + echo "$ac_t""no" 1>&6 +fi + + fi elif test -n "$ld_text_start_addr"; then start_flags="-T $ld_text_start_addr -e __start" @@ -2457,7 +2495,7 @@ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:2461: checking "for runtime libraries flag"" >&5 +echo "configure:2499: checking "for runtime libraries flag"" >&5 dash_r="" for try_dash_r in "-R" "-R " "-rpath "; do xe_check_libs="${try_dash_r}/no/such/file-or-directory" @@ -2475,14 +2513,14 @@ done fi cat > conftest.$ac_ext <<EOF -#line 2479 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +#line 2517 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:2524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* dash_r="$try_dash_r" else @@ -2582,10 +2620,10 @@ fi after_morecore_hook_exists=yes echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6 -echo "configure:2586: checking for malloc_get_state" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2589 "configure" +echo "configure:2624: checking for malloc_get_state" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2627 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char malloc_get_state(); below. */ @@ -2608,7 +2646,7 @@ ; return 0; } EOF -if { (eval echo configure:2612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_malloc_get_state=yes" else @@ -2628,10 +2666,10 @@ fi echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:2632: checking for malloc_set_state" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2635 "configure" +echo "configure:2670: checking for malloc_set_state" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2673 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char malloc_set_state(); below. */ @@ -2654,7 +2692,7 @@ ; return 0; } EOF -if { (eval echo configure:2658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_malloc_set_state=yes" else @@ -2674,16 +2712,16 @@ fi echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:2678: checking whether __after_morecore_hook exists" >&5 -cat > conftest.$ac_ext <<EOF -#line 2680 "configure" +echo "configure:2716: checking whether __after_morecore_hook exists" >&5 +cat > conftest.$ac_ext <<EOF +#line 2718 "configure" #include "confdefs.h" extern void (* __after_morecore_hook)(); int main() { __after_morecore_hook = 0 ; return 0; } EOF -if { (eval echo configure:2687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -2742,7 +2780,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:2746: checking for $ac_word" >&5 +echo "configure:2784: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -2795,7 +2833,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:2799: checking for a BSD compatible install" >&5 +echo "configure:2837: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" @@ -2846,7 +2884,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:2850: checking for $ac_word" >&5 +echo "configure:2888: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -2877,15 +2915,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2881: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2884 "configure" +echo "configure:2919: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2922 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2918,15 +2956,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2922: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2925 "configure" +echo "configure:2960: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2963 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2959,15 +2997,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2963: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2966 "configure" +echo "configure:3001: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3004 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2997,10 +3035,10 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3001: checking for sys/wait.h that is POSIX.1 compatible" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3004 "configure" +echo "configure:3039: checking for sys/wait.h that is POSIX.1 compatible" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3042 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -3016,7 +3054,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3040,10 +3078,10 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3044: checking for ANSI C header files" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3047 "configure" +echo "configure:3082: checking for ANSI C header files" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3085 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -3051,7 +3089,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3068,7 +3106,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 3072 "configure" +#line 3110 "configure" #include "confdefs.h" #include <string.h> EOF @@ -3086,7 +3124,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 3090 "configure" +#line 3128 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -3104,7 +3142,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 3108 "configure" +#line 3146 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3115,7 +3153,7 @@ exit (0); } EOF -if { (eval echo configure:3119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then : else @@ -3140,10 +3178,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3144: checking whether time.h and sys/time.h may both be included" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3147 "configure" +echo "configure:3182: checking whether time.h and sys/time.h may both be included" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3185 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3152,7 +3190,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3176,10 +3214,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3180: checking for sys_siglist declaration in signal.h or unistd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3183 "configure" +echo "configure:3218: checking for sys_siglist declaration in signal.h or unistd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3221 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3191,7 +3229,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -3216,9 +3254,9 @@ echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 -echo "configure:3220: checking for struct utimbuf" >&5 -cat > conftest.$ac_ext <<EOF -#line 3222 "configure" +echo "configure:3258: checking for struct utimbuf" >&5 +cat > conftest.$ac_ext <<EOF +#line 3260 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -3237,7 +3275,7 @@ static struct utimbuf x; x.actime = x.modtime; ; return 0; } EOF -if { (eval echo configure:3241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3279: \"$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 @@ -3257,10 +3295,10 @@ rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3261: checking return type of signal handlers" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3264 "configure" +echo "configure:3299: checking return type of signal handlers" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3302 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3277,7 +3315,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:3281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3299,10 +3337,10 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3303: checking for size_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3306 "configure" +echo "configure:3341: checking for size_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3344 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3333,10 +3371,10 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3337: checking for pid_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3340 "configure" +echo "configure:3375: checking for pid_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3378 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3367,10 +3405,10 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3371: checking for uid_t in sys/types.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3374 "configure" +echo "configure:3409: checking for uid_t in sys/types.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3412 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3406,10 +3444,10 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3410: checking for mode_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3413 "configure" +echo "configure:3448: checking for mode_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3451 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3440,10 +3478,10 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3444: checking for off_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3447 "configure" +echo "configure:3482: checking for off_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3485 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3475,9 +3513,9 @@ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:3479: checking for struct timeval" >&5 -cat > conftest.$ac_ext <<EOF -#line 3481 "configure" +echo "configure:3517: checking for struct timeval" >&5 +cat > conftest.$ac_ext <<EOF +#line 3519 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -3493,7 +3531,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:3497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -3515,10 +3553,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:3519: checking whether struct tm is in sys/time.h or time.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3522 "configure" +echo "configure:3557: checking whether struct tm is in sys/time.h or time.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3560 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -3526,7 +3564,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3550,10 +3588,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3554: checking for tm_zone in struct tm" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3557 "configure" +echo "configure:3592: checking for tm_zone in struct tm" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3595 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -3561,7 +3599,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3584,10 +3622,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3588: checking for tzname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3591 "configure" +echo "configure:3626: checking for tzname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3629 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -3597,7 +3635,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3623,10 +3661,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3627: checking for working const" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3630 "configure" +echo "configure:3665: checking for working const" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3668 "configure" #include "confdefs.h" int main() { @@ -3675,7 +3713,7 @@ ; return 0; } EOF -if { (eval echo configure:3679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3700,7 +3738,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:3704: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:3742: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -3725,12 +3763,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3729: checking whether byte ordering is bigendian" >&5 +echo "configure:3767: 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 3734 "configure" +#line 3772 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3741,11 +3779,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3783: \"$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 3749 "configure" +#line 3787 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3756,7 +3794,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3773,7 +3811,7 @@ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 3777 "configure" +#line 3815 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -3786,7 +3824,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_bigendian=no else @@ -3812,10 +3850,10 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:3816: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3819 "configure" +echo "configure:3854: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3857 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3826,7 +3864,7 @@ exit(0); } EOF -if { (eval echo configure:3830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -3853,10 +3891,10 @@ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3857: checking size of int" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3860 "configure" +echo "configure:3895: checking size of int" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3898 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3867,7 +3905,7 @@ exit(0); } EOF -if { (eval echo configure:3871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -3888,10 +3926,10 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3892: checking size of long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3895 "configure" +echo "configure:3930: checking size of long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3933 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3902,7 +3940,7 @@ exit(0); } EOF -if { (eval echo configure:3906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -3923,10 +3961,10 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:3927: checking size of long long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3930 "configure" +echo "configure:3965: checking size of long long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3968 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3937,7 +3975,7 @@ exit(0); } EOF -if { (eval echo configure:3941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3979: \"$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 @@ -3958,10 +3996,10 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:3962: checking size of void *" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3965 "configure" +echo "configure:4000: checking size of void *" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4003 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3972,7 +4010,7 @@ exit(0); } EOF -if { (eval echo configure:3976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:4014: \"$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 @@ -3994,7 +4032,7 @@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:3998: checking for long file names" >&5 +echo "configure:4036: 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: @@ -4041,12 +4079,12 @@ echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:4045: checking for sin in -lm" >&5 +echo "configure:4083: 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 4050 "configure" +#line 4088 "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 @@ -4057,7 +4095,7 @@ sin() ; return 0; } EOF -if { (eval echo configure:4061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4099,14 +4137,14 @@ cat > conftest.$ac_ext <<EOF -#line 4103 "configure" +#line 4141 "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:4110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_INVERSE_HYPERBOLIC @@ -4123,7 +4161,7 @@ rm -f conftest* echo "checking type of mail spool file locking" 1>&6 -echo "configure:4127: checking type of mail spool file locking" >&5 +echo "configure:4165: checking type of mail spool file locking" >&5 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf if test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF @@ -4147,12 +4185,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:4151: checking for kstat_open in -lkstat" >&5 +echo "configure:4189: 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 4156 "configure" +#line 4194 "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 @@ -4163,7 +4201,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:4167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4197,12 +4235,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:4201: checking for kvm_read in -lkvm" >&5 +echo "configure:4239: 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 4206 "configure" +#line 4244 "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 @@ -4213,7 +4251,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:4217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4248,12 +4286,12 @@ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:4252: checking for cma_open in -lpthreads" >&5 +echo "configure:4290: 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 4257 "configure" +#line 4295 "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 @@ -4264,7 +4302,7 @@ cma_open() ; return 0; } EOF -if { (eval echo configure:4268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4300,7 +4338,7 @@ esac echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:4304: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:4342: 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; @@ -4311,7 +4349,7 @@ if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:4315: checking for \"-z ignore\" linker flag" >&5 +echo "configure:4353: 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 ;; @@ -4321,7 +4359,7 @@ echo "checking "for specified window system"" 1>&6 -echo "configure:4325: checking "for specified window system"" >&5 +echo "configure:4363: checking "for specified window system"" >&5 if test "$with_x11" != "no"; then test "$x_includes $x_libraries" != "NONE NONE" && \ @@ -4354,7 +4392,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:4358: checking for X" >&5 +echo "configure:4396: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4414,12 +4452,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 4418 "configure" +#line 4456 "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:4423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4488,14 +4526,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 4492 "configure" +#line 4530 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:4499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -4604,17 +4642,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:4608: checking whether -R must be followed by a space" >&5 +echo "configure:4646: 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 4611 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:4618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +#line 4649 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:4656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -4630,14 +4668,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 4634 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:4641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +#line 4672 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -4673,12 +4711,12 @@ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4677: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4715: 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 4682 "configure" +#line 4720 "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 @@ -4689,7 +4727,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4713,12 +4751,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:4717: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4755: 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 4722 "configure" +#line 4760 "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 @@ -4729,7 +4767,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4758,10 +4796,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:4762: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4765 "configure" +echo "configure:4800: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4803 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -4784,7 +4822,7 @@ ; return 0; } EOF -if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4805,12 +4843,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4809: checking for gethostbyname in -lnsl" >&5 +echo "configure:4847: 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 4814 "configure" +#line 4852 "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 @@ -4821,7 +4859,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:4825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4851,10 +4889,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:4855: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4858 "configure" +echo "configure:4893: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4896 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -4877,7 +4915,7 @@ ; return 0; } EOF -if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -4900,12 +4938,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:4904: checking "$xe_msg_checking"" >&5 +echo "configure:4942: 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 4909 "configure" +#line 4947 "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 @@ -4916,7 +4954,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:4920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4940,10 +4978,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:4944: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4947 "configure" +echo "configure:4982: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4985 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -4966,7 +5004,7 @@ ; return 0; } EOF -if { (eval echo configure:4970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -4987,12 +5025,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4991: checking for remove in -lposix" >&5 +echo "configure:5029: 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 4996 "configure" +#line 5034 "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 @@ -5003,7 +5041,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:5007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5027,10 +5065,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:5031: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5034 "configure" +echo "configure:5069: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5072 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -5053,7 +5091,7 @@ ; return 0; } EOF -if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -5074,12 +5112,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:5078: checking for shmat in -lipc" >&5 +echo "configure:5116: 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 5083 "configure" +#line 5121 "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 +5128,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:5094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5124,12 +5162,12 @@ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:5128: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:5166: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE " cat > conftest.$ac_ext <<EOF -#line 5133 "configure" +#line 5171 "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 @@ -5140,7 +5178,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:5144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5307,7 +5345,7 @@ echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:5311: checking for X defines extracted by xmkmf" >&5 +echo "configure:5349: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -5339,15 +5377,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:5343: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5346 "configure" +echo "configure:5381: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5384 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5371,12 +5409,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:5375: checking for XOpenDisplay in -lX11" >&5 +echo "configure:5413: 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 5380 "configure" +#line 5418 "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 @@ -5387,7 +5425,7 @@ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:5391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5412,12 +5450,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:5416: checking "$xe_msg_checking"" >&5 +echo "configure:5454: 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 5421 "configure" +#line 5459 "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 @@ -5428,7 +5466,7 @@ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:5432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5455,12 +5493,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:5459: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:5497: 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 5464 "configure" +#line 5502 "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 @@ -5471,7 +5509,7 @@ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:5475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5494,12 +5532,12 @@ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:5498: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:5536: 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 5503 "configure" +#line 5541 "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 @@ -5510,7 +5548,7 @@ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:5514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5533,14 +5571,14 @@ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:5537: checking the version of X11 being used" >&5 +echo "configure:5575: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 5539 "configure" +#line 5577 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:5544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:5582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ./conftest foobar; x11_release=$? else @@ -5564,15 +5602,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5568: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5571 "configure" +echo "configure:5606: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5609 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5603,7 +5641,7 @@ echo $ac_n "checking for XFree86""... $ac_c" 1>&6 -echo "configure:5607: checking for XFree86" >&5 +echo "configure:5645: checking for XFree86" >&5 if test -d "/usr/X386/include" -o \ -f "/etc/XF86Config" -o \ -f "/etc/X11/XF86Config" -o \ @@ -5623,12 +5661,12 @@ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:5627: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:5665: 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 5632 "configure" +#line 5670 "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 @@ -5639,7 +5677,7 @@ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:5643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5678,19 +5716,19 @@ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:5682: checking for main in -lXbsd" >&5 +echo "configure:5720: 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 5687 "configure" +#line 5725 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5727,22 +5765,22 @@ fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:5731: checking for MS-Windows" >&5 +echo "configure:5769: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:5734: checking for main in -lgdi32" >&5 +echo "configure:5772: 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 5739 "configure" +#line 5777 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5806,12 +5844,12 @@ fi fi cat > conftest.$ac_ext <<EOF -#line 5810 "configure" +#line 5848 "configure" #include "confdefs.h" #include <fcntl.h> int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:5815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:5853: \"$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 @@ -5889,7 +5927,7 @@ esac echo "checking for session-management option" 1>&6 -echo "configure:5893: checking for session-management option" >&5; +echo "configure:5931: checking for session-management option" >&5; if test "$with_session" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SESSION @@ -5904,15 +5942,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:5908: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5911 "configure" +echo "configure:5946: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5949 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5935,12 +5973,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:5939: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:5977: 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 5944 "configure" +#line 5982 "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 @@ -5951,7 +5989,7 @@ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:5955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5996,15 +6034,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:6000: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6003 "configure" +echo "configure:6038: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6041 "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:6008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6040,12 +6078,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:6044: checking "$xe_msg_checking"" >&5 +echo "configure:6082: 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 6049 "configure" +#line 6087 "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 @@ -6056,7 +6094,7 @@ tt_message_create() ; return 0; } EOF -if { (eval echo configure:6060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6113,15 +6151,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:6117: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6120 "configure" +echo "configure:6155: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6158 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6144,12 +6182,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:6148: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:6186: 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 6153 "configure" +#line 6191 "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 @@ -6160,7 +6198,7 @@ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:6164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6229,7 +6267,7 @@ fi echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:6233: checking if drag and drop API is needed" >&5 +echo "configure:6271: checking if drag and drop API is needed" >&5 if test "$with_dragndrop" != "no" ; then if test -n "$dragndrop_proto" ; then with_dragndrop=yes @@ -6250,18 +6288,18 @@ fi echo "checking for LDAP" 1>&6 -echo "configure:6254: checking for LDAP" >&5 +echo "configure:6292: checking for LDAP" >&5 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ldap.h""... $ac_c" 1>&6 -echo "configure:6257: checking for ldap.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6260 "configure" +echo "configure:6295: checking for ldap.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6298 "configure" #include "confdefs.h" #include <ldap.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6284,15 +6322,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:6288: checking for lber.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6291 "configure" +echo "configure:6326: checking for lber.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6329 "configure" #include "confdefs.h" #include <lber.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6334: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6318,12 +6356,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:6322: checking "$xe_msg_checking"" >&5 +echo "configure:6360: 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 6327 "configure" +#line 6365 "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 @@ -6334,7 +6372,7 @@ ldap_open() ; return 0; } EOF -if { (eval echo configure:6338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6357,12 +6395,12 @@ } test "$with_umich_ldap" = "no" && { echo $ac_n "checking for ldap_set_option in -lldap10""... $ac_c" 1>&6 -echo "configure:6361: checking for ldap_set_option in -lldap10" >&5 +echo "configure:6399: checking for ldap_set_option in -lldap10" >&5 ac_lib_var=`echo ldap10'_'ldap_set_option | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap10 " cat > conftest.$ac_ext <<EOF -#line 6366 "configure" +#line 6404 "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 @@ -6373,7 +6411,7 @@ ldap_set_option() ; return 0; } EOF -if { (eval echo configure:6377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6437,14 +6475,14 @@ if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:6441: checking for graphics libraries" >&5 +echo "configure:6479: checking for graphics libraries" >&5 if test -z "$with_xpm"; then echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:6445: checking for Xpm - no older than 3.4f" >&5 +echo "configure:6483: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 6448 "configure" +#line 6486 "configure" #include "confdefs.h" #include <X11/xpm.h> int main(int c, char **v) { @@ -6452,7 +6490,7 @@ XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:6456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:6494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ./conftest dummy_arg; xpm_status=$?; if test "$?" = "0"; then @@ -6493,17 +6531,17 @@ libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:6497: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:6535: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <<EOF -#line 6500 "configure" +#line 6538 "configure" #include "confdefs.h" int main() { XpmCreatePixmapFromData() ; return 0; } EOF -if { (eval echo configure:6507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* xpm_for_msw=no else @@ -6530,12 +6568,12 @@ if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:6534: checking for inflate in -lc" >&5 +echo "configure:6572: 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 6539 "configure" +#line 6577 "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 @@ -6546,7 +6584,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:6550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6565,12 +6603,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:6569: checking for inflate in -lz" >&5 +echo "configure:6607: 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 6574 "configure" +#line 6612 "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 @@ -6581,7 +6619,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:6585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6600,12 +6638,12 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:6604: checking for inflate in -lgz" >&5 +echo "configure:6642: 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 6609 "configure" +#line 6647 "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 @@ -6616,7 +6654,7 @@ inflate() ; return 0; } EOF -if { (eval echo configure:6620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6645,18 +6683,18 @@ fi echo $ac_n "checking for gifreader""... $ac_c" 1>&6 -echo "configure:6649: checking for gifreader" >&5 +echo "configure:6687: checking for gifreader" >&5 test -z "$with_gif" && { ac_safe=`echo "gifrlib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gifrlib.h""... $ac_c" 1>&6 -echo "configure:6652: checking for gifrlib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6655 "configure" +echo "configure:6690: checking for gifrlib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6693 "configure" #include "confdefs.h" #include <gifrlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6679,12 +6717,12 @@ } test -z "$with_gif" && { echo $ac_n "checking for GetGifError in -lgifreader""... $ac_c" 1>&6 -echo "configure:6683: checking for GetGifError in -lgifreader" >&5 +echo "configure:6721: checking for GetGifError in -lgifreader" >&5 ac_lib_var=`echo gifreader'_'GetGifError | sed 'y%./+-%__p_%'` xe_check_libs=" -lgifreader " cat > conftest.$ac_ext <<EOF -#line 6688 "configure" +#line 6726 "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 @@ -6695,7 +6733,7 @@ GetGifError() ; return 0; } EOF -if { (eval echo configure:6699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6731,15 +6769,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:6735: checking for jpeglib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6738 "configure" +echo "configure:6773: checking for jpeglib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6776 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6762,12 +6800,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:6766: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:6804: 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 6771 "configure" +#line 6809 "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 @@ -6778,7 +6816,7 @@ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:6782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6814,9 +6852,9 @@ if test -z "$with_png"; then echo $ac_n "checking for png.h - no older than 0.96""... $ac_c" 1>&6 -echo "configure:6818: checking for png.h - no older than 0.96" >&5 +echo "configure:6856: checking for png.h - no older than 0.96" >&5 cat > conftest.$ac_ext <<EOF -#line 6820 "configure" +#line 6858 "configure" #include "confdefs.h" #include <png.h> #if PNG_LIBPNG_VER >= 96 @@ -6836,10 +6874,10 @@ fi test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:6840: checking for pow" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6843 "configure" +echo "configure:6878: checking for pow" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6881 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ @@ -6862,7 +6900,7 @@ ; return 0; } EOF -if { (eval echo configure:6866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_pow=yes" else @@ -6883,12 +6921,12 @@ } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:6887: checking for png_read_image in -lpng" >&5 +echo "configure:6925: 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 6892 "configure" +#line 6930 "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 @@ -6899,7 +6937,7 @@ png_read_image() ; return 0; } EOF -if { (eval echo configure:6903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6935,15 +6973,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:6939: checking for tiffio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6942 "configure" +echo "configure:6977: checking for tiffio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6980 "configure" #include "confdefs.h" #include <tiffio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6966,12 +7004,12 @@ } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:6970: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:7008: 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 6975 "configure" +#line 7013 "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 @@ -6982,7 +7020,7 @@ TIFFClientOpen() ; return 0; } EOF -if { (eval echo configure:6986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7021,19 +7059,19 @@ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:7025: checking for X11 graphics libraries" >&5 +echo "configure:7063: checking for X11 graphics libraries" >&5 test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:7029: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7032 "configure" +echo "configure:7067: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7070 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7056,12 +7094,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:7060: checking for UnGenFace in -lcompface" >&5 +echo "configure:7098: 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 7065 "configure" +#line 7103 "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 @@ -7072,7 +7110,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:7076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7108,12 +7146,12 @@ echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6 -echo "configure:7112: checking for XawScrollbarSetThumb in -lXaw" >&5 +echo "configure:7150: checking for XawScrollbarSetThumb in -lXaw" >&5 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 7117 "configure" +#line 7155 "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 @@ -7124,7 +7162,7 @@ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:7128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7148,15 +7186,15 @@ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:7152: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7155 "configure" +echo "configure:7190: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7193 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7173,12 +7211,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:7177: checking for XmStringFree in -lXm" >&5 +echo "configure:7215: 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 7182 "configure" +#line 7220 "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 @@ -7189,7 +7227,7 @@ XmStringFree() ; return 0; } EOF -if { (eval echo configure:7193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7218,9 +7256,9 @@ if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:7222: checking for Lesstif" >&5 +echo "configure:7260: checking for Lesstif" >&5 cat > conftest.$ac_ext <<EOF -#line 7224 "configure" +#line 7262 "configure" #include "confdefs.h" #include <Xm/Xm.h> #ifdef LESSTIF_VERSION @@ -7504,7 +7542,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:7508: checking for Mule-related features" >&5 +echo "configure:7546: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -7529,15 +7567,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7533: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7536 "configure" +echo "configure:7571: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7574 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7568,12 +7606,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:7572: checking for strerror in -lintl" >&5 +echo "configure:7610: 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 7577 "configure" +#line 7615 "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 @@ -7584,7 +7622,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:7588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7617,19 +7655,19 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:7621: checking for Mule input methods" >&5 +echo "configure:7659: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:7624: checking for XIM" >&5 +echo "configure:7662: checking for XIM" >&5 if test "$have_lesstif" = "yes"; then with_xim=xlib else echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:7628: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:7666: 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 7633 "configure" +#line 7671 "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 @@ -7640,7 +7678,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:7644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7706,15 +7744,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:7710: checking for XFontSet" >&5 +echo "configure:7748: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:7713: checking for XmbDrawString in -lX11" >&5 +echo "configure:7751: 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 7718 "configure" +#line 7756 "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 @@ -7725,7 +7763,7 @@ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:7729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7765,15 +7803,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:7769: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7772 "configure" +echo "configure:7807: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7810 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7798,10 +7836,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7802: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7805 "configure" +echo "configure:7840: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7843 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7824,7 +7862,7 @@ ; return 0; } EOF -if { (eval echo configure:7828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7853,12 +7891,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:7857: checking for crypt in -lcrypt" >&5 +echo "configure:7895: 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 7862 "configure" +#line 7900 "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 @@ -7869,7 +7907,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:7873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7903,12 +7941,12 @@ fi test -z "$with_wnn" && { echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:7907: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:7945: 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 7912 "configure" +#line 7950 "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 @@ -7919,7 +7957,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:7923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7957,12 +7995,12 @@ if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6 -echo "configure:7961: checking for jl_fi_dic_list in -lwnn" >&5 +echo "configure:7999: checking for jl_fi_dic_list in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 7966 "configure" +#line 8004 "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 @@ -7973,7 +8011,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:7977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8008,15 +8046,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:8012: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8015 "configure" +echo "configure:8050: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8053 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8043,15 +8081,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:8047: checking for canna/jrkanji.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8050 "configure" +echo "configure:8085: checking for canna/jrkanji.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8088 "configure" #include "confdefs.h" #include <canna/jrkanji.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8079,15 +8117,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:8083: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8086 "configure" +echo "configure:8121: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8124 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8110,12 +8148,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:8114: checking for RkBgnBun in -lRKC" >&5 +echo "configure:8152: 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 8119 "configure" +#line 8157 "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 @@ -8126,7 +8164,7 @@ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:8130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8149,12 +8187,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:8153: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:8191: 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 8158 "configure" +#line 8196 "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 @@ -8165,7 +8203,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:8169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8214,12 +8252,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:8218: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:8256: 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 8223 "configure" +#line 8261 "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 @@ -8230,7 +8268,7 @@ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8316,10 +8354,10 @@ for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8320: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8323 "configure" +echo "configure:8358: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8361 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8342,7 +8380,7 @@ ; return 0; } EOF -if { (eval echo configure:8346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8379,10 +8417,10 @@ for ac_func in realpath do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8383: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8386 "configure" +echo "configure:8421: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8424 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8405,7 +8443,7 @@ ; return 0; } EOF -if { (eval echo configure:8409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8438,16 +8476,16 @@ esac echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:8442: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 8444 "configure" +echo "configure:8480: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 8482 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:8451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -8467,16 +8505,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:8471: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 8473 "configure" +echo "configure:8509: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 8511 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:8480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8518: \"$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 @@ -8496,11 +8534,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:8500: checking whether localtime caches TZ" >&5 +echo "configure:8538: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 8504 "configure" +#line 8542 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -8535,7 +8573,7 @@ exit (0); } EOF -if { (eval echo configure:8539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then emacs_cv_localtime_cache=no else @@ -8564,9 +8602,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:8568: checking whether gettimeofday accepts one or two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 8570 "configure" +echo "configure:8606: checking whether gettimeofday accepts one or two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 8608 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -8588,7 +8626,7 @@ ; return 0; } EOF -if { (eval echo configure:8592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""two" 1>&6 else @@ -8610,19 +8648,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:8614: checking for inline" >&5 +echo "configure:8652: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 8619 "configure" +#line 8657 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:8626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -8672,17 +8710,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:8676: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8679 "configure" +echo "configure:8714: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8717 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:8686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -8706,10 +8744,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:8710: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8713 "configure" +echo "configure:8748: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8751 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -8732,7 +8770,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:8736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -8771,10 +8809,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:8775: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8778 "configure" +echo "configure:8813: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8816 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -8798,10 +8836,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:8802: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8805 "configure" +echo "configure:8840: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8843 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8824,7 +8862,7 @@ ; return 0; } EOF -if { (eval echo configure:8828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8854,10 +8892,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:8858: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8861 "configure" +echo "configure:8896: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8899 "configure" #include "confdefs.h" find_stack_direction () { @@ -8876,7 +8914,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:8880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_stack_direction=1 else @@ -8904,15 +8942,15 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:8908: checking for vfork.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8911 "configure" +echo "configure:8946: checking for vfork.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8949 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8940,10 +8978,10 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:8944: checking for working vfork" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8947 "configure" +echo "configure:8982: checking for working vfork" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8985 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -9038,7 +9076,7 @@ } } EOF -if { (eval echo configure:9042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:9080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_vfork_works=yes else @@ -9063,10 +9101,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:9067: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9070 "configure" +echo "configure:9105: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9108 "configure" #include "confdefs.h" #include <string.h> main () @@ -9076,7 +9114,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:9080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:9118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -9103,10 +9141,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9107: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9110 "configure" +echo "configure:9145: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9148 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9129,7 +9167,7 @@ ; return 0; } EOF -if { (eval echo configure:9133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9157,10 +9195,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:9161: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9164 "configure" +echo "configure:9199: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9202 "configure" #include "confdefs.h" /* @@ -9215,7 +9253,7 @@ } EOF -if { (eval echo configure:9219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:9257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -9241,10 +9279,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:9245: checking for working mmap" >&5 +echo "configure:9283: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 9248 "configure" +#line 9286 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -9277,7 +9315,7 @@ return 1; } EOF -if { (eval echo configure:9281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:9319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then have_mmap=yes else @@ -9311,15 +9349,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:9315: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9318 "configure" +echo "configure:9353: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9356 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9362,15 +9400,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:9366: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9369 "configure" +echo "configure:9404: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9407 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9402,10 +9440,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:9406: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9409 "configure" +echo "configure:9444: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9447 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -9428,7 +9466,7 @@ ; return 0; } EOF -if { (eval echo configure:9432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -9443,15 +9481,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:9447: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9450 "configure" +echo "configure:9485: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9488 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9468,15 +9506,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:9472: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9475 "configure" +echo "configure:9510: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9513 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9501,9 +9539,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:9505: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:9543: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 9507 "configure" +#line 9545 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9514,7 +9552,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:9518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN @@ -9532,9 +9570,9 @@ fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:9536: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:9574: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext <<EOF -#line 9538 "configure" +#line 9576 "configure" #include "confdefs.h" #include <sys/types.h> @@ -9544,7 +9582,7 @@ static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:9548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST @@ -9575,10 +9613,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:9579: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9582 "configure" +echo "configure:9617: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9620 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -9601,7 +9639,7 @@ ; return 0; } EOF -if { (eval echo configure:9605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -9616,15 +9654,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:9620: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9623 "configure" +echo "configure:9658: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9661 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9641,15 +9679,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:9645: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9648 "configure" +echo "configure:9683: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9686 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9687,15 +9725,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:9691: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9694 "configure" +echo "configure:9729: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9732 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9722,15 +9760,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:9726: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9729 "configure" +echo "configure:9764: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9767 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9763,15 +9801,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:9767: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9770 "configure" +echo "configure:9805: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9808 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9775: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9801,7 +9839,7 @@ echo "checking "for sound support"" 1>&6 -echo "configure:9805: checking "for sound support"" >&5 +echo "configure:9843: checking "for sound support"" >&5 case "$with_sound" in native | both ) with_native_sound=yes;; nas | no ) with_native_sound=no;; @@ -9812,15 +9850,15 @@ if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:9816: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9819 "configure" +echo "configure:9854: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9857 "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:9824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9868,12 +9906,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:9872: checking for ALopenport in -laudio" >&5 +echo "configure:9910: 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 9877 "configure" +#line 9915 "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 @@ -9884,7 +9922,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:9888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9915,12 +9953,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:9919: checking for AOpenAudio in -lAlib" >&5 +echo "configure:9957: 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 9924 "configure" +#line 9962 "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 @@ -9931,7 +9969,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:9935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9969,15 +10007,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:9973: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9976 "configure" +echo "configure:10011: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10014 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10047,7 +10085,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 10051 "configure" +#line 10089 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -10074,7 +10112,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:10078: checking for TTY-related features" >&5 +echo "configure:10116: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -10090,12 +10128,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:10094: checking for tgetent in -lncurses" >&5 +echo "configure:10132: 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 10099 "configure" +#line 10137 "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 @@ -10106,7 +10144,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:10110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10139,15 +10177,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:10143: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10146 "configure" +echo "configure:10181: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10184 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10169,15 +10207,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:10173: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10176 "configure" +echo "configure:10211: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10214 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10181: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10207,15 +10245,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:10211: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10214 "configure" +echo "configure:10249: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10252 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10250,12 +10288,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:10254: checking for tgetent in -l$lib" >&5 +echo "configure:10292: 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 10259 "configure" +#line 10297 "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 @@ -10266,7 +10304,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:10270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10297,12 +10335,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:10301: checking for tgetent in -lcurses" >&5 +echo "configure:10339: 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 10306 "configure" +#line 10344 "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 @@ -10313,7 +10351,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:10317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10331,12 +10369,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:10335: checking for tgetent in -ltermcap" >&5 +echo "configure:10373: 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 10340 "configure" +#line 10378 "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 @@ -10347,7 +10385,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:10351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10395,15 +10433,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:10399: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10402 "configure" +echo "configure:10437: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10440 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10426,12 +10464,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:10430: checking for Gpm_Open in -lgpm" >&5 +echo "configure:10468: 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 10435 "configure" +#line 10473 "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 @@ -10442,7 +10480,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:10446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10491,22 +10529,22 @@ echo "checking for database support" 1>&6 -echo "configure:10495: checking for database support" >&5 +echo "configure:10533: checking for database support" >&5 if test "$with_database_gnudbm" != "no"; then for ac_hdr in ndbm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10502: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10505 "configure" +echo "configure:10540: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10543 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10538,12 +10576,12 @@ if test "$have_ndbm_h" = "yes"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:10542: checking for dbm_open in -lgdbm" >&5 +echo "configure:10580: 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 10547 "configure" +#line 10585 "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 @@ -10554,7 +10592,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:10558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10577,10 +10615,10 @@ fi if test "$with_database_gnudbm" != "yes"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:10581: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10584 "configure" +echo "configure:10619: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10622 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -10603,7 +10641,7 @@ ; return 0; } EOF -if { (eval echo configure:10607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -10639,10 +10677,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:10643: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10646 "configure" +echo "configure:10681: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10684 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -10665,7 +10703,7 @@ ; return 0; } EOF -if { (eval echo configure:10669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -10686,12 +10724,12 @@ if test "$need_libdbm" != "no"; then echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:10690: checking for dbm_open in -ldbm" >&5 +echo "configure:10728: 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 10695 "configure" +#line 10733 "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 @@ -10702,7 +10740,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:10706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10739,10 +10777,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:10743: checking for dbopen" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10746 "configure" +echo "configure:10781: checking for dbopen" >&5 + +cat > conftest.$ac_ext <<EOF +#line 10784 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbopen(); below. */ @@ -10765,7 +10803,7 @@ ; return 0; } EOF -if { (eval echo configure:10769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -10786,12 +10824,12 @@ if test "$need_libdb" != "no"; then echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:10790: checking for dbopen in -ldb" >&5 +echo "configure:10828: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 10795 "configure" +#line 10833 "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 @@ -10802,7 +10840,7 @@ dbopen() ; return 0; } EOF -if { (eval echo configure:10806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10826,7 +10864,7 @@ if test "$with_database_berkdb" = "yes"; then for path in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 10830 "configure" +#line 10868 "configure" #include "confdefs.h" #ifdef HAVE_INTTYPES_H #define __BIT_TYPES_DEFINED__ @@ -10844,7 +10882,7 @@ ; return 0; } EOF -if { (eval echo configure:10848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_path="$path"; break else @@ -10895,12 +10933,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:10899: checking for SOCKSinit in -lsocks" >&5 +echo "configure:10937: 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 10904 "configure" +#line 10942 "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 @@ -10911,7 +10949,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:10915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10968,15 +11006,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10972: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 10975 "configure" +echo "configure:11010: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11013 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -11007,12 +11045,12 @@ test -z "$with_shlib" && test ! -z "$have_dlfcn" && { echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:11011: checking for dlopen in -ldl" >&5 +echo "configure:11049: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` xe_check_libs=" -ldl " cat > conftest.$ac_ext <<EOF -#line 11016 "configure" +#line 11054 "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 @@ -11023,7 +11061,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:11027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11052,12 +11090,12 @@ } test -z "$with_shlib" && test ! -z "$have_dlfcn" && { echo $ac_n "checking for _dlopen in -lc""... $ac_c" 1>&6 -echo "configure:11056: checking for _dlopen in -lc" >&5 +echo "configure:11094: checking for _dlopen in -lc" >&5 ac_lib_var=`echo c'_'_dlopen | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <<EOF -#line 11061 "configure" +#line 11099 "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 @@ -11068,7 +11106,7 @@ _dlopen() ; return 0; } EOF -if { (eval echo configure:11072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11097,12 +11135,12 @@ } test -z "$with_shlib" && test ! -z "$have_dlfcn" && { echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:11101: checking for dlopen in -lc" >&5 +echo "configure:11139: checking for dlopen in -lc" >&5 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <<EOF -#line 11106 "configure" +#line 11144 "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 @@ -11113,7 +11151,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:11117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11142,12 +11180,12 @@ } test -z "$with_shlib" && { echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:11146: checking for shl_load in -ldld" >&5 +echo "configure:11184: 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 11151 "configure" +#line 11189 "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 @@ -11158,7 +11196,7 @@ shl_load() ; return 0; } EOF -if { (eval echo configure:11162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11187,12 +11225,12 @@ } test -z "$with_shlib" && { echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:11191: checking for dld_init in -ldld" >&5 +echo "configure:11229: 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 11196 "configure" +#line 11234 "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 @@ -11203,7 +11241,7 @@ dld_init() ; return 0; } EOF -if { (eval echo configure:11207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11253,7 +11291,7 @@ dll_oflags="-o " echo $ac_n "checking how to build a shared library""... $ac_c" 1>&6 -echo "configure:11257: checking how to build a shared library" >&5 +echo "configure:11295: checking how to build a shared library" >&5 case `uname -rs` in UNIX_SV*|UNIX_System_V*) dll_lflags="-G" @@ -11344,10 +11382,10 @@ for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11348: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 11351 "configure" +echo "configure:11386: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 11389 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11370,7 +11408,7 @@ ; return 0; } EOF -if { (eval echo configure:11374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11406,11 +11444,11 @@ fi cat > conftest.$ac_ext <<EOF -#line 11410 "configure" +#line 11448 "configure" #include "confdefs.h" int main(int c,char *v[]){return 0;} EOF -if { (eval echo configure:11414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:11452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then : else
--- a/configure.in Mon Aug 13 10:37:16 2007 +0200 +++ b/configure.in Mon Aug 13 10:38:01 2007 +0200 @@ -1811,6 +1811,7 @@ for f in "/usr/lpp/X11/bin/smt.exp" "/usr/bin/X11/smt.exp"; do if test -r "$f"; then start_flags="${start_flags},-bI:${f}"; break; fi done + AC_CHECK_LIB(C, terminateAndUnload, XE_APPEND(-lC, libs_system)) fi elif test -n "$ld_text_start_addr"; then start_flags="-T $ld_text_start_addr -e __start"
--- a/etc/BETA Mon Aug 13 10:37:16 2007 +0200 +++ b/etc/BETA Mon Aug 13 10:38:01 2007 +0200 @@ -220,16 +220,22 @@ ** Creating patches for submission ================================== -When making patches please use the `-u' option, or if your diff +Patches to XEmacs should be mailed to <xemacs-patches@xemacs.org>. +Each patch will be reviewed by the patches review board, and will be +acked and added to the distribution, or rejected with an explanation. + +When making patches, please use the `-u' option, or if your diff doesn't support it, `-c'. Using ordinary (context-free) diffs are notoriously prone to error, since line numbers tend to change when others make changes to the same source file. -$ diff -u old-file.c new-file.c +An example of the `diff' usage: + +$ diff -u OLDFILE NEWFILE -or- -$ diff -c old-file.c new-file.c +$ diff -c OLDFILE NEWFILE Also, it is helpful if you create the patch in the top level of the XEmacs source directory: @@ -238,9 +244,10 @@ hack, hack, hack.... $ diff -u lwlib/xlwmenu.c.orig lwlib/xlwmenu.c -It is preferrable for patches to be accompanied by an update (raw -entry preferred) to the appropriate ChangeLog file. Patches to -ChangeLog files have an extremely high rate of failure. +Each patch should be accompanied by an update to the appropriate +ChangeLog file. Please don't mail patches to ChangeLog because they +have an extremely high rate of failure; just mail us the new part of +the ChangeLog you added. Also note that if you cut & paste from an xterm to an XEmacs mail buffer you will probably lose due to tab expansion. The best thing to do is
--- a/etc/FTP Mon Aug 13 10:37:16 2007 +0200 +++ b/etc/FTP Mon Aug 13 10:38:01 2007 +0200 @@ -1,26 +1,26 @@ -*- text -*- - XEmacs availability information. Last Modified: 25-Mar-1997. + XEmacs availability information. Last Modified: 19-Jun-1998. -XEmacs is available via anonymous FTP from ftp.xemacs.org (128.174.252.16) +XEmacs is available via anonymous FTP from ftp.xemacs.org (207.96.122.8) in the directory /pub/xemacs/. ftp.xemacs.org is the primary distribution point, but you may find copies of it at other sites as well. Some sites to try include: ftp://ftp.jaist.ac.jp/pub/GNU/xemacs/ - ftp://ftp.uu.net:/systems/gnu/xemacs/ - ftp://ftp.sunet.se:/pub/gnu/xemacs/ - ftp://ftp.cenatls.cena.dgac.fr:/pub/Emacs/xemacs/ - ftp://ftp.th-darmstadt.de:/pub/editors/xemacs/ - ftp://sunsite.doc.ic.ac.uk:/gnu/xemacs/ - ftp://ftp.lip6.fr:/pub/emacs/xemacs/ - ftp://uiarchive.cso.uiuc.edu:/pub/packages/xemacs/ - ftp://ftp.technion.ac.il:/pub/unsupported/gnu/xemacs/ - ftp://thphys.irb.hr:/pub/xemacs/ + ftp://ftp.uu.net/systems/gnu/xemacs/ + ftp://ftp.sunet.se/pub/gnu/xemacs/ + ftp://ftp.cenatls.cena.dgac.fr/pub/Emacs/xemacs/ + ftp://ftp.th-darmstadt.de/pub/editors/xemacs/ + ftp://sunsite.doc.ic.ac.uk/gnu/xemacs/ + ftp://ftp.lip6.fr/pub/emacs/xemacs/ + ftp://uiarchive.cso.uiuc.edu/pub/packages/xemacs/ + ftp://ftp.technion.ac.il/pub/unsupported/gnu/xemacs/ + ftp://ftp.linux.hr/pub/xemacs/ ftp://sunsite.cnlab-switch.ch/mirror/xemacs/ - ftp://ftp.unicamp.br:/pub/xemacs/ - ftp://ftp.usyd.edu.au:/pub/Xemacs/ + ftp://ftp.unicamp.br/pub/xemacs/ + ftp://ftp.usyd.edu.au/pub/Xemacs/ ftp://ftp.lab.kdd.co.jp/xemacs/ ftp://SunSITE.sut.ac.jp/pub/archives/xemacs/ ftp://sunsite.icm.edu.pl/pub/unix/xemacs
--- a/etc/HELLO Mon Aug 13 10:37:16 2007 +0200 +++ b/etc/HELLO Mon Aug 13 10:38:01 2007 +0200 @@ -3,7 +3,7 @@ --------------------------------------------------------- Arabic [2](38R(47d(3T!JSa(4W(3W[0](B -Croatian Zdravo +Croatian (Hrvatski) Bog (Bok), Dobar dan Czech (,Bh(Besky) Dobr,B}(B den Danish (Dansk) Hej, Goddag English Hello
--- a/etc/NEWS Mon Aug 13 10:37:16 2007 +0200 +++ b/etc/NEWS Mon Aug 13 10:38:01 2007 +0200 @@ -39,7 +39,7 @@ ** XEmacs is now supported under Microsoft Windows 95/98 and Windows NT operating systems. For starters, look at the XEmacs on Windows FAQ -at <URL:http://jagor.srce.hr/~hniksic/xemacs-on-windows.txt>. To +at <URL:http://jagor.srce.hr/~hniksic/xemacs-on-windows-faq.txt>. To discuss Windows-specific issues, subscribe to the mailing list at <xemacs-nt-request@xemacs.org>. @@ -47,6 +47,14 @@ any `XEmacs' resources in the resource database. Otherwise, it will continue to use the `Emacs' class. +** The options menu has been ported to Custom. +This means that each entry in the options menu acts as if you had customized +the corresponding variable by hand. ### WARNING: there is currently no +upgrading function to help you port your old options settings to the new +format. Consequently, if you want to modify the options for XEmacs 21, you +will have to set them all again through the menu, and remove the code loading +.xemacs-options from your .emacs. + ** When the Zmacs region is active, `M-x query-replace' and the other replace commands now operate on the region contents only.
--- a/lib-src/ChangeLog Mon Aug 13 10:37:16 2007 +0200 +++ b/lib-src/ChangeLog Mon Aug 13 10:38:01 2007 +0200 @@ -1,3 +1,12 @@ +1998-06-16 Jan Vroonhof <vroonhof@math.ethz.ch> + + * gnuclient.c (main): Use disconnect_from_server to read & echo + result. + +1998-06-15 Andy Piper <andyp@parallax.co.uk> + + * Makefile.in.in: add xemacs icon to the runemacs executable. + 1998-06-12 Jim Radford <radford@robby.caltech.edu> * gnuclient.c (initialize_signals): Don't pass SIGHUP to XEmacs.
--- a/lib-src/Makefile.in.in Mon Aug 13 10:37:16 2007 +0200 +++ b/lib-src/Makefile.in.in Mon Aug 13 10:38:01 2007 +0200 @@ -273,10 +273,12 @@ runemacs_args = -I. $(cflags) -I${srcdir} -I${srcdir}/../src \ -DVERSION='"${version}"' ${srcdir}/../nt/runemacs.c \ $(ldflags) -Wl,--subsystem,windows -runemacs_deps = ${srcdir}/../nt/runemacs.c ../src/config.h +runemacs_deps = ${srcdir}/../nt/runemacs.c ${srcdir}/../nt/xemacs.ico ../src/config.h runemacs: ${runemacs_deps} - $(CC) ${runemacs_args} -o $@ + echo "runemacs ICON DISCARDABLE \"../nt/xemacs.ico\"" \ + | windres -o runemacs_res.o + $(CC) runemacs_res.o ${runemacs_args} -o $@ ootags_args = -I. $(cflags) -I${srcdir} -I${srcdir}/../src \ -DVERSION='"${version}"' ${srcdir}/ootags.c \
--- a/lib-src/gnuclient.c Mon Aug 13 10:37:16 2007 +0200 +++ b/lib-src/gnuclient.c Mon Aug 13 10:38:01 2007 +0200 @@ -24,7 +24,7 @@ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 'etc/emacsclient.c' from the GNU Emacs 18.52 distribution. - Please mail bugs and suggestions to the author at the above address. + Please mail bugs and suggestions to the XEmacs maintainer. */ /* @@ -467,12 +467,14 @@ send_string (s, ")"); } send_string (s, "))"); - send_string (s, EOT_STR); - if (read_line (s, result) == 0) - { - fprintf (stderr, "%s: Could not read\n", progname); - exit (1); - } + /* disconnect already sends EOT_STR */ +#ifdef SYSV_IPC + if (connect_type == (int) CONN_IPC) + disconnect_from_ipc_server (s, msgp, batch && !quick); +#else /* !SYSV_IPC */ + if (connect_type != (int) CONN_IPC) + disconnect_from_server (s, batch && !quick); +#endif /* !SYSV_IPC */ } /* eval_function || eval_form || load_library */ else if (batch) { @@ -493,12 +495,14 @@ send_string(s, buffer); } send_string(s,"))"); - send_string (s, EOT_STR); - if (read_line (s, result) == 0) - { - fprintf (stderr, "%s: Could not read\n", progname); - exit (1); - } + /* disconnect already sends EOT_STR */ +#ifdef SYSV_IPC + if (connect_type == (int) CONN_IPC) + disconnect_from_ipc_server (s, msgp, batch && !quick); +#else /* !SYSV_IPC */ + if (connect_type != (int) CONN_IPC) + disconnect_from_server (s, batch && !quick); +#endif /* !SYSV_IPC */ } if (!batch) @@ -647,8 +651,6 @@ #endif /* !SYSV_IPC */ } /* not batch */ - if (batch && !quick) - printf ("%s\n", result); return 0;
--- a/lisp/ChangeLog Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/ChangeLog Mon Aug 13 10:38:01 2007 +0200 @@ -1,3 +1,61 @@ +1998-06-19 Jonathan Harris <jhar@tardis.ed.ac.uk> + + * font.el: Split font-family-mappings into X and + mswindows-specific versions. + mswindows-font-create-[object|name]: Treat supplied size + as a pointsize. Added underline and strikethru handling. + + * msw-faces.el: changed default mswindows charset to western. + + * msw-glyphs.el: removed space in border-glyph font string that + was inserted to get round bugs in the mswindows C font code. + +1998-06-15 Jonathan Harris <jhar@tardis.ed.ac.uk> + + * minibuf.el: make read-color-completion-table call + (mswindows-color-list for mswindows devices. + +1998-06-18 Sam Mikes <smikes@alumni.hmc.edu> + + * lisp/font-lock.el + (font-lock-match-c++-style-declaration-item-and-skip-to-next): + Let declaration items contain non-word symbol characters. + +1998-06-15 Adrian Aichner <aichner@ecf.teradyne.com> + + * package-get.el (package-get-package-provider): Added autoload + cookie. Loading "package-get-base.el" in ALL functions that use + it. Fixed some (interactive ...) with multiple argument specs + again. Cosmetic indentation changes. + +1998-05-27 Glynn Clements <glynn@sensei.co.uk> + + * info.el (Info-insert-dir): Don't use nreverse on variables + that you want to use later. + +1998-06-17 Glynn Clements <glynn@sensei.co.uk> + + * x-mouse.el (x-set-point-and-move-selection): Replace call + to x-kill-primary-selection with kill-primary-selection + +1998-06-12 Martin Buchholz <martin@xemacs.org> + + * simple.el (what-cursor-position): Make cursor position reported + use value of column-number-start-at-one + +1998-06-17 SL Baur <steve@altair.xemacs.org> + + * about.el (xemacs-hackers): Fix Jareth's email address. + +1998-06-16 SL Baur <steve@altair.xemacs.org> + + * startup.el (startup-splash-frame): Remove + `xemacs-startup-logo-function'. + +1998-06-15 SL Baur <steve@altair.xemacs.org> + + * about.el (about-hackers): Update credits list. + 1998-06-06 Jeff Miller <jmiller@smart.net> * lisp/sound.el: Update sound-ext to allow filenames with
--- a/lisp/about.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/about.el Mon Aug 13 10:38:01 2007 +0200 @@ -63,7 +63,7 @@ (dkindred "Darrell Kindred" "dkindred@cmu.edu") (dv "Didier Verna" "verna@inf.enst.fr") (hniksic "Hrvoje Niksic" "hniksic@srce.hr") - (jareth "Jareth Hein" "jhod@camelot-soft.com") + (jareth "Jareth Hein" "jareth@camelot.co.jp") (jason "Jason Mastaler" "jason@mastaler.com") (jens "Jens Lautenbacher" "jens@lemcbed.lem.uni-karlsruhe.de") (juhp "Jens-Ulrik Holger Petersen" "petersen@kurims.kyoto-u.ac.jp") @@ -1269,6 +1269,7 @@ (print-short "Rick Braumoeller" "rickb@mti.sgi.com") (print-short "Matthew J. Brown" "mjb@doc.ic.ac.uk") (print-short "Alastair Burt" "burt@dfki.uni-kl.de") + (print-short "David Bush" "david.bush@adn.alcatel.com") (print-short "Richard Caley" "rjc@cstr.edinburgh.ac.uk") (print-short "Stephen Carney" "carney@gvc.dec.com") (print-short "Lorenzo M. Catucci" "lorenzo@argon.roma2.infn.it") @@ -1296,6 +1297,7 @@ (print-short "Jonathan Edwards" "edwards@intranet.com") (print-short "Eric Eide" "eeide@asylum.cs.utah.edu") (print-short "EKR" "ekr@terisa.com") + (print-short "Gunnar Evermann" "Gunnar.Evermann@nats.informatik.uni-hamburg.de") (print-short "Oscar Figueiredo" "Oscar.Figueiredo@di.epfl.ch") (print-short "David Fletcher" "frodo@tsunami.com") (print-short "Paul Flinders" "ptf@delcam.co.uk") @@ -1322,6 +1324,7 @@ (print-short "Michael Guenther" "michaelg@igor.stuttgart.netsurf.de") (print-short "Dipankar Gupta" "dg@hplb.hpl.hp.com") (print-short "Markus Gutschke" "gutschk@GOEDEL.UNI-MUENSTER.DE") + (print-short "Kai Haberzettl" "khaberz@privat.circular.de") (print-short "Adam Hammer" "hammer@cs.purdue.edu") (print-short "Magnus Hammerin" "magnush@epact.se") (print-short "ChangGil Han" "cghan@phys401.phys.pusan.ac.kr") @@ -1336,6 +1339,7 @@ (print-short "Mike Hill" "mikehill@hgeng.com") (print-short "Charles Hines" "chuck_hines@VNET.IBM.COM") (print-short "Shane Holder" "holder@rsn.hp.com") + (print-short "Chris Holt" "xris@migraine.stanford.edu") (print-short "Tetsuya HOYANO" "hoyano@ari.bekkoame.or.jp") (print-short "David Hughes" "djh@harston.cv.com") (print-short "Tatsuya Ichikawa" "ichikawa@hv.epson.co.jp") @@ -1402,8 +1406,10 @@ (print-short "Andy Norman" "ange@hplb.hpl.hp.com") (print-short "Joe Nuspl" "nuspl@sequent.com") (print-short "Kim Nyberg" "kny@tekla.fi") + (print-short "Christian Nybø" "chr@mediascience.no") + (print-short "Kevin Oberman" "oberman@es.net") (print-short "David Ofelt" "ofelt@getalife.Stanford.EDU") - (print-short "Darryl Okahata" "darrylo@mina.sr.hp.com") + (print-short "Darryl Okahata" "darrylo@sr.hp.com") (print-short "Alexandre Oliva" "oliva@dcc.unicamp.br") (print-short "Tore Olsen" "toreo@colargol.idb.hist.no") (print-short "Greg Onufer" "Greg.Onufer@eng.sun.com") @@ -1413,10 +1419,12 @@ (print-short "Joel Peterson" "tarzan@aosi.com") (print-short "Thomas A. Peterson" "tap@src.honeywell.com") (print-short "Tibor Polgar" "tibor@alteon.com") + (print-short "Fabrice POPINEAU" "popineau@esemetz.ese-metz.fr") (print-short "Frederic Poncin" "fp@info.ucl.ac.be") (print-short "E. Rehmi Post" "rehmi@asylum.sf.ca.us") (print-short "Martin Pottendorfer" "Martin.Pottendorfer@aut.alcatel.at") (print-short "Colin Rafferty" "craffert@ml.com") + (print-short "Rick Rankin" "Rick_Rankin-P15254@email.mot.com") (print-short "Paul M Reilly" "pmr@pajato.com") (print-short "Jack Repenning" "jackr@sgi.com") (print-short "Daniel Rich" "drich@cisco.com") @@ -1432,6 +1440,7 @@ (print-short "Kenji Sato" "ken@ny.kdd.com") (print-short "Mike Scheidler" "c23mts@eng.delcoelect.com") (print-short "Daniel Schepler" "daniel@shep13.wustl.edu") + (print-short "Holger Schauer" "schauer@coling.uni-freiburg.de") (print-short "Darrel Schneider" "darrel@slc.com") (print-short "Hayden Schultz" "haydens@ll.mit.edu") (print-short "Cotton Seed" "cottons@cybercom.net") @@ -1448,6 +1457,7 @@ (print-short "Anders Stenman" "stenman@isy.liu.se") (print-short "Jason Stewart" "jasons@cs.unm.edu") (print-short "Rick Tait" "rickt@gnu.ai.mit.edu") + (print-short "TANAKA Hayashi" "tanakah@mxa.mesh.ne.jp") (print-short "Samuel Tardieu" "sam@inf.enst.fr") (print-short "James Thompson" "thompson@wg2.waii.com") (print-short "Nobu Toge" "toge@accad1.kek.jp")
--- a/lisp/auto-autoloads.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/auto-autoloads.el Mon Aug 13 10:38:01 2007 +0200 @@ -1204,6 +1204,46 @@ ;;;*** +;;;### (autoloads (package-get-custom package-get-package-provider package-get package-get-all package-get-update-all) "package-get" "lisp/package-get.el") + +(autoload 'package-get-update-all "package-get" "\ +Fetch and install the latest versions of all currently installed packages." t nil) + +(autoload 'package-get-all "package-get" "\ +Fetch PACKAGE with VERSION and all other required packages. +Uses `package-get-base' to determine just what is required and what +package provides that functionality. If VERSION is nil, retrieves +latest version. Optional argument FETCHED-PACKAGES is used to keep +track of packages already fetched." t nil) + +(autoload 'package-get "package-get" "\ +Fetch PACKAGE from remote site. +Optional arguments VERSION indicates which version to retrieve, nil +means most recent version. CONFLICT indicates what happens if the +package is already installed. Valid values for CONFLICT are: +'always always retrieve the package even if it is already installed +'never do not retrieve the package if it is installed. + +The value of `package-get-base' is used to determine what files should +be retrieved. The value of `package-get-remote' is used to determine +where a package should be retrieved from. The sites are tried in +order so one is better off listing easily reached sites first. + +Once the package is retrieved, its md5 checksum is computed. If that +sum does not match that stored in `package-get-base' for this version +of the package, an error is signalled." t nil) + +(autoload 'package-get-package-provider "package-get" "\ +Search for a package that provides SYM and return the name and + version. Searches in `package-get-base' for SYM. If SYM is a + consp, then it must match a corresponding (provide (SYM VERSION)) from + the package." t nil) + +(autoload 'package-get-custom "package-get" "\ +Fetch and install the latest versions of all customized packages." t nil) + +;;;*** + ;;;### (autoloads (picture-mode) "picture" "lisp/picture.el") (autoload 'picture-mode "picture" "\
--- a/lisp/font-lock.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/font-lock.el Mon Aug 13 10:38:01 2007 +0200 @@ -1991,7 +1991,7 @@ ;; with optional whitespace and a "(". Everything following the item (but ;; belonging to it) is expected to by skip-able by `forward-sexp', and items ;; are expected to be separated with a "," or ";". - (if (looking-at "[ \t*&]*\\(\\sw+\\)\\(::\\(\\sw+\\)\\)?[ \t]*\\((\\)?") + (if (looking-at "[ \t*&]*\\(\\(?:\\sw\\|\\s_\\)+\\)\\(::\\(\\(?:\\sw\\|\\s_\\)+\\)\\)?[ \t]*\\((\\)?") (save-match-data (condition-case nil (save-restriction
--- a/lisp/font.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/font.el Mon Aug 13 10:38:01 2007 +0200 @@ -141,40 +141,6 @@ (defvar font-maximum-slippage "1pt" "How much a font is allowed to vary from the desired size.") -(defvar font-family-mappings - '( - ("serif" . ("new century schoolbook" - "utopia" - "charter" - "times" - "lucidabright" - "garamond" - "palatino" - "times new roman" - "baskerville" - "bookman" - "bodoni" - "computer modern" - "rockwell" - )) - ("sans-serif" . ("lucida" - "helvetica" - "gills-sans" - "avant-garde" - "univers" - "optima")) - ("elfin" . ("tymes")) - ("monospace" . ("courier" - "courier new" - "fixed" - "lucidatypewriter" - "clean" - "terminal")) - ("cursive" . ("sirene" - "zapf chancery")) - ) - "A list of font family mappings.") - (define-font-keywords :family :style :size :registry :encoding) (define-font-keywords @@ -520,6 +486,39 @@ (encoding "[^-]+")) (concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'")))) +(defvar font-x-family-mappings + '( + ("serif" . ("new century schoolbook" + "utopia" + "charter" + "times" + "lucidabright" + "garamond" + "palatino" + "times new roman" + "baskerville" + "bookman" + "bodoni" + "computer modern" + "rockwell" + )) + ("sans-serif" . ("lucida" + "helvetica" + "gills-sans" + "avant-garde" + "univers" + "optima")) + ("elfin" . ("tymes")) + ("monospace" . ("courier" + "fixed" + "lucidatypewriter" + "clean" + "terminal")) + ("cursive" . ("sirene" + "zapf chancery")) + ) + "A list of font family mappings on X devices.") + (defun x-font-create-object (fontname &optional device) (let ((case-fold-search t)) (if (or (not (stringp fontname)) @@ -583,7 +582,7 @@ (normal (mapcar (function (lambda (x) (if x (aref x 0)))) (aref menu 1)))) (sort (font-unique (nconc scaled normal)) 'string-lessp)))) - (cons "monospace" (mapcar 'car font-family-mappings)))) + (cons "monospace" (mapcar 'car font-x-family-mappings)))) (defvar font-default-cache nil) @@ -671,13 +670,13 @@ (while (and family (not done)) (setq cur-family (car family) family (cdr family)) - (if (assoc cur-family font-family-mappings) + (if (assoc cur-family font-x-family-mappings) ;; If the family name is an alias as defined by - ;; font-family-mappings, then append those families + ;; font-x-family-mappings, then append those families ;; to the front of 'family' and continue in the loop. (setq family (append (cdr-safe (assoc cur-family - font-family-mappings)) + font-x-family-mappings)) family)) ;; Not an alias for a list of fonts, so we just check it. ;; First, convert all '-' to spaces so that we don't screw up @@ -750,13 +749,14 @@ (while (and family (not done)) (setq cur-family (car family) family (cdr family)) - (if (assoc cur-family font-family-mappings) + (if (assoc cur-family font-x-family-mappings) ;; If the family name is an alias as defined by - ;; font-family-mappings, then append those families + ;; font-x-family-mappings, then append those families ;; to the front of 'family' and continue in the loop. + ;; #### jhar: I don't know about ns font names, so using X mappings (setq family (append (cdr-safe (assoc cur-family - font-family-mappings)) + font-x-family-mappings)) family)) ;; CARL: Need help here - I am not familiar with the NS font ;; model @@ -770,13 +770,13 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; mswindows fonts look like: -;;; fontname[:[weight][ style][:pointsize[:effects[:charset]]]] +;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset] ;;; A minimal mswindows font spec looks like: ;;; Courier New ;;; A maximal mswindows font spec looks like: -;;; Courier New:Bold Italic:10:underline strikeout:ansi +;;; Courier New:Bold Italic:10:underline strikeout:western ;;; Missing parts of the font spec should be filled in with these values: -;;; Courier New:Normal:10::ansi +;;; Courier New:Normal:10::western ;; "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+:[a-zA-Z ]*:[a-zA-Z 0-9]*$" (defvar font-mswindows-font-regexp (let @@ -798,7 +798,7 @@ (:demi . "Demi") (:book . "Book") (:medium . "Medium") - (:normal . "Medium") + (:normal . "Normal") (:demi-bold . "Demibold") (:bold . "Bold") (:regular . "Regular") @@ -806,6 +806,23 @@ "An assoc list mapping keywords to actual mswindows specific strings for use in the 'weight' field of an mswindows font string.") +(defvar font-mswindows-family-mappings + '( + ("serif" . ("times new roman" + "century schoolbook" + "book antiqua" + "bookman old style")) + ("sans-serif" . ("arial" + "verdana" + "lucida sans unicode")) + ("monospace" . ("courier new" + "lucida console" + "courier" + "terminal")) + ("cursive" . ("roman" + "script")) + ) + "A list of font family mappings on mswindows devices.") (defun mswindows-font-create-object (fontname &optional device) (let ((case-fold-search t) @@ -813,7 +830,7 @@ (if (or (not (stringp font)) (not (string-match font-mswindows-font-regexp font))) (make-font) - (let ((name (match-string 1 font)) + (let ((family (match-string 1 font)) (weight (match-string 2 font)) (style (match-string 3 font)) (pointsize (match-string 4 font)) @@ -823,16 +840,26 @@ (size nil) (case-fold-search t) ) - (if pointsize (setq size (/ (string-to-int pointsize) 10))) + (if pointsize (setq size (concat pointsize "pt"))) (if weight (setq weight (intern-soft (concat ":" (downcase weight))))) - (setq retval (make-font :family name + (setq retval (make-font :family family :weight weight - :size size)) + :size size + :encoding charset)) (set-font-bold-p retval (eq :bold weight)) (cond ((null style) nil) - ((string-match "^[iI]talic" style) + ((string-match "^ *[iI]talic" style) (set-font-italic-p retval t))) + (cond + ((null effects) nil) + ((string-match "^[uU]nderline [sS]trikeout" effects) + (set-font-underline-p retval t) + (set-font-strikethru-p retval t)) + ((string-match "[uU]nderline" effects) + (set-font-underline-p retval t)) + ((string-match "[sS]trikeout" effects) + (set-font-strikethru-p retval t))) retval)))) (defun mswindows-font-create-name (fontobj &optional device) @@ -847,13 +874,13 @@ (let* ((default (font-default-object-for-device device)) (family (or (font-family fontobj) (font-family default))) - (weight (or (font-weight fontobj) :medium)) + (weight (or (font-weight fontobj) :regular)) (style (font-style fontobj)) (size (or (if font-running-xemacs (font-size fontobj)) (font-size default))) - (registry (or (font-registry fontobj) - (font-registry default))) + (underline-p (font-underline-p fontobj)) + (strikeout-p (font-strikethru-p fontobj)) (encoding (or (font-encoding fontobj) (font-encoding default)))) (if (stringp family) @@ -871,24 +898,29 @@ (while (and family (not done)) (setq cur-family (car family) family (cdr family)) - (if (assoc cur-family font-family-mappings) + (if (assoc cur-family font-mswindows-family-mappings) ;; If the family name is an alias as defined by - ;; font-family-mappings, then append those families + ;; font-mswindows-family-mappings, then append those families ;; to the front of 'family' and continue in the loop. (setq family (append (cdr-safe (assoc cur-family - font-family-mappings)) + font-mswindows-family-mappings)) family)) ;; We treat oblique and italic as equivalent. Don't ask. - ;; Courier New:Bold Italic:10:underline strikeout:ansi + ;; Courier New:Bold Italic:10:underline strikeout:western (setq font-name (format "%s:%s%s:%s:%s:%s" cur-family weight (if (font-italic-p fontobj) " Italic" "") (if size - (int-to-string (* 10 size)) "10") - "" - "") + (int-to-string size) "10") + (if underline-p + (if strikeout-p + "underline strikeout" + "underline") + (if strikeout-p "strikeout" "")) + (if encoding + encoding "")) done (try-font-name font-name device)))) (if done font-name)))))
--- a/lisp/info.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/info.el Mon Aug 13 10:38:01 2007 +0200 @@ -869,7 +869,7 @@ ;; the list of them so that when they get pushed in, they appear ;; in the same order they got specified in the path, from top to ;; bottom. - (nconc buffers (nreverse lbuffers)) + (nconc buffers (reverse lbuffers)) (or buffers (error "Can't find the Info directory node")) @@ -880,7 +880,7 @@ ;; reverse it since they are pushed down from the top. the ;; `Info-directory-list can be specified in natural order ;; this way. - others (nreverse (cdr buffers))) + others (reverse (cdr buffers))) ;; Insert the entire original dir file as a start; note that we've ;; already saved its default directory to use as the default
--- a/lisp/minibuf.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/minibuf.el Mon Aug 13 10:38:01 2007 +0200 @@ -2075,6 +2075,8 @@ (kill-buffer (current-buffer)))) (setq x-read-color-completion-table clist) x-read-color-completion-table))) + (mswindows + (mapcar #'list (mswindows-color-list))) (tty (mapcar #'list (tty-color-list))))) @@ -2082,7 +2084,8 @@ "Read the name of a color from the minibuffer. On X devices, this uses `x-library-search-path' to find rgb.txt in order to build a completion table. -On TTY devices, this uses `tty-color-list'." +On TTY devices, this uses `tty-color-list'. +On mswindows devices, this uses `mswindows-color-list'." (let ((table (read-color-completion-table))) (completing-read prompt table nil (and table must-match) initial-contents)))
--- a/lisp/msw-faces.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/msw-faces.el Mon Aug 13 10:38:01 2007 +0200 @@ -49,13 +49,13 @@ ;;; Fill in missing parts of a font spec. This is primarily intended as a ;;; helper function for the functions below. ;;; mswindows fonts look like: -;;; fontname[:[weight][ style][:pointsize[:effects[:charset]]]] +;;; fontname[:[weight][ style][:pointsize[:effects]]][:charset] ;;; A minimal mswindows font spec looks like: ;;; Courier New ;;; A maximal mswindows font spec looks like: -;;; Courier New:Bold Italic:10:underline strikeout:ansi +;;; Courier New:Bold Italic:10:underline strikeout:western ;;; Missing parts of the font spec should be filled in with these values: -;;; Courier New:Normal:10::ansi +;;; Courier New:Normal:10::western (defun mswindows-font-canonicalize-name (font) "Given a mswindows font or font specification, this returns its specification in canonical form." @@ -68,14 +68,14 @@ "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+:[a-zA-Z ]*:[a-zA-Z 0-9]*$" name) name) ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+:[a-zA-Z ]*$" - name) (concat name ":ansi")) + name) (concat name ":western")) ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*:[0-9]+$" name) - (concat name "::ansi")) + (concat name "::western")) ((string-match "^[a-zA-Z ]+:[a-zA-Z ]*$" name) - (concat name ":10::ansi")) + (concat name ":10::western")) ((string-match "^[a-zA-Z ]+$" name) - (concat name ":Normal:10::ansi")) - (t "Courier New:Normal:10::ansi"))))) + (concat name ":Normal:10::western")) + (t "Courier New:Normal:10::western"))))) (defun mswindows-make-font-bold (font &optional device) "Given a mswindows font specification, this attempts to make a bold font.
--- a/lisp/msw-glyphs.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/msw-glyphs.el Mon Aug 13 10:38:01 2007 +0200 @@ -61,7 +61,7 @@ ;; strings are not allowed so they will be ignored. ("" [nothing]))) - (set-face-font 'border-glyph "WingDings:regular:11: :symbol" + (set-face-font 'border-glyph "WingDings:Regular:11::Symbol" 'global 'mswindows) (set-glyph-image continuation-glyph "\xC3" 'global 'mswindows) (set-glyph-image truncation-glyph "\xF0" 'global 'mswindows)
--- a/lisp/package-get-base.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/package-get-base.el Mon Aug 13 10:38:01 2007 +0200 @@ -437,6 +437,44 @@ requires (xemacs-base) type regular )) +(sounds-au + (standards-version 1.0 + version "1.01" + author-version "21.0" + date "1998-06-19" + build-date "1998-06-19" + maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>" + distribution stable + priority high + category "libs" + dump nil + description "XEmacs Sun sound files." + filename "sounds-au-1.01-pkg.tar.gz" + md5sum "878bde0798d5479ec3c2e1b4da8d5ee5" + size 125689 + provides () + requires () + type regular +)) +(sounds-wav + (standards-version 1.0 + version "1.01" + author-version "21.0" + date "1998-06-19" + build-date "1998-06-19" + maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>" + distribution stable + priority high + category "libs" + dump nil + description "XEmacs Microsoft sound files." + filename "sounds-wav-1.01-pkg.tar.gz" + md5sum "cec8161f3c0ef188d416bb81bd2472c9" + size 148571 + provides () + requires () + type regular +)) (tooltalk (standards-version 1.0 version "1.04" @@ -477,19 +515,19 @@ )) (xemacs-devel (standards-version 1.0 - version "1.12" - author-version "21.0b37" - date "1998-04-20" - build-date "1998-04-22" + version "1.13" + author-version "21.0" + date "1998-06-15" + build-date "1998-06-19" maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>" distribution stable priority medium category "libs" dump nil description "Emacs Lisp developer support." - filename "xemacs-devel-1.12-pkg.tar.gz" - md5sum "7661b0a0e77c30f4147d943b382c0d9c" - size 77623 + filename "xemacs-devel-1.13-pkg.tar.gz" + md5sum "3bec2cd2b955fa86617335ad14480e1a" + size 78840 provides (docref eldoc elp find-func hide-copyleft ielm regexp-opt trace) requires (xemacs-base) type single @@ -1407,3 +1445,4 @@ type regular )) )) +(provide 'package-get-base)
--- a/lisp/package-get.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/package-get.el Mon Aug 13 10:38:01 2007 +0200 @@ -179,6 +179,7 @@ latest version. Optional argument FETCHED-PACKAGES is used to keep track of packages already fetched." (interactive "sPackage: \nsVersion: ") + (load "package-get-base.el") (let* ((the-package (package-get-info-find-package package-get-base package)) (this-package (package-get-info-version @@ -208,8 +209,8 @@ (package-get-all reqd-name reqd-version fetched-packages))) ) (setq this-requires (cdr this-requires))) - fetched-packages - )) + fetched-packages + )) ;;;###autoload (defun package-get (package &optional version conflict) @@ -229,6 +230,7 @@ sum does not match that stored in `package-get-base' for this version of the package, an error is signalled." (interactive "xPackage List: ") + (load "package-get-base.el") (let* ((this-package (package-get-info-version (package-get-info-find-package package-get-base @@ -252,8 +254,8 @@ (not (file-exists-p (package-get-staging-dir filename)))) (if (file-exists-p (package-get-remote-filename (car search-dirs) filename)) - (copy-file (package-get-remote-filename (car search-dirs) filename) - (package-get-staging-dir filename)) + (copy-file (package-get-remote-filename (car search-dirs) filename) + (package-get-staging-dir filename)) (setq search-dirs (cdr search-dirs)) )) (if (not (file-exists-p (package-get-staging-dir filename))) @@ -261,7 +263,7 @@ ;; Validate the md5 checksum ;; Doing it with XEmacs removes the need for an external md5 program (with-temp-buffer - ; What ever happened to i-f-c-literally + ;; What ever happened to i-f-c-literally (let (file-name-handler-alist) (insert-file-contents-internal (package-get-staging-dir filename))) (if (not (string= (md5 (current-buffer)) @@ -283,15 +285,15 @@ )) (defun package-get-info-find-package (which name) - "Look in WHICH for the packaged called NAME and return all the info - associated with it. See `package-get-base' for info on the format - returned. + "Look in WHICH for the package called NAME and return all the info +associated with it. See `package-get-base' for info on the format +returned. To access fields returned from this, use `package-get-info-version' to return information about particular a version. Use `package-get-info-find-prop' to find particular property from a version returned by `package-get-info-version'." - (interactive "xPackage list: sPackage Name: ") + (interactive "xPackage list: \nsPackage Name: ") (if which (if (eq (caar which) name) (cdar which) @@ -371,17 +373,19 @@ I'm not sure if I want to do this by searching directories or checking some built in variables. For now, use packages-package-list." ;; Use packages-package-list which contains name and version - (equal (plist-get - (package-get-info-find-package packages-package-list - package) ':version) - (if (floatp version) version (string-to-number version)))) + (equal (plist-get + (package-get-info-find-package packages-package-list + package) ':version) + (if (floatp version) version (string-to-number version)))) +;;;###autoload (defun package-get-package-provider (sym) "Search for a package that provides SYM and return the name and version. Searches in `package-get-base' for SYM. If SYM is a consp, then it must match a corresponding (provide (SYM VERSION)) from the package." (interactive "SSymbol: ") + (load "package-get-base.el") (let ((packages package-get-base) (done nil) (found nil)) @@ -484,7 +488,7 @@ " :group '" category "-packages\n" " :initialize 'package-get-ever-installed-p\n" " :type 'boolean)\n\n") custom-buffer))) - package-get-base) custom-buffer) + package-get-base) custom-buffer) ) ;; need this first to avoid infinite dependency loops
--- a/lisp/simple.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/simple.el Mon Aug 13 10:38:01 2007 +0200 @@ -716,7 +716,7 @@ (hscroll (if (= (window-hscroll) 0) "" (format " Hscroll=%d" (window-hscroll)))) - (col (current-column))) + (col (+ (current-column) (if column-number-start-at-one 1 0)))) (if (= pos end) (if (or (/= beg 1) (/= end (1+ total))) (message "point=%d of %d(%d%%) <%d - %d> column %d %s"
--- a/lisp/startup.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/startup.el Mon Aug 13 10:38:01 2007 +0200 @@ -979,15 +979,17 @@ For tips and answers to frequently asked questions, see the XEmacs FAQ. \(It's on the Help menu, or type " (key xemacs-local-faq) " [a capital F!].\)")))) -(defvar xemacs-startup-logo-function nil - "If non-nil, function called to provide the startup logo. -This function should return an initialized glyph if it is used.") +;; I really hate global variables, oh well. +;(defvar xemacs-startup-logo-function nil +; "If non-nil, function called to provide the startup logo. +;This function should return an initialized glyph if it is used.") (defun startup-splash-frame () (let ((p (point)) - (logo (cond (xemacs-startup-logo-function - (funcall xemacs-startup-logo-function)) - (t xemacs-logo))) +; (logo (cond (xemacs-startup-logo-function +; (funcall xemacs-startup-logo-function)) +; (t xemacs-logo))) + (logo xemacs-logo) (cramped-p (eq 'tty (console-type)))) (unless cramped-p (insert "\n")) (indent-to (startup-center-spaces logo))
--- a/lisp/x-mouse.el Mon Aug 13 10:37:16 2007 +0200 +++ b/lisp/x-mouse.el Mon Aug 13 10:38:01 2007 +0200 @@ -105,7 +105,7 @@ (and (x-selection-owner-p) primary-selection-extent (x-insert-selection t event)) - (x-kill-primary-selection)) + (kill-primary-selection)) (defun mouse-track-and-copy-to-cutbuffer (event) "Make a selection like `mouse-track', but also copy it to the cutbuffer."
--- a/man/ChangeLog Mon Aug 13 10:37:16 2007 +0200 +++ b/man/ChangeLog Mon Aug 13 10:38:01 2007 +0200 @@ -1,3 +1,14 @@ +1998-06-10 Adrian Aichner <aichner@ecf.teradyne.com> + + * texinfo.texi: added ../info/ to @setfilename, broke line after + @noindent. Changed @var{arg-not-used-by-@TeX{}} to + @var{arg-not-used-by-@@TeX{}} to make `texinfo-format-buffer' + happy. Fixed refs broken by a previous patch of mine. + +1998-06-18 Darryl Okahata <darrylo@sr.hp.com> + + * lispref/os.texi (os.texi): Document `user-home-directory'. + 1998-06-13 Greg Klanderman <greg@alphatech.com> * lispref/windows.texi (Resizing Windows): document third optional
--- a/man/lispref/os.texi Mon Aug 13 10:37:16 2007 +0200 +++ b/man/lispref/os.texi Mon Aug 13 10:38:01 2007 +0200 @@ -858,6 +858,38 @@ This function returns the effective @sc{uid} of the user. @end defun +@defun user-home-directory +This function returns the ``@code{HOME}'' directory of the user, and is +intended to replace occurrences of ``@code{(getenv "HOME")}''. Under +Unix systems, the following is done: + +@enumerate +@item +Return the value of ``@code{(getenv "HOME")}'', if set. + +@item +Return ``/'', as a fallback, but issue a warning. (Future versions of +XEmacs will also attempt to lookup the @code{HOME} directory via +@code{getpwent()}, but this has not yet been implemented.) +@end enumerate + +Under MS Windows, this is done: + +@enumerate +@item +Return the value of ``@code{(getenv "HOME")}'', if set. + +@item +If the environment variables @code{HOMEDRIVE} and @code{HOMEDIR} are +both set, return the concatenation (the following description uses MS +Windows environment variable substitution syntax): +@code{%HOMEDRIVE%%HOMEDIR%}. + +@item +Return ``C:\'', as a fallback, but issue a warning. +@end enumerate +@end defun + @node Time of Day @section Time of Day
--- a/man/texinfo.texi Mon Aug 13 10:37:16 2007 +0200 +++ b/man/texinfo.texi Mon Aug 13 10:38:01 2007 +0200 @@ -1,9 +1,9 @@ \input texinfo.tex @c -*-texinfo-*- -@c $Id: texinfo.texi,v 1.6 1998/06/13 04:28:16 steve Exp $ +@c $Id: texinfo.texi,v 1.7 1998/06/20 00:58:34 steve Exp $ @c %**start of header @c All text is ignored before the setfilename. -@setfilename texinfo +@setfilename ../info/texinfo @settitle Texinfo @value{edition} @c Edition number is now the same as the Texinfo distribution version number. @@ -924,7 +924,7 @@ @TeX{} is freely distributable. It is written in a superset of Pascal called WEB and can be compiled either in Pascal or (by using a conversion program that comes with the @TeX{} distribution) in C. -(@xref{TeX Mode, ,@TeX{} Mode, emacs, The GNU Emacs Manual}, for information +(@xref{TeX Mode, ,@TeX{} Mode, xemacs, XEmacs User's Manual}, for information about @TeX{}.)@refill @TeX{} is very powerful and has a great many features. Because a @@ -1561,8 +1561,8 @@ delimiter, you can jump from chapter title to chapter title with the @kbd{C-x ]} (@code{forward-page}) and @kbd{C-x [} (@code{backward-page}) commands and narrow to a chapter with the -@kbd{C-x p} (@code{narrow-to-page}) command. (@xref{Pages, , ,emacs, -The GNU Emacs Manual}, for details about the page commands.)@refill +@kbd{C-x p} (@code{narrow-to-page}) command. (@xref{Pages, , , xemacs, +XEmacs User's Manual}, for details about the page commands.)@refill You may name a Texinfo file however you wish, but the convention is to end a Texinfo file name with one of the three extensions @@ -1777,7 +1777,7 @@ @kbd{C-x n n} (@code{narrow-to-region}) command and @code{texinfo-show-structure} will work on only that region. To see the whole buffer again, use @w{@kbd{C-x n w}} (@code{widen}). -(@xref{Narrowing, , , emacs, The GNU Emacs Manual}, for more +(@xref{Narrowing, , , xemacs, XEmacs User's Manual}, for more information about the narrowing commands.)@refill @vindex page-delimiter @@ -1788,7 +1788,7 @@ ]} (@code{forward-page}) and @kbd{C-x [} (@code{backward-page}) commands to move forward and backward by chapter, and to use the @kbd{C-x p} (@code{narrow-to-page}) command to narrow to a chapter. -@xref{Pages, , , emacs, The GNU Emacs Manual}, for more information +@xref{Pages, , , xemacs, XEmacs User's Manual}, for more information about the page commands.@refill @node Updating Nodes and Menus, Info Formatting, Showing the Structure, Texinfo Mode @@ -1975,10 +1975,9 @@ column to which menu descriptions are indented. By default, the value is 32 although it is often useful to reduce it to as low as 24. You can set the variable with the @kbd{M-x edit-options} command -(@pxref{Edit Options, , Editing Variable Values, emacs, The GNU Emacs -Manual}) or with the @kbd{M-x set-variable} command (@pxref{Examining, -, Examining and Setting Variables, emacs, The GNU Emacs -Manual}).@refill +(@pxref{Edit Options, , Editing Variable Values, xemacs, XEmacs User's +Manual}) or with the @kbd{M-x set-variable} command (@pxref{Examining, , +Examining and Setting Variables, xemacs, XEmacs User's Manual}).@refill Also, the @code{texinfo-indent-menu-description} command may be used to indent existing menu descriptions to a specified column. Finally, if @@ -6146,26 +6145,30 @@ @@uref@{ftp://ftp.gnu.ai.mit.edu/pub/gnu@} @end example -@noindent produces (in text): +@noindent +produces (in text): @display The official GNU ftp site is @uref{ftp://ftp.gnu.ai.mit.edu/pub/gnu} @end display -@noindent whereas +@noindent +whereas @example The official @@uref@{ftp://ftp.gnu.ai.mit.edu/pub/gnu, GNU ftp site@} holds programs and texts. @end example -@noindent produces (in text): +@noindent +produces (in text): @display The official @uref{ftp://ftp.gnu.ai.mit.edu/pub/gnu, GNU ftp site} holds programs and texts. @end display -@noindent and (in HTML): +@noindent +and (in HTML): @example The official <A HREF="ftp://ftp.gnu.ai.mit.edu/pub/gnu">GNU ftp site</A> holds programs and texts. @@ -6806,7 +6809,8 @@ Send bug reports to @@email@{bug-texinfo@@@@gnu.org@}. Send suggestions to the @@email@{bug-texinfo@@@@gnu.org, same place@}. @end example -@noindent produces +@noindent +produces @example Send bug reports to @email{bug-texinfo@@gnu.org}. Send suggestions to the @email{bug-texinfo@@gnu.org, same place}. @@ -8188,7 +8192,8 @@ @@multitable @@columnfractions .33 .33 .33 @end example -@noindent The fractions need not add up exactly to 1.0, as these do +@noindent +The fractions need not add up exactly to 1.0, as these do not. This allows you to produce tables that do not need the full line length. @@ -8229,7 +8234,7 @@ Here is a complete example of a multi-column table (the text is from @cite{The GNU Emacs Manual}, @pxref{Split Window,, Splitting Windows, -emacs, The GNU Emacs Manual}): +xemacs, XEmacs User's Manual}): @example @@multitable @@columnfractions .15 .45 .4 @@ -8249,7 +8254,8 @@ @@end multitable @end example -@noindent produces: +@noindent +produces: @multitable @columnfractions .15 .45 .4 @item Key @tab Command @tab Description @@ -8865,7 +8871,7 @@ The meanings of @code{@@:} and @code{@@.}@: in Texinfo are designed to work well with the Emacs sentence motion commands (@pxref{Sentences,,, -emacs, The GNU Emacs Manual}). This made it necessary for them to be +xemacs, XEmacs User's Manual}). This made it necessary for them to be incompatible with some other formatting systems that use @@-commands. Do not put braces after any of these commands. @@ -8903,7 +8909,8 @@ example. @end example -@noindent produces +@noindent +produces @example Spacey@ @ @ @ @@ -9833,7 +9840,8 @@ @example @@hyphenation@{man-u-script man-u-scripts@} @end example -@noindent @TeX{} only uses the specified hyphenation points when the +@noindent +@TeX{} only uses the specified hyphenation points when the words match exactly, so give all necessary variants. @end table @@ -10415,7 +10423,7 @@ @item @@defspec @var{name} @var{arguments}@dots{} The @code{@@defspec} command is the definition command for special forms. (In Lisp, a special form is an entity much like a function, -@pxref{Special Forms,,, elisp, GNU Emacs Lisp Reference Manual}.) +@pxref{Special Forms,,, lispref, XEmacs Lisp Reference Manual}.) @code{@@defspec} is equivalent to @samp{@@deffn @{Special Form@} @dots{}} and works like @code{@@defun}.@refill @end table @@ -10502,7 +10510,7 @@ @cindex User options, marking The @code{@@defopt} command is the definition command for @dfn{user options}, i.e., variables intended for users to change according to -taste; Emacs has many such (@pxref{Variables,,, emacs, The GNU Emacs +taste; Emacs has many such (@pxref{Variables,,, xemacs, XEmacs User's Manual}). @code{@@defopt} is equivalent to @samp{@@defvr @{User Option@} @dots{}} and works like @code{@@defvar}.@refill @end table @@ -11036,8 +11044,8 @@ @code{@@defun} command and it is followed, on the same line, by the parameter list.@refill -Here is a definition from @ref{Calling Functions,,, elisp, The GNU Emacs -Lisp Reference Manual}. +Here is a definition from @ref{Calling Functions,,, lispref, XEmacs Lisp +Reference Manual}. @quotation @defun apply function &rest arguments @@ -11297,9 +11305,9 @@ It can be either @samp{"separate"} for the separate node style or @samp{"end"} for the end of node style. (You can change the value of this variable with the @kbd{M-x edit-options} command (@pxref{Edit -Options, , Editing Variable Values, emacs, The GNU Emacs Manual}), or +Options, , Editing Variable Values, xemacs, XEmacs User's Manual}), or with the @kbd{M-x set-variable} command (@pxref{Examining, , Examining -and Setting Variables, emacs, The GNU Emacs Manual}).@refill +and Setting Variables, xemacs, XEmacs User's Manual}).@refill The @code{texinfo-footnote-style} variable also controls the style if you use the @kbd{M-x makeinfo-region} or @kbd{M-x makeinfo-buffer} @@ -11852,7 +11860,8 @@ @@@var{macro-name} @{@var{arg1}, @var{arg2}, @dots{}@} @end example -@noindent and the result will be just as if you typed the body of +@noindent +and the result will be just as if you typed the body of @var{macro-name} at that spot. For example: @example @@ -11862,7 +11871,8 @@ @@foo@{a, b@} @end example -@noindent produces: +@noindent +produces: @display Together: a & b. @@ -11893,7 +11903,8 @@ @@bar aah @end example -@noindent produces: +@noindent +produces: @display Twice: aah, aah. @@ -11970,7 +11981,8 @@ tex foo.texi @end example -@noindent @TeX{} will produce a @dfn{DVI file} as well as several auxiliary +@noindent +@TeX{} will produce a @dfn{DVI file} as well as several auxiliary files containing information for indices, cross references, etc. The DVI file (for @dfn{DeVice Independent} file) can be printed on virtually any printe (see the following sections). @@ -12252,10 +12264,10 @@ You can change the values of these variables with the @kbd{M-x edit-options} command (@pxref{Edit Options, , Editing Variable Values, -emacs, The GNU Emacs Manual}), with the @kbd{M-x set-variable} command -(@pxref{Examining, , Examining and Setting Variables, emacs, The GNU -Emacs Manual}), or with your @file{.emacs} initialization file -(@pxref{Init File, , , emacs, The GNU Emacs Manual}).@refill +xemacs, XEmacs User's Manual}), with the @kbd{M-x set-variable} command +(@pxref{Examining, , Examining and Setting Variables, xemacs, XEmacs +User's Manual}), or with your @file{.emacs} initialization file +(@pxref{Init File, , , xemacs, XEmacs User's Manual}).@refill @node Compile-Command, Requirements Summary, Texinfo Mode Printing, Format/Print Hardcopy @comment node-name, next, previous, up @@ -12283,7 +12295,7 @@ @noindent This technique is most often used by programmers who also compile programs -this way; see @ref{Compilation, , , emacs, The GNU Emacs Manual}.@refill +this way; see @ref{Compilation, , , xemacs, XEmacs User's Manual}.@refill @node Requirements Summary, Preparing for TeX, Compile-Command, Format/Print Hardcopy @@ -12948,7 +12960,7 @@ (@code{next-error}). This causes Emacs to go to and position the cursor on the line in the Texinfo source that @code{makeinfo} thinks caused the error. @xref{Compilation, , Running @code{make} or -Compilers Generally, emacs, The GNU Emacs Manual}, for more +Compilers Generally, xemacs, XEmacs User's Manual}, for more information about using the @code{next-error} command.@refill In addition, you can kill the shell in which the @code{makeinfo} @@ -13000,9 +13012,9 @@ @noindent @ifinfo For more information, see@* -@ref{Edit Options, , Editing Variable Values, emacs, The GNU Emacs Manual},@* -@ref{Examining, , Examining and Setting Variables, emacs, The GNU Emacs Manual},@* -@ref{Init File, , , emacs, The GNU Emacs Manual}, and@* +@ref{Edit Options, , Editing Variable Values, xemacs, XEmacs User's Manual},@* +@ref{Examining, , Examining and Setting Variables, xemacs, XEmacs User's Manual},@* +@ref{Init File, , , xemacs, XEmacs User's Manual}, and@* @ref{makeinfo options, , Options for @code{makeinfo}}. @end ifinfo @@ -13052,7 +13064,7 @@ You can format Texinfo files for Info using @code{batch-texinfo-format} and Emacs Batch mode. You can run Emacs in Batch mode from any shell, including a shell inside of Emacs. (@xref{Command Switches, , Command -Line Switches and Arguments, emacs, The GNU Emacs Manual}.)@refill +Line Switches and Arguments, xemacs, XEmacs User's Manual}.)@refill Here is a shell command to format all the files that end in @file{.texinfo} in the current directory: @@ -13099,7 +13111,7 @@ files were always kept short and @dfn{include files} were designed as a way to create a single, large printed manual out of the smaller Info files. @xref{Include Files}, for more information. Include files are -still used for very large documents, such as @cite{The Emacs Lisp +still used for very large documents, such as @cite{The XEmacs Lisp Reference Manual}, in which each chapter is a separate file.)@refill When a file is split, Info itself makes use of a shortened version of @@ -15135,7 +15147,7 @@ Also, if you are writing a manual about software, you should explain that the software is free and either include the GNU General Public License (GPL) or provide a reference to it. @xref{Distrib, , -Distribution, emacs, The GNU Emacs Manual}, for an example of the text +Distribution, xemacs, XEmacs User's Manual}, for an example of the text that could be used in the software ``Distribution'', ``General Public License'', and ``NO WARRANTY'' sections of a document. @xref{Copying, , Texinfo Copying Conditions}, for an example of a brief explanation @@ -15511,7 +15523,7 @@ @end group @end example -The outer Texinfo source file for @cite{The GNU Emacs Lisp Reference +The outer Texinfo source file for @cite{The XEmacs Lisp Reference Manual} is named @file{elisp.texi}. This outer file contains a master menu with 417 entries and a list of 41 @code{@@include} files.@refill @@ -15546,7 +15558,7 @@ no longer necessary to keep them small.@refill Nowadays, multiple Texinfo files are used mostly for large documents, -such as @cite{The GNU Emacs Lisp Reference Manual}, and for projects +such as @cite{The XEmacs Lisp Reference Manual}, and for projects in which several different people write different sections of a document simultaneously.@refill @@ -16106,8 +16118,8 @@ @code{re-search-forward} was called; it was this function that could not find the missing right-hand brace.@refill -@xref{Lisp Debug, , Debugging Emacs Lisp, emacs, The GNU Emacs -Manual}, for more information.@refill +@xref{Lisp Debug, , Debugging Emacs Lisp, xemacs, XEmacs User's Manual}, +for more information.@refill @end ignore @node Debugging with TeX, Using texinfo-show-structure, Debugging with Info, Catching Mistakes @@ -16286,20 +16298,20 @@ window, you can position the cursor over one of the lines and use the @kbd{C-c C-c} command (@code{occur-mode-goto-occurrence}), to jump to the corresponding spot in the Texinfo file. @xref{Other Repeating -Search, , Using Occur, emacs, The GNU Emacs Manual}, for more +Search, , Using Occur, xemacs, XEmacs User's Manual}, for more information about @code{occur-mode-goto-occurrence}.@refill The first line in the @samp{*Occur*} window describes the @dfn{regular expression} specified by @var{texinfo-heading-pattern}. This regular expression is the pattern that @code{texinfo-show-structure} looks for. -@xref{Regexps, , Using Regular Expressions, emacs, The GNU Emacs Manual}, +@xref{Regexps, , Using Regular Expressions, xemacs, XEmacs User's Manual}, for more information.@refill When you invoke the @code{texinfo-show-structure} command, Emacs will display the structure of the whole buffer. If you want to see the structure of just a part of the buffer, of one chapter, for example, use the @kbd{C-x n n} (@code{narrow-to-region}) command to mark the -region. (@xref{Narrowing, , , emacs, The GNU Emacs Manual}.) This is +region. (@xref{Narrowing, , , xemacs, XEmacs User's Manual}.) This is how the example used above was generated. (To see the whole buffer again, use @kbd{C-x n w} (@code{widen}).)@refill @@ -16331,10 +16343,10 @@ @noindent and then, when prompted, type a @dfn{regexp}, a regular expression for the pattern you want to match. (@xref{Regexps, , Regular Expressions, -emacs, The GNU Emacs Manual}.) The @code{occur} command works from -the current location of the cursor in the buffer to the end of the -buffer. If you want to run @code{occur} on the whole buffer, place -the cursor at the beginning of the buffer.@refill +xemacs, XEmacs User's Manual}.) The @code{occur} command works from the +current location of the cursor in the buffer to the end of the buffer. +If you want to run @code{occur} on the whole buffer, place the cursor at +the beginning of the buffer.@refill For example, to see all the lines that contain the word @samp{@@chapter} in them, just type @samp{@@chapter}. This will @@ -16349,7 +16361,7 @@ all the nodes that are part of the same chapter or section and therefore have the same `Up' pointer.@refill -@xref{Other Repeating Search, , Using Occur, emacs , The GNU Emacs Manual}, +@xref{Other Repeating Search, , Using Occur, xemacs, XEmacs User's Manual}, for more information.@refill @node Running Info-Validate, , Using occur, Catching Mistakes @@ -16758,7 +16770,8 @@ @end group @end display -@noindent Please make checks payable to the University of Washington. +@noindent +Please make checks payable to the University of Washington. Checks must be in U.S.@: dollars, drawn on a U.S.@: bank. Overseas sites: please add to the base cost, if desired, $20.00 for shipment via air parcel post, or $30.00 for shipment via courier.
--- a/nt/ChangeLog Mon Aug 13 10:37:16 2007 +0200 +++ b/nt/ChangeLog Mon Aug 13 10:38:01 2007 +0200 @@ -1,3 +1,22 @@ +1998-06-19 Jonathan Harris <jhar@tardis.ed.ac.uk> + + * file.ico, lisp.ico: + New icons to represent a generic file and a lisp file. + + * xemacs.rc: Build file.ico and lisp.ico into the executable. + +1998-06-15 Peter Windle <peterw@sdl.ug.eds.com> + + * xemacs.mak: Made XPM and X11 checks cope with case-sensitive + NFS. Also apply Sean MacLennan's change allowing + emacs_beta_version to be undefined. + +1998-06-19 SL Baur <steve@altair.xemacs.org> + + * xemacs.mak (distclean): Reorder when puresize-adjust.h gets + deleted. + From Adrian Aichner <aichner@ecf.teradyne.com> + 1998-06-08 Kirill M. Katsnelson <kkm@kis.ru> * config.h: Undefined DONT_ENCAPSULATE. @@ -389,14 +408,3 @@ * cpp.exe not used: cl.exe from VC++4.2 seems to handle everything properly. -NOTES: - -Compilation with nmake -f xemacs.mak. - -Using X11R6.3 for NT. - -Work started with 20.1b2. - -Local Variables: -mode: change-log -End:
--- a/nt/xemacs.mak Mon Aug 13 10:37:16 2007 +0200 +++ b/nt/xemacs.mak Mon Aug 13 10:38:01 2007 +0200 @@ -94,8 +94,8 @@ !message Please specify root directory for your XPM installation: XPM_DIR=path CONFIG_ERROR=1 !endif -!if $(HAVE_MSW) && $(HAVE_XPM) && defined(XPM_DIR) && !exist("$(XPM_DIR)\LIB\XPM.LIB") -!message Specified XPM directory does not contain "$(XPM_DIR)\LIB\XPM.LIB" +!if $(HAVE_MSW) && $(HAVE_XPM) && defined(XPM_DIR) && !exist("$(XPM_DIR)\lib\Xpm.lib") +!message Specified XPM directory does not contain "$(XPM_DIR)\lib\Xpm.lib" CONFIG_ERROR=1 !endif !if $(HAVE_MSW) && $(HAVE_TOOLBARS) && !$(HAVE_XPM) @@ -259,7 +259,7 @@ -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \ -DINFODOCK_BUILD_VERSION=$(infodock_build_version) !else -!if defined(emacs_beta_version) +!if "$(emacs_beta_version)" != "" XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version)-b$(emacs_beta_version) !else XEMACS_VERSION_STRING=$(emacs_major_version).$(emacs_minor_version) @@ -553,6 +553,11 @@ # TEMACS Executable +# This may not exist +!if "$(emacs_beta_version)" != "" +EMACS_BETA_VERSION=-DEMACS_BETA_VERSION=$(emacs_beta_version) +!ENDIF + TEMACS_DIR=$(XEMACS)\src TEMACS=$(TEMACS_DIR)\temacs.exe TEMACS_BROWSE=$(TEMACS_DIR)\temacs.bsc @@ -567,7 +572,7 @@ TEMACS_CPP_FLAGS= $(WARN_CPP_FLAGS) $(INCLUDES) $(DEFINES) $(DEBUG_DEFINES) \ -DEMACS_MAJOR_VERSION=$(emacs_major_version) \ -DEMACS_MINOR_VERSION=$(emacs_minor_version) \ - -DEMACS_BETA_VERSION=$(emacs_beta_version) \ + $(EMACS_BETA_VERSION) \ -DXEMACS_CODENAME=\"$(xemacs_codename)\" \ -DPATH_PACKAGEPATH=\"$(PATH_PACKAGEPATH)\" @@ -817,12 +822,12 @@ del *.rej del *.pdb del *.tmp - del puresize-adjust.h cd $(OUTDIR) del *.obj del *.sbr del *.lib cd $(XEMACS)\$(TEMACS_DIR) + del puresize-adjust.h del config.h del paths.h del Emacs.ad.h
--- a/nt/xemacs.rc Mon Aug 13 10:37:16 2007 +0200 +++ b/nt/xemacs.rc Mon Aug 13 10:38:01 2007 +0200 @@ -1,1 +1,3 @@ XEmacs icon preload "xemacs.ico" +XEmacsFile icon "File.ico" +XEmacsLisp icon "Lisp.ico"
--- a/src/ChangeLog Mon Aug 13 10:37:16 2007 +0200 +++ b/src/ChangeLog Mon Aug 13 10:38:01 2007 +0200 @@ -1,3 +1,86 @@ +1998-06-19 Jonathan Harris <jhar@tardis.ed.ac.uk> + + * redisplay-msw.c: new function mswindows_apply_face_effects. + This is called by output_string and output_cursor to display + underline and strikeout on faces. + +1998-06-19 Jonathan Harris <jhar@tardis.ed.ac.uk> + + * console-msw.h: added a list of fonts to device data. + + * device-msw.c: enumerate list of available fonts in + mswindows_init_device. Free list in mswindows_delete_device. + + * objects-msw.c: Added helper function match_font used by + mswindows_initialize_font_instance and mswindows_list_fonts. + Allow a charset to be specified in a font string, even if + previous fields havn't been specified. + +1998-06-15 Jonathan Harris <jhar@tardis.ed.ac.uk> + + * objects-msw.c: + Removed compilation warnings from mswindows_string_to_color. + mswindows_list_fonts returns a more general bogus font. + New lisp-visible function mswindows-color-list. + +1998-06-19 David Bush <david.bush@adn.alcatel.com> + + * editfns.c (Fuser_login_name): Modify to user new function + user_login_name. + (user_login_name): C only function to avoid Lisp object overhead + Returns "unknown" instead of nil in Cygwin environment + + * fileio.c (Fexpand_file_name): Treat "~" and "~user" as + equivalent for current user in Cygwin environment. Use new + function user_login_name to get username. + + * lisp.h: Declare user_login_name + +1998-06-18 Michael Sperber [Mr. Preprocessor] <sperber@informatik.uni-tuebingen.de> + + * unexaix.c (make_hdr): Fixed bias computations so debugging info + works again. + Some other insignificant nitpicks. + +1998-06-18 Andy Piper <andyp@parallax.co.uk> + + * toolbar-msw.c (mswindows_output_toolbar): specify ILC_MASK when + creating the image list and make sure he bk color is transparent. + +1998-06-18 Jan Vroonhof <vroonhof@math.ethz.ch> + + * event-Xt.c (emacs_Xt_remove_timeout): Also remove timeout from + completed_timeouts. The timer could have expired. + +1998-06-17 Andy Piper <andyp@parallax.co.uk> + + * console-msw.h: move XEMACS_RECT_WH inside frame + parameters. define macors to access it. + + * frame-msw.c (mswindows_init_frame_1): use new target_rect + parameter to intialise desired sizing. (mswindows_init_frame_2): + enable and size the frame to something sensible when we get + here. (mswindows_set_frame_properites): use new + mswindows_size_frame_internal function and size frame if frame + parameters not just if init is finished - WM_SIZE happens too + early for some specs. (mswindows_size_frame_internal): new + function abstracted from mswindows_set_frame_properties. + (Vmswindows_use_system_frame_size_defaults): + new variable controls whether to allow the system to pick frame + size defaults, defaults to nil. + + * event-msw.c: in WM_SIZE use mswindows_size_frame_internal rather + than duplicated code. + +1998-06-15 Colin Rafferty <colin@xemacs.org> + + * Makefile.in.in: Made EXTW_LINK expand properly. + +1998-06-12 Martin Buchholz <martin@xemacs.org> + + * redisplay.c (vars_of_redisplay): default value of + column-number-start-at-one should be NIL! + 1998-06-11 Martin Buchholz <martin@xemacs.org> * casefiddle.c:
--- a/src/Makefile.in.in Mon Aug 13 10:37:16 2007 +0200 +++ b/src/Makefile.in.in Mon Aug 13 10:38:01 2007 +0200 @@ -228,21 +228,39 @@ # ifdef USE_GCC # ifdef USG5 # define EXTW_LINK(objs, output) $(CC) -shared objs -Xlinker -z -Xlinker text -o output +extw_link_beg = $(CC) -shared +extw_link_mid = -Xlinker -z -Xlinker text -o +extw_link_end = ## I cannot figure out how to do shared a.out libraries, so just punt. # elif !defined (LINUX) || defined (__ELF__) # define EXTW_LINK(objs, output) $(CC) -shared objs -o output +extw_link_beg = $(CC) -shared +extw_link_mid = -o +extw_link_end = # endif # elif defined (USG5) # if defined (IRIX) # define EXTW_LINK(objs, output) $(LD) -shared -g -check_registry ${TOOLROOT}/usr/lib/so_locations objs -o output +extw_link_beg = $(LD) -shared -g -check_registry ${TOOLROOT}/usr/lib/so_locations +extw_link_mid = -o +extw_link_end = # else /* not IRIX */ # define EXTW_LINK(objs, output) $(CC) -G objs -z text -o output +extw_link_beg = $(CC) -G +extw_link_mid = -z text -o +extw_link_end = # endif /* not IRIX */ # else /* not USG5 */ # if defined (DEC_ALPHA) && defined (OSF1) # define EXTW_LINK(objs, output) $(LD) $(ldflags) $(ld_switch_shared) -d objs -o output $(LIBES) +extw_link_beg = $(LD) $(ldflags) $(ld_switch_shared) -d +extw_link_mid = -o +extw_link_end = $(LIBES) # else /* !(DEC_ALPHA && OSF1) */ # define EXTW_LINK(objs, output) $(LD) -dc objs -assert pure-text -o output +extw_link_beg = $(LD) -dc +extw_link_mid = -assert pure-text -o +extw_link_end = # endif /* !(DEC_ALPHA && OSF1) */ # endif /* not USG5 */ @@ -573,13 +591,13 @@ #ifdef EXTW_LINK libextcli_Xm.so.1: ${external_client_motif_objs_shared} - EXTW_LINK(${external_client_motif_objs_shared}, libextcli_Xm.so.1) + ${extw_link_beg} ${external_client_motif_objs_shared} ${extw_link_mid} libextcli_Xm.so.1 ${extw_link_end} libextcli_Xt.so.1: ${external_client_xt_objs_shared} - EXTW_LINK(${external_client_xt_objs_shared}, libextcli_Xt.so.1) + ${extw_link_beg} ${external_client_xt_objs_shared} ${extw_link_mid} libextcli_Xt.so.1 ${extw_link_end} libextcli_Xlib.so.1: ${external_client_xlib_objs_shared} - EXTW_LINK(${external_client_xlib_objs_shared}, libextcli_Xlib.so.1) + ${extw_link_beg} ${external_client_xlib_objs_shared} ${extw_link_mid} libextcli_Xlib.so.1 ${extw_link_end} #endif /* EXTW_LINK */
--- a/src/console-msw.h Mon Aug 13 10:37:16 2007 +0200 +++ b/src/console-msw.h Mon Aug 13 10:38:01 2007 +0200 @@ -83,6 +83,14 @@ * Device */ +#define MSW_FONTSIZE (LF_FACESIZE*4+12) + +struct mswindows_font_enum +{ + char fontname[MSW_FONTSIZE]; + struct mswindows_font_enum *next; +}; + struct mswindows_device { int logpixelsx, logpixelsy; @@ -90,6 +98,7 @@ int horzres, vertres; /* Size in pixels */ int horzsize, vertsize; /* Size in mm */ int bitspixel; + struct mswindows_font_enum *fontlist; }; #define DEVICE_MSWINDOWS_DATA(d) DEVICE_TYPE_DATA (d, mswindows) @@ -102,11 +111,19 @@ #define DEVICE_MSWINDOWS_HORZSIZE(d) (DEVICE_MSWINDOWS_DATA (d)->horzsize) #define DEVICE_MSWINDOWS_VERTSIZE(d) (DEVICE_MSWINDOWS_DATA (d)->vertsize) #define DEVICE_MSWINDOWS_BITSPIXEL(d) (DEVICE_MSWINDOWS_DATA (d)->bitspixel) +#define DEVICE_MSWINDOWS_FONTLIST(d) (DEVICE_MSWINDOWS_DATA (d)->fontlist) /* * Frame */ +typedef struct +{ + int left; + int top; + int width; + int height; +} XEMACS_RECT_WH; struct mswindows_frame { @@ -150,6 +167,10 @@ int ignore_next_lbutton_up : 1; int ignore_next_rbutton_up : 1; int sizing : 1; + + /* Geometry, in characters, as specified by proplist during frame + creation. Memebers are set to -1 for unspecified */ + XEMACS_RECT_WH* target_rect; }; #define FRAME_MSWINDOWS_DATA(f) FRAME_TYPE_DATA (f, mswindows) @@ -166,6 +187,7 @@ #define FRAME_MSWINDOWS_TITLE_CHECKSUM(f) (FRAME_MSWINDOWS_DATA (f)->title_checksum) #define FRAME_MSWINDOWS_CHARWIDTH(f) (FRAME_MSWINDOWS_DATA (f)->charwidth) #define FRAME_MSWINDOWS_CHARHEIGHT(f) (FRAME_MSWINDOWS_DATA (f)->charheight) +#define FRAME_MSWINDOWS_TARGET_RECT(f) (FRAME_MSWINDOWS_DATA (f)->target_rect) /* Frame check and validation macros */ #define FRAME_MSWINDOWS_P(frm) CONSOLE_TYPESYM_MSWINDOWS_P (FRAME_TYPE (frm)) @@ -200,6 +222,7 @@ void mswindows_redraw_exposed_area (struct frame *f, int x, int y, int width, int height); +void mswindows_size_frame_internal (struct frame* f, XEMACS_RECT_WH* dest); /* win32 DDE management library */ #define MSWINDOWS_DDE_ITEM_OPEN "Open" @@ -225,15 +248,6 @@ #endif extern Lisp_Object Vmswindows_frame_being_created; -typedef struct -{ - int left; - int top; - int width; - int height; -} XEMACS_RECT_WH; - -extern XEMACS_RECT_WH mswindows_frame_target_rect; extern Lisp_Object mswindows_frame_being_created; #endif /* _XEMACS_CONSOLE_MSW_H_ */
--- a/src/device-msw.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/device-msw.c Mon Aug 13 10:38:01 2007 +0200 @@ -62,25 +62,138 @@ Lisp_Object Qinit_pre_mswindows_win, Qinit_post_mswindows_win; +struct font_enum_t +{ + HDC hdc; + struct device *d; +}; + + +/************************************************************************/ +/* helpers */ +/************************************************************************/ + +static int CALLBACK +font_enum_callback_2 (ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *lpntme, + int FontType, struct font_enum_t *font_enum) +{ + struct mswindows_font_enum *fontlist, **fonthead; + char fontname[MSW_FONTSIZE]; + + /* The enumerated font weights are not to be trusted because: + * a) lpelfe->elfStyle is only filled in for TrueType fonts. + * b) Not all Bold and Italic styles of all fonts (inluding some Vector, + * Truetype and Raster fonts) are enumerated. + * I guess that fonts for which Bold and Italic styles are generated + * 'on-the-fly' are not enumerated. It would be overly restrictive to + * disallow Bold And Italic weights for these fonts, so we just leave + * weights unspecified. This means that we have to weed out duplicates of + * those fonts that do get enumerated with different weights. */ + + if (FontType == 0 /*vector*/ || FontType == TRUETYPE_FONTTYPE) + /* Scalable, so leave pointsize blank */ + sprintf (fontname, "%s::::%s", lpelfe->elfLogFont.lfFaceName, + lpelfe->elfScript); + else + /* Formula for pointsize->height from LOGFONT docs in Platform SDK */ + sprintf (fontname, "%s::%d::%s", lpelfe->elfLogFont.lfFaceName, + MulDiv (lpntme->ntmTm.tmHeight - lpntme->ntmTm.tmInternalLeading, + 72, DEVICE_MSWINDOWS_LOGPIXELSY (font_enum->d)), + lpelfe->elfScript); + + fonthead = &DEVICE_MSWINDOWS_FONTLIST (font_enum->d); + fontlist = *fonthead; + while (fontlist) + if (!strcmp (fontname, fontlist->fontname)) + return 1; /* found a duplicate */ + else + fontlist = fontlist->next; + + /* Insert entry at head */ + fontlist = *fonthead; + *fonthead = xmalloc (sizeof (struct mswindows_font_enum)); + if (*fonthead == NULL) + { + *fonthead = fontlist; + return 0; + } + strcpy ((*fonthead)->fontname, fontname); + (*fonthead)->next = fontlist; + return 1; +} + +static int CALLBACK +font_enum_callback_1 (ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *lpntme, + int FontType, struct font_enum_t *font_enum) +{ + /* This function gets called once per facename per character set. + * We call a second callback to enumerate the fonts in each facename */ + return EnumFontFamiliesEx (font_enum->hdc, &lpelfe->elfLogFont, + (FONTENUMPROC) font_enum_callback_2, + (LPARAM) font_enum, 0); +} + +static Lisp_Object +build_syscolor_string (int index) +{ + DWORD clr; + char buf[16]; + + if (index < 0) + return Qnil; + + clr = GetSysColor (index); + sprintf (buf, "#%02X%02X%02X", + GetRValue (clr), + GetGValue (clr), + GetBValue (clr)); + return build_string (buf); +} + +static Lisp_Object +build_syscolor_cons (int index1, int index2) +{ + Lisp_Object color1, color2; + struct gcpro gcpro1; + GCPRO1 (color1); + color1 = build_syscolor_string (index1); + color2 = build_syscolor_string (index2); + RETURN_UNGCPRO (Fcons (color1, color2)); +} + +static Lisp_Object +build_sysmetrics_cons (int index1, int index2) +{ + return Fcons (index1 < 0 ? Qnil : make_int (GetSystemMetrics (index1)), + index2 < 0 ? Qnil : make_int (GetSystemMetrics (index2))); +} + + + +/************************************************************************/ +/* methods */ +/************************************************************************/ + static void mswindows_init_device (struct device *d, Lisp_Object props) { WNDCLASSEX wc; - HWND desktop; HDC hdc; + LOGFONT logfont; + struct font_enum_t font_enum; + DEVICE_CLASS (d) = Qcolor; DEVICE_INFD (d) = DEVICE_OUTFD (d) = -1; init_baud_rate (d); init_one_device (d); d->device_data = xnew_and_zero (struct mswindows_device); - - desktop = GetDesktopWindow(); - hdc = GetDC(desktop); + hdc = CreateCompatibleDC (NULL); + assert (hdc!=NULL); DEVICE_MSWINDOWS_LOGPIXELSX(d) = GetDeviceCaps(hdc, LOGPIXELSX); DEVICE_MSWINDOWS_LOGPIXELSY(d) = GetDeviceCaps(hdc, LOGPIXELSY); DEVICE_MSWINDOWS_PLANES(d) = GetDeviceCaps(hdc, PLANES); - /* FIXME: Only valid if RC_PALETTE bit set in RASTERCAPS, + /* #### SIZEPALETTE only valid if RC_PALETTE bit set in RASTERCAPS, what should we return for a non-palette-based device? */ DEVICE_MSWINDOWS_CELLS(d) = GetDeviceCaps(hdc, SIZEPALETTE); DEVICE_MSWINDOWS_HORZRES(d) = GetDeviceCaps(hdc, HORZRES); @@ -88,9 +201,16 @@ DEVICE_MSWINDOWS_HORZSIZE(d) = GetDeviceCaps(hdc, HORZSIZE); DEVICE_MSWINDOWS_VERTSIZE(d) = GetDeviceCaps(hdc, VERTSIZE); DEVICE_MSWINDOWS_BITSPIXEL(d) = GetDeviceCaps(hdc, BITSPIXEL); - ReleaseDC(desktop, hdc); - DEVICE_CLASS(d) = Qcolor; + DEVICE_MSWINDOWS_FONTLIST (d) = NULL; + logfont.lfCharSet = DEFAULT_CHARSET; + logfont.lfFaceName[0] = '\0'; + logfont.lfPitchAndFamily = DEFAULT_PITCH; + font_enum.hdc = hdc; + font_enum.d = d; + EnumFontFamiliesEx (hdc, &logfont, (FONTENUMPROC) font_enum_callback_1, + (LPARAM) (&font_enum), 0); + DeleteDC (hdc); /* Register the main window class */ wc.cbSize = sizeof (WNDCLASSEX); @@ -137,45 +257,22 @@ static void mswindows_delete_device (struct device *d) { + struct mswindows_font_enum *fontlist, *next; + + fontlist = DEVICE_MSWINDOWS_FONTLIST (d); + while (fontlist) + { + next = fontlist->next; + free (fontlist); + fontlist = next; + } + #ifdef HAVE_DRAGNDROP DdeNameService (mswindows_dde_mlid, 0L, 0L, DNS_REGISTER); DdeUninitialize (mswindows_dde_mlid); #endif -} -static Lisp_Object -build_syscolor_string (int index) -{ - DWORD clr; - char buf[16]; - - if (index < 0) - return Qnil; - - clr = GetSysColor (index); - sprintf (buf, "#%02X%02X%02X", - GetRValue (clr), - GetGValue (clr), - GetBValue (clr)); - return build_string (buf); -} - -static Lisp_Object -build_syscolor_cons (int index1, int index2) -{ - Lisp_Object color1, color2; - struct gcpro gcpro1; - GCPRO1 (color1); - color1 = build_syscolor_string (index1); - color2 = build_syscolor_string (index2); - RETURN_UNGCPRO (Fcons (color1, color2)); -} - -static Lisp_Object -build_sysmetrics_cons (int index1, int index2) -{ - return Fcons (index1 < 0 ? Qnil : make_int (GetSystemMetrics (index1)), - index2 < 0 ? Qnil : make_int (GetSystemMetrics (index2))); + free (d->device_data); } static Lisp_Object @@ -271,6 +368,7 @@ { return XDEVIMPF_PIXEL_GEOMETRY; } + /************************************************************************/ /* initialization */
--- a/src/editfns.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/editfns.c Mon Aug 13 10:38:01 2007 +0200 @@ -637,12 +637,43 @@ */ (uid)) { - struct passwd *pw = NULL; + char *returned_name; + int local_uid; if (!NILP (uid)) { CHECK_INT (uid); - pw = getpwuid (XINT (uid)); + local_uid = XINT(uid); + returned_name = user_login_name(&local_uid); + } + else + { + returned_name = user_login_name(NULL); + } + /* #### - I believe this should return nil instead of "unknown" when pw==0 + pw=0 is indicated by a null return from user_login_name + */ + return returned_name ? build_string (returned_name) : Qnil; +} + +/* This function may be called from other C routines when a + character string representation of the user_login_name is + needed but a Lisp Object is not. The UID is passed by + reference. If UID == NULL, then the USER name + for the user running Xemacs will be returned. This + corresponds to a nil argument to Fuser_login_name. +*/ +char* +user_login_name (uid) + int *uid; +{ + struct passwd *pw = NULL; + + /* uid == NULL to return name of this user */ + if (uid != NULL) + { + pw = getpwuid (*uid); + return pw ? pw->pw_name : NULL; } else { @@ -659,12 +690,22 @@ #endif ); if (user_name) - return build_string (user_name); + return (user_name); else - pw = getpwuid (geteuid ()); + { + pw = getpwuid (geteuid ()); +#ifdef __CYGWIN32__ + /* Since the Cygwin environment may not have an /etc/passwd, + return "unknown" instead of the null if the username + cannot be determined. + */ + return pw ? pw->pw_name : "unknown"; +#else + /* For all but Cygwin return NULL (nil) */ + return pw ? pw->pw_name : NULL; +#endif + } } - /* #### - I believe this should return nil instead of "unknown" when pw==0 */ - return pw ? build_string (pw->pw_name) : Qnil; } DEFUN ("user-real-login-name", Fuser_real_login_name, 0, 0, 0, /*
--- a/src/event-Xt.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/event-Xt.c Mon Aug 13 10:38:01 2007 +0200 @@ -1685,28 +1685,58 @@ { struct Xt_timeout *timeout, *t2; + timeout = NULL; + /* Find the timeout on the list of pending ones, if it's still there. */ - if (!pending_timeouts) return; - if (id == pending_timeouts->id) - { - timeout = pending_timeouts; - pending_timeouts = pending_timeouts->next; - } - else + if (pending_timeouts) { - t2 = pending_timeouts; - while (t2->next && t2->next->id != id) t2 = t2->next; - if (! t2->next) return; - timeout = t2->next; - t2->next = t2->next->next; + if (id == pending_timeouts->id) + { + timeout = pending_timeouts; + pending_timeouts = pending_timeouts->next; + } + else + { + t2 = pending_timeouts; + while (t2->next && t2->next->id != id) t2 = t2->next; + if ( t2->next) /*found it */ + { + timeout = t2->next; + t2->next = t2->next->next; + } + } + /* if it was pending, we have removed it from the list */ + if (timeout) + XtRemoveTimeOut (timeout->interval_id); } - /* At this point, we've found the thing on the list of pending timeouts, - and removed it. - */ - - XtRemoveTimeOut (timeout->interval_id); - Blocktype_free (the_Xt_timeout_blocktype, timeout); + /* It could be that the Xt call back was already called but we didn't convert + into an Emacs event yet */ + if (!timeout && completed_timeouts) + { + /* Code duplication! */ + if (id == completed_timeouts->id) + { + timeout = completed_timeouts; + completed_timeouts = completed_timeouts->next; + } + else + { + t2 = completed_timeouts; + while (t2->next && t2->next->id != id) t2 = t2->next; + if ( t2->next) /*found it */ + { + timeout = t2->next; + t2->next = t2->next->next; + } + } + } + + /* If we found the thing on the lists of timeouts, + and removed it, deallocate + */ + if (timeout) + Blocktype_free (the_Xt_timeout_blocktype, timeout); } static void
--- a/src/event-msw.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/event-msw.c Mon Aug 13 10:38:01 2007 +0200 @@ -1893,7 +1893,7 @@ if (wParam==SIZE_MINIMIZED) { /* Iconified */ - FRAME_VISIBLE_P (frame) = 0; + FRAME_VISIBLE_P (frame) = 0; mswindows_enqueue_magic_event (hwnd, XM_UNMAPFRAME); } else @@ -1911,42 +1911,15 @@ /* If we are inside frame creation, we have to apply geometric properties now. */ - if (mswindows_frame_target_rect.left >= 0 - || mswindows_frame_target_rect.top >= 0 - || mswindows_frame_target_rect.width >= 0 - || mswindows_frame_target_rect.height >= 0) + if (FRAME_MSWINDOWS_TARGET_RECT (frame)) { /* Yes, we have to size again */ - XEMACS_RECT_WH geom; - - geom.left = mswindows_frame_target_rect.left; - geom.top = mswindows_frame_target_rect.top; - char_to_real_pixel_size (frame, - mswindows_frame_target_rect.width, - mswindows_frame_target_rect.height, - &geom.width, &geom.height); - if (mswindows_frame_target_rect.width < 0) - geom.width = -1; - if (mswindows_frame_target_rect.height < 0) - geom.height = -1; - + mswindows_size_frame_internal ( frame, + FRAME_MSWINDOWS_TARGET_RECT + (frame)); /* Reset to we do not get here again */ - mswindows_frame_target_rect.left = -1; - mswindows_frame_target_rect.top = -1; - mswindows_frame_target_rect.width = -1; - mswindows_frame_target_rect.height = -1; - - /* Size the rectangle to the actual size */ - GetWindowRect (hwnd, &rect); - SetWindowPos - (hwnd, NULL, - geom.left >= 0 ? geom.left : rect.left, - geom.top >= 0 ? geom.top : rect.top, - geom.width >= 0 ? geom.width : rect.right - rect.left, - geom.height >= 0 ? geom.height : rect.bottom - rect.top, - SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSENDCHANGING - | ((geom.left >= 0 || geom.top >= 0) ? 0 : SWP_NOMOVE) - | ((geom.width >= 0 || geom.height >= 0) ? 0 : SWP_NOSIZE)); + xfree (FRAME_MSWINDOWS_TARGET_RECT (frame)); + FRAME_MSWINDOWS_TARGET_RECT (frame) = 0; } else {
--- a/src/fileio.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/fileio.c Mon Aug 13 10:38:01 2007 +0200 @@ -789,6 +789,9 @@ #endif /* WINDOWSNT */ int length; Lisp_Object handler; +#ifdef __CYGWIN32__ + char *user; +#endif CHECK_STRING (name); @@ -1019,6 +1022,19 @@ dostounix_filename (newdir); nm += strlen(o) + 1; #else /* not WINDOWSNT */ +#ifdef __CYGWIN32__ + if ((user = user_login_name (NULL)) != NULL) + { + /* Does the user login name match the ~name? */ + if (strcmp(user,((char *) o + 1)) == 0) + { + newdir = (Bufbyte *) get_home_directory(); + nm = p; + } + } + if (! newdir) + { +#endif /* __CYGWIN32__ */ /* Jamie reports that getpwnam() can get wedged by SIGIO/SIGALARM occurring in it. (It can call select()). */ slow_down_interrupts (); @@ -1029,6 +1045,9 @@ newdir = (Bufbyte *) pw -> pw_dir; nm = p; } +#ifdef __CYGWIN32__ + } +#endif #endif /* not WINDOWSNT */ /* If we don't find a user of that name, leave the name
--- a/src/frame-msw.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/frame-msw.c Mon Aug 13 10:38:01 2007 +0200 @@ -55,6 +55,10 @@ #define POPUP_WIDTH 30 #define POPUP_HEIGHT 10 +/* Default popup size, in characters */ +#define DEFAULT_FRAME_WIDTH 80 +#define DEFAULT_FRAME_HEIGHT 35 + #ifdef HAVE_MENUBARS #define ADJR_MENUFLAG TRUE #else @@ -63,6 +67,7 @@ /* Default properties to use when creating frames. */ Lisp_Object Vdefault_mswindows_frame_plist; +Lisp_Object Vmswindows_use_system_frame_size_defaults; /* Lisp_Object Qname, Qheight, Qwidth, Qinitially_unmapped, Qpopup, Qtop, Qleft; */ Lisp_Object Qinitially_unmapped, Qpopup; @@ -71,10 +76,6 @@ frame Lisp_Object already protected by Fmake_frame */ Lisp_Object Vmswindows_frame_being_created; -/* Geometry, in characters, as specified by proplist during frame - creation. Memebers are set to -1 for unspecified */ -XEMACS_RECT_WH mswindows_frame_target_rect; - static void mswindows_init_frame_1 (struct frame *f, Lisp_Object props) { @@ -111,13 +112,16 @@ if (!NILP (height)) CHECK_INT (height); - mswindows_frame_target_rect.left = NILP (left) ? -1 : abs (XINT (left)); - mswindows_frame_target_rect.top = NILP (top) ? -1 : abs (XINT (top)); - mswindows_frame_target_rect.width = NILP (width) ? -1 : abs (XINT (width)); - mswindows_frame_target_rect.height = NILP (height) ? -1 : abs (XINT (height)); + f->frame_data = xnew_and_zero (struct mswindows_frame); + FRAME_MSWINDOWS_TARGET_RECT (f) = xnew_and_zero (XEMACS_RECT_WH); - f->frame_data = xnew_and_zero (struct mswindows_frame); - + FRAME_MSWINDOWS_TARGET_RECT (f)->left = NILP (left) ? -1 : abs (XINT (left)); + FRAME_MSWINDOWS_TARGET_RECT (f)->top = NILP (top) ? -1 : abs (XINT (top)); + FRAME_MSWINDOWS_TARGET_RECT (f)->width = NILP (width) ? -1 : + abs (XINT (width)); + FRAME_MSWINDOWS_TARGET_RECT (f)->height = NILP (height) ? -1 : + abs (XINT (height)); + /* Misc frame stuff */ FRAME_MSWINDOWS_DATA(f)->button2_need_lbutton = 0; FRAME_MSWINDOWS_DATA(f)->button2_need_rbutton = 0; @@ -150,8 +154,6 @@ first_frame = 0; } - /* We always create am overlapped frame with default size, - and later adjust only requested geometry parameters. */ rect_default.left = rect_default.top = CW_USEDEFAULT; rect_default.width = rect_default.height = CW_USEDEFAULT; } @@ -203,12 +205,20 @@ SetTextAlign (FRAME_MSWINDOWS_DC(f), TA_BASELINE | TA_LEFT | TA_NOUPDATECP); } -#if 0 /* #### unused */ static void mswindows_init_frame_2 (struct frame *f, Lisp_Object props) { + if (NILP (Vmswindows_use_system_frame_size_defaults)) + { + /* I don't think anything can set the frame size before this + since we don't have X resources. This may change if we look + at the registry. Even so these values can get overridden + later.*/ + XEMACS_RECT_WH dest = { -1, -1, DEFAULT_FRAME_WIDTH, + DEFAULT_FRAME_HEIGHT }; + mswindows_size_frame_internal (f, &dest); + } } -#endif /* Called after frame's properties are set */ static void @@ -264,12 +274,12 @@ } static void -mswindows_set_frame_size (struct frame *f, int cols, int rows) +mswindows_set_frame_size (struct frame *f, int width, int height) { RECT rect; rect.left = rect.top = 0; - rect.right = cols; - rect.bottom = rows; + rect.right = width; + rect.bottom = height; AdjustWindowRectEx (&rect, GetWindowLong (FRAME_MSWINDOWS_HANDLE(f), GWL_STYLE), @@ -505,8 +515,8 @@ static void mswindows_set_frame_properties (struct frame *f, Lisp_Object plist) { - int x=0, y=0; - int width = 0, height = 0; + int x=-1, y=-1; + int width = -1, height = -1; BOOL width_specified_p = FALSE; BOOL height_specified_p = FALSE; BOOL x_specified_p = FALSE; @@ -566,46 +576,61 @@ /* Now we've extracted the properties, apply them. Do not apply geometric properties during frame creation. This is excessive anyways, and this loses becuase WM_SIZE has not - been sent yet, so frame width and height fields are not initialized - */ - if (f->init_finished - && (width_specified_p || height_specified_p || x_specified_p || y_specified_p)) + been sent yet, so frame width and height fields are not initialized. + + unfortunately WM_SIZE loses as well since the resize is only + applied once and the first time WM_SIZE is applied not everything + is initialised in the frame (toolbars for instance). enabling + this always makes no visible difference and fixes a whole host of + bugs (and is more consistent with X) so I am going to reenable it. + --andyp */ + if ( FRAME_PIXWIDTH (f) && FRAME_PIXHEIGHT (f) + && (width_specified_p || height_specified_p || x_specified_p || y_specified_p)) { - Lisp_Object frame = Qnil; - RECT rect; - int pixel_width, pixel_height; - XSETFRAME (frame, f); + XEMACS_RECT_WH dest = { x, y, width, height }; + + mswindows_size_frame_internal (f, &dest); + } +} - char_to_real_pixel_size (f, width, height, &pixel_width, &pixel_height); - if (!width_specified_p) - pixel_width = FRAME_PIXWIDTH (f); - if (!height_specified_p) - pixel_height = FRAME_PIXHEIGHT (f); +void mswindows_size_frame_internal (struct frame* f, XEMACS_RECT_WH* dest) +{ + RECT rect; + int pixel_width, pixel_height; + int size_p = (dest->width >=0 || dest->height >=0); + int move_p = (dest->top >=0 || dest->left >=0); - GetWindowRect (FRAME_MSWINDOWS_HANDLE(f), &rect); - if (!x_specified_p) - x = rect.left; - if (!y_specified_p) - y = rect.top; + char_to_real_pixel_size (f, dest->width, dest->height, &pixel_width, &pixel_height); + + if (dest->width < 0) + pixel_width = FRAME_PIXWIDTH (f); + if (dest->height < 0) + pixel_height = FRAME_PIXHEIGHT (f); + + GetWindowRect (FRAME_MSWINDOWS_HANDLE(f), &rect); + if (dest->left < 0) + dest->left = rect.left; + if (dest->top < 0) + dest->top = rect.top; - rect.left = rect.top = 0; - rect.right = pixel_width; - rect.bottom = pixel_height; - AdjustWindowRectEx (&rect, - GetWindowLong (FRAME_MSWINDOWS_HANDLE(f), GWL_STYLE), - GetMenu (FRAME_MSWINDOWS_HANDLE(f)) != NULL, - GetWindowLong (FRAME_MSWINDOWS_HANDLE(f), GWL_EXSTYLE)); - + rect.left = rect.top = 0; + rect.right = pixel_width; + rect.bottom = pixel_height; + + AdjustWindowRectEx (&rect, + GetWindowLong (FRAME_MSWINDOWS_HANDLE(f), GWL_STYLE), + GetMenu (FRAME_MSWINDOWS_HANDLE(f)) != NULL, + GetWindowLong (FRAME_MSWINDOWS_HANDLE(f), GWL_EXSTYLE)); - if (IsIconic (FRAME_MSWINDOWS_HANDLE(f)) || IsZoomed (FRAME_MSWINDOWS_HANDLE(f))) - ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_RESTORE); + if (IsIconic (FRAME_MSWINDOWS_HANDLE(f)) + || IsZoomed (FRAME_MSWINDOWS_HANDLE(f))) + ShowWindow (FRAME_MSWINDOWS_HANDLE(f), SW_RESTORE); - SetWindowPos (FRAME_MSWINDOWS_HANDLE(f), NULL, - x, y, rect.right - rect.left, rect.bottom - rect.top, - SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSENDCHANGING - | ((width_specified_p || height_specified_p) ? 0 : SWP_NOSIZE) - | ((x_specified_p || y_specified_p) ? 0 : SWP_NOMOVE)); - } + SetWindowPos (FRAME_MSWINDOWS_HANDLE(f), NULL, + dest->left, dest->top, rect.right - rect.left, rect.bottom - rect.top, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSENDCHANGING + | (size_p ? 0 : SWP_NOSIZE) + | (move_p ? 0 : SWP_NOMOVE)); } static Lisp_Object @@ -641,7 +666,7 @@ { /* frame methods */ CONSOLE_HAS_METHOD (mswindows, init_frame_1); -/* CONSOLE_HAS_METHOD (mswindows, init_frame_2); */ + CONSOLE_HAS_METHOD (mswindows, init_frame_2); CONSOLE_HAS_METHOD (mswindows, init_frame_3); CONSOLE_HAS_METHOD (mswindows, after_init_frame); CONSOLE_HAS_METHOD (mswindows, mark_frame); @@ -683,6 +708,13 @@ /* Needn't staticpro -- see comment above. */ Vmswindows_frame_being_created = Qnil; + DEFVAR_LISP ("mswindows-use-system-frame-size-defaults", &Vmswindows_use_system_frame_size_defaults /* +Controls whether to use system or XEmacs defaults for frame size. +If nil then reasonable defaults are used for intial frame sizes. If t +then the system will choose default sizes for the frame. +*/ ); + Vmswindows_use_system_frame_size_defaults = Qnil; + DEFVAR_LISP ("default-mswindows-frame-plist", &Vdefault_mswindows_frame_plist /* Plist of default frame-creation properties for mswindows frames. These override what is specified in `default-frame-plist', but are
--- a/src/lisp.h Mon Aug 13 10:37:16 2007 +0200 +++ b/src/lisp.h Mon Aug 13 10:38:01 2007 +0200 @@ -2043,6 +2043,7 @@ /* Defined in editfns.c */ void uncache_home_directory (void); char *get_home_directory (void); +char *user_login_name (int *); Bufpos bufpos_clip_to_bounds (Bufpos, Bufpos, Bufpos); Bytind bytind_clip_to_bounds (Bytind, Bytind, Bytind); void buffer_insert1 (struct buffer *, Lisp_Object);
--- a/src/objects-msw.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/objects-msw.c Mon Aug 13 10:38:01 2007 +0200 @@ -721,6 +721,11 @@ {"LightGreen" , PALETTERGB (144, 238, 144) } }; + +/************************************************************************/ +/* helpers */ +/************************************************************************/ + static int hexval (char c) { @@ -747,7 +752,7 @@ for (i=1; i<strlen(name); i++) { if (!isxdigit ((int)name[i])) - return(-1); + return (COLORREF) -1; } if (strlen(name)==7) { @@ -793,7 +798,7 @@ return (PALETTERGB (r, g, b)); } else - return -1; + return (COLORREF) -1; } else if (*name) /* Can't be an empty string */ { @@ -810,9 +815,68 @@ if (!stricmp (nospaces, mswindows_X_color_map[i].name)) return (mswindows_X_color_map[i].colorref); } - return(-1); + return (COLORREF) -1; } +/* + * Returns non-zero if the two supplied font patterns match. + * If they match and fontname is not NULL, copies the logical OR of the + * patterns to fontname (which is assumed to be at least MSW_FONTSIZE in size). + * + * The patterns 'match' iff for each field that is not blank in either pattern, + * the corresponding field in the other pattern is either identical or blank. + */ +static int +match_font (char *pattern1, char *pattern2, char *fontname) +{ + char *c1=pattern1, *c2=pattern2, *e1, *e2; + int i; + + if (fontname) + fontname[0] = '\0'; + + for (i=0; i<5; i++) + { + if (c1 && (e1 = strchr (c1, ':'))) + *(e1) = '\0'; + if (c2 && (e2 = strchr (c2, ':'))) + *(e2) = '\0'; + + if (c1 && c1[0]!='\0') + { + if (c2 && c2[0]!='\0' && stricmp(c1, c2)) + { + if (e1) *e1 = ':'; + if (e2) *e2 = ':'; + return 0; + } + else if (fontname) + strcat (strcat (fontname, c1), ":"); + } + else if (fontname) + { + if (c2 && c2[0]!='\0') + strcat (strcat (fontname, c2), ":"); + else + strcat (fontname, ":"); + } + + if (e1) *(e1++) = ':'; + if (e2) *(e2++) = ':'; + c1=e1; + c2=e2; + } + + if (fontname) + fontname[strlen (fontname) - 1] = '\0'; /* Trim trailing ':' */ + return 1; +} + + +/************************************************************************/ +/* methods */ +/************************************************************************/ + static int mswindows_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name, Lisp_Object device, Error_behavior errb) @@ -908,34 +972,40 @@ static int mswindows_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object name, - Lisp_Object device, Error_behavior errb) + Lisp_Object device, Error_behavior errb) { CONST char *extname; LOGFONT logfont; int fields; int pt; - char fontname[LF_FACESIZE], weight[32], *style, points[8], effects[32], charset[32]; - + char fontname[LF_FACESIZE], weight[LF_FACESIZE], *style, points[8]; + char effects[LF_FACESIZE], charset[LF_FACESIZE]; + char *c; + GET_C_STRING_CTEXT_DATA_ALLOCA (f->name, extname); /* * mswindows fonts look like: - * fontname[:[weight ][style][:pointsize[:effects[:charset]]]] + * fontname[:[weight ][style][:pointsize[:effects]]][:charset] * The font name field shouldn't be empty. - * #### Windows will substitute a default (monospace) font if the font name - * specifies a non-existent font. We don't catch this. - * effects and charset are currently ignored. * * ie: * Lucida Console:Regular:10 * minimal: * Courier New * maximal: - * Courier New:Bold Italic:10:underline strikeout:ansi + * Courier New:Bold Italic:10:underline strikeout:western */ + fields = sscanf (extname, "%31[^:]:%31[^:]:%7[^:]:%31[^:]:%31s", fontname, weight, points, effects, charset); + /* This function is implemented in a fairly ad-hoc manner. + * The general idea is to validate and canonicalize each of the above fields + * at the same time as we build up the win32 LOGFONT structure. This enables + * us to use math_font() on a canonicalized font string to check the + * availability of the requested font */ + if (fields<0) { maybe_signal_simple_error ("Invalid font", f->name, Qfont, errb); @@ -953,105 +1023,134 @@ return (0); } - if (fields > 1 && strlen(weight)) + /* weight */ + if (fields < 2) + strcpy (weight, "Regular"); + + /* Maybe split weight into weight and style */ + if ((c=strchr(weight, ' '))) { - char *c; - /* Maybe split weight into weight and style */ - if ((c=strchr(weight, ' '))) - { - *c = '\0'; - style = c+1; - } - else - style = NULL; + *c = '\0'; + style = c+1; + } + else + style = NULL; + +#define FROB(wgt) \ + if (stricmp (weight, #wgt) == 0) \ + logfont.lfWeight = FW_##wgt - /* weight: Most-often used (maybe) first */ - if (stricmp (weight,"regular") == 0) + FROB (REGULAR); + else FROB (THIN); + else FROB (EXTRALIGHT); + else FROB (ULTRALIGHT); + else FROB (LIGHT); + else FROB (NORMAL); + else FROB (MEDIUM); + else FROB (SEMIBOLD); + else FROB (DEMIBOLD); + else FROB (BOLD); + else FROB (EXTRABOLD); + else FROB (ULTRABOLD); + else FROB (HEAVY); + else FROB (BLACK); + else if (!style) + { logfont.lfWeight = FW_REGULAR; - else if (stricmp (weight,"normal") == 0) - logfont.lfWeight = FW_NORMAL; - else if (stricmp (weight,"bold") == 0) - logfont.lfWeight = FW_BOLD; - else if (stricmp (weight,"medium") == 0) - logfont.lfWeight = FW_MEDIUM; - else if (stricmp (weight,"italic") == 0) /* Hack for early exit */ - { - logfont.lfItalic = TRUE; - style=weight; + style = weight; /* May have specified style without weight */ } - /* the rest */ - else if (stricmp (weight,"black") == 0) - logfont.lfWeight = FW_BLACK; - else if (stricmp (weight,"heavy") == 0) - logfont.lfWeight = FW_HEAVY; - else if (stricmp (weight,"ultrabold") == 0) - logfont.lfWeight = FW_ULTRABOLD; - else if (stricmp (weight,"extrabold") == 0) - logfont.lfWeight = FW_EXTRABOLD; - else if (stricmp (weight,"demibold") == 0) - logfont.lfWeight = FW_SEMIBOLD; - else if (stricmp (weight,"semibold") == 0) - logfont.lfWeight = FW_SEMIBOLD; - else if (stricmp (weight,"light") == 0) - logfont.lfWeight = FW_LIGHT; - else if (stricmp (weight,"ultralight") == 0) - logfont.lfWeight = FW_ULTRALIGHT; - else if (stricmp (weight,"extralight") == 0) - logfont.lfWeight = FW_EXTRALIGHT; - else if (stricmp (weight,"thin") == 0) - logfont.lfWeight = FW_THIN; - else + else { - logfont.lfWeight = FW_NORMAL; - if (!style) - style = weight; /* May have specified a style without a weight */ - else - { - maybe_signal_simple_error ("Invalid font weight", f->name, Qfont, errb); - return (0); /* Invalid weight */ - } + maybe_signal_simple_error ("Invalid font weight", f->name, Qfont, errb); + return (0); } - if (style) +#undef FROB + + if (style) { /* #### what about oblique? */ if (stricmp (style,"italic") == 0) logfont.lfItalic = TRUE; - else if (stricmp (style,"roman") == 0) - logfont.lfItalic = FALSE; else { maybe_signal_simple_error ("Invalid font weight or style", f->name, Qfont, errb); - return (0); /* Invalid weight or style */ + return (0); } - } - else - { - logfont.lfItalic = FALSE; - } - } + /* Glue weight and style together again */ + if (weight != style) + *c = ' '; + } else - { - logfont.lfWeight = FW_NORMAL; logfont.lfItalic = FALSE; - } - /* #### Should we reject strings that don't specify a size? */ - if (fields < 3 || !strlen(points) || (pt=atoi(points))==0) - pt = 10; + if (fields < 3) + pt = 10; /* #### Should we reject strings that don't specify a size? */ + else if ((pt=atoi(points)) == 0) + { + maybe_signal_simple_error ("Invalid font pointsize", f->name, Qfont, errb); + return (0); + } /* Formula for pointsize->height from LOGFONT docs in MSVC5 Platform SDK */ logfont.lfHeight = -MulDiv(pt, DEVICE_MSWINDOWS_LOGPIXELSY(XDEVICE (device)), 72); logfont.lfWidth = 0; - /* Default to monospaced if the specified font name is not found */ - logfont.lfPitchAndFamily = FF_MODERN; - - /* ####: FIXME? */ + /* Effects */ logfont.lfUnderline = FALSE; logfont.lfStrikeOut = FALSE; + if (fields >= 4 && effects[0] != '\0') + { + char *effects2; + /* Maybe split effects into effects and effects2 */ + if ((c=strchr (effects, ' '))) + { + *c = '\0'; + effects2 = c+1; + } + else + effects2 = NULL; + + if (stricmp (effects, "underline") == 0) + logfont.lfUnderline = TRUE; + else if (stricmp (effects, "strikeout") == 0) + logfont.lfStrikeOut = TRUE; + else + { + maybe_signal_simple_error ("Invalid font effect", f->name, + Qfont, errb); + return (0); + } + + if (effects2 && effects2[0] != '\0') + { + if (stricmp (effects2, "underline") == 0) + logfont.lfUnderline = TRUE; + else if (stricmp (effects2, "strikeout") == 0) + logfont.lfStrikeOut = TRUE; + else + { + maybe_signal_simple_error ("Invalid font effect", f->name, + Qfont, errb); + return (0); + } + } + + /* Regenerate sanitised effects string */ + if (logfont.lfUnderline) + { + if (logfont.lfStrikeOut) + strcpy (effects, "underline strikeout"); + else + strcpy (effects, "underline"); + } + else if (logfont.lfStrikeOut) + strcpy (effects, "strikeout"); + } + else + effects[0] = '\0'; #define FROB(cs) \ else if (stricmp (charset, #cs) == 0) \ @@ -1063,40 +1162,72 @@ than Russian. */ #define CYRILLIC_CHARSET RUSSIAN_CHARSET #define CENTRALEUROPEAN_CHARSET EASTEUROPE_CHARSET +#define CENTRALEUROPEAN_CHARSET EASTEUROPE_CHARSET - if (fields > 4) + /* charset can be specified even if earlier fields havn't been */ + if ((fields < 5) && (c=strchr (extname, ':')) && (c=strchr (c+1, ':')) && + (c=strchr (c+1, ':')) && (c=strchr (c+1, ':'))) { - if (charset[0] == '\0' || stricmp (charset, "ansi") == 0) - logfont.lfCharSet = ANSI_CHARSET; - FROB (DEFAULT); /* #### Should we alow this? */ - FROB (SYMBOL); - FROB (SHIFTJIS); - FROB (GB2312); - FROB (HANGEUL); - FROB (CHINESEBIG5); - FROB (OEM); - FROB (JOHAB); - FROB (HEBREW); - FROB (ARABIC); - FROB (GREEK); - FROB (TURKISH); - FROB (THAI); - FROB (EASTEUROPE); - FROB (CENTRALEUROPEAN); - FROB (CYRILLIC); - FROB (MAC); - FROB (BALTIC); - else - { - maybe_signal_simple_error ("Invalid charset name", f->name, Qfont, errb); - return 0; - } + strncpy (charset, c+1, LF_FACESIZE); + charset[LF_FACESIZE-1] = '\0'; } else - logfont.lfCharSet = ANSI_CHARSET; + charset[0] = '\0'; + + if (charset[0] == '\0' || (stricmp (charset, "ansi") == 0) || + (stricmp (charset, "western") == 0)) + { + logfont.lfCharSet = ANSI_CHARSET; + strcpy (charset, "western"); + } + FROB (SYMBOL); + FROB (SHIFTJIS); + FROB (GB2312); + FROB (HANGEUL); + FROB (CHINESEBIG5); + FROB (JOHAB); + FROB (HEBREW); + FROB (ARABIC); + FROB (GREEK); + FROB (TURKISH); + FROB (THAI); + FROB (EASTEUROPE); + FROB (CENTRALEUROPEAN); + FROB (CYRILLIC); + FROB (MAC); + FROB (BALTIC); + else if (stricmp (charset, "oem/dos") == 0) + logfont.lfCharSet = OEM_CHARSET; + else + { + maybe_signal_simple_error ("Invalid charset", f->name, Qfont, errb); + return 0; + } #undef FROB - + + /* Windows will silently substitute a default font if the fontname + * specifies a non-existent font. So we check the font against the device's + * list of font patterns to make sure that at least one of them matches */ + { + struct mswindows_font_enum *fontlist; + char truename[MSW_FONTSIZE]; + int done = 0; + + sprintf (truename, "%s:%s:%d:%s:%s", fontname, weight, pt, effects, charset); + fontlist = DEVICE_MSWINDOWS_FONTLIST (XDEVICE (device)); + while (fontlist && !done) + { + done = match_font (fontlist->fontname, truename, NULL); + fontlist = fontlist->next; + } + if (!done) + { + maybe_signal_simple_error ("No matching font", f->name, Qfont, errb); + return 0; + } + } + /* Misc crud */ logfont.lfEscapement = logfont.lfOrientation = 0; #if 1 @@ -1108,6 +1239,9 @@ logfont.lfClipPrecision = CLIP_STROKE_PRECIS; logfont.lfQuality = PROOF_QUALITY; #endif + /* Default to monospaced if the specified fontname doesn't exist. + * The match_font calls above should mean that this can't happen. */ + logfont.lfPitchAndFamily = FF_MODERN; if ((f->data = CreateFontIndirect(&logfont)) == NULL) { @@ -1162,8 +1296,20 @@ static Lisp_Object mswindows_list_fonts (Lisp_Object pattern, Lisp_Object device) { - /* #### Implement me */ - return list1 (build_string ("Courier New:Regular:10")); + Lisp_Object result = Qnil; + struct mswindows_font_enum *fontlist; + char fontname[MSW_FONTSIZE], *extpattern; + + GET_C_STRING_CTEXT_DATA_ALLOCA (pattern, extpattern); + fontlist = DEVICE_MSWINDOWS_FONTLIST (XDEVICE (device)); + while (fontlist) + { + if (match_font (fontlist->fontname, extpattern, fontname)) + result = Fcons (build_string (fontname), result); + fontlist = fontlist->next; + } + + return Fnreverse (result); } #ifdef MULE @@ -1194,12 +1340,33 @@ /************************************************************************/ +/* non-methods */ +/************************************************************************/ + +DEFUN ("mswindows-color-list", Fmswindows_color_list, 0, 0, 0, /* +Return a list of the colors available on mswindows devices. +*/ + ()) +{ + Lisp_Object result = Qnil; + int i; + + for (i=0; i<countof (mswindows_X_color_map); i++) + result = Fcons (build_string (mswindows_X_color_map[i].name), result); + + return Fnreverse (result); +} + + + +/************************************************************************/ /* initialization */ /************************************************************************/ void syms_of_objects_mswindows (void) { + DEFSUBR (Fmswindows_color_list); } void
--- a/src/redisplay-msw.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/redisplay-msw.c Mon Aug 13 10:38:01 2007 +0200 @@ -240,6 +240,53 @@ /***************************************************************************** + mswindows_apply_face_effects + + Draw underline and strikeout as if this was X. + #### On mswindows this really should be done as part of drawing the font. + The line width used is chosen arbitrarily from the font height. + ****************************************************************************/ +static void +mswindows_apply_face_effects (HDC hdc, struct display_line *dl, int xpos, + int width, struct Lisp_Font_Instance *fi, + struct face_cachel *cachel, + struct face_cachel *color_cachel) +{ + int yclip; + HBRUSH brush, oldbrush; + RECT rect; + + brush = CreateSolidBrush (COLOR_INSTANCE_MSWINDOWS_COLOR ( + XCOLOR_INSTANCE (color_cachel->foreground))); + if (brush) + { + yclip = dl->ypos + dl->descent - dl->clip; + rect.left = xpos; + rect.right = xpos + width; + oldbrush = SelectObject (hdc, brush); + + if (cachel->underline) + { + rect.top = dl->ypos + dl->descent/2; + rect.bottom = rect.top + (fi->height >= 0x20 ? 2 : 1); + if (rect.bottom <= yclip) + FillRect (hdc, &rect, brush); + } + if (cachel->strikethru) + { + rect.top = dl->ypos + dl->descent - (dl->ascent + dl->descent)/2; + rect.bottom = rect.top + (fi->height >= 0x20 ? 2 : 1); + if (rect.bottom <= yclip) + FillRect (hdc, &rect, brush); + } + + SelectObject (hdc, oldbrush); + DeleteObject (brush); + } +} + + +/***************************************************************************** mswindows_output_hline Output a horizontal line in the foreground of its face. @@ -326,7 +373,7 @@ /* Use the font from the underlying character */ cachel = WINDOW_FACE_CACHEL (w, findex); - /* XXX MULE: Need to know the charset! */ + /* #### MULE: Need to know the charset! */ font = FACE_CACHEL_FONT (cachel, Vcharset_ascii); } @@ -338,15 +385,21 @@ if (!image_p) { + struct face_cachel *color_cachel; + /* Use cursor fg/bg for block cursor, or character fg/bg for the bar or when we need to erase the cursor. Output nothing at eol if bar cursor */ face_index = get_builtin_face_cache_index (w, Vtext_cursor_face); - cachel = WINDOW_FACE_CACHEL (w, ((!cursor_p || bar_p) - ? findex : face_index)); - mswindows_update_dc (hdc, font, cachel->foreground, - cachel->background, Qnil); + color_cachel = WINDOW_FACE_CACHEL (w, ((!cursor_p || bar_p) ? + findex : face_index)); + mswindows_update_dc (hdc, font, color_cachel->foreground, + color_cachel->background, Qnil); ExtTextOut (hdc, xpos, dl->ypos, ETO_OPAQUE|ETO_CLIPPED, &rect, p_char, n_char, NULL); + if (real_char_p && (cachel->underline || cachel->strikethru)) + mswindows_apply_face_effects (hdc, dl, xpos, width, + XFONT_INSTANCE (font), + cachel, color_cachel); } if (!cursor_p) @@ -362,7 +415,7 @@ } else if (!focus) { - /* Now have real character drawn in its own color. We defalte + /* Now have real character drawn in its own color. We deflate the rectangle so character cell will be bounded by the previously drawn cursor shape */ InflateRect (&rect, -1, -1); @@ -379,6 +432,10 @@ cachel->background, Qnil); ExtTextOut (hdc, xpos, dl->ypos, ETO_OPAQUE | ETO_CLIPPED, &rect, p_char, n_char, NULL); + if (cachel->underline || cachel->strikethru) + mswindows_apply_face_effects (hdc, dl, xpos+1, width-2, + XFONT_INSTANCE (font), + cachel, cachel); } } @@ -428,7 +485,7 @@ XSETWINDOW (window, w); -#if 0 /* XXX: FIXME? */ +#if 0 /* #### FIXME? */ /* We can't work out the width before we've set the font in the DC */ if (width < 0) width = mswindows_text_width (cachel, Dynarr_atp (buf, 0), Dynarr_length (buf)); @@ -508,14 +565,16 @@ } } - assert (runs[i].dimension == 1); /* XXX FIXME */ + assert (runs[i].dimension == 1); /* #### FIXME: Broken when Mule? */ ExtTextOut (hdc, xpos, dl->ypos, NILP(bg_pmap) ? ETO_CLIPPED | ETO_OPAQUE : ETO_CLIPPED, &rect, (char *) runs[i].ptr, runs[i].len, NULL); - /* XXX FIXME? X does underline/strikethrough here - we will do it as part of face's font */ - + /* #### X does underline/strikethrough here so we do the same. + On mswindows, underline/strikethrough really belongs to the font */ + if (cachel->underline || cachel->strikethru) + mswindows_apply_face_effects (hdc, dl, xpos, this_width, fi, + cachel, cachel); xpos += this_width; } }
--- a/src/redisplay.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/redisplay.c Mon Aug 13 10:38:01 2007 +0200 @@ -8454,7 +8454,7 @@ DEFVAR_BOOL ("column-number-start-at-one", &column_number_start_at_one /* *Non-nil means column display number starts at 1. */ ); - column_number_start_at_one = 1; + column_number_start_at_one = 0; } void
--- a/src/toolbar-msw.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/toolbar-msw.c Mon Aug 13 10:38:01 2007 +0200 @@ -300,16 +300,19 @@ /* need to build an image list for the bitmaps */ if (!ilist && !(ilist = ImageList_Create ( bmwidth, bmheight, - ILC_COLOR24, nbuttons, nbuttons * 2 ))) + ILC_MASK | ILC_COLOR24, + nbuttons, nbuttons * 2 ))) { xfree (button_tbl); signal_simple_error ("couldn't create image list", instance); } - + + /* make the mask actually do something */ + ImageList_SetBkColor (ilist, CLR_NONE); /* add a bitmap to the list */ if ((tbbutton->iBitmap = - ImageList_Add + ImageList_Add (ilist, bitmap ? bitmap : IMAGE_INSTANCE_MSWINDOWS_BITMAP (p),
--- a/src/unexaix.c Mon Aug 13 10:37:16 2007 +0200 +++ b/src/unexaix.c Mon Aug 13 10:38:01 2007 +0200 @@ -154,7 +154,7 @@ { int new = -1, a_out = -1; - if (a_name && (a_out = open (a_name, 0)) < 0) + if (a_name && (a_out = open (a_name, O_RDONLY)) < 0) { PERROR (a_name); } @@ -326,6 +326,7 @@ { ulong ptr = section[0].s_scnptr; + bias = -1; for (scns = 0; scns < f_hdr.f_nscns; scns++) { struct scnhdr *s = §ion[scns]; @@ -344,12 +345,17 @@ } s->s_scnptr = ptr; } - else + else if (s->s_flags & STYP_DATA) + s->s_scnptr = ptr; + else if (!(s->s_flags & (STYP_TEXT | STYP_BSS))) { + if (bias == -1) /* if first section after bss */ bias = ptr - s->s_scnptr; - s->s_scnptr = ptr; + + s->s_scnptr += bias; + ptr = s->s_scnptr; } - + ptr = ptr + s->s_size; } } @@ -535,7 +541,7 @@ if (!lnnoptr || !f_hdr.f_symptr) return 0; - if ((new = open (new_name, 2)) < 0) + if ((new = open (new_name, O_RDWR)) < 0) { PERROR (new_name); return -1; @@ -552,7 +558,7 @@ write (new, &symentry, SYMESZ); } - for (naux = symentry.n_numaux; naux-- != 0; ) + for (naux = symentry.n_numaux; naux != 0; --naux) { read (new, &auxentry, AUXESZ); nsyms++;
--- a/version.sh Mon Aug 13 10:37:16 2007 +0200 +++ b/version.sh Mon Aug 13 10:38:01 2007 +0200 @@ -2,7 +2,7 @@ emacs_major_version=21 emacs_minor_version=0 emacs_beta_version= -xemacs_codename="Swedish Landrace" +xemacs_codename="Thuringian" infodock_major_version=3 infodock_minor_version=90 -infodock_build_version=9 +infodock_build_version=10