From: tomo Date: Mon, 2 Sep 2002 15:56:09 +0000 (+0000) Subject: XEmacs 21.4.5 "Civil Service". X-Git-Tag: r21-4-5~2 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21db8709c0c2dcedbd278c7fe571290d5ce80a71;p=chise%2Fxemacs-chise.git XEmacs 21.4.5 "Civil Service". --- diff --git a/ChangeLog b/ChangeLog index 221cff5..c33f02c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,48 @@ +2001-10-23 Stephen J. Turnbull + + * XEmacs 21.4.5 "Civil Service" is released. + +2001-10-05 Stephen J. Turnbull + + * configure.in: Document that autoconf 2.5x is unsupported. + +2001-10-02 Stephen J. Turnbull + + * PROBLEMS: configure doesn't support --with-{ld,as}, use environment + variables. Suggested by Goran Koruga . + +2001-09-17 Ben Wing + + * configure.in (TAB): + * configure.in (XE_COMPUTE_RUNPATH): + Don't use -Wshadow when compiling with g++ or you get buried in + silly warnings. This patch was already applied but somehow got + unapplied. Stephen? + +2001-08-19 Charles Wilson + + * configure.in (for graphics libraries): Detect Cygwin xpm-nox. + +2001-08-02 Peter Brown + + Synch options documentation with those in configure.in: + + * configure.usage (--with-dialogs): added lucid to list of options + * configure.usage (--with-widgets): added lucid to list of options + * configure.usage (--with-dragndrop): added GTK to list of protocols + * configure.usage (--mail-locking): added `locking' or `mmdf'. to list + of options + + +2001-09-25 Didier Verna + + * configure.ac: new. Autoconf 2.5x guard. + +2001-08-29 Jered Floyd + + * configure.in (moduledir,sitemoduledir,archlibdir): + Place arch-specific files under ${libdir}, not under ${datadir}. + 2001-07-28 Stephen J. Turnbull * XEmacs 21.4.4 "Artificial Intelligence" is released. diff --git a/PROBLEMS b/PROBLEMS index 8525d37..7439a78 100644 --- a/PROBLEMS +++ b/PROBLEMS @@ -212,6 +212,10 @@ normally held in /usr/ccs/bin. This can be done by one of: - uninstalling GNU ld. +- configuring XEmacs with these environment settings (suggested by + Goran Koruga ): + LD=/usr/ccs/bin/ld AS=/usr/ccs/bin/as configure + The Solaris2 FAQ claims: When you install gcc, don't make the mistake of installing diff --git a/configure b/configure index 3f5a328..1c2a34f 100755 --- a/configure +++ b/configure @@ -16,6 +16,7 @@ ### To rebuild it, execute the command ### autoconf ### in the this directory. You must have autoconf version 2.13 or later. +### Note: this script has not yet been ported to autoconf version 2.5x. ### This file is part of XEmacs. @@ -222,13 +223,13 @@ infodir='${datadir}/${instvardir}/info' infopath='' install_pp='' lispdir='${datadir}/${instvardir}/lisp' -moduledir='${datadir}/${instvardir}/${configuration}/modules' +moduledir='${libdir}/${instvardir}/${configuration}/modules' sitelispdir='${datadir}/${inststaticdir}/site-lisp' -sitemoduledir='${datadir}/${inststaticdir}/site-modules' +sitemoduledir='${libdir}/${inststaticdir}/site-modules' pkgdir='${datadir}/${instvardir}/lisp' package_path='' etcdir='${datadir}/${instvardir}/etc' -archlibdir='${datadir}/${instvardir}/${configuration}' +archlibdir='${libdir}/${instvardir}/${configuration}' docdir='${archlibdir}' with_netinstall="no" with_prefix='yes' @@ -847,7 +848,7 @@ echo " Use \`$progname --help' to show usage.") >&2 && exit 1 fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:851: checking whether ln -s works" >&5 +echo "configure:852: checking whether ln -s works" >&5 rm -f conftestdata if ln -s X conftestdata 2>/dev/null @@ -1112,7 +1113,7 @@ EOF echo $ac_n "checking "host system type"""... $ac_c" 1>&6 -echo "configure:1116: checking "host system type"" >&5 +echo "configure:1117: checking "host system type"" >&5 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'` canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"` configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` @@ -1627,7 +1628,7 @@ xe_save_CFLAGS="$CFLAGS" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1631: checking for $ac_word" >&5 +echo "configure:1632: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1654,7 +1655,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1658: checking for $ac_word" >&5 +echo "configure:1659: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1702,7 +1703,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1706: checking for $ac_word" >&5 +echo "configure:1707: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1731,7 +1732,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1735: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1736: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1744,12 +1745,12 @@ cross_compiling=no cat > conftest.$ac_ext << EOF -#line 1748 "configure" +#line 1749 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1777,19 +1778,19 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1781: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1782: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1786: checking whether we are using GNU C" >&5 +echo "configure:1787: checking whether we are using GNU C" >&5 cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1807,7 +1808,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1811: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1812: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1840,7 +1841,7 @@ if test "$with_gcc" = "no" -a "$GCC" = "yes"; then # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1844: checking for $ac_word" >&5 +echo "configure:1845: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1867,7 +1868,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1871: checking for $ac_word" >&5 +echo "configure:1872: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1915,7 +1916,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1919: checking for $ac_word" >&5 +echo "configure:1920: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1944,7 +1945,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1948: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1949: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1957,12 +1958,12 @@ cross_compiling=no cat > conftest.$ac_ext << EOF -#line 1961 "configure" +#line 1962 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1990,19 +1991,19 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1994: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1995: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1999: checking whether we are using GNU C" >&5 +echo "configure:2000: checking whether we are using GNU C" >&5 cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2020,7 +2021,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2024: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2025: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2053,7 +2054,7 @@ elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2057: checking for $ac_word" >&5 +echo "configure:2058: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2080,7 +2081,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2084: checking for $ac_word" >&5 +echo "configure:2085: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2128,7 +2129,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2132: checking for $ac_word" >&5 +echo "configure:2133: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2157,7 +2158,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2161: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2162: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -2170,12 +2171,12 @@ cross_compiling=no cat > conftest.$ac_ext << EOF -#line 2174 "configure" +#line 2175 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2203,19 +2204,19 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2207: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2208: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2212: checking whether we are using GNU C" >&5 +echo "configure:2213: checking whether we are using GNU C" >&5 cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2233,7 +2234,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2237: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2238: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2270,7 +2271,7 @@ test -n "$CPP" -a -d "$CPP" && CPP= test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2274: checking how to run the C preprocessor" >&5 +echo "configure:2275: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2283,13 +2284,13 @@ if test -z "$CPP"; then # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2300,13 +2301,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2317,13 +2318,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2349,9 +2350,9 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2353: checking for AIX" >&5 +echo "configure:2354: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:2382: checking for GNU libc" >&5 +echo "configure:2383: checking for GNU libc" >&5 cat > conftest.$ac_ext < int main() { @@ -2392,7 +2393,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_glibc=yes else @@ -2469,7 +2470,7 @@ EOF esac cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -2717,17 +2718,17 @@ test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" && if test "$ext if test "$__USLC__" = yes; then echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6 -echo "configure:2721: checking for whether the -Kalloca compiler flag is needed" >&5 +echo "configure:2722: checking for whether the -Kalloca compiler flag is needed" >&5 need_kalloca=no cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2738,14 +2739,14 @@ else xe_save_c_switch_system="$c_switch_system" c_switch_system="$c_switch_system -Kalloca" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* need_kalloca=yes else @@ -2762,8 +2763,11 @@ fi if test "$cflags_specified" = "no"; then if test "$GCC" = "yes"; then - CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes -Wshadow" + CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes" CFLAGS="$CFLAGS -Wsign-compare" + if test "$xemacs_compiler" != "g++"; then + CFLAGS="$CFLAGS -Wshadow" + fi test "$have_glibc" != "yes" && CFLAGS="$CFLAGS -Wpointer-arith" elif test "$__SUNPRO_C" = "yes"; then case "$opsys" in @@ -2780,7 +2784,7 @@ fi if test "$GCC" = "yes"; then echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6 -echo "configure:2784: checking for buggy gcc versions" >&5 +echo "configure:2788: checking for buggy gcc versions" >&5 GCC_VERSION=`$CC --version` case `uname -s`:`uname -m`:$GCC_VERSION in *:sun4*:2.8.1|*:sun4*:egcs-2.90.*) @@ -2903,7 +2907,7 @@ test "$pdump" = "yes" && extra_objs="$extra_objs dumper.o" && if test "$extra_v fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:2907: checking for dynodump" >&5 +echo "configure:2911: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -2941,12 +2945,12 @@ if test "$unexec" = "unexaix.o"; then done echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6 -echo "configure:2945: checking for terminateAndUnload in -lC" >&5 +echo "configure:2949: checking for terminateAndUnload in -lC" >&5 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'` xe_check_libs=" -lC " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3065,7 +3069,7 @@ fi if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:3069: checking "for runtime libraries flag"" >&5 +echo "configure:3073: checking "for runtime libraries flag"" >&5 case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; @@ -3087,14 +3091,14 @@ if test "$GCC" = "yes"; then done fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* dash_r="$try_dash_r" else @@ -3195,10 +3199,10 @@ else fi after_morecore_hook_exists=yes echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:3199: checking for malloc_set_state" >&5 +echo "configure:3203: checking for malloc_set_state" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_malloc_set_state=yes" else @@ -3241,16 +3245,16 @@ doug_lea_malloc=no fi echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:3245: checking whether __after_morecore_hook exists" >&5 +echo "configure:3249: checking whether __after_morecore_hook exists" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -3306,7 +3310,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3310: checking for $ac_word" >&5 +echo "configure:3314: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -3361,7 +3365,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3365: checking for a BSD compatible install" >&5 +echo "configure:3369: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -3415,7 +3419,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3419: checking for $ac_word" >&5 +echo "configure:3423: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -3447,15 +3451,15 @@ for ac_hdr in a.out.h elf.h cygwin/version.h fcntl.h inttypes.h libg do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3451: checking for $ac_hdr" >&5 +echo "configure:3455: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3485,10 +3489,10 @@ fi done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3489: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3493: checking for sys/wait.h that is POSIX.1 compatible" >&5 cat > conftest.$ac_ext < #include @@ -3504,7 +3508,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3528,10 +3532,10 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3532: checking for ANSI C header files" >&5 +echo "configure:3536: checking for ANSI C header files" >&5 cat > conftest.$ac_ext < #include @@ -3539,7 +3543,7 @@ cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3556,7 +3560,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3574,7 +3578,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3592,7 +3596,7 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3603,7 +3607,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:3611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -3629,10 +3633,10 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3633: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3637: checking whether time.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext < #include @@ -3641,7 +3645,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3665,10 +3669,10 @@ EOF fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3669: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:3673: checking for sys_siglist declaration in signal.h or unistd.h" >&5 cat > conftest.$ac_ext < #include @@ -3680,7 +3684,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -3706,9 +3710,9 @@ fi echo $ac_n "checking for utime""... $ac_c" 1>&6 -echo "configure:3710: checking for utime" >&5 +echo "configure:3714: checking for utime" >&5 cat > conftest.$ac_ext < #include @@ -3716,7 +3720,7 @@ int main() { struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x); ; return 0; } EOF -if { (eval echo configure:3720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3724: \"$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 @@ -3735,10 +3739,10 @@ else for ac_func in utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3739: checking for $ac_func" >&5 +echo "configure:3743: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3793,10 +3797,10 @@ rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3797: checking return type of signal handlers" >&5 +echo "configure:3801: checking return type of signal handlers" >&5 cat > conftest.$ac_ext < #include @@ -3813,7 +3817,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3835,10 +3839,10 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3839: checking for size_t" >&5 +echo "configure:3843: checking for size_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3869,10 +3873,10 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3873: checking for pid_t" >&5 +echo "configure:3877: checking for pid_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3903,10 +3907,10 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3907: checking for uid_t in sys/types.h" >&5 +echo "configure:3911: checking for uid_t in sys/types.h" >&5 cat > conftest.$ac_ext < EOF @@ -3942,10 +3946,10 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3946: checking for mode_t" >&5 +echo "configure:3950: checking for mode_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3976,10 +3980,10 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3980: checking for off_t" >&5 +echo "configure:3984: checking for off_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4010,10 +4014,10 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:4014: checking for ssize_t" >&5 +echo "configure:4018: checking for ssize_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4045,9 +4049,9 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4049: checking for socklen_t" >&5 +echo "configure:4053: checking for socklen_t" >&5 cat > conftest.$ac_ext < socklen_t x; @@ -4056,7 +4060,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4065,7 +4069,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < int accept (int, struct sockaddr *, size_t *); @@ -4074,7 +4078,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""size_t" 1>&6 @@ -4106,9 +4110,9 @@ fi rm -f conftest* echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:4110: checking for struct timeval" >&5 +echo "configure:4114: checking for struct timeval" >&5 cat > conftest.$ac_ext < @@ -4124,7 +4128,7 @@ int main() { static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:4128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -4146,10 +4150,10 @@ fi rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4150: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4154: checking whether struct tm is in sys/time.h or time.h" >&5 cat > conftest.$ac_ext < #include @@ -4157,7 +4161,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4181,10 +4185,10 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4185: checking for tm_zone in struct tm" >&5 +echo "configure:4189: checking for tm_zone in struct tm" >&5 cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -4192,7 +4196,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4215,10 +4219,10 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4219: checking for tzname" >&5 +echo "configure:4223: checking for tzname" >&5 cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -4228,7 +4232,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4254,10 +4258,10 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4258: checking for working const" >&5 +echo "configure:4262: checking for working const" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4331,7 +4335,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:4335: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:4339: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -4356,12 +4360,12 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4360: checking whether byte ordering is bigendian" >&5 +echo "configure:4364: checking whether byte ordering is bigendian" >&5 ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -4372,11 +4376,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -4387,7 +4391,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4404,7 +4408,7 @@ fi rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_bigendian=no else @@ -4444,10 +4448,10 @@ fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4448: checking size of short" >&5 +echo "configure:4452: checking size of short" >&5 cat > conftest.$ac_ext < #include @@ -4459,7 +4463,7 @@ main() exit(0); } EOF -if { (eval echo configure:4463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -4487,10 +4491,10 @@ if test "$ac_cv_sizeof_short" = 0; then exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4491: checking size of int" >&5 +echo "configure:4495: checking size of int" >&5 cat > conftest.$ac_ext < #include @@ -4502,7 +4506,7 @@ main() exit(0); } EOF -if { (eval echo configure:4506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -4524,10 +4528,10 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4528: checking size of long" >&5 +echo "configure:4532: checking size of long" >&5 cat > conftest.$ac_ext < #include @@ -4539,7 +4543,7 @@ main() exit(0); } EOF -if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -4561,10 +4565,10 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4565: checking size of long long" >&5 +echo "configure:4569: checking size of long long" >&5 cat > conftest.$ac_ext < #include @@ -4576,7 +4580,7 @@ main() exit(0); } EOF -if { (eval echo configure:4580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4584: \"$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 @@ -4598,10 +4602,10 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4602: checking size of void *" >&5 +echo "configure:4606: checking size of void *" >&5 cat > conftest.$ac_ext < #include @@ -4613,7 +4617,7 @@ main() exit(0); } EOF -if { (eval echo configure:4617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4621: \"$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 @@ -4636,7 +4640,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:4640: checking for long file names" >&5 +echo "configure:4644: 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: @@ -4682,10 +4686,10 @@ fi echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:4686: checking for sin" >&5 +echo "configure:4690: checking for sin" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_sin=yes" else @@ -4726,12 +4730,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:4730: checking for sin in -lm" >&5 +echo "configure:4734: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` xe_check_libs=" -lm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4786,14 +4790,14 @@ EOF cat > conftest.$ac_ext < int main() { return atanh(1.0) + asinh(1.0) + acosh(1.0); ; return 0; } EOF -if { (eval echo configure:4797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_INVERSE_HYPERBOLIC @@ -4810,14 +4814,14 @@ fi rm -f conftest* echo "checking type of mail spool file locking" 1>&6 -echo "configure:4814: checking type of mail spool file locking" >&5 +echo "configure:4818: checking type of mail spool file locking" >&5 for ac_func in lockf flock do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4818: checking for $ac_func" >&5 +echo "configure:4822: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4922,12 +4926,12 @@ test "$mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \ case "$opsys" in decosf*) echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:4926: checking for cma_open in -lpthreads" >&5 +echo "configure:4930: checking for cma_open in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lpthreads " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4974,7 +4978,7 @@ fi esac echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:4978: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:4982: 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; @@ -4986,7 +4990,7 @@ fi if test "$opsys" = "sol2"; then if test "$os_release" -ge 56; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:4990: checking for \"-z ignore\" linker flag" >&5 +echo "configure:4994: 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 ;; @@ -4997,7 +5001,7 @@ fi echo "checking "for specified window system"" 1>&6 -echo "configure:5001: checking "for specified window system"" >&5 +echo "configure:5005: checking "for specified window system"" >&5 GNOME_CONFIG=no @@ -5005,7 +5009,7 @@ GTK_CONFIG=no if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5009: checking for GNOME configuration script" >&5 +echo "configure:5013: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` @@ -5036,7 +5040,7 @@ fi if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5040: checking for GTK configuration script" >&5 +echo "configure:5044: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` @@ -5058,37 +5062,37 @@ fi if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5062: checking gtk version" >&5 +echo "configure:5066: checking gtk version" >&5 GTK_VERSION=`${GTK_CONFIG} --version` echo "$ac_t""${GTK_VERSION}" 1>&6 echo $ac_n "checking gtk libs""... $ac_c" 1>&6 -echo "configure:5067: checking gtk libs" >&5 +echo "configure:5071: checking gtk libs" >&5 GTK_LIBS=`${GTK_CONFIG} --libs` libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi echo "$ac_t""${GTK_LIBS}" 1>&6 echo $ac_n "checking gtk cflags""... $ac_c" 1>&6 -echo "configure:5073: checking gtk cflags" >&5 +echo "configure:5077: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi echo "$ac_t""${GTK_CFLAGS}" 1>&6 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5080: checking for main in -lgdk_imlib" >&5 +echo "configure:5084: checking for main in -lgdk_imlib" >&5 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdk_imlib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5110,12 +5114,12 @@ fi echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5114: checking for Imlib_init in -lImlib" >&5 +echo "configure:5118: checking for Imlib_init in -lImlib" >&5 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'` xe_check_libs=" -lImlib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5149,10 +5153,10 @@ fi for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5153: checking for $ac_func" >&5 +echo "configure:5157: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5254,15 +5258,15 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5258: checking for $ac_hdr" >&5 +echo "configure:5262: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5293,19 +5297,19 @@ done echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5297: checking for main in -lxml" >&5 +echo "configure:5301: checking for main in -lxml" >&5 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lxml " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5327,19 +5331,19 @@ fi echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5331: checking for main in -lglade" >&5 +echo "configure:5335: checking for main in -lglade" >&5 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5361,19 +5365,19 @@ fi echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5365: checking for main in -lglade-gnome" >&5 +echo "configure:5369: checking for main in -lglade-gnome" >&5 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lglade-gnome " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5394,7 +5398,7 @@ fi cat > conftest.$ac_ext < EOF @@ -5453,7 +5457,7 @@ if test "$with_x11" != "no"; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:5457: checking for X" >&5 +echo "configure:5461: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5513,12 +5517,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5526: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5587,14 +5591,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -5703,17 +5707,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:5707: checking whether -R must be followed by a space" >&5 +echo "configure:5711: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -5729,14 +5733,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -5772,12 +5776,12 @@ ac_cv_lib_dnet_dnet_ntoa=no else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5776: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:5780: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5812,12 +5816,12 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:5816: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:5820: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet_stub " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5857,10 +5861,10 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5861: checking for gethostbyname" >&5 +echo "configure:5865: checking for gethostbyname" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5904,12 +5908,12 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5908: checking for gethostbyname in -lnsl" >&5 +echo "configure:5912: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5950,10 +5954,10 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:5954: checking for connect" >&5 +echo "configure:5958: checking for connect" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5999,12 +6003,12 @@ fi xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6003: checking "$xe_msg_checking"" >&5 +echo "configure:6007: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocket $X_EXTRA_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6039,10 +6043,10 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:6043: checking for remove" >&5 +echo "configure:6047: checking for remove" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -6086,12 +6090,12 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6090: checking for remove in -lposix" >&5 +echo "configure:6094: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6126,10 +6130,10 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6130: checking for shmat" >&5 +echo "configure:6134: checking for shmat" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -6173,12 +6177,12 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6177: checking for shmat in -lipc" >&5 +echo "configure:6181: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6225,12 +6229,12 @@ fi xe_msg_checking="for IceConnectionNumber in -lICE" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6229: checking "$xe_msg_checking"" >&5 +echo "configure:6233: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE $X_EXTRA_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6408,7 +6412,7 @@ EOF echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6412: checking for X defines extracted by xmkmf" >&5 +echo "configure:6416: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -6457,15 +6461,15 @@ EOF ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:6461: checking for X11/Intrinsic.h" >&5 +echo "configure:6465: checking for X11/Intrinsic.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6489,12 +6493,12 @@ fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6493: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6497: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6530,12 +6534,12 @@ fi xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6534: checking "$xe_msg_checking"" >&5 +echo "configure:6538: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 -b i486-linuxaout" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6573,12 +6577,12 @@ fi echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:6577: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:6581: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6612,12 +6616,12 @@ fi echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:6616: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:6620: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6651,14 +6655,14 @@ fi echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:6655: checking the version of X11 being used" >&5 +echo "configure:6659: checking the version of X11 being used" >&5 cat > conftest.$ac_ext < int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:6662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else @@ -6689,10 +6693,10 @@ EOF for ac_func in XConvertCase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6693: checking for $ac_func" >&5 +echo "configure:6697: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6747,15 +6751,15 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6751: checking for $ac_hdr" >&5 +echo "configure:6755: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6788,10 +6792,10 @@ done for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6792: checking for $ac_func" >&5 +echo "configure:6796: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6842,9 +6846,9 @@ fi done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:6846: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:6850: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -6877,12 +6881,12 @@ rm -f conftest* test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:6881: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:6885: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6932,19 +6936,19 @@ EOF echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:6936: checking for main in -lXbsd" >&5 +echo "configure:6940: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lXbsd " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6981,22 +6985,22 @@ fi fi if test "$with_msw" != "no"; then echo "checking for MS-Windows" 1>&6 -echo "configure:6985: checking for MS-Windows" >&5 +echo "configure:6989: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:6988: checking for main in -lgdi32" >&5 +echo "configure:6992: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdi32 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7069,14 +7073,14 @@ EOF fi fi cat > conftest.$ac_ext < int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then - { test "$extra_verbose" = "yes" && cat << \EOF + need_event_unixoid=yes; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MSG_SELECT EOF cat >> confdefs.h <<\EOF @@ -7138,15 +7142,15 @@ fi if test "$with_x11" = "yes"; then ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6 -echo "configure:7142: checking for X11/extensions/shape.h" >&5 +echo "configure:7146: checking for X11/extensions/shape.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7198,7 +7202,7 @@ case "$x_libraries" in *X11R4* ) esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7202: checking for WM_COMMAND option" >&5; +echo "configure:7206: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND @@ -7213,15 +7217,15 @@ fi test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:7217: checking for X11/Xauth.h" >&5 +echo "configure:7221: checking for X11/Xauth.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7244,12 +7248,12 @@ fi } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7248: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7252: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7305,15 +7309,15 @@ if test "$with_tooltalk" != "no" ; then for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:7309: checking for ${dir}tt_c.h" >&5 +echo "configure:7313: checking for ${dir}tt_c.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7349,12 +7353,12 @@ if test "$with_tooltalk" != "no" ; then xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7353: checking "$xe_msg_checking"" >&5 +echo "configure:7357: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'` xe_check_libs=" -ltt $extra_libs" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7422,15 +7426,15 @@ fi test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:7426: checking for Dt/Dt.h" >&5 +echo "configure:7430: checking for Dt/Dt.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7453,12 +7457,12 @@ fi } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:7457: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:7461: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7542,7 +7546,7 @@ fi if test "$with_dragndrop" != "no" ; then echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6 -echo "configure:7546: checking if drag and drop API is needed" >&5 +echo "configure:7550: checking if drag and drop API is needed" >&5 if test -n "$dragndrop_proto" ; then with_dragndrop=yes echo "$ac_t""yes (${dragndrop_proto} )" 1>&6 @@ -7562,18 +7566,18 @@ EOF fi echo "checking for LDAP" 1>&6 -echo "configure:7566: checking for LDAP" >&5 +echo "configure:7570: 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:7569: checking for ldap.h" >&5 +echo "configure:7573: checking for ldap.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7596,15 +7600,15 @@ fi } test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for lber.h""... $ac_c" 1>&6 -echo "configure:7600: checking for lber.h" >&5 +echo "configure:7604: checking for lber.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7628,12 +7632,12 @@ fi if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:7632: checking for ldap_search in -lldap" >&5 +echo "configure:7636: checking for ldap_search in -lldap" >&5 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7669,12 +7673,12 @@ fi xe_msg_checking="for ldap_open in -lldap" test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7673: checking "$xe_msg_checking"" >&5 +echo "configure:7677: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7710,12 +7714,12 @@ fi xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7714: checking "$xe_msg_checking"" >&5 +echo "configure:7718: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7751,12 +7755,12 @@ fi xe_msg_checking="for ldap_open in -lldap" test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:7755: checking "$xe_msg_checking"" >&5 +echo "configure:7759: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lldap -llber -lkrb -ldes" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7818,10 +7822,10 @@ EOF for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7822: checking for $ac_func" >&5 +echo "configure:7826: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7875,20 +7879,20 @@ fi if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:7879: checking for PostgreSQL" >&5 +echo "configure:7883: checking for PostgreSQL" >&5 for header_dir in "" "pgsql/" "postgresql/"; do ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6 -echo "configure:7884: checking for ${header_dir}libpq-fe.h" >&5 +echo "configure:7888: checking for ${header_dir}libpq-fe.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7912,12 +7916,12 @@ fi test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:7916: checking for PQconnectdb in -lpq" >&5 +echo "configure:7920: checking for PQconnectdb in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7961,12 +7965,12 @@ EOF echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:7965: checking for PQconnectStart in -lpq" >&5 +echo "configure:7969: checking for PQconnectStart in -lpq" >&5 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lpq " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8025,15 +8029,36 @@ fi if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:8029: checking for graphics libraries" >&5 - +echo "configure:8033: checking for graphics libraries" >&5 + + libpath_xpm= + incpath_xpm= + case "$opsys" in + cygwin*) + cygwin_top=`eval "gcc -print-file-name=libc.a"` ; + cygwin_top=`eval "dirname ${cygwin_top}"`; + cygwin_top="${cygwin_top}/.."; + case "$window_system" in + x11) ;; + msw) libpath_xpm="-L${cygwin_top}/lib/noX" + incpath_xpm="-I${cygwin_top}/include/noX" + ;; + gtk) ;; + none) ;; + *) ;; + esac + ;; + *) ;; + esac xpm_problem="" if test -z "$with_xpm"; then + CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi + LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:8034: checking for Xpm - no older than 3.4f" >&5 +echo "configure:8059: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext < @@ -8042,7 +8067,7 @@ echo "configure:8034: checking for Xpm - no older than 3.4f" >&5 XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:8046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest dummy_arg; xpm_status=$?; if test "$xpm_status" = "0"; then @@ -8082,19 +8107,21 @@ cat >> confdefs.h <<\EOF EOF } + LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi + CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6 -echo "configure:8088: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:8115: checking for \"FOR_MSW\" xpm" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else @@ -8120,15 +8147,15 @@ EOF test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:8124: checking for compface.h" >&5 +echo "configure:8151: checking for compface.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8132: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8151,12 +8178,12 @@ fi } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:8155: checking for UnGenFace in -lcompface" >&5 +echo "configure:8182: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8219,12 +8246,12 @@ EOF if test "$with_png $with_tiff" != "no no"; then echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6 -echo "configure:8223: checking for inflate in -lc" >&5 +echo "configure:8250: checking for inflate in -lc" >&5 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8254,12 +8281,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:8258: checking for inflate in -lz" >&5 +echo "configure:8285: checking for inflate in -lz" >&5 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lz " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8289,12 +8316,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:8293: checking for inflate in -lgz" >&5 +echo "configure:8320: checking for inflate in -lgz" >&5 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'` xe_check_libs=" -lgz " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8335,15 +8362,15 @@ fi test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6 -echo "configure:8339: checking for jpeglib.h" >&5 +echo "configure:8366: checking for jpeglib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8366,12 +8393,12 @@ fi } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:8370: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:8397: checking for jpeg_destroy_decompress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8418,10 +8445,10 @@ EOF png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:8422: checking for pow" >&5 +echo "configure:8449: checking for pow" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pow=yes" else @@ -8465,15 +8492,15 @@ fi } test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:8469: checking for png.h" >&5 +echo "configure:8496: checking for png.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8496,12 +8523,12 @@ fi } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:8500: checking for png_read_image in -lpng" >&5 +echo "configure:8527: checking for png_read_image in -lpng" >&5 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'` xe_check_libs=" -lpng " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8535,10 +8562,10 @@ fi } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:8539: checking for workable png version information" >&5 +echo "configure:8566: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext < int main(int c, char **v) { @@ -8546,7 +8573,7 @@ echo "configure:8539: checking for workable png version information" >&5 if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1; return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;} EOF -if { (eval echo configure:8550: \"$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 ./conftest dummy_arg; png_status=$?; if test "$png_status" = "0"; then @@ -8589,15 +8616,15 @@ EOF test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:8593: checking for tiffio.h" >&5 +echo "configure:8620: checking for tiffio.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8620,12 +8647,12 @@ fi } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:8624: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:8651: checking for TIFFClientOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'` xe_check_libs=" -ltiff " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8675,15 +8702,15 @@ fi if test "$with_gtk" = "yes"; then test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:8679: checking for compface.h" >&5 +echo "configure:8706: checking for compface.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8706,12 +8733,12 @@ fi } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:8710: checking for UnGenFace in -lcompface" >&5 +echo "configure:8737: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8761,12 +8788,12 @@ fi if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:8765: checking for X11 graphics libraries" >&5 +echo "configure:8792: checking for X11 graphics libraries" >&5 fi if test "$with_x11" = "yes" -a "$with_widgets" = "athena"; then echo "checking for the Athena widgets" 1>&6 -echo "configure:8770: checking for the Athena widgets" >&5 +echo "configure:8797: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; @@ -8780,12 +8807,12 @@ echo "configure:8770: checking for the Athena widgets" >&5 if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8784: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:8811: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8812,12 +8839,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8816: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:8843: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8859,12 +8886,12 @@ fi else echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8863: checking for threeDClassRec in -l$athena_variant" >&5 +echo "configure:8890: checking for threeDClassRec in -l$athena_variant" >&5 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -l$athena_variant " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8893,12 +8920,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:8897: checking for threeDClassRec in -lXaw" >&5 +echo "configure:8924: checking for threeDClassRec in -lXaw" >&5 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8940,15 +8967,15 @@ fi if test "$athena_3d" = "no"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:8944: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:8971: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8968,15 +8995,15 @@ else echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6 -echo "configure:8972: checking for X11/Xaw/XawInit.h" >&5 +echo "configure:8999: checking for X11/Xaw/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9002,15 +9029,15 @@ fi else ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:9006: checking for X11/$athena_variant/XawInit.h" >&5 +echo "configure:9033: checking for X11/$athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9027,15 +9054,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9031: checking for X11/$athena_variant/ThreeD.h" >&5 +echo "configure:9058: checking for X11/$athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9039: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9063,15 +9090,15 @@ fi if test -z "$athena_h_path"; then ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6 -echo "configure:9067: checking for $athena_variant/XawInit.h" >&5 +echo "configure:9094: checking for $athena_variant/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9088,15 +9115,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9092: checking for $athena_variant/ThreeD.h" >&5 +echo "configure:9119: checking for $athena_variant/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9125,15 +9152,15 @@ fi if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:9129: checking for X11/Xaw3d/XawInit.h" >&5 +echo "configure:9156: checking for X11/Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9150,15 +9177,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9154: checking for X11/Xaw3d/ThreeD.h" >&5 +echo "configure:9181: checking for X11/Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9190,15 +9217,15 @@ fi if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6 -echo "configure:9194: checking for Xaw3d/XawInit.h" >&5 +echo "configure:9221: checking for Xaw3d/XawInit.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9215,15 +9242,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9219: checking for Xaw3d/ThreeD.h" >&5 +echo "configure:9246: checking for Xaw3d/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9255,15 +9282,15 @@ fi if test -z "$athena_h_path"; then ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6 -echo "configure:9259: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:9286: checking for X11/Xaw/ThreeD.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9302,15 +9329,15 @@ fi if test "$with_x11" = "yes"; then ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:9306: checking for Xm/Xm.h" >&5 +echo "configure:9333: checking for Xm/Xm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9327,12 +9354,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:9331: checking for XmStringFree in -lXm" >&5 +echo "configure:9358: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9372,9 +9399,9 @@ fi if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:9376: checking for Lesstif" >&5 +echo "configure:9403: checking for Lesstif" >&5 cat > conftest.$ac_ext < #ifdef LESSTIF_VERSION @@ -9798,7 +9825,7 @@ fi if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:9802: checking for Mule-related features" >&5 +echo "configure:9829: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -9823,15 +9850,15 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9827: checking for $ac_hdr" >&5 +echo "configure:9854: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9835: \"$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 | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9862,12 +9889,12 @@ done echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:9866: checking for strerror in -lintl" >&5 +echo "configure:9893: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9911,18 +9938,18 @@ fi echo "checking for Mule input methods" 1>&6 -echo "configure:9915: checking for Mule input methods" >&5 +echo "configure:9942: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:9918: checking for XIM" >&5 +echo "configure:9945: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:9921: checking for XOpenIM in -lX11" >&5 +echo "configure:9948: checking for XOpenIM in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9957,12 +9984,12 @@ fi if test "$have_motif $have_lesstif" = "yes no"; then echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:9961: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:9988: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10038,15 +10065,15 @@ EOF if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:10042: checking for XFontSet" >&5 +echo "configure:10069: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:10045: checking for XmbDrawString in -lX11" >&5 +echo "configure:10072: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10097,15 +10124,15 @@ EOF test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:10101: checking for wnn/jllib.h" >&5 +echo "configure:10128: checking for wnn/jllib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10128,15 +10155,15 @@ fi } test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6 -echo "configure:10132: checking for wnn/commonhd.h" >&5 +echo "configure:10159: checking for wnn/commonhd.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10161,10 +10188,10 @@ fi for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10165: checking for $ac_func" >&5 +echo "configure:10192: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10216,12 +10243,12 @@ done test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:10220: checking for crypt in -lcrypt" >&5 +echo "configure:10247: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10267,12 +10294,12 @@ fi if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:10271: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:10298: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10301,12 +10328,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:10305: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:10332: checking for jl_dic_list_e in -lwnn4" >&5 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn4 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10335,12 +10362,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:10339: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:10366: checking for jl_dic_list_e in -lwnn6" >&5 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10369,12 +10396,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:10373: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:10400: checking for dic_list_e in -lwnn6_fromsrc" >&5 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6_fromsrc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10433,12 +10460,12 @@ EOF if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:10437: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:10464: checking for jl_fi_dic_list in -l$libwnn" >&5 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -l$libwnn " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10484,15 +10511,15 @@ EOF if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:10488: checking for canna/jrkanji.h" >&5 +echo "configure:10515: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10519,15 +10546,15 @@ fi c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:10523: checking for canna/jrkanji.h" >&5 +echo "configure:10550: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10555,15 +10582,15 @@ fi test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:10559: checking for canna/RK.h" >&5 +echo "configure:10586: checking for canna/RK.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10586,12 +10613,12 @@ fi } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:10590: checking for RkBgnBun in -lRKC" >&5 +echo "configure:10617: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10625,12 +10652,12 @@ fi } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:10629: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:10656: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10690,12 +10717,12 @@ if test "$need_motif" = "yes" ; then libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:10694: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:10721: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10792,10 +10819,10 @@ fi for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10796: checking for $ac_func" >&5 +echo "configure:10823: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10850,10 +10877,10 @@ done for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10854: checking for $ac_func" >&5 +echo "configure:10881: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10905,10 +10932,10 @@ done echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:10909: checking for openpty" >&5 +echo "configure:10936: checking for openpty" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openpty=yes" else @@ -10950,12 +10977,12 @@ else echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:10954: checking for openpty in -lutil" >&5 +echo "configure:10981: checking for openpty in -lutil" >&5 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'` xe_check_libs=" -lutil " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11001,15 +11028,15 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11005: checking for $ac_hdr" >&5 +echo "configure:11032: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11045,15 +11072,15 @@ for ac_hdr in stropts.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11049: checking for $ac_hdr" >&5 +echo "configure:11076: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11086,10 +11113,10 @@ if test "$ac_cv_header_stropts_h" = "yes"; then for ac_func in isastream do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11090: checking for $ac_func" >&5 +echo "configure:11117: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11143,15 +11170,15 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11147: checking for $ac_hdr" >&5 +echo "configure:11174: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11188,10 +11215,10 @@ extra_objs="$extra_objs realpath.o" && if test "$extra_verbose" = "yes"; then for ac_func in getloadavg do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11192: checking for $ac_func" >&5 +echo "configure:11219: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11247,15 +11274,15 @@ if test "$ac_cv_func_getloadavg" = "yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11251: checking for $ac_hdr" >&5 +echo "configure:11278: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11291,12 +11318,12 @@ else echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:11295: checking for kstat_open in -lkstat" >&5 +echo "configure:11322: checking for kstat_open in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lkstat " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11342,15 +11369,15 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11346: checking for $ac_hdr" >&5 +echo "configure:11373: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11382,12 +11409,12 @@ done echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:11386: checking for kvm_read in -lkvm" >&5 +echo "configure:11413: checking for kvm_read in -lkvm" >&5 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` xe_check_libs=" -lkvm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11432,16 +11459,16 @@ fi fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:11436: checking whether netdb declares h_errno" >&5 +echo "configure:11463: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext < int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:11445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -11461,16 +11488,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:11465: checking for sigsetjmp" >&5 +echo "configure:11492: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:11474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11501: \"$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 @@ -11490,11 +11517,11 @@ fi rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:11494: checking whether localtime caches TZ" >&5 +echo "configure:11521: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11529,7 +11556,7 @@ main() exit (0); } EOF -if { (eval echo configure:11533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -11559,9 +11586,9 @@ fi if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:11563: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:11590: checking whether gettimeofday accepts one or two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""two" 1>&6 else @@ -11604,19 +11631,19 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:11608: checking for inline" >&5 +echo "configure:11635: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -11657,17 +11684,17 @@ if test "$__DECC" != "yes"; then # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:11661: checking for working alloca.h" >&5 +echo "configure:11688: checking for working alloca.h" >&5 cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:11671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -11691,10 +11718,10 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:11695: checking for alloca" >&5 +echo "configure:11722: checking for alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -11761,10 +11788,10 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:11765: checking whether alloca needs Cray hooks" >&5 +echo "configure:11792: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11792: checking for $ac_func" >&5 +echo "configure:11819: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11844,10 +11871,10 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:11848: checking stack direction for C alloca" >&5 +echo "configure:11875: checking stack direction for C alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -11896,15 +11923,15 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:11900: checking for vfork.h" >&5 +echo "configure:11927: checking for vfork.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11932,10 +11959,10 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:11936: checking for working vfork" >&5 +echo "configure:11963: checking for working vfork" >&5 cat > conftest.$ac_ext < @@ -12030,7 +12057,7 @@ main() { } } EOF -if { (eval echo configure:12034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_vfork_works=yes else @@ -12056,10 +12083,10 @@ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:12060: checking for working strcoll" >&5 +echo "configure:12087: checking for working strcoll" >&5 cat > conftest.$ac_ext < main () @@ -12069,7 +12096,7 @@ main () strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:12073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -12097,10 +12124,10 @@ fi for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12101: checking for $ac_func" >&5 +echo "configure:12128: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12151,10 +12178,10 @@ fi done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:12155: checking whether getpgrp takes no argument" >&5 +echo "configure:12182: checking whether getpgrp takes no argument" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -12236,10 +12263,10 @@ fi echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:12240: checking for working mmap" >&5 +echo "configure:12267: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext < #include @@ -12272,7 +12299,7 @@ int main (int argc, char *argv[]) return 1; } EOF -if { (eval echo configure:12276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -12301,9 +12328,9 @@ test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no if test "$rel_alloc $have_mmap" = "default yes"; then if test "$doug_lea_malloc" = "yes"; then echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6 -echo "configure:12305: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:12332: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext < int main() { @@ -12315,7 +12342,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -12340,15 +12367,15 @@ EOF ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:12344: checking for termios.h" >&5 +echo "configure:12371: checking for termios.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12379: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12391,15 +12418,15 @@ else echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:12395: checking for termio.h" >&5 +echo "configure:12422: checking for termio.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12431,10 +12458,10 @@ fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:12435: checking for socket" >&5 +echo "configure:12462: checking for socket" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -12472,15 +12499,15 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:12476: checking for netinet/in.h" >&5 +echo "configure:12503: checking for netinet/in.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12497,15 +12524,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:12501: checking for arpa/inet.h" >&5 +echo "configure:12528: checking for arpa/inet.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12530,9 +12557,9 @@ EOF } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:12534: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:12561: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext < @@ -12543,7 +12570,7 @@ int main() { static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:12547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN @@ -12561,9 +12588,9 @@ else fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:12565: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:12592: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext < @@ -12573,7 +12600,7 @@ int main() { static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:12577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST @@ -12604,10 +12631,10 @@ fi echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:12608: checking for msgget" >&5 +echo "configure:12635: checking for msgget" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -12645,15 +12672,15 @@ if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:12649: checking for sys/ipc.h" >&5 +echo "configure:12676: checking for sys/ipc.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12670,15 +12697,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:12674: checking for sys/msg.h" >&5 +echo "configure:12701: checking for sys/msg.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12716,15 +12743,15 @@ fi ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:12720: checking for dirent.h" >&5 +echo "configure:12747: checking for dirent.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12751,15 +12778,15 @@ else echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:12755: checking for sys/dir.h" >&5 +echo "configure:12782: checking for sys/dir.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12792,15 +12819,15 @@ fi ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:12796: checking for nlist.h" >&5 +echo "configure:12823: checking for nlist.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12830,22 +12857,22 @@ fi echo "checking "for sound support"" 1>&6 -echo "configure:12834: checking "for sound support"" >&5 +echo "configure:12861: checking "for sound support"" >&5 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes if test "$with_native_sound" != "no"; then if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:12841: checking for multimedia/audio_device.h" >&5 +echo "configure:12868: checking for multimedia/audio_device.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12893,12 +12920,12 @@ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:12897: checking for ALopenport in -laudio" >&5 +echo "configure:12924: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12940,12 +12967,12 @@ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:12944: checking for AOpenAudio in -lAlib" >&5 +echo "configure:12971: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13001,15 +13028,15 @@ fi for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:13005: checking for ${dir}/soundcard.h" >&5 +echo "configure:13032: checking for ${dir}/soundcard.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13040: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13063,15 +13090,15 @@ fi if test "$with_nas_sound" != "no"; then ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6 -echo "configure:13067: checking for audio/audiolib.h" >&5 +echo "configure:13094: checking for audio/audiolib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13102: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13089,12 +13116,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6 -echo "configure:13093: checking for AuOpenServer in -laudio" >&5 +echo "configure:13120: checking for AuOpenServer in -laudio" >&5 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13144,7 +13171,7 @@ EOF fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext < EOF @@ -13175,7 +13202,7 @@ if test "$with_esd_sound" != "no"; then # Extract the first word of "esd-config", so it can be a program name with args. set dummy esd-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13179: checking for $ac_word" >&5 +echo "configure:13206: checking for $ac_word" >&5 if test -n "$have_esd_config"; then ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test. @@ -13204,10 +13231,10 @@ fi c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6 -echo "configure:13208: checking for esd_play_stream" >&5 +echo "configure:13235: checking for esd_play_stream" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_esd_play_stream=yes" else @@ -13281,7 +13308,7 @@ test -z "$with_tty" && with_tty=yes if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:13285: checking for TTY-related features" >&5 +echo "configure:13312: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -13297,12 +13324,12 @@ EOF if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:13301: checking for tgetent in -lncurses" >&5 +echo "configure:13328: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13346,15 +13373,15 @@ EOF ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:13350: checking for ncurses/curses.h" >&5 +echo "configure:13377: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13376,15 +13403,15 @@ fi ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:13380: checking for ncurses/term.h" >&5 +echo "configure:13407: checking for ncurses/term.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13414,15 +13441,15 @@ fi c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:13418: checking for ncurses/curses.h" >&5 +echo "configure:13445: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13457,12 +13484,12 @@ fi for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:13461: checking for tgetent in -l$lib" >&5 +echo "configure:13488: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -l$lib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13504,12 +13531,12 @@ fi else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:13508: checking for tgetent in -lcurses" >&5 +echo "configure:13535: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13538,12 +13565,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:13542: checking for tgetent in -ltermcap" >&5 +echo "configure:13569: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13602,15 +13629,15 @@ EOF test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:13606: checking for gpm.h" >&5 +echo "configure:13633: checking for gpm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13633,12 +13660,12 @@ fi } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:13637: checking for Gpm_Open in -lgpm" >&5 +echo "configure:13664: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13692,27 +13719,27 @@ else for feature in ncurses gpm; do eval "with_${feature}=no" done fi -test "$with_x11" = "yes" -o "$with_tty" = "yes" && extra_objs="$extra_objs event-unixoid.o" && if test "$extra_verbose" = "yes"; then +test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" && extra_objs="$extra_objs event-unixoid.o" && if test "$extra_verbose" = "yes"; then echo " xemacs will be linked with \"event-unixoid.o\"" fi test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:13703: checking for database support" >&5 +echo "configure:13730: checking for database support" >&5 if test "$with_database_gdbm $with_database_dbm" != "no no"; then ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 -echo "configure:13708: checking for ndbm.h" >&5 +echo "configure:13735: checking for ndbm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13742,12 +13769,12 @@ fi if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:13746: checking for dbm_open in -lgdbm" >&5 +echo "configure:13773: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13786,10 +13813,10 @@ fi if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:13790: checking for dbm_open" >&5 +echo "configure:13817: checking for dbm_open" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -13831,12 +13858,12 @@ else echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:13835: checking for dbm_open in -ldbm" >&5 +echo "configure:13862: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13888,10 +13915,10 @@ EOF if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:13892: checking for Berkeley db.h" >&5 +echo "configure:13919: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do cat > conftest.$ac_ext < @@ -13913,7 +13940,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -13929,9 +13956,9 @@ rm -f conftest* if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:13933: checking for Berkeley DB version" >&5 +echo "configure:13960: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 1 @@ -13943,7 +13970,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "yes" >/dev/null 2>&1; then rm -rf conftest* cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 2 @@ -13970,10 +13997,10 @@ fi rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:13974: checking for $dbfunc" >&5 +echo "configure:14001: checking for $dbfunc" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$dbfunc=yes" else @@ -14015,12 +14042,12 @@ else echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:14019: checking for $dbfunc in -ldb" >&5 +echo "configure:14046: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14095,12 +14122,12 @@ fi if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:14099: checking for SOCKSinit in -lsocks" >&5 +echo "configure:14126: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14166,22 +14193,22 @@ fi if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:14170: checking for module support" >&5 +echo "configure:14197: checking for module support" >&5 if test "$with_msw" = "yes"; then have_dl=yes; else ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:14177: checking for dlfcn.h" >&5 +echo "configure:14204: checking for dlfcn.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14198,16 +14225,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:14202: checking for dlopen in -lc" >&5 +echo "configure:14229: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext < int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14216,18 +14243,18 @@ else rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:14220: checking for dlopen in -ldl" >&5 +echo "configure:14247: checking for dlopen in -ldl" >&5 ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext < int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14256,12 +14283,12 @@ EOF else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:14260: checking for shl_load in -ldld" >&5 +echo "configure:14287: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14299,12 +14326,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:14303: checking for dld_init in -ldld" >&5 +echo "configure:14330: checking for dld_init in -ldld" >&5 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14360,7 +14387,7 @@ xehost=$canonical xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:14364: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:14391: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; @@ -14388,9 +14415,9 @@ if test "$GCC" = "yes"; then XEGCC=yes else echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:14392: checking checking whether we are using GNU C" >&5 +echo "configure:14419: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <&6 -echo "configure:14416: checking how to produce PIC code" >&5 +echo "configure:14443: checking how to produce PIC code" >&5 wl= can_build_shared=yes @@ -14513,18 +14540,18 @@ if test -n "$dll_cflags"; then # Check to make sure the dll_cflags actually works. echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6 -echo "configure:14517: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:14544: checking if PIC flag ${dll_cflags} really works" >&5 save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $dll_cflags -DPIC" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also @@ -14555,7 +14582,7 @@ cc_produces_so=no xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:14559: checking if C compiler can produce shared libraries" >&5 +echo "configure:14586: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes; then xcldf="-shared" xldf="-shared" @@ -14606,14 +14633,14 @@ if test -n "$xcldf"; then xe_libs= ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5' cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else @@ -14638,7 +14665,7 @@ if test -z "$LTLD"; then if test "$XEGCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:14642: checking for ld used by GCC" >&5 +echo "configure:14669: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -14664,7 +14691,7 @@ echo "configure:14642: checking for ld used by GCC" >&5 esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:14668: checking for GNU ld" >&5 +echo "configure:14695: checking for GNU ld" >&5 fi if test -z "$LTLD"; then @@ -14702,7 +14729,7 @@ ld_dynamic_link_flags= # Check to see if it really is or isn't GNU ld. echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6 -echo "configure:14706: checking if the linker is GNU ld" >&5 +echo "configure:14733: checking if the linker is GNU ld" >&5 # I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LTLD -v 2>&1 &5; then xe_gnu_ld=yes @@ -14730,7 +14757,7 @@ else # OK - only NOW do we futz about with ld. # See if the linker supports building shared libraries. echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6 -echo "configure:14734: checking whether the linker supports shared libraries" >&5 +echo "configure:14761: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes @@ -14941,10 +14968,10 @@ EOF for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14945: checking for $ac_func" >&5 +echo "configure:14972: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15006,11 +15033,11 @@ done fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else diff --git a/configure.in b/configure.in index 00db67d..9a86a7f 100644 --- a/configure.in +++ b/configure.in @@ -16,6 +16,7 @@ define([AC_INIT_NOTICE], ### To rebuild it, execute the command ### autoconf ### in the this directory. You must have autoconf version 2.13 or later. +### Note: this script has not yet been ported to autoconf version 2.5x. ### This file is part of XEmacs. @@ -333,13 +334,13 @@ infodir='${datadir}/${instvardir}/info' infopath='' install_pp='' lispdir='${datadir}/${instvardir}/lisp' -moduledir='${datadir}/${instvardir}/${configuration}/modules' +moduledir='${libdir}/${instvardir}/${configuration}/modules' sitelispdir='${datadir}/${inststaticdir}/site-lisp' -sitemoduledir='${datadir}/${inststaticdir}/site-modules' +sitemoduledir='${libdir}/${inststaticdir}/site-modules' pkgdir='${datadir}/${instvardir}/lisp' package_path='' etcdir='${datadir}/${instvardir}/etc' -archlibdir='${datadir}/${instvardir}/${configuration}' +archlibdir='${libdir}/${instvardir}/${configuration}' docdir='${archlibdir}' with_netinstall="no" with_prefix='yes' @@ -1898,9 +1899,15 @@ if test "$cflags_specified" = "no"; then dnl Following values of CFLAGS are known to work well. dnl Should we take debugging options into consideration? if test "$GCC" = "yes"; then - CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes -Wshadow" + CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes" dnl Yuck, bad compares have been worth at least 3 crashes! CFLAGS="$CFLAGS -Wsign-compare" + dnl You get five zillion shadowing warnings with g++. + dnl Even with gcc, -Wshadow is questionable because of its complaints + dnl about parameters with the same names as global functions. + if test "$xemacs_compiler" != "g++"; then + CFLAGS="$CFLAGS -Wshadow" + fi dnl glibc is intentionally not `-Wpointer-arith'-clean. dnl Ulrich Drepper has rejected patches to fix the glibc header files. test "$have_glibc" != "yes" && CFLAGS="$CFLAGS -Wpointer-arith" @@ -2906,7 +2913,7 @@ if test "$with_msw" != "no"; then dnl check for our special version of select AC_TRY_RUN([#include int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }], - [AC_DEFINE(HAVE_MSG_SELECT)]) + [need_event_unixoid=yes; AC_DEFINE(HAVE_MSG_SELECT)]) with_file_coding=yes XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o) fi @@ -3171,9 +3178,38 @@ dnl ---------------------- if test "$window_system" != "none"; then AC_CHECKING(for graphics libraries) + dnl add special code to handle xpm-nox on Cygwin (csw) + dnl -- should only happen if CYGWIN && WITH_XPM && WITH_MSW && !WITH_X + libpath_xpm= + incpath_xpm= + case "$opsys" in + cygwin*) + cygwin_top=`eval "gcc -print-file-name=libc.a"` ; + cygwin_top=`eval "dirname ${cygwin_top}"`; + cygwin_top="${cygwin_top}/.."; + case "$window_system" in + dnl use "standard" search pattern + x11) ;; + dnl hardcode "standard" non-X11 xpm lib/inc dirs + msw) libpath_xpm="-L${cygwin_top}/lib/noX" + incpath_xpm="-I${cygwin_top}/include/noX" + ;; + dnl not supported on cygwin (yet?) + gtk) ;; + dnl probably not reached... + none) ;; + dnl ditto + *) ;; + esac + ;; + dnl use "standard" search pattern for all other OS's + *) ;; + esac dnl Autodetect Xpm xpm_problem="" if test -z "$with_xpm"; then + XE_PREPEND("$incpath_xpm", CFLAGS) + XE_PREPEND("$libpath_xpm", LDFLAGS) AC_MSG_CHECKING(for Xpm - no older than 3.4f) xe_check_libs=-lXpm AC_TRY_RUN([#define XPM_NUMBERS @@ -3209,7 +3245,9 @@ if test "$window_system" != "none"; then dnl #### then it will succeed if FOR_MSW is defined, dnl #### but doesn't actually verify this assumption. AC_DEFINE(HAVE_XPM) + XE_PREPEND("$libpath_xpm", LDFLAGS) XE_PREPEND(-lXpm, libs_x) + XE_PREPEND("$incpath_xpm", CFLAGS) AC_MSG_CHECKING(for \"FOR_MSW\" xpm) xe_check_libs=-lXpm AC_TRY_LINK(, [XpmCreatePixmapFromData()], @@ -4210,7 +4248,9 @@ else dnl "$with_tty" = "no" fi dnl with_tty dnl Do we need event-unixoid.o ? -test "$with_x11" = "yes" -o "$with_tty" = "yes" && XE_ADD_OBJS(event-unixoid.o) +dnl This is needed for X, or for TTY, or for MSWIN w/Cygwin select() +dnl [but not Mingw MSWIN] +test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" && XE_ADD_OBJS(event-unixoid.o) dnl Database support dnl We do not necessarily have to have libdb/lib(g)dbm for DB/(G)DBM support. diff --git a/configure.usage b/configure.usage index 77f52c2..ecf7437 100644 --- a/configure.usage +++ b/configure.usage @@ -77,15 +77,16 @@ Window-system options: *WARNING* The Motif menubar is currently broken. --with-scrollbars=TYPE Use TYPE scrollbars (lucid, motif, athena, or no). ---with-dialogs=TYPE Use TYPE dialog boxes (motif, athena, or no). +--with-dialogs=TYPE Use TYPE dialog boxes (lucid, motif, athena, or no). Lucid menubars and scrollbars are the default. Motif dialog boxes will be used if Motif can be found. ---with-widgets=TYPE Use TYPE widgets (motif, athena, or no). +--with-widgets=TYPE Use TYPE widgets (lucid, motif, athena, or no). Motif widgets will be used if Motif can be found. Other widget types are currently unsupported. --with-dragndrop Compile in the generic drag and drop API. This is automatically added if one of the drag and drop - protocols is found (currently CDE, OffiX, MSWindows). + protocols is found (currently CDE, OffiX, MSWindows, + and GTK). *WARNING* The Drag'n'drop support is under development and is considered experimental. --with-cde Compile in support for CDE drag and drop. @@ -155,7 +156,7 @@ Mail options: --mail-locking=TYPE (*) Specify the locking to be used by movemail to prevent concurrent updates of mail spool files. Valid types - are `lockf', `flock', and `dot'. + are `lockf', `flock', `dot', `locking' or `mmdf'. --with-pop Support POP for mail retrieval. --with-kerberos Support Kerberos-authenticated POP. --with-hesiod Support Hesiod to get the POP server host. diff --git a/etc/OXYMORONS b/etc/OXYMORONS index 6717c52..acb23c0 100644 --- a/etc/OXYMORONS +++ b/etc/OXYMORONS @@ -37,6 +37,7 @@ theme for the releases following the promotion of 21.4 from "gamma" to 21.4.14: Security Through Obscurity 21.4.15: Standard C 21.4.16: Successful IPO +21.4.17: Sufficiently Smart Compiler -N.B. Only incredibly redeeming suggestoins can be accepted now. +N.B. Only incredibly redeeming suggestions can be accepted now. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index e5f8566..a8f859a 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2001-10-23 Stephen J. Turnbull + + * XEmacs 21.4.5 "Civil Service" is released. + 2001-07-28 Stephen J. Turnbull * XEmacs 21.4.4 "Artificial Intelligence" is released. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b853ba6..5bf434f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,135 @@ +2001-10-23 Stephen J. Turnbull + + * XEmacs 21.4.5 "Civil Service" is released. + +2001-04-23 Didier Verna + + * cus-edit.el (custom-variable-pre-save): New. + * cus-edit.el (custom-variable-post-save): New. + * cus-edit.el (custom-variable-save): use them. + * cus-edit.el (custom-face-pre-save): New. + * cus-edit.el (custom-face-post-save): New. + * cus-edit.el (custom-face-save): use them. + * cus-edit.el (custom-group-pre-save): New. + * cus-edit.el (custom-group-post-save): New. + * cus-edit.el (custom-group-save): use them. + * cus-edit.el (Custom-save): use the pre/post functions above, + call `custom-save-all' only once. + * cus-edit.el (custom-variable-pre-reset-standard): New. + * cus-edit.el (custom-variable-post-reset-standard): New. + * cus-edit.el (custom-variable-reset-standard): use them. + * cus-edit.el (custom-face-pre-reset-standard): New. + * cus-edit.el (custom-face-post-reset-standard): New. + * cus-edit.el (custom-face-reset-standard): use them. + * cus-edit.el (custom-group-pre-reset-standard): New. + * cus-edit.el (custom-group-post-reset-standard): New. + * cus-edit.el (Custom-reset-standard): use them. + * cus-edit.el (custom-face-reset-saved): use the pre/post + functions above, call `custom-save-all' only once. + +2001-04-08 Danny Colascione + + * gutter-items.el (buffers-tab face): Derive from the modeline + face by default. Many people use white-on-black for the default + font, and the tabs look hideous with that color combination. The + modeline usually has the correct colors. + +2001-09-28 Robert Pluim + + * etags.el (find-tag): Doc fix, point users at pop-tag-mark. + (tag-mark-stack-max): Typo fix. + +2001-09-28 Ben Wing + + * font-lock.el: + * font-lock.el (font-lock-after-change-function): + fix problem with last patch, reported by Katsumi Yamaoka. + +2001-09-17 Ben Wing + + * font-lock.el (font-lock-after-change-function): + fix problem when you insert a comment on the line before a line of + code: if we use the following char, then when you hit backspace, + the following line of code turns the comment color. + +2001-06-08 Ben Wing + + * process.el: comment about shell-command-switch. + * process.el (shell-quote-argument): Need to quote a null + argument, too. From Dan Holmsand. + + * startup.el (normal-top-level): Delete some unused FSF junk. + * startup.el (command-line-early): + + * startup.el (command-line): Call MS Windows init function. + + * win32-native.el: + * win32-native.el (mswindows-system-shells): New. + * win32-native.el (mswindows-system-shell-p): New. + * win32-native.el (init-mswindows-at-startup): New. + * win32-native.el (mswindows-quote-one-vc-runtime-arg): + * win32-native.el (mswindows-quote-one-simple-arg): + * win32-native.el (mswindows-quote-one-command-arg): + * win32-native.el (mswindows-construct-process-command-line-alist): + Correct comments at top. Correctly handle passing arguments + to Cygwin programs and to bash. Fix quoting of zero-length + arguments (from Dan Holmsand). Set shell-command-switch based + on shell-file-name, which in turn comes from env var SHELL. + +2001-07-18 Alexey Mahotkin + + * toolbar.el (toolbar-visible-p, toolbar-captioned-p, + default-toolbar-position): Fill docstrings for balloon-help. + +2001-03-15 Stephen J. Turnbull + + * faces.el: Reenable specifications over 'gtk domain. + +2001-08-08 Didier Verna + + * autoload.el (update-autoload-files): make defdir a file name, + not directory name. + +2001-08-06 Steve Youngs + + * menubar-items.el (default-menubar): Use 'report-xemacs-bug'. + + * lisp-mnt.el (lm-report-bug): Use 'report-xemacs-bug-beta-address'. + +2001-08-01 Edward M. Lee + + * font-menu.el (font-menu-set-font): Default to current font-family. + (font-menu-preferred-resolution): + (font-menu-size-scaling): + Provide gtk defaults, too. + +2001-07-29 Mike Alexander + + * cus-face.el (custom-set-face-font-size): Last arg to apply is a + list + (custom-set-face-font-family): ditto + +2001-07-26 Mike Sperber + + * files.el (auto-mode-alist): .9 files are man pages, too. + +2001-07-23 Edwin Steiner + + * process.el (call-process-internal): bind + coding-system-for-write to 'binary when calling + start-process-internal, so the process receives + the literal contents of INFILE. + +2001-09-15 Edward M. Lee + + * files.el (auto-mode-alist): Add configure.ac support. + +2001-07-19 Adrian Aichner + + * buff-menu.el: + mouse.el: + Adrian's mouse-track patch. See . + 2001-07-28 Stephen J. Turnbull * XEmacs 21.4.4 "Artificial Intelligence" is released. diff --git a/lisp/autoload.el b/lisp/autoload.el index 195885d..9911d82 100644 --- a/lisp/autoload.el +++ b/lisp/autoload.el @@ -509,7 +509,7 @@ The directory to which the auto-autoloads.el file must be the first parameter on the command line." (unless noninteractive (error "batch-update-autoloads is to be used only with -batch")) - (let ((defdir default-directory) + (let ((defdir (directory-file-name default-directory)) (enable-local-eval nil)) ; Don't query in batch mode. ;; (message "Updating autoloads in %s..." generated-autoload-file) (dolist (arg command-line-args-left) diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el index 482dcc7..1729956 100644 --- a/lisp/buff-menu.el +++ b/lisp/buff-menu.el @@ -140,8 +140,8 @@ Letters do not insert themselves; instead, they are commands. (setq revert-buffer-function 'Buffer-menu-revert-function) (setq truncate-lines t) (setq buffer-read-only t) - (make-local-variable 'mouse-track-click-hook) ; XEmacs - (add-hook 'mouse-track-click-hook 'Buffer-menu-maybe-mouse-select) ; XEmacs + (make-local-hook 'mouse-track-click-hook) ; XEmacs + (add-hook 'mouse-track-click-hook 'Buffer-menu-maybe-mouse-select t t) ; XEmacs (run-hooks 'buffer-menu-mode-hook)) (defun Buffer-menu-revert-function (ignore1 ignore2) diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 12ae67f..38b437f 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -562,14 +562,24 @@ groups after non-groups, if nil do not order groups at all." children))) (defun Custom-save () - "Set all modified group members and save them." + "Set all modified options and save them." (interactive) - (let ((children custom-options)) + (let ((all-children custom-options) + children) (mapc (lambda (child) (when (memq (widget-get child :custom-state) '(modified set)) - (widget-apply child :custom-save))) - children)) - (custom-save-all)) + (push child children))) + all-children) + (let ((the-children children) + child) + (while (setq child (pop the-children)) + (widget-apply child :custom-pre-save))) + (custom-save-all) + (let ((the-children children) + child) + (while (setq child (pop the-children)) + (widget-apply child :custom-post-save))) + )) (defvar custom-reset-menu '(("Current" . Custom-reset-current) @@ -610,11 +620,23 @@ when the action is chosen.") (defun Custom-reset-standard (&rest ignore) "Reset all modified, set, or saved group members to their standard settings." (interactive) - (let ((children custom-options)) + (let ((all-children custom-options) + children must-save) (mapc (lambda (child) (when (memq (widget-get child :custom-state) '(modified set saved)) - (widget-apply child :custom-reset-standard))) - children))) + (push child children))) + all-children) + (let ((the-children children) + child) + (while (setq child (pop the-children)) + (and (widget-apply child :custom-pre-reset-standard) + (setq must-save t)))) + (and must-save (custom-save-all)) + (let ((the-children children) + child) + (while (setq child (pop the-children)) + (widget-apply child :custom-post-reset-standard))) + )) ;;; The Customize Commands @@ -1848,10 +1870,14 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"." :value-create 'custom-variable-value-create :action 'custom-variable-action :custom-set 'custom-variable-set + :custom-pre-save 'custom-variable-pre-save :custom-save 'custom-variable-save + :custom-post-save 'custom-variable-post-save :custom-reset-current 'custom-redraw :custom-reset-saved 'custom-variable-reset-saved - :custom-reset-standard 'custom-variable-reset-standard) + :custom-pre-reset-standard 'custom-variable-pre-reset-standard + :custom-reset-standard 'custom-variable-reset-standard + :custom-post-reset-standard 'custom-variable-post-reset-standard) (defun custom-variable-type (symbol) "Return a widget suitable for editing the value of SYMBOL. @@ -2175,8 +2201,8 @@ Optional EVENT is the location for the menu." (custom-variable-state-set widget) (custom-redraw-magic widget))) -(defun custom-variable-save (widget) - "Set and save the value for the variable being edited by WIDGET." +(defun custom-variable-pre-save (widget) + "Prepare for saving the value for the variable being edited by WIDGET." (let* ((form (widget-get widget :custom-form)) (state (widget-get widget :custom-state)) (child (car (widget-get widget :children))) @@ -2219,9 +2245,18 @@ Optional EVENT is the location for the menu." (put symbol 'saved-variable-comment comment))) (put symbol 'customized-value nil) (put symbol 'customized-variable-comment nil) - (custom-save-all) - (custom-variable-state-set widget) - (custom-redraw-magic widget))) + )) + +(defun custom-variable-post-save (widget) + "Finish saving the variable being edited by WIDGET." + (custom-variable-state-set widget) + (custom-redraw-magic widget)) + +(defun custom-variable-save (widget) + "Set and save the value for the variable being edited by WIDGET." + (custom-variable-pre-save widget) + (custom-save-all) + (custom-variable-post-save widget)) (defun custom-variable-reset-saved (widget) "Restore the saved value for the variable being edited by WIDGET." @@ -2242,8 +2277,10 @@ Optional EVENT is the location for the menu." ;; This call will possibly make the comment invisible (custom-redraw widget))) -(defun custom-variable-reset-standard (widget) - "Restore the standard setting for the variable being edited by WIDGET." +;; This function returns non nil if we need to re-save the options --dv. +(defun custom-variable-pre-reset-standard (widget) + "Prepare for restoring the variable being edited by WIDGET to its +standard setting." (let* ((symbol (widget-value widget)) (set (or (get symbol 'custom-set) 'set-default))) (if (get symbol 'standard-value) @@ -2260,10 +2297,21 @@ Optional EVENT is the location for the menu." (if (null (cdr (get symbol 'theme-value))) (put symbol 'theme-value nil)) (put symbol 'saved-variable-comment nil) - (custom-save-all)) - (widget-put widget :custom-state 'unknown) - ;; This call will possibly make the comment invisible - (custom-redraw widget))) + widget) + )) + +(defun custom-variable-post-reset-standard (widget) + "Finish resetting the variable being edited by WIDGET to its standard +value." + (widget-put widget :custom-state 'unknown) + ;; This call will possibly make the comment invisible + (custom-redraw widget)) + +(defun custom-variable-reset-standard (widget) + "Restore the standard setting for the variable being edited by WIDGET." + (when (custom-variable-pre-reset-standard widget) + (custom-save-all)) + (custom-variable-post-reset-standard widget)) ;;; The `custom-face-edit' Widget. @@ -2394,10 +2442,14 @@ Match frames with dark backgrounds") :custom-category 'face :custom-form nil ; defaults to value of `custom-face-default-form' :custom-set 'custom-face-set + :custom-pre-save 'custom-face-pre-save :custom-save 'custom-face-save + :custom-post-save 'custom-face-post-save :custom-reset-current 'custom-redraw :custom-reset-saved 'custom-face-reset-saved + :custom-pre-reset-standard 'custom-face-pre-reset-standard :custom-reset-standard 'custom-face-reset-standard + :custom-post-reset-standard 'custom-face-post-reset-standard :custom-menu 'custom-face-menu-create) (define-widget 'custom-face-all 'editable-list @@ -2640,8 +2692,8 @@ Optional EVENT is the location for the menu." (custom-face-state-set widget) (custom-redraw-magic widget))) -(defun custom-face-save (widget) - "Make the face attributes in WIDGET default." +(defun custom-face-pre-save (widget) + "Prepare for saving the face being edited by WIDGET." (let* ((symbol (widget-value widget)) (child (car (widget-get widget :children))) (value (widget-value child)) @@ -2659,12 +2711,21 @@ Optional EVENT is the location for the menu." (put symbol 'face-comment comment) (put symbol 'customized-face-comment nil) (put symbol 'saved-face-comment comment) - (custom-save-all) - (custom-face-state-set widget) - (custom-redraw-magic widget))) + )) + +(defun custom-face-post-save (widget) + "Finish saving the face being edited by WIDGET." + (custom-face-state-set widget) + (custom-redraw-magic widget)) + +(defun custom-face-save (widget) + "Save the face being edited by WIDGET." + (custom-face-pre-save widget) + (custom-save-all) + (custom-face-post-save widget)) (defun custom-face-reset-saved (widget) - "Restore WIDGET to the face's default attributes." + "Reset the face being edited by WIDGET to its saved value." (let* ((symbol (widget-value widget)) (child (car (widget-get widget :children))) (value (get symbol 'saved-face)) @@ -2682,12 +2743,12 @@ Optional EVENT is the location for the menu." (custom-face-state-set widget) (custom-redraw-magic widget))) -(defun custom-face-reset-standard (widget) - "Restore WIDGET to the face's standard settings." +;; This function returns non nil if we need to re-save the options --dv. +(defun custom-face-pre-reset-standard (widget) + "Prepare for restoring the face edited by WIDGET to its standard +settings." (let* ((symbol (widget-value widget)) - (child (car (widget-get widget :children))) - (value (get symbol 'face-defface-spec)) - (comment-widget (widget-get widget :comment-widget))) + (value (get symbol 'face-defface-spec))) (unless value (signal 'error (list "No standard setting for this face" symbol))) (put symbol 'customized-face nil) @@ -2699,14 +2760,30 @@ Optional EVENT is the location for the menu." (if (null (cdr (get symbol 'theme-face))) (put symbol 'theme-face nil)) (put symbol 'saved-face-comment nil) - (custom-save-all)) + widget) + )) + +(defun custom-face-post-reset-standard (widget) + "Finish restoring the face edited by WIDGET to its standard settings." + (let* ((symbol (widget-value widget)) + (child (car (widget-get widget :children))) + (value (get symbol 'face-defface-spec)) + (comment-widget (widget-get widget :comment-widget))) (face-spec-set symbol value nil '(custom)) (put symbol 'face-comment nil) (widget-value-set child value) ;; This call manages the comment visibility (widget-value-set comment-widget "") (custom-face-state-set widget) - (custom-redraw-magic widget))) + (custom-redraw-magic widget) + )) + +(defun custom-face-reset-standard (widget) + "Restore the face edited by WIDGET to its standard settings." + (when (custom-face-pre-reset-standard widget) + (custom-save-all)) + (custom-face-post-reset-standard widget)) + ;;; The `face' Widget. @@ -2879,10 +2956,14 @@ and so forth. The remaining group tags are shown with :action 'custom-group-action :custom-category 'group :custom-set 'custom-group-set + :custom-pre-save 'custom-group-pre-save :custom-save 'custom-group-save + :custom-post-save 'custom-group-post-save :custom-reset-current 'custom-group-reset-current :custom-reset-saved 'custom-group-reset-saved + :custom-pre-reset-standard 'custom-group-pre-reset-standard :custom-reset-standard 'custom-group-reset-standard + :custom-post-reset-standard 'custom-group-post-reset-standard :custom-menu 'custom-group-menu-create) (defun custom-group-sample-face-get (widget) @@ -3191,14 +3272,28 @@ Optional EVENT is the location for the menu." (widget-apply child :custom-set))) children))) -(defun custom-group-save (widget) +(defun custom-group-pre-save (widget) + "Prepare for saving all modified group members." + (let ((children (widget-get widget :children))) + (mapc (lambda (child) + (when (memq (widget-get child :custom-state) '(modified set)) + (widget-apply child :custom-pre-save))) + children))) + +(defun custom-group-post-save (widget) "Save all modified group members." (let ((children (widget-get widget :children))) (mapc (lambda (child) (when (memq (widget-get child :custom-state) '(modified set)) - (widget-apply child :custom-save))) + (widget-apply child :custom-post-save))) children))) +(defun custom-group-save (widget) + "Save all modified group members." + (custom-group-pre-save widget) + (custom-save-all) + (custom-group-post-save widget)) + (defun custom-group-reset-current (widget) "Reset all modified group members." (let ((children (widget-get widget :children))) @@ -3215,15 +3310,35 @@ Optional EVENT is the location for the menu." (widget-apply child :custom-reset-saved))) children))) -(defun custom-group-reset-standard (widget) - "Reset all modified, set, or saved group members." +;; This function returns non nil when we need to re-save the options --dv. +(defun custom-group-pre-reset-standard (widget) + "Prepare for resetting all modified, set, or saved group members." + (let ((children (widget-get widget :children)) + must-save) + (mapc (lambda (child) + (when (memq (widget-get child :custom-state) + '(modified set saved)) + (and (widget-apply child :custom-pre-reset-standard) + (setq must-save t)))) + children) + must-save + )) + +(defun custom-group-post-reset-standard (widget) + "Finish resetting all modified, set, or saved group members." (let ((children (widget-get widget :children))) (mapc (lambda (child) (when (memq (widget-get child :custom-state) '(modified set saved)) - (widget-apply child :custom-reset-standard))) + (widget-apply child :custom-post-reset-standard))) children))) +(defun custom-group-reset-standard (widget) + "Reset all modified, set, or saved group members." + (when (custom-group-pre-reset-standard widget) + (custom-save-all)) + (custom-group-post-reset-standard widget)) + (defun custom-group-state-update (widget) "Update magic." (unless (eq (widget-get widget :custom-state) 'hidden) diff --git a/lisp/cus-face.el b/lisp/cus-face.el index 403f806..5f79527 100644 --- a/lisp/cus-face.el +++ b/lisp/cus-face.el @@ -202,7 +202,8 @@ If FRAME is nil, use the default face." (defun custom-set-face-font-size (face size &optional locale tags) "Set the font of FACE to SIZE." - (let* ((font (apply 'face-font-name face locale)) + ;; #### should this call have tags in it? + (let* ((font (apply 'face-font-name face (list locale))) ;; Gag (fontobj (font-create-object font))) (set-font-size fontobj size) @@ -217,7 +218,8 @@ If FRAME is nil, use the default face." (defun custom-set-face-font-family (face family &optional locale tags) "Set the font of FACE to FAMILY." - (let* ((font (apply 'face-font-name face locale)) + ;; #### should this call have tags in it? + (let* ((font (apply 'face-font-name face (list locale))) ;; Gag (fontobj (font-create-object font))) (set-font-family fontobj family) diff --git a/lisp/etags.el b/lisp/etags.el index 56fc478..0c368cb 100644 --- a/lisp/etags.el +++ b/lisp/etags.el @@ -761,7 +761,8 @@ in the tag table that matches the tagname used in the previous find-tag. the tag. This version of this function supports multiple active tags tables, -and completion. +and completion. See also the commands `\\[push-tag-mark]' and +`\\[pop-tag-mark]'. Variables of note: @@ -1170,7 +1171,7 @@ If this is a C-defined elisp function, it does something more clever." (defcustom tag-mark-stack-max 16 "*The maximum number of elements kept on the mark-stack used by tags-search. See also the commands `\\[push-tag-mark]' and -and `\\[pop-tag-mark]'." +`\\[pop-tag-mark]'." :type 'integer :group 'etags) diff --git a/lisp/faces.el b/lisp/faces.el index 4e34298..deb9148 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1761,7 +1761,7 @@ in that frame; otherwise change each frame." 'global) (set-face-background-pixmap 'highlight '(((x default mono) . "gray1") -;; ((gtk default mono) . "gray1") + ((gtk default mono) . "gray1") ((mswindows default mono) . "gray1")) 'global) @@ -1773,7 +1773,7 @@ in that frame; otherwise change each frame." 'global) (set-face-background-pixmap 'zmacs-region '(((x default mono) . "gray3") -;; ((gtk default mono) . "gray3") + ((gtk default mono) . "gray3") ((mswindows default mono) . "gray3")) 'global) @@ -1781,9 +1781,9 @@ in that frame; otherwise change each frame." '(((x default color) . "gray68") ((x default grayscale) . "gray68") ((x default mono) . [default foreground]) -;; ((gtk default color) . "gray68") -;; ((gtk default grayscale) . "gray68") -;; ((gtk default mono) . [default foreground]) + ((gtk default color) . "gray68") + ((gtk default grayscale) . "gray68") + ((gtk default mono) . [default foreground]) ((mswindows default color) . "gray68") ((mswindows default grayscale) . "gray68") ((mswindows default mono) . [default foreground])) @@ -1801,7 +1801,7 @@ in that frame; otherwise change each frame." 'global) (set-face-background-pixmap 'primary-selection '(((x default mono) . "gray3") - ;;((gtk default mono) . "gray3") + ((gtk default mono) . "gray3") ((mswindows default mono) . "gray3")) 'global) @@ -1809,24 +1809,24 @@ in that frame; otherwise change each frame." '(((x default color) . "paleturquoise") ((x default color) . "green") ((x default grayscale) . "gray53") - ;;((gtk default color) . "paleturquoise") - ;;((gtk default color) . "green") - ;;((gtk default grayscale) . "gray53") + ((gtk default color) . "paleturquoise") + ((gtk default color) . "green") + ((gtk default grayscale) . "gray53") ((mswindows default color) . "paleturquoise") ((mswindows default color) . "green") ((mswindows default grayscale) . "gray53")) 'global) (set-face-background-pixmap 'secondary-selection '(((x default mono) . "gray1") - ;;((gtk default mono) . "gray1") + ((gtk default mono) . "gray1") ((mswindows default mono) . "gray1")) 'global) (set-face-background 'isearch '(((x default color) . "paleturquoise") ((x default color) . "green") - ;;((gtk default color) . "paleturquoise") - ;;((gtk default color) . "green") + ((gtk default color) . "paleturquoise") + ((gtk default color) . "green") ((mswindows default color) . "paleturquoise") ((mswindows default color) . "green")) 'global) diff --git a/lisp/files.el b/lisp/files.el index d987bcb..c9ba0b5 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1192,7 +1192,7 @@ run `normal-mode' explicitly." ("\\.m?spec$" .sh-mode) ;; The following come after the ChangeLog pattern for the sake of ;; ChangeLog.1, etc. and after the .scm.[0-9] pattern too. - ("\\.[12345678]\\'" . nroff-mode) + ("\\.[123456789]\\'" . nroff-mode) ("\\.[tT]e[xX]\\'" . tex-mode) ("\\.\\(?:sty\\|cls\\|bbl\\)\\'" . latex-mode) ("\\.bib\\'" . bibtex-mode) @@ -1223,7 +1223,7 @@ run `normal-mode' explicitly." ;; Windows syntax. ("[/\\][._].*emacs\\'" . emacs-lisp-mode) ("\\.m4\\'" . autoconf-mode) - ("configure\\.in\\'" . autoconf-mode) + ("configure\\(\\.in\\|\\.ac\\)\\'" . autoconf-mode) ("\\.ml\\'" . lisp-mode) ("\\.ma?ke?\\'" . makefile-mode) ("[Mm]akefile\\(\\.\\|\\'\\)" . makefile-mode) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 693b57c..d927539 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1992-1995, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Amdahl Corporation. -;; Copyright (C) 1996, 2000 Ben Wing. +;; Copyright (C) 1996, 2000, 2001 Ben Wing. ;; Author: Jamie Zawinski , for the LISPM Preservation Society. ;; Minimally merged with FSF 19.34 by Barry Warsaw @@ -1203,10 +1203,15 @@ buffer modifications are performed or a buffer is reverted.") (defun font-lock-after-change-function (beg end old-len) (when font-lock-mode ;; treat deletions as if the following character (or previous, if - ;; there is no following) were inserted. this is a bit of a hack + ;; there is no following) were inserted. (also use the previous + ;; character at end of line. this avoids a problem when you + ;; insert a comment on the line before a line of code: if we use + ;; the following char, then when you hit backspace, the following + ;; line of code turns the comment color.) this is a bit of a hack ;; but allows us to use text properties for everything. (if (= beg end) - (cond ((/= end (point-max)) (setq end (1+ end))) + (cond ((not (save-excursion (goto-char end) (eolp))) + (setq end (1+ end))) ((/= beg (point-min)) (setq beg (1- beg))) (t nil))) (put-text-property beg end 'font-lock-pending t) diff --git a/lisp/font-menu.el b/lisp/font-menu.el index 22829be..05562c6 100644 --- a/lisp/font-menu.el +++ b/lisp/font-menu.el @@ -160,12 +160,14 @@ the last entry in the menu." (defvar font-menu-preferred-resolution (make-specifier-and-init 'generic '((global ((mswindows) . ":") - ((x gtk) . "*-*"))) t) + ((gtk) . "*-*") + ((x) . "*-*"))) t) "Preferred horizontal and vertical font menu resolution (e.g. \"75:75\").") (defvar font-menu-size-scaling (make-specifier-and-init 'integer '((global ((mswindows) . 1) - ((x gtk) . 10))) t) + ((gtk) . 10) + ((x) . 10))) t) "Scale factor used in defining font sizes.") ;; only call XListFonts (and parse) once per device. @@ -377,7 +379,9 @@ or if you change your font path, you can call this to re-initialize the menus." (condition-case c (font-menu-change-face face from-family from-weight from-size - family weight size) + (or family from-family) + (or weight from-weight) + (or size from-size)) (error (display-error c nil) (sit-for 1))))) @@ -392,7 +396,7 @@ or if you change your font path, you can call this to re-initialize the menus." ;; OK Let Customize do it. (custom-set-face-update-spec 'default (list (list 'type (device-type))) - (list :family family + (list :family (or family from-family) :size (concat (int-to-string (/ (or size from-size) diff --git a/lisp/gutter-items.el b/lisp/gutter-items.el index 054aa59..018b935 100644 --- a/lisp/gutter-items.el +++ b/lisp/gutter-items.el @@ -118,7 +118,7 @@ list in `buffer-list' order (usual most-recently-selected-first)." :group 'buffers-tab) (make-face 'buffers-tab "Face for displaying the buffers tab.") -(set-face-parent 'buffers-tab 'default) +(set-face-parent 'buffers-tab 'modeline) (defcustom buffers-tab-face 'buffers-tab "*Face to use for displaying the buffers tab." diff --git a/lisp/lisp-mnt.el b/lisp/lisp-mnt.el index 3b1adbb..223f8e0 100644 --- a/lisp/lisp-mnt.el +++ b/lisp/lisp-mnt.el @@ -560,8 +560,8 @@ Prompts for bug subject. Leaves you in a mail buffer." (mail nil (if addr (concat (car addr) " <" (cdr addr) ">") - (or (and (boundp 'report-emacs-bug-beta-address) - report-emacs-bug-beta-address) + (or (and (boundp 'report-xemacs-bug-beta-address) + report-xemacs-bug-beta-address) "")) topic) (goto-char (point-max)) diff --git a/lisp/menubar-items.el b/lisp/menubar-items.el index 75abd1b..ad67f0d 100644 --- a/lisp/menubar-items.el +++ b/lisp/menubar-items.el @@ -1484,8 +1484,8 @@ which will not be used as accelerators." ["Find %_Packages" finder-by-keyword] ["View %_Splash Screen" xemacs-splash-buffer] ["%_Unix Manual..." manual-entry]) - ["Send %_Bug Report..." report-emacs-bug - :active (fboundp 'report-emacs-bug)]))) + ["Send %_Bug Report..." report-xemacs-bug + :active (fboundp 'report-xemacs-bug)]))) (defun maybe-add-init-button () diff --git a/lisp/mouse.el b/lisp/mouse.el index 9eaa504..7141595 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -532,7 +532,7 @@ button is held down (see also `mouse-track-y-threshold'), then a drag is initiated; otherwise the gesture is considered to be a click. See `mouse-track'. -The value should be either a number of a form to be evaluated to +The value should be either a number or a form to be evaluated to produce a number.") (defvar mouse-track-y-threshold '(face-height 'default) @@ -570,7 +570,9 @@ Return true if the function was activated." event ex) t))) -(defun mouse-track-run-hook (hook event &rest args) +(defvar Mouse-track-gensym (gensym)) + +(defun mouse-track-run-hook (hook override event &rest args) ;; ugh, can't use run-hook-with-args-until-success because we have ;; to get the value using symbol-value-in-buffer. Doing a ;; save-excursion/set-buffer is wrong because the hook might want to @@ -578,33 +580,40 @@ Return true if the function was activated." ;; the hook might not want to change the buffer. ;; #### What we need here is a Lisp interface to ;; run_hook_with_args_in_buffer. Here is a poor man's version. - (let ((buffer (event-buffer event))) - (and mouse-grabbed-buffer (setq buffer mouse-grabbed-buffer)) - (when buffer - (let ((value (symbol-value-in-buffer hook buffer nil))) - (if (and (listp value) (not (eq (car value) 'lambda))) - ;; List of functions. - (let (retval) - (while (and value (null retval)) - ;; Found `t': should process default value. We could - ;; splice it into the buffer-local value, but that - ;; would cons, which is not a good thing for - ;; mouse-track hooks. - (if (eq (car value) t) - (let ((global (default-value hook))) - (if (and (listp global) (not (eq (car global) 'lambda))) - ;; List of functions. - (while (and global - (null (setq retval - (apply (car global) event args)))) - (pop global)) - ;; lambda - (setq retval (apply (car global) event args)))) - (setq retval (apply (car value) event args))) - (pop value)) - retval) - ;; lambda - (apply value event args)))))) + (let ((overridden (plist-get override hook Mouse-track-gensym))) + (if (not (eq overridden Mouse-track-gensym)) + (if (and (listp overridden) (not (eq (car overridden) 'lambda))) + (some #'(lambda (val) (apply val event args)) overridden) + (apply overridden event args)) + (let ((buffer (event-buffer event))) + (and mouse-grabbed-buffer (setq buffer mouse-grabbed-buffer)) + (when buffer + (let ((value (symbol-value-in-buffer hook buffer nil))) + (if (and (listp value) (not (eq (car value) 'lambda))) + ;; List of functions. + (let (retval) + (while (and value (null retval)) + ;; Found `t': should process default value. We could + ;; splice it into the buffer-local value, but that + ;; would cons, which is not a good thing for + ;; mouse-track hooks. + (if (eq (car value) t) + (let ((global (default-value hook))) + (if (and (listp global) (not (eq (car global) + 'lambda))) + ;; List of functions. + (while (and global + (null (setq retval + (apply (car global) + event args)))) + (pop global)) + ;; lambda + (setq retval (apply (car global) event args)))) + (setq retval (apply (car value) event args))) + (pop value)) + retval) + ;; lambda + (apply value event args)))))))) (defun mouse-track-scroll-undefined (random) ;; the old implementation didn't actually define this function, @@ -615,7 +624,7 @@ Return true if the function was activated." ;; difficult to do), this function may get called. ) -(defun mouse-track (event) +(defun mouse-track (event &optional overriding-hooks) "Generalized mouse-button handler. This should be bound to a mouse button. The behavior of this function is customizable using various hooks and variables: see `mouse-track-click-hook', `mouse-track-drag-hook', @@ -629,6 +638,10 @@ behavior. You can explicitly request this default behavior, and override any custom-supplied handlers, by using the function `mouse-track-default' instead of `mouse-track'. +\(In general, you can override specific hooks by using the argument +OVERRIDING-HOOKS, which should be a plist of alternating hook names +and values.) + Default behavior is as follows: If you click-and-drag, the selection will be set to the region between the @@ -669,7 +682,7 @@ at the initial click position." (setq mouse-track-click-count (1+ mouse-track-click-count))) (if (not (event-window event)) (error "Not over a window.")) - (mouse-track-run-hook 'mouse-track-down-hook + (mouse-track-run-hook 'mouse-track-down-hook overriding-hooks event mouse-track-click-count) (unwind-protect (while mouse-down @@ -683,14 +696,17 @@ at the initial click position." (setq mouse-moved t)) (if mouse-moved (mouse-track-run-hook 'mouse-track-drag-hook - event mouse-track-click-count nil)) + overriding-hooks + event mouse-track-click-count nil)) (mouse-track-set-timeout event)) ((and (timeout-event-p event) (eq (event-function event) 'mouse-track-scroll-undefined)) (if mouse-moved (mouse-track-run-hook 'mouse-track-drag-hook - (event-object event) mouse-track-click-count t)) + overriding-hooks + (event-object event) + mouse-track-click-count t)) (mouse-track-set-timeout (event-object event))) ((button-release-event-p event) (setq mouse-track-up-time (event-timestamp event)) @@ -698,12 +714,15 @@ at the initial click position." (setq mouse-track-up-y (event-y-pixel event)) (setq mouse-down nil) (mouse-track-run-hook 'mouse-track-up-hook - event mouse-track-click-count) + overriding-hooks + event mouse-track-click-count) (if mouse-moved (mouse-track-run-hook 'mouse-track-drag-up-hook - event mouse-track-click-count) + overriding-hooks + event mouse-track-click-count) (mouse-track-run-hook 'mouse-track-click-hook - event mouse-track-click-count))) + overriding-hooks + event mouse-track-click-count))) ((or (key-press-event-p event) (and (misc-user-event-p event) (eq (event-function event) 'cancel-mode-internal))) @@ -717,7 +736,14 @@ at the initial click position." (and (buffer-live-p buffer) (save-excursion (set-buffer buffer) - (run-hooks 'mouse-track-cleanup-hook)))))) + (let ((override (plist-get overriding-hooks + 'mouse-track-cleanup-hook + Mouse-track-gensym))) + (if (not (eq override Mouse-track-gensym)) + (if (and (listp override) (not (eq (car override) 'lambda))) + (mapc #'funcall override) + (funcall override)) + (run-hooks 'mouse-track-cleanup-hook)))))))) ;;;;;;;;;;;; default handlers: new version of mouse-track @@ -1039,29 +1065,33 @@ at the initial click position." ;; (and (eq (console-type) 'x) (sit-for 0.15 t)) + ;; zmacs-activate-region -> zmacs-activate-region-hook -> + ;; activate-region-as-selection -> either own-selection or + ;; mouse-track-activate-rectangular-selection (zmacs-activate-region))) ((console-on-window-system-p) + ;; #### do we need this? we don't do it when zmacs-regions = t (if (= start end) (disown-selection type) - (if (consp default-mouse-track-extent) - ;; own the rectangular region - ;; this is a hack - (let ((r default-mouse-track-extent)) - (save-excursion - (set-buffer (get-buffer-create " *rect yank temp buf*")) - (while r - (insert (extent-string (car r)) "\n") - (setq r (cdr r))) - (own-selection (buffer-substring (point-min) (point-max))) - (kill-buffer (current-buffer)))) - (own-selection (cons (set-marker (make-marker) start) - (set-marker (make-marker) end)) - type))))) + (activate-region-as-selection)))) (if (and (eq 'x (console-type)) (not (= start end))) ;; I guess cutbuffers should do something with rectangles too. ;; does anybody use them? - (x-store-cutbuffer (buffer-substring start end))))) + (x-store-cutbuffer (buffer-substring start end))))) + +(defun mouse-track-activate-rectangular-selection () + (if (consp default-mouse-track-extent) + ;; own the rectangular region + ;; this is a hack + (let ((r default-mouse-track-extent)) + (save-excursion + (set-buffer (get-buffer-create " *rect yank temp buf*")) + (erase-buffer) + (while r + (insert (extent-string (car r)) "\n") + (setq r (cdr r))) + (own-selection (buffer-substring (point-min) (point-max))))))) (defun default-mouse-track-deal-with-down-event (click-count) (let ((event default-mouse-track-down-event)) @@ -1315,12 +1345,14 @@ at the initial click position." (defun mouse-track-default (event) "Invoke `mouse-track' with only the default handlers active." (interactive "e") - (let ((mouse-track-down-hook 'default-mouse-track-down-hook) - (mouse-track-drag-hook 'default-mouse-track-drag-hook) - (mouse-track-drag-up-hook 'default-mouse-track-drag-up-hook) - (mouse-track-click-hook 'default-mouse-track-click-hook) - (mouse-track-cleanup-hook 'default-mouse-track-cleanup-hook)) - (mouse-track event))) + (mouse-track event + '(mouse-track-down-hook + default-mouse-track-down-hook + mouse-track-up-hook nil + mouse-track-drag-hook default-mouse-track-drag-hook + mouse-track-drag-up-hook default-mouse-track-drag-up-hook + mouse-track-click-hook default-mouse-track-click-hook + mouse-track-cleanup-hook default-mouse-track-cleanup-hook))) (defun mouse-track-do-rectangle (event) "Like `mouse-track' but selects rectangles instead of regions." @@ -1351,37 +1383,37 @@ custom mouse-track handlers that the user may have installed." (let ((default-mouse-track-adjust t)) (mouse-track-default event))) -(defvar mouse-track-insert-selected-region nil) - -(defun mouse-track-insert-drag-up-hook (event click-count) - (setq mouse-track-insert-selected-region - (default-mouse-track-return-dragged-selection event))) - (defun mouse-track-insert (event &optional delete) "Make a selection with the mouse and insert it at point. This is exactly the same as the `mouse-track' command on \\[mouse-track], except that point is not moved; the selected text is immediately inserted after being selected\; and the selection is immediately disowned afterwards." (interactive "*e") - (setq mouse-track-insert-selected-region nil) - (let ((mouse-track-drag-up-hook 'mouse-track-insert-drag-up-hook) - (mouse-track-click-hook 'mouse-track-insert-click-hook) - s) - (save-excursion - (save-window-excursion - (mouse-track event) - (if (consp mouse-track-insert-selected-region) - (let ((pair mouse-track-insert-selected-region)) - (setq s (prog1 - (buffer-substring (car pair) (cdr pair)) - (if delete - (kill-region (car pair) (cdr pair))))))))) - (or (null s) (equal s "") (insert s)))) - -(defun mouse-track-insert-click-hook (event click-count) - (default-mouse-track-drag-hook event click-count nil) - (mouse-track-insert-drag-up-hook event click-count) - t) + (let (s selreg) + (flet ((Mouse-track-insert-drag-up-hook (event count) + (setq selreg + (default-mouse-track-return-dragged-selection event)) + t) + (Mouse-track-insert-click-hook (event count) + (default-mouse-track-drag-hook event count nil) + (setq selreg + (default-mouse-track-return-dragged-selection event)) + t)) + (save-excursion + (save-window-excursion + (mouse-track + event + '(mouse-track-drag-up-hook + Mouse-track-insert-drag-up-hook + mouse-track-click-hook + Mouse-track-insert-click-hook)) + (if (consp selreg) + (let ((pair selreg)) + (setq s (prog1 + (buffer-substring (car pair) (cdr pair)) + (if delete + (kill-region (car pair) (cdr pair)))))))))) + (or (null s) (equal s "") (insert s)))) (defun mouse-track-delete-and-insert (event) "Make a selection with the mouse and insert it at point. diff --git a/lisp/process.el b/lisp/process.el index e287189..79a81e6 100644 --- a/lisp/process.el +++ b/lisp/process.el @@ -53,6 +53,7 @@ "Executing external commands." :group 'processes) +;; This may be changed to "/c" in win32-native.el. (defvar shell-command-switch "-c" "Switch used to have the shell execute its command line argument.") @@ -121,13 +122,17 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you (when (and stderr (not (eq t stderr))) (setq stderr (expand-file-name stderr)) (setq errbuf (generate-new-buffer "*call-process*"))) - (setq proc - (apply 'start-process-internal "*call-process*" - buffer - ;#### not implemented until my new process - ;changes go in. - ;(if (eq t stderr) buffer (list buffer errbuf)) - program args)) + ;; We read INFILE using the binary coding-system. + ;; We must feed the process using the same coding-system, so + ;; that it really receives the contents of INFILE. + (let ((coding-system-for-write 'binary)) + (setq proc + (apply 'start-process-internal "*call-process*" + buffer + ;#### not implemented until my new process + ;changes go in. + ;(if (eq t stderr) buffer (list buffer errbuf)) + program args))) (if buffer (set-marker (process-mark proc) (point buffer) buffer)) (unwind-protect @@ -446,15 +451,17 @@ lost packets." ;; around shell metachars gets through the last two, and applying ;; the normal VC runtime quoting works with practically all apps. (mswindows-quote-one-vc-runtime-arg argument t) - ;; Quote everything except POSIX filename characters. - ;; This should be safe enough even for really weird shells. - (let ((result "") (start 0) end) - (while (string-match "[^-0-9a-zA-Z_./]" argument start) - (setq end (match-beginning 0) - result (concat result (substring argument start end) - "\\" (substring argument end (1+ end))) - start (1+ end))) - (concat result (substring argument start))))) + (if (equal argument "") + "\"\"" + ;; Quote everything except POSIX filename characters. + ;; This should be safe enough even for really weird shells. + (let ((result "") (start 0) end) + (while (string-match "[^-0-9a-zA-Z_./]" argument start) + (setq end (match-beginning 0) + result (concat result (substring argument start end) + "\\" (substring argument end (1+ end))) + start (1+ end))) + (concat result (substring argument start)))))) (defun shell-command-to-string (command) "Execute shell command COMMAND and return its output as a string." diff --git a/lisp/startup.el b/lisp/startup.el index 66524d2..6085ac1 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -463,24 +463,10 @@ Type ^H^H^H (Control-h Control-h Control-h) to get more help options.\n") (if load-user-init-file-p (maybe-migrate-user-init-file)) - ;;####FSFmacs junk - ;; (or menubar-bindings-done - ;; (precompute-menubar-bindings)) + ;; FSF calls precompute-menubar-bindings. We don't mix menubars + ;; and keymaps. )) -;;####FSFmacs junk -;;; Precompute the keyboard equivalents in the menu bar items. -;;(defun precompute-menubar-bindings () -;; (if (eq window-system 'x) -;; (let ((submap (lookup-key global-map [menu-bar]))) -;; (while submap -;; (and (consp (car submap)) -;; (symbolp (car (car submap))) -;; (stringp (car-safe (cdr (car submap)))) -;; (keymapp (cdr (cdr (car submap)))) -;; (x-popup-menu nil (cdr (cdr (car submap))))) -;; (setq submap (cdr submap)))))) - (defun command-line-early (args) ;; This processes those switches which need to be processed before ;; starting up the window system. @@ -591,6 +577,9 @@ If this is nil, no message will be displayed.") ;; handled here instead of down in C. (setq command-line-args-left (command-line-early command-line-args-left)) + (when (eq system-type 'windows-nt) + (init-mswindows-at-startup)) + ;; Setup the toolbar icon directory (when (featurep 'toolbar) (init-toolbar-location)) diff --git a/lisp/toolbar.el b/lisp/toolbar.el index f92b044..030099d 100644 --- a/lisp/toolbar.el +++ b/lisp/toolbar.el @@ -32,8 +32,8 @@ (defcustom toolbar-visible-p ;; added for the options menu - dverna apr. 98 (specifier-instance default-toolbar-visible-p) - "Whether the default toolbar is globally visible. This option can be -customized through the options menu." + "Whether the default toolbar is globally visible. +This option can be customized through the options menu." :group 'display :type 'boolean :set #'(lambda (var val) @@ -43,8 +43,8 @@ customized through the options menu." (defcustom toolbar-captioned-p ;; added for the options menu - dverna apr. 98 (specifier-instance toolbar-buttons-captioned-p) - "Whether the toolbars buttons are globally captioned. This option can be -customized through the options menu." + "Whether the toolbars buttons are globally captioned. +This option can be customized through the options menu." :group 'display :type 'boolean :set #'(lambda (var val) @@ -54,8 +54,9 @@ customized through the options menu." (defcustom default-toolbar-position ;; added for the options menu - dverna (default-toolbar-position) - "The location of the default toolbar. It can be 'top, 'bottom, 'left or -'right. This option can be customized through the options menu." + "The location of the default toolbar. +It can be 'top, 'bottom, 'left or 'right. This option can be +customized through the options menu." :group 'display :type '(choice (const :tag "top" top) (const :tag "bottom" bottom) diff --git a/lisp/win32-native.el b/lisp/win32-native.el index d30d8a5..a7187e2 100644 --- a/lisp/win32-native.el +++ b/lisp/win32-native.el @@ -1,4 +1,4 @@ -;;; win32-native.el --- Lisp routines for MS Windows. +;;; win32-native.el --- Lisp routines when running on native MS Windows. ;; Copyright (C) 1994 Free Software Foundation, Inc. ;; Copyright (C) 2000 Ben Wing. @@ -23,24 +23,26 @@ ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -;;; Synched up with: Not synched with FSF. Almost completely divergent. +;;; Synched up with: Not in FSF. ;;; (FSF has stuff in w32-fns.el and term/w32-win.el.) ;;; Commentary: ;; This file is dumped with XEmacs for MS Windows (without cygwin). +;; It is for stuff that is used specifically when `system-type' eq +;; `windows-nt' (i.e. also applies to MinGW), and has nothing to do +;; with the `mswindows' device type. Thus, it probably applies in +;; non-interactive mode as well, and it DOES NOT APPLY to Cygwin. -;; Based on NT Emacs version by Geoff Voelker (voelker@cs.washington.edu) +;; Based (originally) on NT Emacs version by Geoff Voelker +;; (voelker@cs.washington.edu) ;; Ported to XEmacs by Marc Paquette ;; Largely modified by Kirill M. Katsnelson +;; Rewritten from scratch by Ben Wing . No code in common +;; with FSF. ;;; Code: -;; The cmd.exe shell uses the "/c" switch instead of the "-c" switch -;; for executing its command line argument (from simple.el). -;; #### Oh if we had an alist of shells and their command switches. -(setq shell-command-switch "/c") - ;; For appending suffixes to directories and files in shell ;; completions. This screws up cygwin users so we leave it out for ;; now. Uncomment this if you only ever want to use cmd. @@ -61,6 +63,27 @@ (setq grep-regexp-alist '(("^\\(\\([a-zA-Z]:\\)?[^:( \t\n]+\\)[:( \t]+\\([0-9]+\\)[:) \t]" 1 3))) +(defvar mswindows-system-shells '("cmd" "cmd.exe" "command" "command.com" + "4nt" "4nt.exe" "4dos" "4dos.exe" + "ndos" "ndos.exe") + "List of strings recognized as Windows NT/9X system shells. +These are shells with native semantics, e.g. they use `/c', not '-c', +to pass a command in.") + +(defun mswindows-system-shell-p (shell-name) + (member (downcase (file-name-nondirectory shell-name)) + mswindows-system-shells)) + +(defun init-mswindows-at-startup () + ;; shell-file-name is initialized in the C code (callproc.c) from + ;; SHELL or COMSPEC. + ;; #### If only shell-command-switch could be a function. But there + ;; is code littered around that uses it. + ;; #### Maybe we should set a symbol-value handler on `shell-file-name' + ;; that automatically sets shell-command-switch? + (if (mswindows-system-shell-p shell-file-name) + (setq shell-command-switch "/c"))) + ;;---------------------------------------------------------------------- ;; Quoting process args ;;-------------------- @@ -76,28 +99,32 @@ to the process appear to be getting passed incorrectly.") ;; we also include shell metachars if asked. ;; note that \ is NOT included! it's perfectly OK to include an ;; arg like c:\ or c:\foo. - (if (string-match (if quote-shell "[ \t\n\r\f*?\"<>|&^%]" "[ \t\n\r\f*?\"]") - arg) - (progn - ;; handle nested quotes, possibly preceded by backslashes - (setq arg (replace-in-string arg "\\([\\]*\\)\"" "\\1\\1\\\\\"")) - ;; handle trailing backslashes - (setq arg (replace-in-string arg "\\([\\]+\\)$" "\\1\\1")) - (concat "\"" arg "\"")) - arg)) + (cond ((equal arg "") "\"\"") + ((string-match + (if quote-shell "[ \t\n\r\f*?\"<>|&^%]" "[ \t\n\r\f*?\"]") + arg) + ;; handle nested quotes, possibly preceded by backslashes + (setq arg (replace-in-string arg "\\([\\]*\\)\"" "\\1\\1\\\\\"")) + ;; handle trailing backslashes + (setq arg (replace-in-string arg "\\([\\]+\\)$" "\\1\\1")) + (concat "\"" arg "\"")) + (t arg))) (defun mswindows-quote-one-simple-arg (arg &optional quote-shell) ;; just put double quotes around args with spaces (and maybe shell ;; metachars). - (if (string-match (if quote-shell "[ \t\n\r\f*?\"<>|&^%]" "[ \t\n\r\f*?]") - arg) - (concat "\"" arg "\"") - arg)) + (cond ((equal arg "") "\"\"") + ((string-match + (if quote-shell "[ \t\n\r\f*?\"<>|&^%]" "[ \t\n\r\f*?]") + arg) + (concat "\"" arg "\"")) + (t arg))) (defun mswindows-quote-one-command-arg (arg) ;; quote an arg to get it past COMMAND.COM/CMD.EXE: need to quote shell ;; metachars with ^. - (replace-in-string "[<>|&^%]" "^\\1" arg)) + (cond ((equal arg "") "\"\"") + (t (replace-in-string "[<>|&^%]" "^\\1" arg)))) (defun mswindows-construct-verbatim-command-line (program args) (mapconcat #'identity args " ")) @@ -198,7 +225,11 @@ to the process appear to be getting passed incorrectly.") args " ")) (defvar mswindows-construct-process-command-line-alist - '(("[\\/].?.?sh\\." . mswindows-construct-verbatim-command-line) + '( + ;; at one point (pre-1.0), this was required for Cygwin bash. + ;; evidently, Cygwin changed its arg handling to work just like + ;; any standard VC program, so we no longer need it. + ;;("[\\/].?.?sh\\." . mswindows-construct-verbatim-command-line) ("[\\/]command\\.com$" . mswindows-construct-command-command-line) ("[\\/]cmd\\.exe$" . mswindows-construct-command-command-line) ("" . mswindows-construct-vc-runtime-command-line)) diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 771b09b..e1938e7 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,33 @@ +2001-10-23 Stephen J. Turnbull + + * XEmacs 21.4.5 "Civil Service" is released. + +2001-10-02 Darryl Okahata + + * If HAVE_XMU was not defined (xmu was not being used), xlwgcs.c + was still referencing xmu functions. + +2001-04-08 Danny Colascione + + * lwlib-Xlw.c: + xlwtabs.c: + xlwtabs.h: + Force buffer-tab highlight update when moving the buffer, avoiding + an ugly black border, used for keyboard focus indication, on a + widget that can never have keyboard focus, the buffer tab. + +2001-07-26 Andy Piper + + Fix progress gauge flashing under OpenMotif: + + * lwlib-Xm.c (xm_update_progress): new function. Set Scale height + and width from normal height and width. + * lwlib-Xm.c (xm_create_progress): ditto. + * lwlib-Xm.c (xm_update_one_widget): call xm_update_progress. + * lwlib.c (lw_get_value_arg): new function. Return an argument + based on its name. + * lwlib.h: declare it. + 2001-07-28 Stephen J. Turnbull * XEmacs 21.4.4 "Artificial Intelligence" is released. diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c index 92437d5..150e168 100644 --- a/lwlib/lwlib-Xlw.c +++ b/lwlib/lwlib-Xlw.c @@ -49,9 +49,15 @@ Boston, MA 02111-1307, USA. */ #include "../src/xmu.h" #include "xlwtabs.h" #endif - +#include +#include +#include +#include +#include + + #ifdef LWLIB_MENUBARS_LUCID /* Menu callbacks */ @@ -142,9 +148,8 @@ xlw_create_popup_menu (widget_instance* instance) XtSetArg (al [0], XtNmenu, instance->info->val); XtSetArg (al [1], XtNhorizontal, False); widget = XtCreateManagedWidget ("popup", xlwMenuWidgetClass, - popup_shell, al, 2); - XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance); - + popup_shell, al, 2); + XtAddCallback (widget, XtNselect, pick_hook, (XtPointer)instance); return popup_shell; } #endif /* LWLIB_MENUBARS_LUCID */ diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 3e25262..097700e 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -336,6 +336,36 @@ xm_update_pushbutton (widget_instance* instance, Widget widget, XtAddCallback (widget, XmNactivateCallback, xm_generic_callback, instance); } +static void +xm_update_progress (widget_instance* instance, Widget scale, + widget_value* val) +{ + Arg al[20]; + int ac = 0; + Dimension height = 0; + Dimension width = 0; + if (!val->call_data) + { + XtSetArg (al [ac], XmNeditable, False); ac++; + } + else + { + XtSetArg (al [ac], XmNeditable, val->enabled); ac++; + } + height = (Dimension)lw_get_value_arg (val, XtNheight); + width = (Dimension)lw_get_value_arg (val, XtNwidth); + if (height > 0) + { + XtSetArg (al [ac], XmNscaleHeight, height); ac++; + } + if (width > 0) + { + XtSetArg (al [ac], XmNscaleWidth, width); ac++; + } + + XtSetValues (scale, al, 1); +} + #ifdef LWLIB_MENUBARS_MOTIF static void @@ -858,6 +888,10 @@ xm_update_one_widget (widget_instance* instance, Widget widget, xm_update_scrollbar (instance, widget, val); } #endif + else if (class == xmScaleWidgetClass) + { + xm_update_progress (instance, widget, val); + } /* Lastly update our global arg values. */ if (val->args && val->args->nargs) XtSetValues (widget, val->args->args, val->args->nargs); @@ -912,7 +946,7 @@ xm_update_one_value (widget_instance* instance, Widget widget, if (radiobox) { CompositeWidget radio = (CompositeWidget)widget; - int i; + unsigned int i; for (i = 0; i < radio->composite.num_children; i++) { int set = False; @@ -1649,20 +1683,18 @@ xm_create_progress (widget_instance *instance) { Arg al[20]; int ac = 0; + Dimension height = 0; + Dimension width = 0; Widget scale = 0; widget_value* val = instance->info->val; -#if 0 /* This looks too awful, although more correct. */ if (!val->call_data) { - XtSetArg (al [ac], XmNsensitive, False); ac++; + XtSetArg (al [ac], XmNeditable, False); ac++; } else { - XtSetArg (al [ac], XmNsensitive, val->enabled); ac++; + XtSetArg (al [ac], XmNeditable, val->enabled); ac++; } -#else - XtSetArg (al [ac], XmNsensitive, True); ac++; -#endif XtSetArg (al [ac], XmNalignment, XmALIGNMENT_BEGINNING); ac++; XtSetArg (al [ac], XmNuserData, val->call_data); ac++; XtSetArg (al [ac], XmNmappedWhenManaged, FALSE); ac++; @@ -1671,6 +1703,18 @@ xm_create_progress (widget_instance *instance) look ugly. I think this may be a LessTif bug but for now we just get rid of it. */ XtSetArg (al [ac], XmNhighlightThickness, (Dimension)0);ac++; + + height = (Dimension)lw_get_value_arg (val, XtNheight); + width = (Dimension)lw_get_value_arg (val, XtNwidth); + if (height > 0) + { + XtSetArg (al [ac], XmNscaleHeight, height); ac++; + } + if (width > 0) + { + XtSetArg (al [ac], XmNscaleWidth, width); ac++; + } + /* add any args the user supplied for creation time */ lw_add_value_args_to_args (val, al, &ac); diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index 44e5ebd..f9c90f5 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c @@ -1389,6 +1389,22 @@ void lw_add_value_args_to_args (widget_value* wv, ArgList addto, int* offset) } } +XtArgVal lw_get_value_arg (widget_value* wv, String name) +{ + int i; + if (wv->args) + { + for (i = 0; i < wv->args->nargs; i++) + { + if (!strcmp (wv->args->args[i].name, name)) + { + return wv->args->args[i].value; + } + } + } + return (XtArgVal)0; +} + void lw_add_widget_value_arg (widget_value* wv, String name, XtArgVal value) { int i = 0; diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h index d2f0c54..ad0241b 100644 --- a/lwlib/lwlib.h +++ b/lwlib/lwlib.h @@ -214,6 +214,7 @@ void lw_pop_up_all_widgets (LWLIB_ID id); void lw_pop_down_all_widgets (LWLIB_ID id); void lw_add_value_args_to_args (widget_value* wv, ArgList addto, int* offset); void lw_add_widget_value_arg (widget_value* wv, String name, XtArgVal value); +XtArgVal lw_get_value_arg (widget_value* wv, String name); void lw_copy_widget_value_args (widget_value* copy, widget_value* val); widget_value * copy_widget_value_tree (widget_value *val, change_type change); diff --git a/lwlib/xlwgcs.c b/lwlib/xlwgcs.c index 3b6cd7e..94a273b 100644 --- a/lwlib/xlwgcs.c +++ b/lwlib/xlwgcs.c @@ -522,6 +522,8 @@ XtAllocateGC(Widget w, int depth, unsigned long mask, XGCValues *values, #endif +#ifdef HAVE_XMU + static unsigned char screen0[2] = {0,0} ; static unsigned char screen25[2] = {0,0xaa} ; static unsigned char screen75[2] = {0xaa,0xff} ; @@ -544,3 +546,5 @@ getDitherPixmap(Widget w, int contrast) else return XCreateBitmapFromData(dpy,win, (char *)screen100, 2,2) ; } + +#endif /* HAVE_XMU */ diff --git a/lwlib/xlwtabs.c b/lwlib/xlwtabs.c index 32c282c..ec1502a 100644 --- a/lwlib/xlwtabs.c +++ b/lwlib/xlwtabs.c @@ -146,6 +146,8 @@ static XtResource resources[] = { XtOffsetOf(RectObjRec,rectangle.border_width), XtRImmediate, (XtPointer)0}, {XtNtopWidget, XtCTopWidget, XtRWidget, sizeof(Widget), offset(topWidget), XtRImmediate, NULL}, + {XtNhighlightWidget, XtCHighlightWidget, XtRWidget, sizeof(Widget), + offset(hilight), XtRImmediate, NULL}, {XtNcallback, XtCCallback, XtRCallback, sizeof(XtPointer), offset(callbacks), XtRCallback, NULL}, {XtNpopdownCallback, XtCCallback, XtRCallback, sizeof(XtPointer), @@ -650,6 +652,12 @@ TabsSetValues(Widget current, Widget request, Widget new, if( tw->core.sensitive != curtw->core.sensitive ) needRedraw = True ; + /* Highlit widget changed */ + if ( tw->tabs.hilight != curtw->tabs.hilight ) + { + needRedraw = True ; + } + /* If top widget changes, need to change stacking order, redraw tabs. * Window system will handle the redraws. */ @@ -670,6 +678,7 @@ TabsSetValues(Widget current, Widget request, Widget new, if( tab->tabs.row != tw->tabs.numRows-1 ) TabsShuffleRows(tw) ; + needRedraw = True ; } else diff --git a/lwlib/xlwtabs.h b/lwlib/xlwtabs.h index 6f5d410..467d287 100644 --- a/lwlib/xlwtabs.h +++ b/lwlib/xlwtabs.h @@ -47,6 +47,7 @@ internalWidth Width Dimension 4 *1 internalHeight Height Dimension 2 *1 topWidget TopWidget Widget *2 + highlightWidget HighlightWidget Widget 4 callback Callback XtCallbackList NULL *3 popdownCallback Callback XtCallbackList NULL *4 selectInsensitive SelectInsensitive Boolean True *5 @@ -132,6 +133,11 @@ #define XtCTopWidget "TopWidget" #endif +#ifndef XtNhighlightWidget +#define XtNhighlightWidget "highlightWidget" +#define XtCHighlightWidget "HighlightWidget" +#endif + #ifndef XtNhSpace #define XtNhSpace "hSpace" #define XtCHSpace "HSpace" diff --git a/man/ChangeLog b/man/ChangeLog index 323fcab..f398f33 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,37 @@ +2001-10-23 Stephen J. Turnbull + + * XEmacs 21.4.5 "Civil Service" is released. + +2001-10-17 Stephen J. Turnbull + + * xemacs/text.texi (Outline Visibility): hide-subtree is bound to + C-c C-d, not C-c C-h. Thanks: Keith Browne . + +2001-07-25 Jim Horning + + * xemacs/packages.texi (Package Terminology): + * xemacs/packages.texi (Automatically): + In itemize and enumerate lists @item should be on its own line. + +2001-09-16 Adrian Aichner + + * xemacs-faq.texi (Q4.0.7): Fix link to VM FAQ thanks to word I + got from Gregory Neil Shapiro. + * xemacs-faq.texi (Q1.3.7): Update moved link. + * xemacs-faq.texi (Q7.0.2): Comment out empty list of bullets to + avoid HTML error in texi2html translation. + +2001-09-15 Adrian Aichner + + * xemacs-faq.texi (Q4.6.1): Infodock is now hosted on SourceForge, + infodock.com is no more. + * xemacs-faq.texi (Q4.7.1): Take auc out of http://sunsite.auc.dk. + +2001-09-09 Adrian Aichner + + * xemacs-faq.texi (Q1.0.9): Correct link to snapshots as suggested + by Robin S. Socha. + 2001-07-28 Stephen J. Turnbull * XEmacs 21.4.4 "Artificial Intelligence" is released. diff --git a/man/xemacs-faq.texi b/man/xemacs-faq.texi index 70c82d9..f32038f 100644 --- a/man/xemacs-faq.texi +++ b/man/xemacs-faq.texi @@ -7,7 +7,7 @@ @finalout @titlepage @title XEmacs FAQ -@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/07/25 07:46:06 $ +@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/10/23 08:35:23 $ @sp 1 @author Tony Rossini @author Ben Wing @@ -655,10 +655,9 @@ The most common pronounciation is @samp{Eks eemax}. @node Q1.0.9, Q1.0.10, Q1.0.8, Introduction @unnumberedsubsec Q1.0.9: What does XEmacs look like? -Screen snapshots are available in the WWW version of the FAQ. -@example -@uref{http://www.xemacs.org/faq/xemacs-faq.html} -@end example +Screen snapshots are available at +@uref{http://www.xemacs.org/About/Screenshots/index.html} +as part of the XEmacs website. @node Q1.0.10, Q1.0.11, Q1.0.9, Introduction @unnumberedsubsec Q1.0.10: Is there a port of XEmacs to Microsoft ('95 or NT)? @@ -1056,8 +1055,7 @@ modification to @email{ava@@math.jhu.ed, Valery Alexeev's} @file{russian.el} which can be obtained from @end quotation -@uref{http://ftpsearch.ntnu.no/?query=russian.el.Z}. -@c dead link above +@uref{http://ftpsearch.lycos.com/?query=russian.el.Z&form=medium}. @email{d.barsky@@ee.surrey.ac.uk, Dima Barsky} writes: @@ -1077,7 +1075,7 @@ There is another cyrillic mode for both GNU Emacs and XEmacs by @quotation The fullest resource I found on Russian language use (in and out of -XEmacs) is @uref{http://sunsite.oit.unc.edu/sergei/Software/Software.html} +XEmacs) is @uref{http://www.ibiblio.org/sergei/Software/Software.html} @end quotation @node Q1.4.1, Q1.4.2, Q1.3.7, Introduction @@ -3904,7 +3902,7 @@ Note that each string is a regular expression. @node Q4.0.7, Q4.0.8, Q4.0.6, Subsystems @unnumberedsubsec Q4.0.7: Is there a mailing list or FAQ for VM? -A FAQ for VM exists at @uref{http://www.cyberpass.net/~gorkab/vmfaq.htm}. +A FAQ for VM exists at @uref{http://www.wonderworks.com/vm/FAQ.html}. VM has its own newsgroups gnu.emacs.vm.info and gnu.emacs.vm.bug. @@ -4371,11 +4369,9 @@ did so.) @unnumberedsec 4.6: Infodock @unnumberedsubsec Q4.6.1: What is Infodock? -InfoDock is an integrated productivity toolset, mainly aimed at -technical people. It is developed and supported by InfoDock -Associates, a firm that offers custom support and development -for InfoDock, XEmacs and GNU Emacs. ( @uref{http://www.infodock.com}, -@email{info@@infodock.com}, +1 408 243 3300). +@uref{http://sourceforge.net/projects/infodock/, InfoDock} is an +integrated productivity toolset, mainly aimed at technical people, +hosted at SourceForge. InfoDock is built atop the XEmacs variant of GNU Emacs and so has all of the power of Emacs, but with an easier to use and more comprehensive @@ -4543,7 +4539,7 @@ The most recent version is always available by ftp at @iftex @* @end iftex -@uref{ftp://sunsite.auc.dk/packages/auctex/auctex.tar.gz}. +@uref{ftp://sunsite.dk/packages/auctex/auctex.tar.gz}. In case you don't have access to anonymous ftp, you can get it by an email request to @email{ftpmail@@decwrl.dec.com}. @@ -4552,7 +4548,7 @@ WWW users may want to check out the AUC TeX page at @iftex @* @end iftex -@uref{http://sunsite.auc.dk/auctex/}. +@uref{http://sunsite.dk/auctex/}. @node Q4.7.2, Q4.7.3, Q4.7.1, Subsystems @unnumberedsubsec Q4.7.2: Are there any Emacs Lisp Spreadsheets? @@ -6717,8 +6713,10 @@ Etags changes. See @file{NEWS} for full details. Not yet written. -@itemize @bullet -@end itemize +@c APA: Texi2html produces invalid HTML from an empty list of bullets! +@c Please uncomment following list when it does contain bullets. +@c @itemize @bullet +@c @end itemize @node Q7.0.3, Q7.0.4, Q7.0.2, Current Events @unnumberedsubsec Q7.0.3: What's new in XEmacs 21.1? diff --git a/man/xemacs/packages.texi b/man/xemacs/packages.texi index 6776abb..a7b7162 100644 --- a/man/xemacs/packages.texi +++ b/man/xemacs/packages.texi @@ -32,12 +32,14 @@ local needs with safe removal of unnecessary code. There are two main flavors of packages. @itemize @bullet -@item Regular Packages +@item +Regular Packages @cindex regular packages A regular package is one in which multiple files are involved and one may not in general safely remove any of them. -@item Single-File Packages +@item +Single-File Packages @cindex single-file packages A single-file package is an aggregate collection of thematically related but otherwise independent lisp files. These files are bundled @@ -247,7 +249,8 @@ where I mention "Options -> Manage Packages", substitute "Tools -> Packages". @enumerate 1 -@item Choose a download site. +@item +Choose a download site. via menu: Options -> Manages Packages -> Add Download Site via keyb: @code{M-x customize-variable RET package-get-remote RET} (put in the details of remote host and directory) @@ -255,7 +258,8 @@ via keyb: @code{M-x customize-variable RET package-get-remote RET} If the package tarballs _AND_ the package-index file are in a local directory, you can: @code{M-x pui-add-install-directory RET} -@item Obtain a list of packages and display the list in a buffer named +@item +Obtain a list of packages and display the list in a buffer named @file{*Packages*}. menu: Options -> Manage Packages -> List & Install keyb: @code{M-x pui-list-packages RET} @@ -319,11 +323,13 @@ Moving the mouse over a package will also cause additional information about the package to be displayed in the minibuffer. -@item Choose the packages you wish to install. +@item +Choose the packages you wish to install. mouse: Click button 2 on the package name. keyb: @kbd{RET} on the package name -@item Make sure you have everything you need. +@item +Make sure you have everything you need. menu: Packages -> Add Required keyb: @kbd{r} @@ -334,7 +340,8 @@ those packages also. For novices and gurus alike, this step can save your bacon. It's easy to forget to install a critical package. -@item Download and install the packages. +@item +Download and install the packages. menu: Packages -> Install/Remove Selected keyb: @kbd{x} @end enumerate diff --git a/man/xemacs/text.texi b/man/xemacs/text.texi index cebcb29..a622742 100644 --- a/man/xemacs/text.texi +++ b/man/xemacs/text.texi @@ -562,10 +562,10 @@ bodies are not affected. @findex hide-subtree @findex show-subtree -@kindex C-c C-s (Outline mode) +@kindex C-c C-d (Outline mode) @kindex C-c C-h (Outline mode) @cindex subtree (Outline mode) - Two more powerful opposites are @kbd{C-c C-h} (@code{hide-subtree}) and + Two more powerful opposites are @kbd{C-c C-d} (@code{hide-subtree}) and @kbd{C-c C-s} (@code{show-subtree}). Both should be used when point is on a heading line, and both apply to all the lines of that heading's @dfn{subtree}: its body, all its subheadings, both direct and indirect, and diff --git a/netinstall/ChangeLog b/netinstall/ChangeLog index e499752..e967ce7 100644 --- a/netinstall/ChangeLog +++ b/netinstall/ChangeLog @@ -1,3 +1,7 @@ +2001-10-23 Stephen J. Turnbull + + * XEmacs 21.4.5 "Civil Service" is released. + 2001-07-28 Stephen J. Turnbull * XEmacs 21.4.4 "Artificial Intelligence" is released. @@ -253,5 +257,5 @@ * all: port from cygwin setup. -%%% $Id: ChangeLog,v 1.2.2.9 2001/07/25 07:43:33 stephent Exp $ -$Revision: 1.2.2.9 $ +%%% $Id: ChangeLog,v 1.2.2.10 2001/07/28 11:45:44 stephent Exp $ +$Revision: 1.2.2.10 $ diff --git a/nt/ChangeLog b/nt/ChangeLog index f953df0..4a98f3c 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,13 @@ +2001-10-23 Stephen J. Turnbull + + * XEmacs 21.4.5 "Civil Service" is released. + +2001-08-02 Dr. Volker Zell + + * xemacs.rc: + Under cygwin, when environment variable CYGWIN is set + to check_case:strict, filenames are considered case sensitive. + 2001-07-28 Stephen J. Turnbull * XEmacs 21.4.4 "Artificial Intelligence" is released. diff --git a/nt/xemacs.rc b/nt/xemacs.rc index d39ed5c..b4cea1d 100644 --- a/nt/xemacs.rc +++ b/nt/xemacs.rc @@ -3,5 +3,5 @@ #endif XEmacs ICON PRELOAD "xemacs.ico" -XEmacsFile ICON "File.ico" -XEmacsLisp ICON "Lisp.ico" +XEmacsFile ICON "file.ico" +XEmacsLisp ICON "lisp.ico" diff --git a/src/ChangeLog b/src/ChangeLog index 4da413d..63f3e73 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,230 @@ +2001-10-23 Stephen J. Turnbull + + * XEmacs 21.4.5 "Civil Service" is released. + +2001-04-08 Danny Colascione + + * glyphs-x.c: Force buffer-tab highlight update when moving the + buffer, avoiding an ugly black border, used for keyboard focus + indication, on a widget that can never have keyboard focus, the + buffer tab. + +2001-08-30 Daiki Ueno + + * process-unix.c (unix_open_multicast_group): Remove too much + conversion between host and network byte order. + +2001-09-10 Nix + + * src/buffer.c (kill_buffer): Undedicate windows showing BUF + before replacing them. + + * src/window.c (window_loop): Implement new UNDEDICATE_BUFFER + operation. + + * src/window.c (undedicate_windows): Use it. + * src/window.h: Add prototype. + +2001-09-17 Ben Wing + + * fileio.c (normalize_filename): + * fileio.c (Fexpand_file_name): + Fix various C++ compile errors in Andy's recent code. + + * callint.c (Fcall_interactively): + * editfns.c (Ftemp_directory): + * editfns.c (Fuser_full_name): + * emacs.c (argmatch): + * lread.c (locate_file_map_suffixes): + * redisplay-x.c (x_ring_bell): + Fix sign-compare warnings. + +2001-09-08 Andy Piper + + * fileio.c (normalize_filename): copied from nt.c + * (Ffile_name_directory): enable win32 paths under cygwin. + * (Ffile_name_nondirectory): ditto. + * (directory_file_name): ditto. + * (Fexpand_file_name): ditto. + * (Ffile_truename): ditto. + * (Fsubstitute_in_file_name): ditto. + * (Ffile_name_absolute_p): ditto. + * (Ffile_readable_p): ditto. + +2001-09-08 Andy Piper + + * device-msw.c (mswindows_finish_init_device): remove dde + initialization. + * device-msw.c (mswindows_init_dde): factor out from + mswindows_finish_init_device() + * device-msw.c (init_mswindows_very_early): new function + initialize but don't enable dde. + * emacs.c (main_1): call init_mswindows_very_early. + * event-msw.c: + * event-msw.c (mswindows_dde_callback): only execute when we are + ready. + * symsinit.h: declare init_mswindows_very_early. + +2001-05-02 Kirill 'Big K' Katsnelson + + [sjt: This has been in 21.5 for months with no complaints.] + + * console.h (struct console_methods): Added flags member. + (CONSOLE_IMPLEMENTATION_FLAGS): Defined. + (CONMETH_IMPL_FLAG): + (CONSOLE_IMPL_FLAG): Macro to check implememntation flags. + Defined XDEVIMPF_DONT_PREEMPT_REDISPLAY. + + * device.c (window_system_pixelated_geometry): Use the above macros. + + * device.h (DEVICE_IMPL_FLAG): Macro to check a device + implememntation flag. + * device.h (DEVICE_DISPLAY_P): Use it. + + * frame.c (delete_frame_internal): Use the above macro. + + * redisplay.c (redisplay_device): Use it. + (redisplay_device): Obey XDEVIMPF_DONT_PREEMPT_REDISPLAY. + (redisplay_frame): Ditto. + + * device-msw.c (mswindows_device_implementation_flags): Removed. + (msprinter_device_implementation_flags): Removed. + (console_type_create_device_mswindows): Removed references to + implementation_flags methods, set implementation flags here. + (console_type_create_device_mswindows): Added XDEVIMPF_DONT_PREEMPT. + + * device-gtk.c (gtk_device_implementation_flags): Removed method. + (console_type_create_device_gtk): Removed method declaration. + Added commented out statement which semantically matches the + commented out statement in the above removed method. + +2001-04-14 Gordon Sadler + + The attached patch fixes a few warnings. + + * src/emacs.c: prototype console_type_create_select_gtk for GTK only + * src/frame-gtk.c: guard against GNOME calls in GTK only + * src/redisplay-gtk.c: include #ifdef HAVE_POLL + * src/select-gtk.c: prototype lisp_to_time + +2001-06-08 Ben Wing + + ------ gc-in-window-procedure fixes ------ + + * alloc.c: + * alloc.c (struct post_gc_action): + * alloc.c (register_post_gc_action): + * alloc.c (run_post_gc_actions): + * alloc.c (garbage_collect_1): + Create "post-gc actions", to avoid those dreaded "GC during window + procedure" problems. + + * event-msw.c: + Abort, clean and simple, when GC in window procedure. We want + to flush these puppies out. + + * glyphs-msw.c: + * glyphs-msw.c (finalize_destroy_window): + * glyphs-msw.c (mswindows_finalize_image_instance): + Use a post-gc action when destroying subwindows. + + * lisp.h: + Declare register_post_gc_action(). + + * scrollbar-msw.c: + * scrollbar-msw.c (unshow_that_mofo): + Use a post-gc action when unshowing scrollbar windows, if in gc. + + * redisplay.c (mark_redisplay): + Add comment about the utter evilness of what's going down here. + + ------ cygwin setitimer fixes ------ + + * Makefile.in.in (sheap_objs): + * Makefile.in.in (profile_objs): + * Makefile.in.in (objs): + Compile profile.c only when HAVE_SETITIMER. + + * nt.c (mswindows_sigset): + * nt.c (mswindows_sighold): + * nt.c (mswindows_sigrelse): + * nt.c (mswindows_sigpause): + * nt.c (mswindows_raise): + * nt.c (close_file_data): + Style fixes. + + * nt.c: + Move setitimer() emulation to win32.c, because Cygwin needs it too. + + * profile.c: + * profile.c (Fstart_profiling): + * profile.c (Fstop_profiling): + Make sure we don't compile if no setitimer(). Use qxe_setitimer() + instead of just plain setitimer(). + + * signal.c: + * signal.c (set_one_shot_timer): + * signal.c (alarm): + Define qxe_setitimer() as an encapsulation around setitimer() -- + call setitimer() directly unless Cygwin or MS Win, in which case + we use our simulated version in win32.c. + + * systime.h: + * systime.h (struct itimerval): + * systime.h (ITIMER_REAL): + Prototype mswindows_setitimer() and qxe_setitimer(). Long + comment about "qxe" and the policy regarding encapsulation. + + * win32.c: + * win32.c (setitimer_helper_proc): + * win32.c (setitimer_helper_period): + * win32.c (setitimer_helper): + * win32.c (mswindows_setitimer): + Move setitimer() emulation here, so Cygwin can use it. + Rename a couple of functions and variables to be longer and more + descriptive. In setitimer_helper_proc(), send the signal + using either mswindows_raise() or (on Cygwin) kill(). If for + some reason we are still getting lockups, we'll change the kill() + to directly invoke the signal handlers. + + ------ windows shell fixes ------ + + * callproc.c: + * ntproc.c: + Comments about how these two files must die. + + * callproc.c (init_callproc): + On MS Windows, init shell-file-name from SHELL, then COMSPEC, + not just COMSPEC. (more correct and closer to FSF.) Don't + force a value for SHELL into the environment. (Comments added + to explain why not.) + + * nt.c (init_user_info): + Don't shove a fabricated SHELL into the environment. See above. + +2001-06-01 Ben Wing + + * Makefile.in.in (ldflags): + eliminate that pesky "defaulting to 00401000" warning. + * nt.h: + eliminate warnings. + +2001-06-15 Golubev I. N. + + * s/sco5.h (FORCE_ALLOCATE_PTY_THE_OLD_FASHIONED_WAY): #define. + * process-unix.c (allocate_pty): #ifndef "modern" pty allocation. + +2001-04-24 Jerry James + + * faces.h: pass parameters to Fadd_spec_to_specifier in the + correct order. + +2001-06-01 Ben Wing + + * event-msw.c (debug_mswin_messages): + conditionalize the messages that were causing compile errors. + (if only macros could generate #ifdef statements ...) + 2001-07-28 Stephen J. Turnbull * XEmacs 21.4.4 "Artificial Intelligence" is released. diff --git a/src/Makefile.in.in b/src/Makefile.in.in index 43381b7..2a5dc11 100644 --- a/src/Makefile.in.in +++ b/src/Makefile.in.in @@ -142,13 +142,17 @@ sheap_objs=sheap.o win32_objs=win32.o xemacs_res.o #endif +#ifdef HAVE_SETITIMER +profile_objs=profile.o +#endif + ## -Demacs is needed to make some files produce the correct version ## for use in Emacs. cppflags = $(CPPFLAGS) -Demacs -I. $(c_switch_all) cflags = $(CFLAGS) $(cppflags) #if defined (WIN32_NATIVE) || defined (CYGWIN) -ldflags = $(LDFLAGS) -mwindows $(ld_switch_all) $(ld_dynamic_link_flags) +ldflags = $(LDFLAGS) -mwindows -e _mainCRTStartup $(ld_switch_all) $(ld_dynamic_link_flags) #else ldflags = $(LDFLAGS) $(ld_switch_all) $(ld_dynamic_link_flags) #endif @@ -195,7 +199,7 @@ objs=\ gui.o gutter.o $(gui_objs) hash.o imgproc.o indent.o insdel.o intl.o\ keymap.o $(RTC_patch_objs) line-number.o lread.o lstream.o\ macros.o marker.o md5.o minibuf.o objects.o opaque.o\ - print.o process.o profile.o\ + print.o process.o $(profile_objs)\ rangetab.o redisplay.o redisplay-output.o regex.o\ search.o select.o $(sheap_objs) signal.o sound.o\ specifier.o strftime.o symbols.o syntax.o sysdep.o\ diff --git a/src/alloc.c b/src/alloc.c index 50de95c..35f9481 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -3242,6 +3242,61 @@ restore_gc_inhibit (Lisp_Object val) /* Maybe we want to use this when doing a "panic" gc after memory_full()? */ static int gc_hooks_inhibited; +struct post_gc_action +{ + void (*fun) (void *); + void *arg; +}; + +typedef struct post_gc_action post_gc_action; + +typedef struct +{ + Dynarr_declare (post_gc_action); +} post_gc_action_dynarr; + +static post_gc_action_dynarr *post_gc_actions; + +/* Register an action to be called at the end of GC. + gc_in_progress is 0 when this is called. + This is used when it is discovered that an action needs to be taken, + but it's during GC, so it's not safe. (e.g. in a finalize method.) + + As a general rule, do not use Lisp objects here. + And NEVER signal an error. +*/ + +void +register_post_gc_action (void (*fun) (void *), void *arg) +{ + post_gc_action action; + + if (!post_gc_actions) + post_gc_actions = Dynarr_new (post_gc_action); + + action.fun = fun; + action.arg = arg; + + Dynarr_add (post_gc_actions, action); +} + +static void +run_post_gc_actions (void) +{ + int i; + + if (post_gc_actions) + { + for (i = 0; i < Dynarr_length (post_gc_actions); i++) + { + post_gc_action action = Dynarr_at (post_gc_actions, i); + (action.fun) (action.arg); + } + + Dynarr_reset (post_gc_actions); + } +} + void garbage_collect_1 (void) @@ -3457,6 +3512,8 @@ garbage_collect_1 (void) gc_in_progress = 0; + run_post_gc_actions (); + /******* End of garbage collection ********/ run_hook_trapping_errors ("Error in post-gc-hook", Qpost_gc_hook); diff --git a/src/buffer.c b/src/buffer.c index 58c7994..a1620b7 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1256,9 +1256,11 @@ with `delete-process'. delete_from_buffer_alist (buf); - /* #### This is a problem if this buffer is in a dedicated window. - Need to undedicate any windows of this buffer first (and delete them?) - */ + /* Undedicate any windows of this buffer, and make sure no windows + show it. */ + + undedicate_windows (buf, Qt); + GCPRO1 (buf); Freplace_buffer_in_windows (buf, Qnil, Qall); UNGCPRO; diff --git a/src/callint.c b/src/callint.c index b3abc7b..faa910d 100644 --- a/src/callint.c +++ b/src/callint.c @@ -573,7 +573,7 @@ when reading the arguments. int prompt_length; prompt_length = ((prompt_limit) ? (prompt_limit - prompt_start) - : strlen (prompt_start)); + : (int) strlen (prompt_start)); if (prompt_limit && prompt_limit[1] == 0) { prompt_limit = 0; /* "sfoo:\n" -- strip tailing return */ diff --git a/src/callproc.c b/src/callproc.c index 0ee95f0..ff28a49 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1,4 +1,4 @@ -/* Synchronous subprocess invocation for XEmacs. +/* Old synchronous subprocess invocation for XEmacs. Copyright (C) 1985, 86, 87, 88, 93, 94, 95 Free Software Foundation, Inc. This file is part of XEmacs. @@ -21,6 +21,16 @@ Boston, MA 02111-1307, USA. */ /* Synched up with: Mule 2.0, FSF 19.30. */ /* Partly sync'ed with 19.36.4 */ + +/* #### This ENTIRE file is only used in batch mode. + + We only need two things to get rid of both this and ntproc.c: + + -- my `stderr-proc' ws, which adds support for a separate stderr + in asynch. subprocesses. (it's a feature in `old-call-process-internal'.) + -- a noninteractive event loop that supports processes. +*/ + #include #include "lisp.h" @@ -893,13 +903,40 @@ init_callproc (void) { /* Initialize shell-file-name from environment variables or best guess. */ #ifdef WIN32_NATIVE - const char *shell = egetenv ("COMSPEC"); - if (!shell) shell = "\\WINNT\\system32\\cmd.exe"; + const char *shell = egetenv ("SHELL"); + if (!shell) shell = egetenv ("COMSPEC"); + /* Should never happen! */ + if (!shell) shell = (GetVersion () & 0x80000000 ? "command" : "cmd"); #else /* not WIN32_NATIVE */ const char *shell = egetenv ("SHELL"); if (!shell) shell = "/bin/sh"; #endif +#if 0 /* defined (WIN32_NATIVE) */ + /* BAD BAD BAD. We do not wanting to be passing an XEmacs-created + SHELL var down to some inferior Cygwin process, which might get + screwed up. + + There are a few broken apps (eterm/term.el, eterm/tshell.el, + os-utils/terminal.el, texinfo/tex-mode.el) where this will + cause problems. Those broken apps don't look at + shell-file-name, instead just at explicit-shell-file-name, + ESHELL and SHELL. They are apparently attempting to borrow + what `M-x shell' uses, but that latter also looks at + shell-file-name. What we want is for all of these apps to look + at shell-file-name, so that the user can change the value of + shell-file-name and everything will work out hunky-dorey. + */ + + if (!egetenv ("SHELL")) + { + CBufbyte *faux_var = alloca_array (CBufbyte, 7 + strlen (shell)); + sprintf (faux_var, "SHELL=%s", shell); + Vprocess_environment = Fcons (build_string (faux_var), + Vprocess_environment); + } +#endif /* 0 */ + Vshell_file_name = build_string (shell); } } diff --git a/src/console.h b/src/console.h index a071448..d1f748f 100644 --- a/src/console.h +++ b/src/console.h @@ -63,11 +63,34 @@ enum device_metrics extern const struct struct_description cted_description; extern const struct struct_description console_methods_description; + +/* + * Constants returned by device_implementation_flags_method + */ + +/* Set when device uses pixel-based geometry */ +#define XDEVIMPF_PIXEL_GEOMETRY 0x00000001L + +/* Indicates that the device is a printer */ +#define XDEVIMPF_IS_A_PRINTER 0x00000002L + +/* Do not automatically redisplay this device */ +#define XDEVIMPF_NO_AUTO_REDISPLAY 0x00000004L + +/* Do not delete the device when last frame's gone */ +#define XDEVIMPF_FRAMELESS_OK 0x00000008L + +/* Do not preempt resiaply of frame or device once it starts */ +#define XDEVIMPF_DONT_PREEMPT_REDISPLAY 0x00000010L + struct console_methods { const char *name; /* Used by print_console, print_device, print_frame */ Lisp_Object symbol; Lisp_Object predicate_symbol; + unsigned int flags; /* Read-only implementation flags, set once upon + console type creation. INITIALIZE_CONSOLE_TYPE sets + this member to 0. */ /* console methods */ void (*init_console_method) (struct console *, Lisp_Object props); @@ -93,7 +116,6 @@ struct console_methods void (*asynch_device_change_method) (void); Lisp_Object (*device_system_metrics_method) (struct device *, enum device_metrics); - unsigned int (*device_implementation_flags_method) (void); Lisp_Object (*own_selection_method)(Lisp_Object selection_name, Lisp_Object selection_value, Lisp_Object how_to_add, @@ -303,26 +325,12 @@ struct console_methods #endif }; -/* - * Constants returned by device_implementation_flags_method - */ - -/* Set when device uses pixel-based geometry */ -#define XDEVIMPF_PIXEL_GEOMETRY 0x00000001L - -/* Indicates that the device is a printer */ -#define XDEVIMPF_IS_A_PRINTER 0x00000002L - -/* Do not automatically redisplay this device */ -#define XDEVIMPF_NO_AUTO_REDISPLAY 0x00000004L - -/* Do not delete the device when last frame's gone */ -#define XDEVIMPF_FRAMELESS_OK 0x00000008L - +#define CONMETH_TYPE(meths) ((meths)->symbol) +#define CONMETH_IMPL_FLAG(meths, f) ((meths)->flags & (f)) #define CONSOLE_TYPE_NAME(c) ((c)->conmeths->name) #define CONSOLE_TYPE(c) ((c)->conmeths->symbol) -#define CONMETH_TYPE(meths) ((meths)->symbol) +#define CONSOLE_IMPL_FLAG(c, f) CONMETH_IMPL_FLAG ((c)->conmeths, (f)) /******** Accessing / calling a console method *********/ @@ -407,6 +415,10 @@ struct console_methods * type##_console_methods #define CONSOLE_INHERITS_METHOD(type, fromtype, m) \ (type##_console_methods->m##_method = fromtype##_##m) +/* Define console type implementation flags */ +#define CONSOLE_IMPLEMENTATION_FLAGS(type, flg) \ + (type##_console_methods->flags = flg) + struct console { struct lcrecord_header header; diff --git a/src/device-gtk.c b/src/device-gtk.c index 408bc7f..7bb336b 100644 --- a/src/device-gtk.c +++ b/src/device-gtk.c @@ -680,12 +680,6 @@ Get the style information for a Gtk device. return (result); } -static unsigned int -gtk_device_implementation_flags (void) -{ - return 0; /* XDEVIMPF_PIXEL_GEOMETRY; */ -} - /************************************************************************/ /* initialization */ @@ -717,7 +711,10 @@ console_type_create_device_gtk (void) CONSOLE_HAS_METHOD (gtk, mark_device); CONSOLE_HAS_METHOD (gtk, delete_device); CONSOLE_HAS_METHOD (gtk, device_system_metrics); - CONSOLE_HAS_METHOD (gtk, device_implementation_flags); + /* CONSOLE_IMPLEMENTATION_FLAGS (gtk, XDEVIMPF_PIXEL_GEOMETRY); */ + /* I inserted the above commented out statement, as the original + implementation of gtk_device_implementation_flags(), which I + deleted, contained commented out XDEVIMPF_PIXEL_GEOMETRY - kkm*/ } void diff --git a/src/device-msw.c b/src/device-msw.c index c1bc745..63ac69d 100644 --- a/src/device-msw.c +++ b/src/device-msw.c @@ -50,6 +50,7 @@ Boston, MA 02111-1307, USA. */ /* win32 DDE management library globals */ #ifdef HAVE_DRAGNDROP DWORD mswindows_dde_mlid; +int mswindows_dde_enable; HSZ mswindows_dde_service; HSZ mswindows_dde_topic_system; HSZ mswindows_dde_item_open; @@ -179,17 +180,18 @@ mswindows_init_device (struct device *d, Lisp_Object props) #endif } +#ifdef HAVE_DRAGNDROP static void -mswindows_finish_init_device (struct device *d, Lisp_Object props) +mswindows_init_dde () { /* Initialize DDE management library and our related globals. We execute a * dde Open("file") by simulating a drop, so this depends on dnd support. */ -#ifdef HAVE_DRAGNDROP # if !(defined(CYGWIN) || defined(MINGW)) CoInitialize (NULL); # endif mswindows_dde_mlid = 0; + mswindows_dde_enable = 0; DdeInitialize (&mswindows_dde_mlid, (PFNCALLBACK)mswindows_dde_callback, APPCMD_FILTERINITS|CBF_FAIL_SELFCONNECTIONS|CBF_FAIL_ADVISES| CBF_FAIL_POKES|CBF_FAIL_REQUESTS|CBF_SKIP_ALLNOTIFICATIONS, @@ -202,6 +204,27 @@ mswindows_finish_init_device (struct device *d, Lisp_Object props) mswindows_dde_item_open = DdeCreateStringHandle (mswindows_dde_mlid, TEXT(MSWINDOWS_DDE_ITEM_OPEN), 0); DdeNameService (mswindows_dde_mlid, mswindows_dde_service, 0L, DNS_REGISTER); +} +#endif + +void +init_mswindows_very_early() +{ +#ifdef HAVE_DRAGNDROP + /* Initializing dde when the device is created is too late - the + client will give up waiting. Instead we initialize here and tell + the client we're too busy until the rest of initialization has + happened. */ + mswindows_init_dde(); +#endif +} + +static void +mswindows_finish_init_device (struct device *d, Lisp_Object props) +{ +#ifdef HAVE_DRAGNDROP + /* Tell pending clients we are ready. */ + mswindows_dde_enable = 1; #endif } @@ -340,12 +363,6 @@ mswindows_device_system_metrics (struct device *d, return Qunbound; } -static unsigned int -mswindows_device_implementation_flags (void) -{ - return XDEVIMPF_PIXEL_GEOMETRY; -} - /************************************************************************/ /* printer helpers */ @@ -533,14 +550,6 @@ msprinter_mark_device (struct device *d) mark_object (DEVICE_MSPRINTER_DEVMODE (d)); } -static unsigned int -msprinter_device_implementation_flags (void) -{ - return ( XDEVIMPF_PIXEL_GEOMETRY - | XDEVIMPF_IS_A_PRINTER - | XDEVIMPF_NO_AUTO_REDISPLAY - | XDEVIMPF_FRAMELESS_OK ); -} /************************************************************************/ /* printer Lisp subroutines */ @@ -1304,13 +1313,17 @@ console_type_create_device_mswindows (void) CONSOLE_HAS_METHOD (mswindows, mark_device); CONSOLE_HAS_METHOD (mswindows, delete_device); CONSOLE_HAS_METHOD (mswindows, device_system_metrics); - CONSOLE_HAS_METHOD (mswindows, device_implementation_flags); + CONSOLE_IMPLEMENTATION_FLAGS (mswindows, XDEVIMPF_PIXEL_GEOMETRY); CONSOLE_HAS_METHOD (msprinter, init_device); CONSOLE_HAS_METHOD (msprinter, mark_device); CONSOLE_HAS_METHOD (msprinter, delete_device); CONSOLE_HAS_METHOD (msprinter, device_system_metrics); - CONSOLE_HAS_METHOD (msprinter, device_implementation_flags); + CONSOLE_IMPLEMENTATION_FLAGS (msprinter, (XDEVIMPF_PIXEL_GEOMETRY + | XDEVIMPF_IS_A_PRINTER + | XDEVIMPF_NO_AUTO_REDISPLAY + | XDEVIMPF_DONT_PREEMPT_REDISPLAY + | XDEVIMPF_FRAMELESS_OK)); } diff --git a/src/device.c b/src/device.c index 6c36f9f..399d61d 100644 --- a/src/device.c +++ b/src/device.c @@ -1175,8 +1175,7 @@ window_system_pixelated_geometry (Lisp_Object domain) Lisp_Object winsy = domain_device_type (domain); struct console_methods *meth = decode_console_type (winsy, ERROR_ME_NOT); assert (meth); - return (MAYBE_INT_CONTYPE_METH (meth, device_implementation_flags, ()) - & XDEVIMPF_PIXEL_GEOMETRY); + return CONMETH_IMPL_FLAG (meth, XDEVIMPF_PIXEL_GEOMETRY); } DEFUN ("domain-device-type", Fdomain_device_type, 0, 1, 0, /* diff --git a/src/device.h b/src/device.h index 1ef2b12..a870bbf 100644 --- a/src/device.h +++ b/src/device.h @@ -48,6 +48,7 @@ struct pixel_to_glyph_translation_cache #define DEVICE_TYPE_NAME(d) ((d)->devmeths->name) #define DEVICE_TYPE(d) ((d)->devmeths->symbol) +#define DEVICE_IMPL_FLAG(d, f) CONMETH_IMPL_FLAG ((d)->devmeths, (f)) #define DEVICE_SPECIFIC_FRAME_PROPS(d) \ ((d)->devmeths->device_specific_frame_props) @@ -273,9 +274,7 @@ error_check_device_type (struct device *d, Lisp_Object sym) #define DEVICE_DISPLAY_P(dev) \ (DEVICE_LIVE_P (dev) && \ - (MAYBE_INT_DEVMETH (dev, \ - device_implementation_flags, ()) \ - & XDEVIMPF_IS_A_PRINTER) ? 0 : 1) + !DEVICE_IMPL_FLAG (dev, XDEVIMPF_IS_A_PRINTER)) #define CHECK_DISPLAY_DEVICE(dev) \ do { \ diff --git a/src/editfns.c b/src/editfns.c index 36417c0..bc3d29b 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -637,7 +637,8 @@ On Unix it is obtained from TMPDIR, with /tmp as the default. { mkdir(path, 0700); /* ignore retval -- checked next anyway. */ } - if (lstat(path, &st) == 0 && st.st_uid == myuid && S_ISDIR(st.st_mode)) + if (lstat(path, &st) == 0 && st.st_uid == (uid_t) myuid && + S_ISDIR(st.st_mode)) { tmpdir = path; } @@ -824,7 +825,7 @@ value of `user-full-name' is returned. #endif tem = ((!NILP (user) && !pw) ? Qnil - : make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)), + : make_ext_string ((Extbyte *) p, (q ? q - p : (int) strlen (p)), Qnative)); #ifdef AMPERSAND_FULL_NAME diff --git a/src/emacs.c b/src/emacs.c index 33b515b..73f6d26 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -241,6 +241,10 @@ static void *malloc_state_ptr; void r_alloc_reinit (void); # endif +#ifdef HAVE_GTK +void console_type_create_select_gtk(void); +#endif + /* Variable whose value is symbol giving operating system type. */ Lisp_Object Vsystem_type; @@ -795,7 +799,7 @@ argmatch (char **argv, int argc, char *sstr, char *lstr, return 1; } arglen = (valptr != NULL && (p = strchr (arg, '=')) != NULL - ? p - arg : strlen (arg)); + ? p - arg : (int) strlen (arg)); if (lstr == 0 || arglen < minlen || strncmp (arg, lstr, arglen) != 0) return 0; else if (valptr == NULL) @@ -1144,6 +1148,11 @@ main_1 (int argc, char **argv, char **envp, int restart) so we can be fairly accurate. */ init_intl_very_early (); /* set up the locale and domain for gettext and such. */ +#ifdef HAVE_MS_WINDOWS + init_mswindows_very_early (); /* Some things - like dde need to be + initialized early so that the + client doesn't give up waiting. */ +#endif /* Now initialize the Lisp engine and the like. Done only during dumping. No dependence on anything that may be in the user's diff --git a/src/event-msw.c b/src/event-msw.c index 4745a66..a2eb0cf 100644 --- a/src/event-msw.c +++ b/src/event-msw.c @@ -1610,6 +1610,8 @@ mswindows_wm_timer_callback (HWND hwnd, UINT umsg, UINT id_timer, DWORD dwtime) * depends on dnd support. */ #ifdef HAVE_DRAGNDROP +extern int mswindows_dde_enable; + HDDEDATA CALLBACK mswindows_dde_callback (UINT uType, UINT uFmt, HCONV hconv, HSZ hszTopic, HSZ hszItem, HDDEDATA hdata, @@ -1636,6 +1638,9 @@ mswindows_dde_callback (UINT uType, UINT uFmt, HCONV hconv, return (HDDEDATA)NULL; case XTYP_EXECUTE: + if (!mswindows_dde_enable) + return (HDDEDATA) DDE_FBUSY; + if (!DdeCmpStringHandles (hszTopic, mswindows_dde_topic_system)) { DWORD len = DdeGetData (hdata, NULL, 0, 0); @@ -1643,7 +1648,7 @@ mswindows_dde_callback (UINT uType, UINT uFmt, HCONV hconv, char *end; char *filename; struct gcpro gcpro1, gcpro2; - Lisp_Object l_dndlist = Qnil; + Lisp_Object l_dndlist = Qnil; Lisp_Object emacs_event = Fmake_event (Qnil, Qnil); Lisp_Object frmcons, devcons, concons; Lisp_Event *event = XEVENT (emacs_event); @@ -2064,17 +2069,9 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam) struct frame *frame; struct mswindows_frame* msframe; - /* Not perfect but avoids crashes. There is potential for wierd - behavior here. */ - if (gc_in_progress) - { - mswindows_output_console_string ("Window procedure called during GC???????\n", 41); - /* Yes, this assert always triggers in a --debug XEmacs. But - --debug=no is default in the stable branches. - #### How about patch in <200106081225.IAA31075@gwyn.tux.org>? */ - assert (!gc_in_progress); - goto defproc; - } + /* If you hit this, rewrite the offending API call to occur after GC, + using register_post_gc_action(). */ + assert (!gc_in_progress); #ifdef DEBUG_XEMACS if (debug_mswindows_events) @@ -3781,7 +3778,9 @@ FROB (WM_NCHITTEST) FROB (WM_NCPAINT) FROB (WM_NCACTIVATE) FROB (WM_GETDLGCODE) +#ifdef WM_SYNCPAINT /* not in VC 5 */ FROB (WM_SYNCPAINT) +#endif /* WM_SYNCPAINT */ FROB (WM_NCMOUSEMOVE) FROB (WM_NCLBUTTONDOWN) FROB (WM_NCLBUTTONUP) @@ -3804,12 +3803,12 @@ FROB (WM_SYSCHAR) FROB (WM_SYSDEADCHAR) FROB (WM_KEYLAST) -#if(WINVER >= 0x0400) && !defined(CYGWIN) +#if(WINVER >= 0x0400) && defined (WM_IME_STARTCOMPOSITION) FROB (WM_IME_STARTCOMPOSITION) FROB (WM_IME_ENDCOMPOSITION) FROB (WM_IME_COMPOSITION) FROB (WM_IME_KEYLAST) -#endif /* WINVER >= 0x0400 */ +#endif /* WINVER >= 0x0400 && defined (WM_IME_STARTCOMPOSITION) */ FROB (WM_INITDIALOG) FROB (WM_COMMAND) @@ -3893,6 +3892,7 @@ FROB (WM_EXITSIZEMOVE) FROB (WM_DROPFILES) FROB (WM_MDIREFRESHMENU) +#ifdef WM_IME_SETCONTEXT /* not in Cygwin? */ #if(WINVER >= 0x0400) && !defined(CYGWIN) FROB (WM_IME_SETCONTEXT) @@ -3910,6 +3910,7 @@ FROB (WM_IME_KEYDOWN) FROB (WM_IME_KEYUP) #endif /* WINVER >= 0x0400 */ +#endif /* WM_IME_SETCONTEXT */ #if(_WIN32_WINNT >= 0x0400) FROB (WM_MOUSEHOVER) diff --git a/src/faces.h b/src/faces.h index cd2d498..1969fe0 100644 --- a/src/faces.h +++ b/src/faces.h @@ -341,9 +341,9 @@ Lisp_Object face_property_matching_instance (Lisp_Object face, #define FACE_PROPERTY_SPEC_LIST(face, property, locale) \ Fspecifier_spec_list (FACE_PROPERTY_SPECIFIER (face, property), \ locale, Qnil, Qnil) -#define SET_FACE_PROPERTY(face, property, locale, value, tag, how_to_add) \ +#define SET_FACE_PROPERTY(face, property, value, locale, tag, how_to_add) \ Fadd_spec_to_specifier (FACE_PROPERTY_SPECIFIER (face, property), \ - locale, value, tag, how_to_add) + value, locale, tag, how_to_add) #define FACE_FOREGROUND(face, domain) \ FACE_PROPERTY_INSTANCE (face, Qforeground, domain, 0, Qzero) diff --git a/src/fileio.c b/src/fileio.c index fcd78b0..578da72 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -53,14 +53,43 @@ Boston, MA 02111-1307, USA. */ #endif /* HPUX_PRE_8_0 */ #endif /* HPUX */ +#if defined(WIN32_NATIVE) || defined(CYGWIN) +#define WIN32_FILENAMES #ifdef WIN32_NATIVE #include "nt.h" +#endif /* WIN32_NATIVE */ #define IS_DRIVE(x) isalpha (x) /* Need to lower-case the drive letter, or else expanded filenames will sometimes compare inequal, because `expand-file-name' doesn't always down-case the drive letter. */ #define DRIVE_LETTER(x) tolower (x) -#endif /* WIN32_NATIVE */ +#ifndef CORRECT_DIR_SEPS +#define CORRECT_DIR_SEPS(s) \ + normalize_filename(s, DIRECTORY_SEP) +/* Default implementation that coerces a file to use path_sep. */ +static void +normalize_filename (Bufbyte *fp, Bufbyte path_sep) +{ + /* Always lower-case drive letters a-z, even if the filesystem + preserves case in filenames. + This is so filenames can be compared by string comparison + functions that are case-sensitive. Even case-preserving filesystems + do not distinguish case in drive letters. */ + if (fp[1] == ':' && *fp >= 'A' && *fp <= 'Z') + { + *fp += 'a' - 'A'; + fp += 2; + } + + while (*fp) + { + if (*fp == '/' || *fp == '\\') + *fp = path_sep; + fp++; + } +} +#endif /* CORRECT_DIR_SEPS */ +#endif /* WIN32_NATIVE || CYGWIN */ int lisp_to_time (Lisp_Object, time_t *); Lisp_Object time_to_lisp (time_t); @@ -427,7 +456,7 @@ Given a Unix syntax file name, returns a string ending in slash. p = beg + XSTRING_LENGTH (filename); while (p != beg && !IS_ANY_SEP (p[-1]) -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES /* only recognize drive specifier at beginning */ && !(p[-1] == ':' && p == beg + 2) #endif @@ -482,7 +511,7 @@ or the entire name if it contains no slash. end = p = beg + XSTRING_LENGTH (filename); while (p != beg && !IS_ANY_SEP (p[-1]) -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES /* only recognize drive specifier at beginning */ && !(p[-1] == ':' && p == beg + 2) #endif @@ -586,9 +615,9 @@ directory_file_name (const char *src, char *dst) strcpy (dst, src); if (slen > 1 && IS_DIRECTORY_SEP (dst[slen - 1]) -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES && !IS_ANY_SEP (dst[slen - 2]) -#endif /* WIN32_NATIVE */ +#endif /* WIN32_FILENAMES */ ) dst[slen - 1] = 0; return 1; @@ -755,12 +784,13 @@ See also the function `substitute-in-file-name'. Bufbyte *newdir, *p, *o; int tlen; Bufbyte *target; -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES int drive = 0; int collapse_newdir = 1; -#else +#endif +#ifndef WIN32_NATIVE struct passwd *pw; -#endif /* WIN32_NATIVE */ +#endif /* WIN32_FILENAMES */ int length; Lisp_Object handler = Qnil; #ifdef CYGWIN @@ -810,14 +840,13 @@ See also the function `substitute-in-file-name'. /* Save time in some common cases - as long as default_directory is not relative, it can be canonicalized with name below (if it is needed at all) without requiring it to be expanded now. */ -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES /* Detect Windows file names with drive specifiers. */ && ! (IS_DRIVE (o[0]) && (IS_DEVICE_SEP (o[1]) && IS_DIRECTORY_SEP (o[2]))) /* Detect Windows file names in UNC format. */ && ! (IS_DIRECTORY_SEP (o[0]) && IS_DIRECTORY_SEP (o[1])) - -#else /* not WIN32_NATIVE */ - +#endif /* not WIN32_FILENAMES */ +#ifndef WIN32_NATIVE /* Detect Unix absolute file names (/... alone is not absolute on Windows). */ && ! (IS_DIRECTORY_SEP (o[0])) @@ -834,10 +863,11 @@ See also the function `substitute-in-file-name'. into name should be safe during all of this, though. */ nm = XSTRING_DATA (name); -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES /* We will force directory separators to be either all \ or /, so make a local copy to modify, even if there ends up being no change. */ - nm = strcpy ((char *)alloca (strlen ((char *)nm) + 1), (char *)nm); + nm = (Bufbyte *) strcpy ((char *) alloca (strlen ((char *) nm) + 1), + (char *) nm); /* Find and remove drive specifier if present; this makes nm absolute even if the rest of the name appears to be relative. */ @@ -845,6 +875,7 @@ See also the function `substitute-in-file-name'. Bufbyte *colon = (Bufbyte *) strrchr ((char *)nm, ':'); if (colon) + { /* Only recognize colon as part of drive specifier if there is a single alphabetic character preceding the colon (and if the character before the drive letter, if present, is a directory @@ -865,6 +896,7 @@ See also the function `substitute-in-file-name'. if (colon[0] == ':') goto look_again; } + } } /* If we see "c://somedir", we want to strip the first slash after the @@ -872,7 +904,7 @@ See also the function `substitute-in-file-name'. "//somedir". */ if (drive && IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) nm++; -#endif /* WIN32_NATIVE */ +#endif /* WIN32_FILENAMES */ /* If nm is absolute, look for /./ or /../ sequences; if none are found, we can probably return right away. We will avoid allocating @@ -910,25 +942,30 @@ See also the function `substitute-in-file-name'. } if (!lose) { -#ifdef WIN32_NATIVE - /* Make sure directories are all separated with / or \ as - desired, but avoid allocation of a new string when not - required. */ - CORRECT_DIR_SEPS (nm); - if (IS_DIRECTORY_SEP (nm[1])) - { - if (strcmp (nm, XSTRING_DATA (name)) != 0) - name = build_string (nm); - } - /* drive must be set, so this is okay */ - else if (strcmp (nm - 2, XSTRING_DATA (name)) != 0) +#ifdef WIN32_FILENAMES + if (drive || IS_DIRECTORY_SEP (nm[1])) { - name = make_string (nm - 2, p - nm + 2); - XSTRING_DATA (name)[0] = DRIVE_LETTER (drive); - XSTRING_DATA (name)[1] = ':'; + /* Make sure directories are all separated with / or \ as + desired, but avoid allocation of a new string when not + required. */ + CORRECT_DIR_SEPS (nm); + if (IS_DIRECTORY_SEP (nm[1])) + { + if (strcmp ((char *) nm, (char *) XSTRING_DATA (name)) != 0) + name = build_string ((CBufbyte *) nm); + } + /* drive must be set, so this is okay */ + else if (strcmp ((char *) nm - 2, + (char *) XSTRING_DATA (name)) != 0) + { + name = make_string (nm - 2, p - nm + 2); + XSTRING_DATA (name)[0] = DRIVE_LETTER (drive); + XSTRING_DATA (name)[1] = ':'; + } + RETURN_UNGCPRO (name); } - RETURN_UNGCPRO (name); -#else /* not WIN32_NATIVE */ +#endif /* not WIN32_FILENAMES */ +#ifndef WIN32_NATIVE if (nm == XSTRING_DATA (name)) RETURN_UNGCPRO (name); RETURN_UNGCPRO (build_string ((char *) nm)); @@ -969,7 +1006,7 @@ See also the function `substitute-in-file-name'. Qfile_name); nm++; -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES collapse_newdir = 0; #endif } @@ -1019,29 +1056,31 @@ See also the function `substitute-in-file-name'. } } -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES /* On DOS and Windows, nm is absolute if a drive name was specified; use the drive's current directory as the prefix if needed. */ if (!newdir && drive) { +#ifdef WIN32_NATIVE /* Get default directory if needed to make nm absolute. */ if (!IS_DIRECTORY_SEP (nm[0])) { - newdir = alloca (MAXPATHLEN + 1); + newdir = (Bufbyte *) alloca (MAXPATHLEN + 1); if (!_getdcwd (toupper (drive) - 'A' + 1, newdir, MAXPATHLEN)) newdir = NULL; } +#endif /* WIN32_NATIVE */ if (!newdir) { /* Either nm starts with /, or drive isn't mounted. */ - newdir = alloca (4); + newdir = (Bufbyte *) alloca (4); newdir[0] = DRIVE_LETTER (drive); newdir[1] = ':'; newdir[2] = '/'; newdir[3] = 0; } } -#endif /* WIN32_NATIVE */ +#endif /* WIN32_FILENAMES */ /* Finally, if no prefix has been specified and nm is not absolute, then it must be expanded relative to default_directory. */ @@ -1050,7 +1089,8 @@ See also the function `substitute-in-file-name'. #ifndef WIN32_NATIVE /* /... alone is not absolute on DOS and Windows. */ && !IS_DIRECTORY_SEP (nm[0]) -#else +#endif +#ifdef WIN32_FILENAMES && !(IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) #endif && !newdir) @@ -1058,7 +1098,7 @@ See also the function `substitute-in-file-name'. newdir = XSTRING_DATA (default_directory); } -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES if (newdir) { /* First ensure newdir is an absolute name. */ @@ -1070,6 +1110,10 @@ See also the function `substitute-in-file-name'. && ! (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1])) /* Detect drive spec by itself */ && ! (IS_DEVICE_SEP (newdir[1]) && newdir[2] == 0) + /* Detect unix format. */ +#ifndef WIN32_NATIVE + && ! (IS_DIRECTORY_SEP (newdir[0])) +#endif ) { /* Effectively, let newdir be (expand-file-name newdir cwd). @@ -1085,19 +1129,22 @@ See also the function `substitute-in-file-name'. } if (!IS_DIRECTORY_SEP (nm[0])) { - char * tmp = alloca (strlen (newdir) + strlen (nm) + 2); - file_name_as_directory (tmp, newdir); - strcat (tmp, nm); + Bufbyte *tmp = (Bufbyte *) alloca (strlen ((char *) newdir) + + strlen ((char *) nm) + 2); + file_name_as_directory ((char *) tmp, (char *) newdir); + strcat ((char *) tmp, (char *) nm); nm = tmp; } - newdir = alloca (MAXPATHLEN + 1); + newdir = (Bufbyte *) alloca (MAXPATHLEN + 1); if (drive) { +#ifdef WIN32_NATIVE if (!_getdcwd (toupper (drive) - 'A' + 1, newdir, MAXPATHLEN)) - newdir = "/"; +#endif + newdir = (Bufbyte *) "/"; } else - getwd (newdir); + getcwd ((char *) newdir, MAXPATHLEN); } /* Strip off drive name from prefix, if present. */ @@ -1109,11 +1156,18 @@ See also the function `substitute-in-file-name'. /* Keep only a prefix from newdir if nm starts with slash (/ /server/share for UNC, nothing otherwise). */ - if (IS_DIRECTORY_SEP (nm[0]) && collapse_newdir) + if (IS_DIRECTORY_SEP (nm[0]) +#ifndef WIN32_NATIVE + && IS_DIRECTORY_SEP (nm[1]) +#endif + && collapse_newdir) { if (IS_DIRECTORY_SEP (newdir[0]) && IS_DIRECTORY_SEP (newdir[1])) { - newdir = strcpy (alloca (strlen (newdir) + 1), newdir); + newdir = + (Bufbyte *) + strcpy ((char *) alloca (strlen ((char *) newdir) + 1), + (char *) newdir); p = newdir + 2; while (*p && !IS_DIRECTORY_SEP (*p)) p++; p++; @@ -1121,10 +1175,10 @@ See also the function `substitute-in-file-name'. *p = 0; } else - newdir = ""; + newdir = (Bufbyte *) ""; } } -#endif /* WIN32_NATIVE */ +#endif /* WIN32_FILENAMES */ if (newdir) { @@ -1132,7 +1186,7 @@ See also the function `substitute-in-file-name'. just // (an incomplete UNC name). */ length = strlen ((char *) newdir); if (length > 1 && IS_DIRECTORY_SEP (newdir[length - 1]) -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES && !(length == 2 && IS_DIRECTORY_SEP (newdir[0])) #endif ) @@ -1149,14 +1203,14 @@ See also the function `substitute-in-file-name'. /* Now concatenate the directory and name to new space in the stack frame */ tlen += strlen ((char *) nm) + 1; -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES /* Add reserved space for drive name. (The Microsoft x86 compiler produces incorrect code if the following two lines are combined.) */ target = (Bufbyte *) alloca (tlen + 2); target += 2; -#else /* not WIN32_NATIVE */ +#else /* not WIN32_FILENAMES */ target = (Bufbyte *) alloca (tlen); -#endif /* not WIN32_NATIVE */ +#endif /* not WIN32_FILENAMES */ *target = 0; if (newdir) @@ -1205,7 +1259,7 @@ See also the function `substitute-in-file-name'. ++o; p += 3; } -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES /* if drive is set, we're not dealing with an UNC, so multiple dir-seps are redundant (and reportedly cause trouble under win95) */ @@ -1218,7 +1272,7 @@ See also the function `substitute-in-file-name'. } } -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES /* At last, set drive name, except for network file name. */ if (drive) { @@ -1226,12 +1280,14 @@ See also the function `substitute-in-file-name'. target[0] = DRIVE_LETTER (drive); target[1] = ':'; } +#ifdef WIN32_NATIVE else { assert (IS_DIRECTORY_SEP (target[0]) && IS_DIRECTORY_SEP (target[1])); } +#endif CORRECT_DIR_SEPS (target); -#endif /* WIN32_NATIVE */ +#endif /* WIN32_FILENAMES */ RETURN_UNGCPRO (make_string (target, o - target)); } @@ -1308,7 +1364,7 @@ No component of the resulting pathname will be a symbolic link, as { Extbyte *pos; -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES if (IS_DRIVE (p[0]) && IS_DEVICE_SEP (p[1]) && IS_DIRECTORY_SEP (p[2])) /* don't test c: on windows */ @@ -1428,12 +1484,12 @@ If `/~' appears, all of FILENAME through that `/' is discarded. for (p = nm; p != endp; p++) { if ((p[0] == '~' -#if defined (WIN32_NATIVE) || defined (CYGWIN) +#if defined (WIN32_FILENAMES) /* // at start of file name is meaningful in WindowsNT systems */ || (IS_DIRECTORY_SEP (p[0]) && p - 1 != nm) -#else /* not (WIN32_NATIVE || CYGWIN) */ +#else /* not (WIN32_FILENAMES) */ || IS_DIRECTORY_SEP (p[0]) -#endif /* not (WIN32_NATIVE || CYGWIN) */ +#endif /* not (WIN32_FILENAMES) */ ) && p != nm && (IS_DIRECTORY_SEP (p[-1]))) @@ -1441,7 +1497,7 @@ If `/~' appears, all of FILENAME through that `/' is discarded. nm = p; substituted = 1; } -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES /* see comment in expand-file-name about drive specifiers */ else if (IS_DRIVE (p[0]) && p[1] == ':' && p > nm && IS_DIRECTORY_SEP (p[-1])) @@ -1449,7 +1505,7 @@ If `/~' appears, all of FILENAME through that `/' is discarded. nm = p; substituted = 1; } -#endif /* WIN32_NATIVE */ +#endif /* WIN32_FILENAMES */ } /* See if any variables are substituted into the string @@ -1559,16 +1615,16 @@ If `/~' appears, all of FILENAME through that `/' is discarded. for (p = xnm; p != x; p++) if ((p[0] == '~' -#if defined (WIN32_NATIVE) +#if defined (WIN32_FILENAMES) || (IS_DIRECTORY_SEP (p[0]) && p - 1 != xnm) -#else /* not WIN32_NATIVE */ +#else /* not WIN32_FILENAMES */ || IS_DIRECTORY_SEP (p[0]) -#endif /* not WIN32_NATIVE */ +#endif /* not WIN32_FILENAMES */ ) /* don't do p[-1] if that would go off the beginning --jwz */ && p != nm && p > xnm && IS_DIRECTORY_SEP (p[-1])) xnm = p; -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES else if (IS_DRIVE (p[0]) && p[1] == ':' && p > nm && IS_DIRECTORY_SEP (p[-1])) xnm = p; @@ -2165,7 +2221,7 @@ On Unix, this is a name starting with a `/' or a `~'. CHECK_STRING (filename); ptr = XSTRING_DATA (filename); return (IS_DIRECTORY_SEP (*ptr) || *ptr == '~' -#ifdef WIN32_NATIVE +#ifdef WIN32_FILENAMES || (IS_DRIVE (*ptr) && ptr[1] == ':' && IS_DIRECTORY_SEP (ptr[2])) #endif ) ? Qt : Qnil; @@ -2283,14 +2339,14 @@ See also `file-exists-p' and `file-attributes'. if (!NILP (handler)) RETURN_UNGCPRO (call2 (handler, Qfile_readable_p, abspath)); -#if defined(WIN32_NATIVE) || defined(CYGWIN) +#if defined(WIN32_FILENAMES) /* Under MS-DOS and Windows, open does not work for directories. */ UNGCPRO; if (access (XSTRING_DATA (abspath), 0) == 0) return Qt; else return Qnil; -#else /* not WIN32_NATIVE */ +#else /* not WIN32_FILENAMES */ { int desc = interruptible_open ((char *) XSTRING_DATA (abspath), O_RDONLY | OPEN_BINARY, 0); UNGCPRO; @@ -2299,7 +2355,7 @@ See also `file-exists-p' and `file-attributes'. close (desc); return Qt; } -#endif /* not WIN32_NATIVE */ +#endif /* not WIN32_FILENAMES */ } /* Having this before file-symlink-p mysteriously caused it to be forgotten diff --git a/src/frame-gtk.c b/src/frame-gtk.c index 963d259..3f3d754 100644 --- a/src/frame-gtk.c +++ b/src/frame-gtk.c @@ -847,9 +847,11 @@ gtk_create_widgets (struct frame *f, Lisp_Object lisp_window_id, Lisp_Object par } #endif /* HAVE_MENUBARS */ +#ifdef HAVE_GNOME if (GNOME_IS_APP (shell)) gnome_app_set_contents (GNOME_APP (shell), text); else +#endif /* Now comes the drawing area, which should fill the rest of the ** frame completely. */ diff --git a/src/frame.c b/src/frame.c index 3f2ee3b..c98d0c3 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1304,9 +1304,8 @@ delete_frame_internal (struct frame *f, int force, console = DEVICE_CONSOLE (d); con = XCONSOLE (console); - if (!called_from_delete_device && - !(MAYBE_INT_DEVMETH (d, device_implementation_flags, ()) - & XDEVIMPF_FRAMELESS_OK)) + if (!called_from_delete_device + && !DEVICE_IMPL_FLAG (d, XDEVIMPF_FRAMELESS_OK)) { /* If we're deleting the only non-minibuffer frame on the device, delete the device. */ diff --git a/src/glyphs-eimage.c b/src/glyphs-eimage.c index f8502d1..1b89d5e 100644 --- a/src/glyphs-eimage.c +++ b/src/glyphs-eimage.c @@ -675,7 +675,7 @@ gif_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, for (slice = 0; slice < unwind.giffile->ImageCount; slice++) { - /* We check here that that the current image covers the full "screen" size. */ + /* We check here that the current image covers the full "screen" size. */ if (unwind.giffile->SavedImages[slice].ImageDesc.Height != height || unwind.giffile->SavedImages[slice].ImageDesc.Width != width || unwind.giffile->SavedImages[slice].ImageDesc.Left != 0 diff --git a/src/glyphs-msw.c b/src/glyphs-msw.c index 39bb3f4..07a762e 100644 --- a/src/glyphs-msw.c +++ b/src/glyphs-msw.c @@ -2091,6 +2091,12 @@ extern int debug_widget_instances; #endif static void +finalize_destroy_window (void *win) +{ + DestroyWindow ((HWND) win); +} + +static void mswindows_finalize_image_instance (Lisp_Image_Instance *p) { if (!p->data) @@ -2107,8 +2113,14 @@ mswindows_finalize_image_instance (Lisp_Image_Instance *p) #endif if (IMAGE_INSTANCE_SUBWINDOW_ID (p)) { - DestroyWindow (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p)); - DestroyWindow (IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (p)); + /* DestroyWindow is not safe here, as it will send messages + to our window proc. */ + register_post_gc_action + (finalize_destroy_window, + (void *) (WIDGET_INSTANCE_MSWINDOWS_HANDLE (p))); + register_post_gc_action + (finalize_destroy_window, + (void *) (IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (p))); IMAGE_INSTANCE_SUBWINDOW_ID (p) = 0; } } diff --git a/src/glyphs-x.c b/src/glyphs-x.c index b45832d..ae7d3be 100644 --- a/src/glyphs-x.c +++ b/src/glyphs-x.c @@ -2778,7 +2778,7 @@ x_tab_control_redisplay (Lisp_Object image_instance) but I couldn't find it. */ Lisp_Object old_selected =gui_item_list_find_selected (XCDR (IMAGE_INSTANCE_WIDGET_ITEMS (ii))); - Arg al [1]; + Arg al [2]; char* name; unsigned int num_children, i; Widget* children; @@ -2794,7 +2794,9 @@ x_tab_control_redisplay (Lisp_Object image_instance) if (!strcmp (XtName (children [i]), name)) { XtSetArg (al [0], XtNtopWidget, children [i]); - XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (ii), al, 1); + XtSetArg (al [1], XtNhighlightWidget, + children [i]); + XtSetValues (IMAGE_INSTANCE_X_WIDGET_ID (ii), al, 2); break; } } diff --git a/src/lisp.h b/src/lisp.h index 4aee0e1..484a7df 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2151,6 +2151,8 @@ void debug_ungcpro(char *, int, struct gcpro *); extern Lisp_Object_ptr_dynarr *staticpros; +void register_post_gc_action (void (*fun) (void *), void *arg); + /* Call staticpro (&var) to protect static variable `var'. */ void staticpro (Lisp_Object *); diff --git a/src/lread.c b/src/lread.c index b8d88bb..918a2cd 100644 --- a/src/lread.c +++ b/src/lread.c @@ -984,7 +984,7 @@ locate_file_map_suffixes (Lisp_Object filename, Lisp_Object suffixes, while (1) { char *esuffix = (char *) strchr (nsuffix, ':'); - int lsuffix = esuffix ? esuffix - nsuffix : strlen (nsuffix); + int lsuffix = esuffix ? esuffix - nsuffix : (int) strlen (nsuffix); /* Concatenate path element/specified name with the suffix. */ strncpy (fn + fn_len, nsuffix, lsuffix); diff --git a/src/nt.c b/src/nt.c index 2eac6d0..2615d67 100644 --- a/src/nt.c +++ b/src/nt.c @@ -1,4 +1,4 @@ -/* Utility and Unix shadow routines for XEmacs on Windows NT. +/* Utility and Unix shadow routines for XEmacs on MS Windows. Copyright (C) 1994, 1995 Free Software Foundation, Inc. This file is part of XEmacs. @@ -247,12 +247,12 @@ init_user_info (void) if (getenv ("HOME") == NULL) putenv ("HOME=c:/"); #endif - if (getenv ("SHELL") == NULL) - putenv ((GetVersion () & 0x80000000) ? "SHELL=command" : "SHELL=cmd"); - /* Set dir and shell from environment variables. */ + /* Set dir from environment variables. */ strcpy (the_passwd.pw_dir, (char *)get_home_directory()); - strcpy (the_passwd.pw_shell, getenv ("SHELL")); + /* We used to set pw_shell here, but the order is wrong (SHELL gets + init in callproc.c, called later in the init process) and pw_shell + is not used anywhere. */ } /* Normalize filename by converting all path separators to @@ -1824,7 +1824,8 @@ unsigned signal_block_mask = 0; /* Signal pending mask: bit set to 1 means sig is pending */ unsigned signal_pending_mask = 0; -mswindows_sighandler mswindows_sigset (int nsig, mswindows_sighandler handler) +mswindows_sighandler +mswindows_sigset (int nsig, mswindows_sighandler handler) { /* We delegate some signals to the system function */ if (nsig == SIGFPE || nsig == SIGABRT || nsig == SIGINT) @@ -1844,40 +1845,43 @@ mswindows_sighandler mswindows_sigset (int nsig, mswindows_sighandler handler) } } -int mswindows_sighold (int nsig) +int +mswindows_sighold (int nsig) { if (nsig < 0 || nsig > SIG_MAX) return errno = EINVAL; - signal_block_mask |= sigmask(nsig); + signal_block_mask |= sigmask (nsig); return 0; } -int mswindows_sigrelse (int nsig) +int +mswindows_sigrelse (int nsig) { if (nsig < 0 || nsig > SIG_MAX) return errno = EINVAL; - signal_block_mask &= ~sigmask(nsig); + signal_block_mask &= ~sigmask (nsig); - if (signal_pending_mask & sigmask(nsig)) + if (signal_pending_mask & sigmask (nsig)) mswindows_raise (nsig); return 0; } -int mswindows_sigpause (int nsig) +int +mswindows_sigpause (int nsig) { - /* This is currently not called, because the only - call to sigpause inside XEmacs is with SIGCHLD - parameter. Just in case, we put an assert here, - so anyone who will add a call to sigpause will - be surprised (or surprise someone else...) */ + /* This is currently not called, because the only call to sigpause + inside XEmacs is with SIGCHLD parameter. Just in case, we put an + assert here, so anyone adds a call to sigpause will be surprised + (or surprise someone else...) */ assert (0); return 0; } -int mswindows_raise (int nsig) +int +mswindows_raise (int nsig) { /* We delegate some raises to the system routine */ if (nsig == SIGFPE || nsig == SIGABRT || nsig == SIGINT) @@ -1887,9 +1891,9 @@ int mswindows_raise (int nsig) return errno = EINVAL; /* If the signal is blocked, remember to issue later */ - if (signal_block_mask & sigmask(nsig)) + if (signal_block_mask & sigmask (nsig)) { - signal_pending_mask |= sigmask(nsig); + signal_pending_mask |= sigmask (nsig); return 0; } @@ -1898,7 +1902,7 @@ int mswindows_raise (int nsig) if (signal_handlers[nsig] != SIG_DFL) { - (*signal_handlers[nsig])(nsig); + (*signal_handlers[nsig]) (nsig); return 0; } @@ -1910,122 +1914,6 @@ int mswindows_raise (int nsig) return 0; } -/*--------------------------------------------------------------------*/ -/* Async timers */ -/*--------------------------------------------------------------------*/ - -/* We emulate two timers, one for SIGALRM, another for SIGPROF. - - itimerproc() function has an implementation limitation: it does - not allow to set *both* interval and period. If an attempt is - made to set both, and then they are unequal, the function - asserts. - - Minimum timer resolution on Win32 systems varies, and is greater - than or equal than 1 ms. The resolution is always wrapped not to - attempt to get below the system defined limit. - */ - -/* Timer precision, denominator of one fraction: for 100 ms - interval, request 10 ms precision - */ -const int timer_prec = 10; - -/* Last itimervals, as set by calls to setitimer */ -static struct itimerval it_alarm; -static struct itimerval it_prof; - -/* Timer IDs as returned by MM */ -MMRESULT tid_alarm = 0; -MMRESULT tid_prof = 0; - -static void CALLBACK timer_proc (UINT uID, UINT uMsg, DWORD dwUser, - DWORD dw1, DWORD dw2) -{ - /* Just raise a signal indicated by dwUser parameter */ - mswindows_raise (dwUser); -} - -/* Divide time in ms specified by IT by DENOM. Return 1 ms - if division results in zero */ -static UINT period (const struct itimerval* it, UINT denom) -{ - static TIMECAPS time_caps; - - UINT res; - const struct timeval* tv = - (it->it_value.tv_sec == 0 && it->it_value.tv_usec == 0) - ? &it->it_interval : &it->it_value; - - /* Zero means stop timer */ - if (tv->tv_sec == 0 && tv->tv_usec == 0) - return 0; - - /* Convert to ms and divide by denom */ - res = (tv->tv_sec * 1000 + (tv->tv_usec + 500) / 1000) / denom; - - /* Converge to minimum timer resolution */ - if (time_caps.wPeriodMin == 0) - timeGetDevCaps (&time_caps, sizeof(time_caps)); - - if (res < time_caps.wPeriodMin) - res = time_caps.wPeriodMin; - - return res; -} - -static int setitimer_helper (const struct itimerval* itnew, - struct itimerval* itold, struct itimerval* itcurrent, - MMRESULT* tid, DWORD sigkind) -{ - UINT delay, resolution, event_type; - - /* First stop the old timer */ - if (*tid) - { - timeKillEvent (*tid); - timeEndPeriod (period (itcurrent, timer_prec)); - *tid = 0; - } - - /* Return old itimerval if requested */ - if (itold) - *itold = *itcurrent; - - *itcurrent = *itnew; - - /* Determine if to start new timer */ - delay = period (itnew, 1); - if (delay) - { - resolution = period (itnew, timer_prec); - event_type = (itnew->it_value.tv_sec == 0 && itnew->it_value.tv_usec == 0) - ? TIME_ONESHOT : TIME_PERIODIC; - timeBeginPeriod (resolution); - *tid = timeSetEvent (delay, resolution, timer_proc, sigkind, event_type); - } - - return !delay || *tid; -} - -int setitimer (int kind, const struct itimerval* itnew, - struct itimerval* itold) -{ - /* In this version, both interval and value are allowed - only if they are equal. */ - assert ((itnew->it_value.tv_sec == 0 && itnew->it_value.tv_usec == 0) - || (itnew->it_interval.tv_sec == 0 && itnew->it_interval.tv_usec == 0) - || (itnew->it_value.tv_sec == itnew->it_interval.tv_sec && - itnew->it_value.tv_usec == itnew->it_interval.tv_usec)); - - if (kind == ITIMER_REAL) - return setitimer_helper (itnew, itold, &it_alarm, &tid_alarm, SIGALRM); - else if (kind == ITIMER_PROF) - return setitimer_helper (itnew, itold, &it_prof, &tid_prof, SIGPROF); - else - return errno = EINVAL; -} - /*--------------------------------------------------------------------*/ /* Memory-mapped files */ @@ -2318,9 +2206,9 @@ mswindows_utime (Lisp_Object path, struct utimbuf *times) void close_file_data (file_data *p_file) { - UnmapViewOfFile (p_file->file_base); - CloseHandle (p_file->file_mapping); - CloseHandle (p_file->file); + UnmapViewOfFile (p_file->file_base); + CloseHandle (p_file->file_mapping); + CloseHandle (p_file->file); } void diff --git a/src/nt.h b/src/nt.h index 6432878..60e6efd 100644 --- a/src/nt.h +++ b/src/nt.h @@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA. */ #define INCLUDED_nt_h_ #include "syswindows.h" +#include "systime.h" /* because of struct utimbuf below */ #ifdef DEBUG_XEMACS #define DebPrint(stuff) _DebPrint stuff diff --git a/src/ntproc.c b/src/ntproc.c index 6a39332..d1daca3 100644 --- a/src/ntproc.c +++ b/src/ntproc.c @@ -1,4 +1,4 @@ -/* Process support for Windows NT port of XEMACS. +/* Old process support under MS Windows, soon to die. Copyright (C) 1992, 1995 Free Software Foundation, Inc. This file is part of XEmacs. @@ -24,6 +24,16 @@ Boston, MA 02111-1307, USA. /* Adapted for XEmacs by David Hobley */ /* Synced with FSF Emacs 19.34.6 by Marc Paquette */ +/* #### This ENTIRE file is only around because of callproc.c, which + in turn is only used in batch mode. + + We only need two things to get rid of both this and callproc.c: + + -- my `stderr-proc' ws, which adds support for a separate stderr + in asynch. subprocesses. (it's a feature in `old-call-process-internal'.) + -- a noninteractive event loop that supports processes. +*/ + #include #undef signal #undef wait @@ -1316,7 +1326,7 @@ When non-nil, they show their window in the method of their choice. &Vwin32_start_process_share_console /* When nil, processes started via start-process are given a new console. When non-nil, they share the Emacs console; this has the limitation of -allowing only only DOS subprocess to run at a time (whether started directly +allowing only one DOS subprocess to run at a time (whether started directly or indirectly by Emacs), and preventing Emacs from cleanly terminating the subprocess group, but may allow Emacs to interrupt a subprocess that doesn't otherwise respond to interrupts from Emacs. diff --git a/src/process-nt.c b/src/process-nt.c index 34da238..2cf4b68 100644 --- a/src/process-nt.c +++ b/src/process-nt.c @@ -1383,7 +1383,7 @@ vars_of_process_nt (void) &Vmswindows_start_process_share_console /* When nil, new child processes are given a new console. When non-nil, they share the Emacs console; this has the limitation of -allowing only only DOS subprocess to run at a time (whether started directly +allowing only one DOS subprocess to run at a time (whether started directly or indirectly by Emacs), and preventing Emacs from cleanly terminating the subprocess group, but may allow Emacs to interrupt a subprocess that doesn't otherwise respond to interrupts from Emacs. diff --git a/src/process-unix.c b/src/process-unix.c index df7e824..c0d1989 100644 --- a/src/process-unix.c +++ b/src/process-unix.c @@ -220,6 +220,7 @@ allocate_pty (void) allocate_pty() tries all the different known easy ways of opening a pty. In case of failure, we resort to the old BSD-style pty grovelling code in allocate_pty_the_old_fashioned_way(). */ +#ifndef FORCE_ALLOCATE_PTY_THE_OLD_FASHIONED_WAY int master_fd = -1; const char *slave_name = NULL; const char *clone = NULL; @@ -342,6 +343,7 @@ allocate_pty (void) lose: if (master_fd >= 0) close (master_fd); +#endif /* ndef FORCE_ALLOCATE_PTY_THE_OLD_FASHIONED_WAY */ return allocate_pty_the_old_fashioned_way (); } @@ -1981,7 +1983,7 @@ unix_open_multicast_group (Lisp_Object name, Lisp_Object dest, memset (&sa, 0, sizeof(sa)); sa.sin_family = AF_INET; sa.sin_port = theport; - sa.sin_addr.s_addr = htonl (inet_addr ((char *) XSTRING_DATA (dest))); + sa.sin_addr.s_addr = inet_addr ((char *) XSTRING_DATA (dest)); /* Socket configuration for reading ------------------------ */ @@ -2001,7 +2003,7 @@ unix_open_multicast_group (Lisp_Object name, Lisp_Object dest, } /* join multicast group */ - imr.imr_multiaddr.s_addr = htonl (inet_addr ((char *) XSTRING_DATA (dest))); + imr.imr_multiaddr.s_addr = inet_addr ((char *) XSTRING_DATA (dest)); imr.imr_interface.s_addr = htonl (INADDR_ANY); if (setsockopt (rs, IPPROTO_IP, IP_ADD_MEMBERSHIP, &imr, sizeof (struct ip_mreq)) < 0) diff --git a/src/profile.c b/src/profile.c index 4d097bc..91753e0 100644 --- a/src/profile.c +++ b/src/profile.c @@ -30,6 +30,10 @@ Boston, MA 02111-1307, USA. */ #include "syssignal.h" #include "systime.h" +#ifndef HAVE_SETITIMER +#error Sorry charlie. We need a scalpel and all we have is a lawnmower. +#endif + /* We implement our own profiling scheme so that we can determine things like which Lisp functions are occupying the most time. Any standard OS-provided profiling works on C functions, which is @@ -192,7 +196,7 @@ will be properly accumulated. foo.it_interval = foo.it_value; profiling_active = 1; inside_profiling = 0; - setitimer (ITIMER_PROF, &foo, 0); + qxe_setitimer (ITIMER_PROF, &foo, 0); return Qnil; } @@ -207,7 +211,7 @@ Stop profiling. foo.it_value.tv_sec = 0; foo.it_value.tv_usec = 0; foo.it_interval = foo.it_value; - setitimer (ITIMER_PROF, &foo, 0); + qxe_setitimer (ITIMER_PROF, &foo, 0); profiling_active = 0; signal (SIGPROF, fatal_error_signal); return Qnil; diff --git a/src/redisplay-gtk.c b/src/redisplay-gtk.c index f1ee926..967cf89 100644 --- a/src/redisplay-gtk.c +++ b/src/redisplay-gtk.c @@ -51,6 +51,10 @@ Boston, MA 02111-1307, USA. */ #include "file-coding.h" /* for CCL conversion */ #endif +#ifdef HAVE_POLL +#include +#endif + #define CONST const #define EOL_CURSOR_WIDTH 5 diff --git a/src/redisplay-output.c b/src/redisplay-output.c index cfd1d26..421acba 100644 --- a/src/redisplay-output.c +++ b/src/redisplay-output.c @@ -271,7 +271,7 @@ compare_runes (struct window *w, struct rune *crb, struct rune *drb) crb->findex != drb->findex || WINDOW_FACE_CACHEL_DIRTY (w, drb->findex)) { - /* We now now we are going to re-output the glyph, but since + /* Now we are going to re-output the glyph, but since this is for some internal reason not related to geometry changes, send a hint to the output routines that they can take some short cuts. This is most useful for diff --git a/src/redisplay-x.c b/src/redisplay-x.c index c1b7fca..d55a798 100644 --- a/src/redisplay-x.c +++ b/src/redisplay-x.c @@ -2065,8 +2065,8 @@ x_ring_bell (struct device *d, int volume, int pitch, int duration) /* #### grab server? */ XGetKeyboardControl (display, &state); - ctl.bell_pitch = (pitch >= 0 ? pitch : state.bell_pitch); - ctl.bell_duration = (duration >= 0 ? duration : state.bell_duration); + ctl.bell_pitch = (pitch >= 0 ? pitch : (int) state.bell_pitch); + ctl.bell_duration = (duration >= 0 ? duration : (int) state.bell_duration); XChangeKeyboardControl (display, KBBellPitch|KBBellDuration, &ctl); XBell (display, (volume * 2) - 100); diff --git a/src/redisplay.c b/src/redisplay.c index 7967999..dc7048e 100644 --- a/src/redisplay.c +++ b/src/redisplay.c @@ -4515,7 +4515,7 @@ create_string_text_block (struct window *w, Lisp_Object disp_string, goto done; } - /* #### What if we we're dealing with a display table? */ + /* #### What if we're dealing with a display table? */ if (data.start_col) data.start_col--; @@ -6276,7 +6276,8 @@ redisplay_frame (struct frame *f, int preemption_check) { struct device *d = XDEVICE (f->device); - if (preemption_check) + if (preemption_check + && !DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY)) { /* The preemption check itself takes a lot of time, so normally don't do it here. We do it if called @@ -6436,27 +6437,29 @@ static int redisplay_device (struct device *d, int automatic) { Lisp_Object frame, frmcons; - int preempted = 0; int size_change_failed = 0; struct frame *f; - if (automatic - && (MAYBE_INT_DEVMETH (d, device_implementation_flags, ()) - & XDEVIMPF_NO_AUTO_REDISPLAY)) + if (automatic && DEVICE_IMPL_FLAG (d, XDEVIMPF_NO_AUTO_REDISPLAY)) return 0; if (DEVICE_STREAM_P (d)) /* nothing to do */ return 0; /* It is possible that redisplay has been called before the - device is fully initialized. If so then continue with the - next device. */ + device is fully initialized, or that the console implementation + allows frameless devices. If so then continue with the next + device. */ if (NILP (DEVICE_SELECTED_FRAME (d))) return 0; - REDISPLAY_PREEMPTION_CHECK; - if (preempted) - return 1; + if (!DEVICE_IMPL_FLAG (d, XDEVIMPF_DONT_PREEMPT_REDISPLAY)) + { + int preempted; + REDISPLAY_PREEMPTION_CHECK; + if (preempted) + return 1; + } /* Always do the selected frame first. */ frame = DEVICE_SELECTED_FRAME (d); @@ -6470,12 +6473,11 @@ redisplay_device (struct device *d, int automatic) { if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f)) { - preempted = redisplay_frame (f, 0); + int preempted = redisplay_frame (f, 0); + if (preempted) + return 1; } - if (preempted) - return 1; - /* If the frame redisplay did not get preempted, then this flag should have gotten set to 0. It might be possible for that not to happen if a size change event were to occur at an odd @@ -6500,12 +6502,11 @@ redisplay_device (struct device *d, int automatic) { if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f)) { - preempted = redisplay_frame (f, 0); + int preempted = redisplay_frame (f, 0); + if (preempted) + return 1; } - if (preempted) - return 1; - if (f->size_change_pending) size_change_failed = 1; } @@ -7099,6 +7100,10 @@ mark_redisplay (void) FRAME_LOOP_NO_BREAK (frmcons, devcons, concons) { struct frame *f = XFRAME (XCAR (frmcons)); + /* #### urk! this does tons o' crap, such as creating lots of + structs, doing window system actions, etc. we DO NOT want to + be doing this -- marking should never change any state. + i think we can just delete this. --ben */ update_frame_window_mirror (f); mark_window_mirror (f->root_mirror); mark_gutters (f); diff --git a/src/s/sco5.h b/src/s/sco5.h index c6d7c45..b15f1d6 100644 --- a/src/s/sco5.h +++ b/src/s/sco5.h @@ -44,6 +44,7 @@ Boston, MA 02111-1307, USA. */ sprintf (pty_name, "/dev/ptyp%d", i); #define PTY_TTY_NAME_SPRINTF \ sprintf (pty_name, "/dev/ttyp%d", i); +#define FORCE_ALLOCATE_PTY_THE_OLD_FASHIONED_WAY /* We have sockets. Always. */ #ifndef HAVE_SOCKETS diff --git a/src/scrollbar-msw.c b/src/scrollbar-msw.c index 403a1dd..2d7e9a9 100644 --- a/src/scrollbar-msw.c +++ b/src/scrollbar-msw.c @@ -88,9 +88,21 @@ mswindows_free_scrollbar_instance (struct scrollbar_instance *sb) } static void +unshow_that_mofo (void *handle) +{ + ShowScrollBar ((HWND) handle, SB_CTL, 0); +} + +static void mswindows_release_scrollbar_instance (struct scrollbar_instance *sb) { - ShowScrollBar (SCROLLBAR_MSW_HANDLE (sb), SB_CTL, 0); + if (gc_in_progress) + /* #### way bogus! need to remove the offending call. + see mark_redisplay(). */ + register_post_gc_action (unshow_that_mofo, + (void *) SCROLLBAR_MSW_HANDLE (sb)); + else + ShowScrollBar (SCROLLBAR_MSW_HANDLE (sb), SB_CTL, 0); SCROLLBAR_MSW_SIZE (sb) = 0; } @@ -192,6 +204,20 @@ mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos) sb = (struct scrollbar_instance *)GetWindowLong (hwnd, GWL_USERDATA); win = real_window ((sb==NULL) ? GetFocus() : sb->mirror, 1); + /* "0 as the second parameter" refers to the call to real_window above. + This comment was taken from Ben's 21.5 code that differs somewhat + from this, I don't think the 21.4 code ever had a 0 there. + #### we're still hitting an abort here with 0 as the second + parameter, although only occasionally. It seems that sometimes we + receive events for scrollbars that don't exist anymore. I assume + it must happen like this: The user does something that causes a + scrollbar to disappear (e.g. Alt-TAB, causing recomputation of + everything in the new frame) and then immediately uses the mouse + wheel, generating scrollbar events. Both events get posted before + we have a chance to process them, and in processing the first, the + scrollbar mentioned in the second disappears. */ + if (NILP (win)) + return; frame = XWINDOW (win)->frame; f = XFRAME (frame); diff --git a/src/select-gtk.c b/src/select-gtk.c index a11cb63..665e336 100644 --- a/src/select-gtk.c +++ b/src/select-gtk.c @@ -38,6 +38,7 @@ Boston, MA 02111-1307, USA. */ #include "opaque.h" #include "frame.h" +int lisp_to_time (Lisp_Object, time_t *); static Lisp_Object Vretrieved_selection; static gboolean waiting_for_selection; Lisp_Object Vgtk_sent_selection_hooks; diff --git a/src/signal.c b/src/signal.c index 67abf86..f85d83c 100644 --- a/src/signal.c +++ b/src/signal.c @@ -102,7 +102,7 @@ set_one_shot_timer (EMACS_TIME interval) struct itimerval it; it.it_value = interval; EMACS_SET_SECS_USECS (it.it_interval, 0, 0); - setitimer (ITIMER_REAL, &it, 0); + qxe_setitimer (ITIMER_REAL, &it, 0); #else int secs; EMACS_TIME_TO_INT (interval, secs); @@ -327,6 +327,7 @@ handle_alarm_going_off (void) } #ifdef HAVE_SETITIMER + unsigned int alarm (unsigned int howlong) { @@ -340,12 +341,27 @@ alarm (unsigned int howlong) new_it.it_value.tv_usec = 0; new_it.it_interval.tv_sec = 0; new_it.it_interval.tv_usec = 0; - setitimer (ITIMER_REAL, &new_it, &old_it); + qxe_setitimer (ITIMER_REAL, &new_it, &old_it); /* Never return zero if there was a timer outstanding. */ return old_it.it_value.tv_sec + (old_it.it_value.tv_usec > 0 ? 1 : 0); } + +int +qxe_setitimer (int kind, const struct itimerval *itnew, + struct itimerval *itold) +{ +#if defined (WIN32_NATIVE) || defined (CYGWIN) + /* setitimer() does not exist on native MS Windows, and appears broken + on Cygwin. See win32.c. */ + return mswindows_setitimer (kind, itnew, itold); +#else + return setitimer (kind, itnew, itold); #endif +} + +#endif /* HAVE_SETITIMER */ + DEFUN ("waiting-for-user-input-p", Fwaiting_for_user_input_p, 0, 0, 0, /* Return non-nil if XEmacs is waiting for input from the user. diff --git a/src/symsinit.h b/src/symsinit.h index 15918cb..8900507 100644 --- a/src/symsinit.h +++ b/src/symsinit.h @@ -32,6 +32,7 @@ void init_intl_very_early (void); void init_process_times_very_early (void); void init_ralloc (void); void init_signals_very_early (void); +void init_mswindows_very_early (void); /* Early Lisp-engine initialization (dump-time for init, run-time for reinit). */ diff --git a/src/systime.h b/src/systime.h index b4497c4..915cf29 100644 --- a/src/systime.h +++ b/src/systime.h @@ -251,12 +251,46 @@ struct itimerval struct timeval it_interval; }; -int setitimer (int kind, const struct itimerval* itnew, - struct itimerval* itold); - #define ITIMER_REAL 1 #define ITIMER_PROF 2 -#endif /* WIN32_NATIVE */ +#endif /* WIN32_NATIVE || BROKEN_CYGWIN */ + +#if defined (WIN32_NATIVE) || defined (CYGWIN) + +int mswindows_setitimer (int kind, const struct itimerval *itnew, + struct itimerval *itold); + +#endif /* defined (WIN32_NATIVE) || defined (CYGWIN) */ + +/* #### Move this comment elsewhere when we figure out the place. + + "qxe" is a unique prefix used to identify encapsulations of standard + library functions. We used to play pre-processing games but in + general this leads to nothing but trouble because someone first + encountering the code will have no idea that what appears to be a + call to a library function has actually been redefined to be a call + somewhere else. This is doubly true when the redefinition occurs + in out-of-the way s+m files and only on certainly systems. + + By making the encapsulation explicit we might be making the code + that uses is slightly less pretty, but this is more than compensated + for by the huge increase in clarity. + + "Standard library function" can refer to any function in any + standard library. If we are explicitly changing the semantics + (e.g. Mule-encapsulating), we should use an extended version of + the prefix, e.g. perhaps "qxe_xlat_" for functions that Mule- + encapsulate, or "qxe_retry_" for functions that automatically + retry a system call interrupted by EINTR. In general, if there + is no prefix extension, it means the function is trying to + provide (more or less) the same semantics as the standard library + function; but be aware that the reimplementation may be incomplete + or differ in important respects. This is especially the case + when attempts are made to implement Unix functions on MS Windows. +*/ + +int qxe_setitimer (int kind, const struct itimerval *itnew, + struct itimerval *itold); #endif /* INCLUDED_systime_h_ */ diff --git a/src/win32.c b/src/win32.c index 203053b..aff1a81 100644 --- a/src/win32.c +++ b/src/win32.c @@ -22,6 +22,9 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #include "lisp.h" #include "buffer.h" + +#include "syssignal.h" +#include "systime.h" #include "syswindows.h" typedef BOOL (WINAPI *pfSwitchToThread_t) (VOID); @@ -215,6 +218,141 @@ otherwise it is an integer representing a ShowWindow flag: return Qnil; } + +/*--------------------------------------------------------------------*/ +/* Async timers */ +/*--------------------------------------------------------------------*/ + +/* setitimer() does not exist on native MS Windows, and appears broken + on Cygwin (random lockups when BROKEN_SIGIO is defined), so we + emulate in both cases by using multimedia timers. */ + +/* We emulate two timers, one for SIGALRM, another for SIGPROF. + + itimerproc() function has an implementation limitation: it does + not allow to set *both* interval and period. If an attempt is + made to set both, and then they are unequal, the function + asserts. + + Minimum timer resolution on Win32 systems varies, and is greater + than or equal than 1 ms. The resolution is always wrapped not to + attempt to get below the system defined limit. + */ + +/* Timer precision, denominator of one fraction: for 100 ms + interval, request 10 ms precision + */ +const int setitimer_helper_timer_prec = 10; + +/* Last itimervals, as set by calls to setitimer */ +static struct itimerval it_alarm; +static struct itimerval it_prof; + +/* Timer IDs as returned by MM */ +MMRESULT tid_alarm = 0; +MMRESULT tid_prof = 0; + +static void CALLBACK +setitimer_helper_proc (UINT uID, UINT uMsg, DWORD dwUser, + DWORD dw1, DWORD dw2) +{ + /* Just raise the signal indicated by the dwUser parameter */ +#ifdef CYGWIN + kill (getpid (), dwUser); +#else + mswindows_raise (dwUser); +#endif +} + +/* Divide time in ms specified by IT by DENOM. Return 1 ms + if division results in zero */ +static UINT +setitimer_helper_period (const struct itimerval* it, UINT denom) +{ + static TIMECAPS time_caps; + + UINT res; + const struct timeval* tv = + (it->it_value.tv_sec == 0 && it->it_value.tv_usec == 0) + ? &it->it_interval : &it->it_value; + + /* Zero means stop timer */ + if (tv->tv_sec == 0 && tv->tv_usec == 0) + return 0; + + /* Convert to ms and divide by denom */ + res = (tv->tv_sec * 1000 + (tv->tv_usec + 500) / 1000) / denom; + + /* Converge to minimum timer resolution */ + if (time_caps.wPeriodMin == 0) + timeGetDevCaps (&time_caps, sizeof(time_caps)); + + if (res < time_caps.wPeriodMin) + res = time_caps.wPeriodMin; + + return res; +} + +static int +setitimer_helper (const struct itimerval* itnew, + struct itimerval* itold, struct itimerval* itcurrent, + MMRESULT* tid, DWORD sigkind) +{ + UINT delay, resolution, event_type; + + /* First stop the old timer */ + if (*tid) + { + timeKillEvent (*tid); + timeEndPeriod (setitimer_helper_period (itcurrent, + setitimer_helper_timer_prec)); + *tid = 0; + } + + /* Return old itimerval if requested */ + if (itold) + *itold = *itcurrent; + + *itcurrent = *itnew; + + /* Determine if to start new timer */ + delay = setitimer_helper_period (itnew, 1); + if (delay) + { + resolution = setitimer_helper_period (itnew, + setitimer_helper_timer_prec); + event_type = (itnew->it_value.tv_sec == 0 && + itnew->it_value.tv_usec == 0) + ? TIME_ONESHOT : TIME_PERIODIC; + timeBeginPeriod (resolution); + *tid = timeSetEvent (delay, resolution, setitimer_helper_proc, sigkind, + event_type); + } + + return !delay || *tid; +} + +int +mswindows_setitimer (int kind, const struct itimerval *itnew, + struct itimerval *itold) +{ + /* In this version, both interval and value are allowed + only if they are equal. */ + assert ((itnew->it_value.tv_sec == 0 && itnew->it_value.tv_usec == 0) + || (itnew->it_interval.tv_sec == 0 && + itnew->it_interval.tv_usec == 0) + || (itnew->it_value.tv_sec == itnew->it_interval.tv_sec && + itnew->it_value.tv_usec == itnew->it_interval.tv_usec)); + + if (kind == ITIMER_REAL) + return setitimer_helper (itnew, itold, &it_alarm, &tid_alarm, SIGALRM); + else if (kind == ITIMER_PROF) + return setitimer_helper (itnew, itold, &it_prof, &tid_prof, SIGPROF); + else + return errno = EINVAL; +} + + void syms_of_win32 (void) { diff --git a/src/window.c b/src/window.c index 8d78ae8..c8eb2a8 100644 --- a/src/window.c +++ b/src/window.c @@ -2534,6 +2534,7 @@ enum window_loop GET_LRU_WINDOW, /* Arg is t for full-width windows only */ DELETE_OTHER_WINDOWS, /* Arg is window not to delete */ DELETE_BUFFER_WINDOWS, /* Arg is buffer */ + UNDEDICATE_BUFFER, /* Arg is buffer */ GET_LARGEST_WINDOW, GET_BUFFER_WINDOW_COUNT, /* Arg is buffer */ GET_BUFFER_MRU_WINDOW /* Arg is buffer */ @@ -2686,6 +2687,13 @@ window_loop (enum window_loop type, break; } + case UNDEDICATE_BUFFER: + { + if ((XBUFFER (p->buffer) == XBUFFER (obj)) && (p->dedicated)) + p->dedicated = Qnil; + break; + } + case DELETE_OTHER_WINDOWS: { /* Don't delete the last window on a frame; this can @@ -2812,6 +2820,12 @@ buffer_window_mru (struct window *w) #endif +void +undedicate_windows (Lisp_Object buffer, Lisp_Object frame) +{ + window_loop (UNDEDICATE_BUFFER, buffer, 0, frame, 1, Qnil); +} + DEFUN ("get-lru-window", Fget_lru_window, 0, 2, 0, /* Return the window least recently selected or used for display. diff --git a/src/window.h b/src/window.h index 69cd2a7..8a79336 100644 --- a/src/window.h +++ b/src/window.h @@ -361,6 +361,7 @@ int window_left_gutter_width (struct window *w, int modeline); int window_right_gutter_width (struct window *w, int modeline); void delete_all_subwindows (struct window *w); +void undedicate_windows (Lisp_Object buffer, Lisp_Object frame); void set_window_pixheight (Lisp_Object window, int pixheight, int nodelete); void set_window_pixwidth (Lisp_Object window, int pixwidth, diff --git a/tests/ChangeLog b/tests/ChangeLog index 7b13a29..6db07bb 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2001-10-23 Stephen J. Turnbull + + * XEmacs 21.4.5 "Civil Service" is released. + 2001-07-28 Stephen J. Turnbull * XEmacs 21.4.4 "Artificial Intelligence" is released. diff --git a/version.sh b/version.sh index 1f9c914..d8e7867 100644 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ emacs_is_beta= emacs_major_version=21 emacs_minor_version=4 -emacs_beta_version=4 -xemacs_codename="Artificial Intelligence" +emacs_beta_version=5 +xemacs_codename="Civil Service" infodock_major_version=4 infodock_minor_version=0 infodock_build_version=8