From: tomo Date: Thu, 30 Oct 2003 11:29:37 +0000 (+0000) Subject: XEmacs 21.4.13 "Rational FORTRAN". X-Git-Tag: r21-4-14-chise-0_21-4~2 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d81014e89b5102527e5b50aac62edeed2955671d;p=chise%2Fxemacs-chise.git.1 XEmacs 21.4.13 "Rational FORTRAN". --- diff --git a/ChangeLog b/ChangeLog index 3067e31..63a7027 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,87 @@ +2003-05-25 XEmacs Build Bot + + * XEmacs 21.4.13 is released + +2003-03-20 Stephen J. Turnbull + + * configure.in (INTPTR_T_IN_CYGWIN_TYPES_H): + Cygwin defines these types in . Detect and don't + duplicate the definition. + +2003-03-18 Stephen J. Turnbull + + * configure.usage (Usage): Use an autodetected feature as an + example of how to disable features. A Martin Buchholz Suggestion. + +2003-03-18 Stephen J. Turnbull + + * INSTALL: Give location of Darwin X11 downloads. + +2003-01-28 Stephen J. Turnbull + + * INSTALL (--with-scrollbars): + (--with-dialogs): + (--with-widgets): + (--with-athena): + Update to current reality. + +2003-01-18 Stephen J. Turnbull + + * INSTALL: + * PROBLEMS: + Mention --site-includes and subdirectories for helping configure + to find 3rd-party add-ons. + +2003-01-28 Martin Buchholz + + * configure.in (opsys): (AIX specific) + Use opsys=aix4-2 for AIX 5 and all future versions. + +2003-01-28 Martin Buchholz + * configure.in (-mthreads): (AIX specific) + Use either -mthreads or -pthread, depending on gcc versions. + gcc changed the name of the `-mthreads' option to `-pthread' + on 2000-06-12. + + Be more careful when appending "_r" to various names of xlc, + so that users can specify --compiler=/absolute/path/to/xlc + +2003-01-27 Martin Buchholz + + * configure.in: Don't disable athena just because the user + specified --with-widgets=no. + +2003-01-27 Martin Buchholz + + * configure.in (athena_3d): + AC_CHECK_LIB must always take a function as + argument, never a global variable. Some linkers can tell the + difference. So change: + threeDClassRec ==> Xaw3dComputeBottomShadowRGB + +2003-03-02 Vin Shelton + + * etc/BETA: synced up with 21.5. Original patch from + Chris Palmer . + +2003-03-02 Robert Pluim + + * configure.in : Don't use the u_int8_t etc typedefs on FreeBSD + when detecting Berkeley DB, as they conflict with . + +2003-02-01 Martin Buchholz + + * configure.in: Don't look for Motif if it's already present in + $x_includes and $x_libraries. + +2003-02-23 Stephen J. Turnbull + + * configure.in: Fix darwin regexp for pdump. + +2003-02-10 Stephen J. Turnbull + + * INSTALL: Recommend Mule, deprecate stripped binaries. + 2003-01-15 Stephen J. Turnbull * XEmacs 21.4.12 "Portable Code" is released. diff --git a/INSTALL b/INSTALL index 3cbcd98..9a3581d 100644 --- a/INSTALL +++ b/INSTALL @@ -50,13 +50,18 @@ necessary for building packages, and we may move to it for the core. ADD-ON LIBRARIES ================ -Decide on what other software packages you would like to use with -XEmacs, but are not yet available on your system. On some systems, -Motif and CDE are optional additions. On Solaris, the SUNWaudmo -package enables native sound support. There are also a number of free -software packages that XEmacs can use. If these are not yet available -on your system, obtain, build and install those external packages -before building XEmacs. The packages XEmacs can use are: +Decide which libraries you would like to use with XEmacs, but are not +yet available on your system. On some systems, X11, Motif and CDE are +optional additions. On MacOS/X systems, you may download X11R6 for +Mac OS X from http://www.apple.com/macosx/x11/download/. You need +both the runtime libraries and the SDK (in a sidebar of that page at +the time of writing). There is also a 3rd-party implementation of +X11R6 for the Mac at http://www.xdarwin.org/. On Solaris, the +SUNWaudmo package enables native sound support. There are also a +number of free software applications that XEmacs can use. If these +are not yet available on your system, obtain, build and install those +external libraries before building XEmacs. The libraries XEmacs can +use are: Xaw3d, XPM, JPEG, compface, PNG, zlib, GNU DBM, Berkeley DB, socks, term, NAS, Canna, Kinput2, SJ3, Wnn. @@ -70,12 +75,19 @@ libraries are statically linked. Use the --site-includes and --site-libraries options when building XEmacs to allow configure to find the external software packages. -If you link with dynamic (``.so'') external package libraries, which -is not recommended, you will also need to add the library directories -to the --site-runtime-libraries option. For your convenience these can -be set together by using the --with-site-prefix command. This will set -these variables as needed assuming your libraries are organised as a -typical /usr tree. +Note that for X11 includes, you should put the files in the X11 +subdirectory of the --site-includes directory. Eg, XEmacs sources +#include . In that case, you should omit the trailing +"/X11" from --site-includes, or the trailing "/includes/X11" from +--site-prefixes. The latter is convenient if your libraries are +installed under "includes/../lib". The directories specified with +--site-includes or --site-libraries take precedence over those +specified with --site-prefixes, and those take precedence over the +standard search paths. + +If you link with dynamic (``.so'') external package libraries, you +will also need to add the runtime library directories to the +--site-runtime-libraries option. PACKAGE SYSTEM ============== @@ -209,18 +221,39 @@ Motif menubar. (In fact, the Motif menubar is currently broken.) If `no' is specified then support for menubars will not be compiled in. The `--with-scrollbars=TYPE' option allows you to specify which X -toolkit you wish to use for the scrollbars. The valid options are -`lucid', `motif', `athena', `athena3d', and `no'. The default is -`lucid' which is a Motif-lookalike scrollbar. If `no' is specified -then support for scrollbars will not be compiled in. +toolkit you wish to use for the scrollbars. The `--with-dialogs=TYPE' option allows you to specify which X toolkit -you wish to use for the dialog boxes. The valid options are `athena', -`athena3d', `motif, and `no. The `lucid' option is accepted and will -result in the `athena' toolkit being used. If the Motif toolkit can be -found the default is `motif'. Otherwise, the default is `athena'. If -`no' is specified then support for dialog boxes will not be compiled -in. +you wish to use for the dialog boxes. + +The `--with-widgets=TYPE' option allows you to specify which X toolkit +you wish to use for native widgets. + + The valid options for TYPE in the `--with-scrollbars', + `--with-dialogs', and `--with-widgets' options are `lucid', + `motif', `athena', `msw', `gtk', and `no'. The `gtk' and `msw' + options are only available on the GTK and MS Windows platforms, + respectively. When available, `gtk' or `msw' and `no' are the + only options. Otherwise, for dialogs and widgets, if the Motif + toolkit can be found the default is `motif'. If not, the default + is `athena'. `lucid' is an alias for `athena'. If `no' is + specified then support for these GUI components will not be + compiled in. + + For scrollbars, the default is `lucid' which is a Motif-lookalike + scrollbar. Otherwise, if the Motif toolkit can be found the + default is `motif'. If not, the default is `athena'. If `no' is + specified then support for scrollbars will not be compiled in. + + If `athena' (or `lucid', for dialogs and widgets) is specified for + any component (even by default), the type of Athena library must + be specified using the following option if more than one is + available. It is not always possible to distinguish them, and + mixing and matching Athena libraries will result in crashes. + +The `--with-athena=TYPE' option specifies the kind of Athena library +being used. Valid values include `xaw', `3d', `xpm', `95', and `next'. +There is no default. The `--with-toolbars' option allows you to enable or disable toolbar support. The default is `yes' as long as support for a windowing @@ -308,10 +341,11 @@ version of malloc. Debug Malloc is not included with XEmacs, is intended for use only by the developers and may be obtained from . -The `--debug' and `--error-checking' options are intended for use only -by the developers. `--debug' adds code to be compiled in for -performing various tests. `--error-checking' adds additional tests to -many of the commonly used macros. +The `--debug' and `--error-checking' options are primarily useful to the +developers. `--debug' incorporates code for performing various tests, +but does not impose a speed penalty. `--error-checking' adds additional +tests to many of the commonly used macros, and imposes a speed penalty. +Neither is especially useful in most common debugging situations. The `--verbose' and `--extra-verbose' options are intended for use only by the developers. `--verbose' causes the results of all @@ -321,10 +355,15 @@ determining configure failures is the file `config.log', which contains the results of the compile and link tests used by configure. The `--with-mule' option enables (MUlti-Lingual Emacs) support, needed -to support non-Latin-1 (including Asian) languages. The Mule support -is not yet as stable or efficient as the `Latin1' support. Enabling -Mule support requires the mule-base package installed prior to -building XEmacs. The following options require Mule support: +to support non-Latin-1 (including Asian) languages. Mule support is +required for Asian language and Unicode (multibyte and wide character) +support. With the advent of the Euro and European Community +expansion, Mule support is also recommended for Western Europeans. +Enabling Mule support requires the mule-base package installed prior +to building XEmacs. The mule-ucs package is required for Unicode +support (but may be added at any time). For Europeans using Latin +alphabets, and for support for the Euro symbol, the latin-unity +package is recommended. The following options require Mule support: The `--with-xim' option enables use of the X11 XIM mechanism to allow an input method to input text into XEmacs. The input method is shared @@ -663,6 +702,15 @@ when running make in the subdirectories. Using GNU Make allows for simultaneous builds with and without the --srcdir option. +STRIPPING BINARIES +================== + +This saves nothing but a small (by modern standards) amount of disk +space; the symbol table is not loaded into memory at execution time. +If you do encounter a crash or other serious bug, the first thing the +developers will do is ask you to build an XEmacs with a full symbol +table, anyway. Don't strip the XEmacs binary. + MAIL-LOCKING POST-INSTALLATION ============================== diff --git a/PROBLEMS b/PROBLEMS index 5ef0d6a..30df425 100644 --- a/PROBLEMS +++ b/PROBLEMS @@ -59,6 +59,11 @@ library, you only need the shared library. To compile objects that link with it, you need the headers---and distros don't provide them with the libraries. You need the additional "development" package, too. +If you have installed it yourself in a non-system location, you may also +need to specify --site-includes, --site-libraries, or --site-prefixes. +Note that many packages, especially X11, expect to find includes in a +subdirectory. Eg, XEmacs #includes , not . See INSTALL. + *** Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures without also using `-fno-schedule-insns'. diff --git a/configure b/configure index 3363fa8..cba4e69 100755 --- a/configure +++ b/configure @@ -1165,12 +1165,12 @@ case "$canonical" in *-*-ultrix4.[12]* ) opsys=bsd4-3 ;; *-*-ultrix* ) opsys=ultrix4-3 ;; - *-*-aix3.1* ) opsys=aix3-1 ;; - *-*-aix3.2.5 ) opsys=aix3-2-5 ;; - *-*-aix3* ) opsys=aix3-2 ;; - *-*-aix4.0* ) opsys=aix4 ;; - *-*-aix4.1* ) opsys=aix4-1 ;; - *-*-aix4* ) opsys=aix4-2 ;; + *-*-aix3.1* ) opsys=aix3-1 ;; + *-*-aix3.2.5 ) opsys=aix3-2-5 ;; + *-*-aix3* ) opsys=aix3-2 ;; + *-*-aix4.0* ) opsys=aix4 ;; + *-*-aix4.1* ) opsys=aix4-1 ;; + *-*-aix[4-9]* ) opsys=aix4-2 ;; *-gnu* ) opsys=gnu ;; *-*-bsd4.[01] ) opsys=bsd4-1 ;; @@ -1549,7 +1549,7 @@ fi if test -z "$pdump"; then case "$opsys" in - linux* ) pdump=yes ;; *-*-darwin* ) pdump=yes ;; *) pdump=no ;; + linux* ) pdump=yes ;; darwin ) pdump=yes ;; *) pdump=no ;; esac fi @@ -1563,6 +1563,14 @@ if test "$dynamic" = "yes"; then case "$opsys" in hpux* | sunos4* | sco5 ) opsys="${opsys}-shr" ;; decosf* ) ld_call_shared="-call_shared" ;; + darwin ) { test "$extra_verbose" = "yes" && cat << \EOF + Defining DLSYM_NEEDS_UNDERSCORE +EOF +cat >> confdefs.h <<\EOF +#define DLSYM_NEEDS_UNDERSCORE 1 +EOF +} + ;; esac else case "$opsys" in sol2 ) @@ -1639,7 +1647,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:1643: checking for $ac_word" >&5 +echo "configure:1651: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1666,7 +1674,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:1670: checking for $ac_word" >&5 +echo "configure:1678: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1714,7 +1722,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:1718: checking for $ac_word" >&5 +echo "configure:1726: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1743,7 +1751,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1747: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1755: 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' @@ -1756,12 +1764,12 @@ cross_compiling=no cat > conftest.$ac_ext << EOF -#line 1760 "configure" +#line 1768 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1773: \"$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 @@ -1789,19 +1797,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:1793: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1801: 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:1798: checking whether we are using GNU C" >&5 +echo "configure:1806: 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:1813: \"$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 @@ -1819,7 +1827,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:1823: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1831: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1852,7 +1860,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:1856: checking for $ac_word" >&5 +echo "configure:1864: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1879,7 +1887,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:1883: checking for $ac_word" >&5 +echo "configure:1891: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1927,7 +1935,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:1931: checking for $ac_word" >&5 +echo "configure:1939: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1956,7 +1964,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1960: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1968: 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' @@ -1969,12 +1977,12 @@ cross_compiling=no cat > conftest.$ac_ext << EOF -#line 1973 "configure" +#line 1981 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1986: \"$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 @@ -2002,19 +2010,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:2006: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2014: 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:2011: checking whether we are using GNU C" >&5 +echo "configure:2019: 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:2026: \"$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 @@ -2032,7 +2040,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:2036: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2044: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2065,7 +2073,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:2069: checking for $ac_word" >&5 +echo "configure:2077: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2092,7 +2100,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:2096: checking for $ac_word" >&5 +echo "configure:2104: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2140,7 +2148,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:2144: checking for $ac_word" >&5 +echo "configure:2152: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2169,7 +2177,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2173: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2181: 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' @@ -2182,12 +2190,12 @@ cross_compiling=no cat > conftest.$ac_ext << EOF -#line 2186 "configure" +#line 2194 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2199: \"$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 @@ -2215,19 +2223,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:2219: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2227: 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:2224: checking whether we are using GNU C" >&5 +echo "configure:2232: 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:2239: \"$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 @@ -2245,7 +2253,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:2249: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2257: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -2282,7 +2290,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:2286: checking how to run the C preprocessor" >&5 +echo "configure:2294: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2295,13 +2303,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:2305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2313: \"$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 : @@ -2312,13 +2320,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:2322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2330: \"$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 : @@ -2329,13 +2337,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:2339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2347: \"$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 : @@ -2361,9 +2369,9 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:2365: checking for AIX" >&5 +echo "configure:2373: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:2394: checking for GNU libc" >&5 +echo "configure:2402: checking for GNU libc" >&5 cat > conftest.$ac_ext < int main() { @@ -2404,7 +2412,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_glibc=yes else @@ -2481,7 +2489,7 @@ EOF esac cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -2729,17 +2737,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:2733: checking for whether the -Kalloca compiler flag is needed" >&5 +echo "configure:2741: 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:2751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* : else @@ -2750,14 +2758,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:2769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* need_kalloca=yes else @@ -2795,7 +2803,7 @@ fi if test "$GCC" = "yes"; then echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6 -echo "configure:2799: checking for buggy gcc versions" >&5 +echo "configure:2807: 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.*) @@ -2853,7 +2861,7 @@ fi if test "$pdump" != "yes"; then echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6 -echo "configure:2857: checking for \"-z nocombreloc\" linker flag" >&5 +echo "configure:2865: checking for \"-z nocombreloc\" linker flag" >&5 case "`ld --help 2>&1`" in *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6 ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;; @@ -2942,7 +2950,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:2946: checking for dynodump" >&5 +echo "configure:2954: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -2980,12 +2988,12 @@ if test "$unexec" = "unexaix.o"; then done echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6 -echo "configure:2984: checking for terminateAndUnload in -lC" >&5 +echo "configure:2992: 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:3008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3104,7 +3112,7 @@ fi if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:3108: checking "for runtime libraries flag"" >&5 +echo "configure:3116: checking "for runtime libraries flag"" >&5 case "$opsys" in sol2 ) dash_r="-R" ;; decosf* | linux* | irix*) dash_r="-rpath " ;; @@ -3126,14 +3134,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:3145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* dash_r="$try_dash_r" else @@ -3234,10 +3242,10 @@ else fi after_morecore_hook_exists=yes echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6 -echo "configure:3238: checking for malloc_set_state" >&5 +echo "configure:3246: 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:3272: \"$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 @@ -3280,16 +3288,16 @@ doug_lea_malloc=no fi echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6 -echo "configure:3284: checking whether __after_morecore_hook exists" >&5 +echo "configure:3292: 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:3301: \"$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 @@ -3345,7 +3353,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:3349: checking for $ac_word" >&5 +echo "configure:3357: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -3400,7 +3408,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:3404: checking for a BSD compatible install" >&5 +echo "configure:3412: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" @@ -3454,7 +3462,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:3458: checking for $ac_word" >&5 +echo "configure:3466: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -3486,15 +3494,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:3490: checking for $ac_hdr" >&5 +echo "configure:3498: 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:3498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3506: \"$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* @@ -3524,10 +3532,10 @@ fi done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3528: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3536: checking for sys/wait.h that is POSIX.1 compatible" >&5 cat > conftest.$ac_ext < #include @@ -3543,7 +3551,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3567,10 +3575,10 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3571: checking for ANSI C header files" >&5 +echo "configure:3579: checking for ANSI C header files" >&5 cat > conftest.$ac_ext < #include @@ -3578,7 +3586,7 @@ cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3590: \"$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* @@ -3595,7 +3603,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 @@ -3613,7 +3621,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 @@ -3631,7 +3639,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') @@ -3642,7 +3650,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:3654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -3668,10 +3676,10 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3672: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3680: checking whether time.h and sys/time.h may both be included" >&5 cat > conftest.$ac_ext < #include @@ -3680,7 +3688,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3704,10 +3712,10 @@ EOF fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3708: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:3716: checking for sys_siglist declaration in signal.h or unistd.h" >&5 cat > conftest.$ac_ext < #include @@ -3719,7 +3727,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -3745,9 +3753,9 @@ fi echo $ac_n "checking for utime""... $ac_c" 1>&6 -echo "configure:3749: checking for utime" >&5 +echo "configure:3757: checking for utime" >&5 cat > conftest.$ac_ext < #include @@ -3755,7 +3763,7 @@ int main() { struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x); ; return 0; } EOF -if { (eval echo configure:3759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3767: \"$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 @@ -3774,10 +3782,10 @@ else for ac_func in utimes do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3778: checking for $ac_func" >&5 +echo "configure:3786: 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:3812: \"$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 @@ -3832,10 +3840,10 @@ rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3836: checking return type of signal handlers" >&5 +echo "configure:3844: checking return type of signal handlers" >&5 cat > conftest.$ac_ext < #include @@ -3852,7 +3860,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3856: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3874,10 +3882,10 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3878: checking for size_t" >&5 +echo "configure:3886: checking for size_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3908,10 +3916,10 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3912: checking for pid_t" >&5 +echo "configure:3920: checking for pid_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3942,10 +3950,10 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3946: checking for uid_t in sys/types.h" >&5 +echo "configure:3954: checking for uid_t in sys/types.h" >&5 cat > conftest.$ac_ext < EOF @@ -3981,10 +3989,10 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3985: checking for mode_t" >&5 +echo "configure:3993: checking for mode_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4015,10 +4023,10 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4019: checking for off_t" >&5 +echo "configure:4027: checking for off_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4049,10 +4057,10 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:4053: checking for ssize_t" >&5 +echo "configure:4061: checking for ssize_t" >&5 cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4084,9 +4092,9 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4088: checking for socklen_t" >&5 +echo "configure:4096: checking for socklen_t" >&5 cat > conftest.$ac_ext < #include @@ -4096,7 +4104,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -4105,7 +4113,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < #include @@ -4115,7 +4123,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""size_t" 1>&6 @@ -4147,9 +4155,9 @@ fi rm -f conftest* echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:4151: checking for struct timeval" >&5 +echo "configure:4159: checking for struct timeval" >&5 cat > conftest.$ac_ext < @@ -4165,7 +4173,7 @@ int main() { static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:4169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -4187,10 +4195,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:4191: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4199: checking whether struct tm is in sys/time.h or time.h" >&5 cat > conftest.$ac_ext < #include @@ -4198,7 +4206,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4222,10 +4230,10 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4226: checking for tm_zone in struct tm" >&5 +echo "configure:4234: checking for tm_zone in struct tm" >&5 cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -4233,7 +4241,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4256,10 +4264,10 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4260: checking for tzname" >&5 +echo "configure:4268: checking for tzname" >&5 cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -4269,7 +4277,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4295,10 +4303,10 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4299: checking for working const" >&5 +echo "configure:4307: checking for working const" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4372,7 +4380,7 @@ fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:4376: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:4384: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -4397,12 +4405,12 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:4401: checking whether byte ordering is bigendian" >&5 +echo "configure:4409: 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 @@ -4413,11 +4421,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4425: \"$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 @@ -4428,7 +4436,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:4432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -4445,7 +4453,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:4470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_bigendian=no else @@ -4485,13 +4493,12 @@ fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:4489: checking size of short" >&5 +echo "configure:4497: checking size of short" >&5 cat > conftest.$ac_ext < -#include main() { FILE *f=fopen("conftestval", "w"); @@ -4500,7 +4507,7 @@ main() exit(0); } EOF -if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -4528,13 +4535,12 @@ if test "$ac_cv_sizeof_short" = 0; then exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:4532: checking size of int" >&5 +echo "configure:4539: checking size of int" >&5 cat > conftest.$ac_ext < -#include main() { FILE *f=fopen("conftestval", "w"); @@ -4543,7 +4549,7 @@ main() exit(0); } EOF -if { (eval echo configure:4547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -4565,13 +4571,12 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:4569: checking size of long" >&5 +echo "configure:4575: checking size of long" >&5 cat > conftest.$ac_ext < -#include main() { FILE *f=fopen("conftestval", "w"); @@ -4580,7 +4585,7 @@ main() exit(0); } EOF -if { (eval echo configure:4584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -4602,13 +4607,12 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:4606: checking size of long long" >&5 +echo "configure:4611: checking size of long long" >&5 cat > conftest.$ac_ext < -#include main() { FILE *f=fopen("conftestval", "w"); @@ -4617,7 +4621,7 @@ main() exit(0); } EOF -if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4625: \"$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 @@ -4639,13 +4643,12 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:4643: checking size of void *" >&5 +echo "configure:4647: checking size of void *" >&5 cat > conftest.$ac_ext < -#include main() { FILE *f=fopen("conftestval", "w"); @@ -4654,7 +4657,7 @@ main() exit(0); } EOF -if { (eval echo configure:4658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:4661: \"$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 @@ -4676,8 +4679,34 @@ EOF +case $opsys in + cygwin* ) cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "typedef.*intptr_t;" >/dev/null 2>&1; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6 + { test "$extra_verbose" = "yes" && cat << \EOF + Defining INTPTR_T_IN_CYGWIN_TYPES_H = 1 +EOF +cat >> confdefs.h <<\EOF +#define INTPTR_T_IN_CYGWIN_TYPES_H 1 +EOF +} + +else + rm -rf conftest* + echo "$ac_t""no" 1>&6 +fi +rm -f conftest* + ;; +esac + echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:4681: checking for long file names" >&5 +echo "configure:4710: 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: @@ -4723,10 +4752,10 @@ fi echo $ac_n "checking for sin""... $ac_c" 1>&6 -echo "configure:4727: checking for sin" >&5 +echo "configure:4756: checking for sin" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4782: \"$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 @@ -4767,12 +4796,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:4771: checking for sin in -lm" >&5 +echo "configure:4800: 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:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4827,14 +4856,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:4838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4867: \"$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 @@ -4851,14 +4880,14 @@ fi rm -f conftest* echo "checking type of mail spool file locking" 1>&6 -echo "configure:4855: checking type of mail spool file locking" >&5 +echo "configure:4884: 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:4859: checking for $ac_func" >&5 +echo "configure:4888: 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:4914: \"$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 @@ -4963,12 +4992,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:4967: checking for cma_open in -lpthreads" >&5 +echo "configure:4996: 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:5012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5016,7 +5045,7 @@ esac echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:5020: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:5049: 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; @@ -5028,7 +5057,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:5032: checking for \"-z ignore\" linker flag" >&5 +echo "configure:5061: 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 ;; @@ -5039,7 +5068,7 @@ fi echo "checking "for specified window system"" 1>&6 -echo "configure:5043: checking "for specified window system"" >&5 +echo "configure:5072: checking "for specified window system"" >&5 GNOME_CONFIG=no @@ -5047,7 +5076,7 @@ GTK_CONFIG=no if test "$with_gnome" != "no"; then echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6 -echo "configure:5051: checking for GNOME configuration script" >&5 +echo "configure:5080: checking for GNOME configuration script" >&5 for possible in gnome-config do possible_version=`${possible} --version 2> /dev/null` @@ -5078,7 +5107,7 @@ fi if test "$with_gtk" != "no";then echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6 -echo "configure:5082: checking for GTK configuration script" >&5 +echo "configure:5111: checking for GTK configuration script" >&5 for possible in gtk12-config gtk14-config gtk-config do possible_version=`${possible} --version 2> /dev/null` @@ -5100,18 +5129,18 @@ fi if test "${GTK_CONFIG}" != "no"; then echo $ac_n "checking gtk version""... $ac_c" 1>&6 -echo "configure:5104: checking gtk version" >&5 +echo "configure:5133: 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:5109: checking gtk libs" >&5 +echo "configure:5138: 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:5115: checking gtk cflags" >&5 +echo "configure:5144: checking gtk cflags" >&5 GTK_CFLAGS=`${GTK_CONFIG} --cflags` if test "$GCC" = "yes"; then GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow" @@ -5121,19 +5150,19 @@ echo "configure:5115: checking gtk cflags" >&5 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6 -echo "configure:5125: checking for main in -lgdk_imlib" >&5 +echo "configure:5154: 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:5166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5155,12 +5184,12 @@ fi echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6 -echo "configure:5159: checking for Imlib_init in -lImlib" >&5 +echo "configure:5188: 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:5204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5194,10 +5223,10 @@ fi for ac_func in gdk_imlib_init do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5198: checking for $ac_func" >&5 +echo "configure:5227: 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:5253: \"$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 @@ -5299,15 +5328,15 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5303: checking for $ac_hdr" >&5 +echo "configure:5332: 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:5311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5340: \"$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* @@ -5338,19 +5367,19 @@ done echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6 -echo "configure:5342: checking for main in -lxml" >&5 +echo "configure:5371: 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:5383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5372,19 +5401,19 @@ fi echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6 -echo "configure:5376: checking for main in -lglade" >&5 +echo "configure:5405: 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:5417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5406,19 +5435,19 @@ fi echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6 -echo "configure:5410: checking for main in -lglade-gnome" >&5 +echo "configure:5439: 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:5451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5439,7 +5468,7 @@ fi cat > conftest.$ac_ext < EOF @@ -5498,7 +5527,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:5502: checking for X" >&5 +echo "configure:5531: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -5558,12 +5587,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:5567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5596: \"$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* @@ -5632,14 +5661,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:5672: \"$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. @@ -5748,17 +5777,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:5752: checking whether -R must be followed by a space" >&5 +echo "configure:5781: 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:5791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -5774,14 +5803,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:5814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -5817,12 +5846,12 @@ ac_cv_lib_dnet_dnet_ntoa=no else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:5821: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:5850: 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:5866: \"$ac_link\") 1>&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,12 +5886,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:5861: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:5890: 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:5906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5902,10 +5931,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:5906: checking for gethostbyname" >&5 +echo "configure:5935: checking for gethostbyname" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5961: \"$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 @@ -5949,12 +5978,12 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5953: checking for gethostbyname in -lnsl" >&5 +echo "configure:5982: 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:5998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5995,10 +6024,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:5999: checking for connect" >&5 +echo "configure:6028: checking for connect" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6054: \"$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 @@ -6044,12 +6073,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:6048: checking "$xe_msg_checking"" >&5 +echo "configure:6077: 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:6093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6084,10 +6113,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:6088: checking for remove" >&5 +echo "configure:6117: checking for remove" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6143: \"$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 @@ -6131,12 +6160,12 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:6135: checking for remove in -lposix" >&5 +echo "configure:6164: 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:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6171,10 +6200,10 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:6175: checking for shmat" >&5 +echo "configure:6204: checking for shmat" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6230: \"$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 @@ -6218,12 +6247,12 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:6222: checking for shmat in -lipc" >&5 +echo "configure:6251: 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:6267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6270,12 +6299,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:6274: checking "$xe_msg_checking"" >&5 +echo "configure:6303: 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:6319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6329,19 +6358,91 @@ EOF MAKE_SUBDIR="$MAKE_SUBDIR lwlib" && if test "$extra_verbose" = "yes"; then echo " Appending \"lwlib\" to \$MAKE_SUBDIR"; fi SRC_SUBDIR_DEPS="$SRC_SUBDIR_DEPS lwlib" && if test "$extra_verbose" = "yes"; then echo " Appending \"lwlib\" to \$SRC_SUBDIR_DEPS"; fi - for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do - inc_dir=`echo $lib_dir | sed -e 's/lib/include/'` - if test -d "$lib_dir" -a -d "$inc_dir"; then - case "$x_libraries" in *"$lib_dir"* ) ;; *) - x_libraries="$lib_dir $x_libraries" - X_LIBS="-L${lib_dir} $X_LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-L${lib_dir}\" to \$X_LIBS"; fi ;; - esac - case "$x_includes" in "$inc_dir"* ) ;; *) - x_includes="$inc_dir $x_includes" - X_CFLAGS="-I${inc_dir} $X_CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-I${inc_dir}\" to \$X_CFLAGS"; fi ;; - esac - break; fi - done + + ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 +echo "configure:6365: 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:6373: \"$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* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + +echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 +echo "configure:6390: 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 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + got_motif=yes +else + echo "$ac_t""no" 1>&6 +fi + + +else + echo "$ac_t""no" 1>&6 +fi + + + if test "$got_motif" != "yes"; then + for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" \ + "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do + inc_dir=`echo $lib_dir | sed -e 's/lib/include/'` + if test -d "$lib_dir" -a -d "$inc_dir"; then + case "$x_libraries" in *"$lib_dir"* ) ;; *) + x_libraries="$lib_dir $x_libraries" + X_LIBS="-L${lib_dir} $X_LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-L${lib_dir}\" to \$X_LIBS"; fi ;; + esac + case "$x_includes" in "$inc_dir"* ) ;; *) + x_includes="$inc_dir $x_includes" + X_CFLAGS="-I${inc_dir} $X_CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-I${inc_dir}\" to \$X_CFLAGS"; fi ;; + esac + break; fi + done + fi for rel in "X11R6" "X11R5" "X11R4"; do lib_dir="/usr/contrib/$rel/lib" inc_dir="/usr/contrib/$rel/include" @@ -6453,7 +6554,7 @@ EOF echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:6457: checking for X defines extracted by xmkmf" >&5 +echo "configure:6558: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -6502,15 +6603,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:6506: checking for X11/Intrinsic.h" >&5 +echo "configure:6607: 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:6514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6615: \"$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* @@ -6534,12 +6635,12 @@ fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:6538: checking for XOpenDisplay in -lX11" >&5 +echo "configure:6639: 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:6655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6575,12 +6676,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:6579: checking "$xe_msg_checking"" >&5 +echo "configure:6680: 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:6696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6618,12 +6719,12 @@ fi echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:6622: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:6723: 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:6739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6657,12 +6758,12 @@ fi echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:6661: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:6762: 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:6778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6696,14 +6797,14 @@ fi echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:6700: checking the version of X11 being used" >&5 +echo "configure:6801: 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:6707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:6808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ./conftest foobar; x11_release=$? else @@ -6734,10 +6835,10 @@ EOF for ac_func in XConvertCase do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6738: checking for $ac_func" >&5 +echo "configure:6839: 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:6865: \"$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 @@ -6792,15 +6893,15 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6796: checking for $ac_hdr" >&5 +echo "configure:6897: 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:6804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6905: \"$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* @@ -6833,10 +6934,10 @@ done for ac_func in XRegisterIMInstantiateCallback do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6837: checking for $ac_func" >&5 +echo "configure:6938: 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:6964: \"$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 @@ -6887,9 +6988,9 @@ fi done echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6 -echo "configure:6891: checking for standard XRegisterIMInstantiateCallback prototype" >&5 +echo "configure:6992: checking for standard XRegisterIMInstantiateCallback prototype" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -6922,12 +7023,12 @@ rm -f conftest* test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:6926: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:7027: 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:7043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6977,19 +7078,19 @@ EOF echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:6981: checking for main in -lXbsd" >&5 +echo "configure:7082: 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:7094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7012,13 +7113,57 @@ fi if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then if test "$GCC" = "yes"; then - X_CFLAGS="-mthreads $X_CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-mthreads\" to \$X_CFLAGS"; fi - libs_x="-mthreads $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-mthreads\" to \$libs_x"; fi + echo $ac_n "checking for name of AIX gcc threads option""... $ac_c" 1>&6 +echo "configure:7118: checking for name of AIX gcc threads option" >&5 + case `$CC -v --help 2>&1` in + *-mthreads*) aix_threads=-mthreads ;; + *) aix_threads=-pthread ;; + esac + echo "$ac_t""$aix_threads" 1>&6 + X_CFLAGS="$aix_threads $X_CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$aix_threads\" to \$X_CFLAGS"; fi + libs_x="$aix_threads $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"$aix_threads\" to \$libs_x"; fi else - case "$CC" in - "xlc" ) CC="xlc_r" ;; - "xlC" ) CC="xlC_r" ;; - "cc" ) CC="cc_r" ;; + case "$CC" in *_r) : ;; + *) + xe_save_CC="$CC" + CC="${CC}_r" + echo $ac_n "checking size of short""... $ac_c" 1>&6 +echo "configure:7132: checking size of short" >&5 + +cat > conftest.$ac_ext < +main() +{ + FILE *f=fopen("conftestval", "w"); + if (!f) exit(1); + fprintf(f, "%d\n", sizeof(short)); + exit(0); +} +EOF +if { (eval echo configure:7146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +then + ac_cv_sizeof_short=`cat conftestval` +else + conftest_rc="$?" + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_sizeof_short=0 +fi +rm -fr conftest* +echo "$ac_t""$ac_cv_sizeof_short" 1>&6 +{ test "$extra_verbose" = "yes" && cat << EOF + Defining SIZEOF_SHORT = $ac_cv_sizeof_short +EOF +cat >> confdefs.h <&6 -echo "configure:7030: checking for MS-Windows" >&5 +echo "configure:7175: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:7033: checking for main in -lgdi32" >&5 +echo "configure:7178: 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:7190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7114,12 +7259,12 @@ EOF fi fi cat > conftest.$ac_ext < int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; } EOF -if { (eval echo configure:7123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:7268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then need_event_unixoid=yes; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MSG_SELECT @@ -7183,15 +7328,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:7187: checking for X11/extensions/shape.h" >&5 +echo "configure:7332: 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:7195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7340: \"$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* @@ -7243,7 +7388,7 @@ case "$x_libraries" in *X11R4* ) esac echo "checking for WM_COMMAND option" 1>&6 -echo "configure:7247: checking for WM_COMMAND option" >&5; +echo "configure:7392: checking for WM_COMMAND option" >&5; if test "$with_wmcommand" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_WMCOMMAND @@ -7258,15 +7403,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:7262: checking for X11/Xauth.h" >&5 +echo "configure:7407: 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:7270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7415: \"$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* @@ -7289,12 +7434,12 @@ fi } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:7293: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:7438: 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:7454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7350,15 +7495,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:7354: checking for ${dir}tt_c.h" >&5 +echo "configure:7499: 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:7362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7507: \"$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* @@ -7394,12 +7539,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:7398: checking "$xe_msg_checking"" >&5 +echo "configure:7543: 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:7559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7467,15 +7612,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:7471: checking for Dt/Dt.h" >&5 +echo "configure:7616: 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:7479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7624: \"$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* @@ -7498,12 +7643,12 @@ fi } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:7502: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:7647: 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:7663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7587,7 +7732,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:7591: checking if drag and drop API is needed" >&5 +echo "configure:7736: 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 @@ -7607,18 +7752,18 @@ EOF fi echo "checking for LDAP" 1>&6 -echo "configure:7611: checking for LDAP" >&5 +echo "configure:7756: 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:7614: checking for ldap.h" >&5 +echo "configure:7759: 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:7622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7767: \"$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* @@ -7641,15 +7786,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:7645: checking for lber.h" >&5 +echo "configure:7790: 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:7653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7798: \"$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* @@ -7673,12 +7818,12 @@ fi if test "$with_ldap" != "no"; then echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6 -echo "configure:7677: checking for ldap_search in -lldap" >&5 +echo "configure:7822: 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:7838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7714,12 +7859,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:7718: checking "$xe_msg_checking"" >&5 +echo "configure:7863: 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:7879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7755,12 +7900,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:7759: checking "$xe_msg_checking"" >&5 +echo "configure:7904: 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:7920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7796,12 +7941,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:7800: checking "$xe_msg_checking"" >&5 +echo "configure:7945: 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:7961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7863,10 +8008,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:7867: checking for $ac_func" >&5 +echo "configure:8012: 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:8038: \"$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 @@ -7920,20 +8065,20 @@ fi if test "$with_postgresql" != "no"; then echo "checking for PostgreSQL" 1>&6 -echo "configure:7924: checking for PostgreSQL" >&5 +echo "configure:8069: 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:7929: checking for ${header_dir}libpq-fe.h" >&5 +echo "configure:8074: 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:7937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8082: \"$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* @@ -7957,12 +8102,12 @@ fi test -n "$libpq_fe_h_file" && { echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6 -echo "configure:7961: checking for PQconnectdb in -lpq" >&5 +echo "configure:8106: 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:8122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8006,12 +8151,12 @@ EOF echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6 -echo "configure:8010: checking for PQconnectStart in -lpq" >&5 +echo "configure:8155: 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:8171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8070,7 +8215,7 @@ fi if test "$window_system" != "none"; then echo "checking for graphics libraries" 1>&6 -echo "configure:8074: checking for graphics libraries" >&5 +echo "configure:8219: checking for graphics libraries" >&5 libpath_xpm= incpath_xpm= @@ -8096,10 +8241,10 @@ echo "configure:8074: checking for graphics libraries" >&5 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:8100: checking for Xpm - no older than 3.4f" >&5 +echo "configure:8245: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm cat > conftest.$ac_ext < @@ -8108,7 +8253,7 @@ echo "configure:8100: checking for Xpm - no older than 3.4f" >&5 XpmIncludeVersion != XpmLibraryVersion() ? 1 : XpmIncludeVersion < 30406 ? 2 : 0 ;} EOF -if { (eval echo configure:8112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8257: \"$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 @@ -8152,17 +8297,17 @@ EOF 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:8156: checking for \"FOR_MSW\" xpm" >&5 +echo "configure:8301: 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:8311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* xpm_for_msw=no else @@ -8188,15 +8333,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:8192: checking for compface.h" >&5 +echo "configure:8337: 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:8200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8345: \"$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* @@ -8219,12 +8364,12 @@ fi } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:8223: checking for UnGenFace in -lcompface" >&5 +echo "configure:8368: 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:8384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8287,12 +8432,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:8291: checking for inflate in -lc" >&5 +echo "configure:8436: 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:8452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8322,12 +8467,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6 -echo "configure:8326: checking for inflate in -lz" >&5 +echo "configure:8471: 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:8487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8357,12 +8502,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6 -echo "configure:8361: checking for inflate in -lgz" >&5 +echo "configure:8506: 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:8522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8403,15 +8548,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:8407: checking for jpeglib.h" >&5 +echo "configure:8552: 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:8415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8560: \"$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* @@ -8434,12 +8579,12 @@ fi } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:8438: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:8583: 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:8599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8486,10 +8631,10 @@ EOF png_problem="" test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:8490: checking for pow" >&5 +echo "configure:8635: checking for pow" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8661: \"$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 @@ -8533,15 +8678,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:8537: checking for png.h" >&5 +echo "configure:8682: 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:8545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8690: \"$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* @@ -8564,12 +8709,12 @@ fi } test -z "$with_png" && { echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6 -echo "configure:8568: checking for png_read_image in -lpng" >&5 +echo "configure:8713: 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:8729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8603,10 +8748,10 @@ fi } if test -z "$with_png"; then echo $ac_n "checking for workable png version information""... $ac_c" 1>&6 -echo "configure:8607: checking for workable png version information" >&5 +echo "configure:8752: checking for workable png version information" >&5 xe_check_libs="-lpng -lz" cat > conftest.$ac_ext < int main(int c, char **v) { @@ -8614,7 +8759,7 @@ echo "configure:8607: 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:8618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8763: \"$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 @@ -8657,15 +8802,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:8661: checking for tiffio.h" >&5 +echo "configure:8806: 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:8669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8814: \"$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* @@ -8688,12 +8833,12 @@ fi } test -z "$with_tiff" && { echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:8692: checking for TIFFClientOpen in -ltiff" >&5 +echo "configure:8837: 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:8853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8743,15 +8888,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:8747: checking for compface.h" >&5 +echo "configure:8892: 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:8755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8900: \"$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* @@ -8774,12 +8919,12 @@ fi } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:8778: checking for UnGenFace in -lcompface" >&5 +echo "configure:8923: 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:8939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8829,17 +8974,12 @@ fi if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:8833: checking for X11 graphics libraries" >&5 +echo "configure:8978: checking for X11 graphics libraries" >&5 fi -case "$with_widgets" in - "yes" | "athena") detect_athena=yes ;; - *) detect_athena=no ;; -esac - -if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then +if test "$with_x11" = "yes"; then echo "checking for the Athena widgets" 1>&6 -echo "configure:8843: checking for the Athena widgets" >&5 +echo "configure:8983: checking for the Athena widgets" >&5 case "$with_athena" in "xaw" | "") athena_variant=Xaw athena_3d=no ;; @@ -8850,15 +8990,17 @@ echo "configure:8843: checking for the Athena widgets" >&5 *) { echo "Error:" "Unknown Athena widget set \`$with_athena'. This should not happen." >&2; exit 1; } ;; esac + athena_3d_function=Xaw3dComputeBottomShadowRGB + if test "$athena_3d" = "no"; then echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8857: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 +echo "configure:8999: 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:9015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8884,24 +9026,24 @@ xe_check_libs="" 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:8889: checking for threeDClassRec in -l$athena_variant" >&5 -ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6 +echo "configure:9031: checking for $athena_3d_function in -l$athena_variant" >&5 +ac_lib_var=`echo $athena_variant'_'$athena_3d_function | 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:9047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8931,24 +9073,24 @@ fi else -echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6 -echo "configure:8936: checking for threeDClassRec in -l$athena_variant" >&5 -ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $athena_3d_function in -l$athena_variant""... $ac_c" 1>&6 +echo "configure:9078: checking for $athena_3d_function in -l$athena_variant" >&5 +ac_lib_var=`echo $athena_variant'_'$athena_3d_function | 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:9094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8965,24 +9107,24 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then athena_lib=$athena_variant else echo "$ac_t""no" 1>&6 -echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6 -echo "configure:8970: checking for threeDClassRec in -lXaw" >&5 -ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $athena_3d_function in -lXaw""... $ac_c" 1>&6 +echo "configure:9112: checking for $athena_3d_function in -lXaw" >&5 +ac_lib_var=`echo Xaw'_'$athena_3d_function | 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:9128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9013,15 +9155,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:9017: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:9159: 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:9025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9167: \"$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* @@ -9041,15 +9183,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:9045: checking for X11/Xaw/XawInit.h" >&5 +echo "configure:9187: 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:9053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9195: \"$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* @@ -9075,15 +9217,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:9079: checking for X11/$athena_variant/XawInit.h" >&5 +echo "configure:9221: 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:9087: \"$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* @@ -9100,15 +9242,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:9104: checking for X11/$athena_variant/ThreeD.h" >&5 +echo "configure:9246: 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:9112: \"$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* @@ -9136,15 +9278,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:9140: checking for $athena_variant/XawInit.h" >&5 +echo "configure:9282: 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:9148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9290: \"$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* @@ -9161,15 +9303,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:9165: checking for $athena_variant/ThreeD.h" >&5 +echo "configure:9307: 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:9173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9315: \"$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* @@ -9198,15 +9340,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:9202: checking for X11/Xaw3d/XawInit.h" >&5 +echo "configure:9344: 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:9210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9352: \"$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* @@ -9223,15 +9365,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:9227: checking for X11/Xaw3d/ThreeD.h" >&5 +echo "configure:9369: 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:9235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9377: \"$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* @@ -9263,15 +9405,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:9267: checking for Xaw3d/XawInit.h" >&5 +echo "configure:9409: 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:9275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9417: \"$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* @@ -9288,15 +9430,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:9292: checking for Xaw3d/ThreeD.h" >&5 +echo "configure:9434: 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:9300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9442: \"$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* @@ -9328,15 +9470,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:9332: checking for X11/Xaw/ThreeD.h" >&5 +echo "configure:9474: 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:9340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9482: \"$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* @@ -9375,15 +9517,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:9379: checking for Xm/Xm.h" >&5 +echo "configure:9521: 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:9387: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9529: \"$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* @@ -9400,12 +9542,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:9404: checking for XmStringFree in -lXm" >&5 +echo "configure:9546: 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:9562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9445,9 +9587,9 @@ fi if test "$have_motif" = "yes"; then echo $ac_n "checking for Lesstif""... $ac_c" 1>&6 -echo "configure:9449: checking for Lesstif" >&5 +echo "configure:9591: checking for Lesstif" >&5 cat > conftest.$ac_ext < #ifdef LESSTIF_VERSION @@ -9871,7 +10013,7 @@ fi if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:9875: checking for Mule-related features" >&5 +echo "configure:10017: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -9896,15 +10038,15 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9900: checking for $ac_hdr" >&5 +echo "configure:10042: 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:9908: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10050: \"$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* @@ -9935,12 +10077,12 @@ done echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:9939: checking for strerror in -lintl" >&5 +echo "configure:10081: 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:10097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9984,18 +10126,18 @@ fi echo "checking for Mule input methods" 1>&6 -echo "configure:9988: checking for Mule input methods" >&5 +echo "configure:10130: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:9991: checking for XIM" >&5 +echo "configure:10133: checking for XIM" >&5 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6 -echo "configure:9994: checking for XOpenIM in -lX11" >&5 +echo "configure:10136: 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:10152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10030,12 +10172,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:10034: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:10176: 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:10192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10111,15 +10253,15 @@ EOF if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:10115: checking for XFontSet" >&5 +echo "configure:10257: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:10118: checking for XmbDrawString in -lX11" >&5 +echo "configure:10260: 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:10276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10170,15 +10312,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:10174: checking for wnn/jllib.h" >&5 +echo "configure:10316: 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:10182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10324: \"$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* @@ -10201,15 +10343,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:10205: checking for wnn/commonhd.h" >&5 +echo "configure:10347: 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:10213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10355: \"$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* @@ -10234,10 +10376,10 @@ fi for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10238: checking for $ac_func" >&5 +echo "configure:10380: 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:10406: \"$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 @@ -10289,12 +10431,12 @@ done test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:10293: checking for crypt in -lcrypt" >&5 +echo "configure:10435: 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:10451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10340,12 +10482,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:10344: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:10486: 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:10502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10374,12 +10516,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:10378: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:10520: 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:10536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10408,12 +10550,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:10412: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:10554: 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:10570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10442,12 +10584,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:10446: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:10588: 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:10604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10506,12 +10648,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:10510: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:10652: 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:10668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10557,15 +10699,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:10561: checking for canna/jrkanji.h" >&5 +echo "configure:10703: 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:10569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10711: \"$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* @@ -10592,15 +10734,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:10596: checking for canna/jrkanji.h" >&5 +echo "configure:10738: 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:10604: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10746: \"$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* @@ -10628,15 +10770,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:10632: checking for canna/RK.h" >&5 +echo "configure:10774: 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:10640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10782: \"$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* @@ -10659,12 +10801,12 @@ fi } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:10663: checking for RkBgnBun in -lRKC" >&5 +echo "configure:10805: 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:10821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10698,12 +10840,12 @@ fi } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:10702: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:10844: 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:10860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10763,12 +10905,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:10767: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:10909: 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:10925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10866,10 +11008,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:10870: checking for $ac_func" >&5 +echo "configure:11012: 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:11038: \"$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 @@ -10933,10 +11075,10 @@ fi 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:10937: checking for $ac_func" >&5 +echo "configure:11079: 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:11105: \"$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 @@ -10988,10 +11130,10 @@ done echo $ac_n "checking for openpty""... $ac_c" 1>&6 -echo "configure:10992: checking for openpty" >&5 +echo "configure:11134: checking for openpty" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11160: \"$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 @@ -11033,12 +11175,12 @@ else echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6 -echo "configure:11037: checking for openpty in -lutil" >&5 +echo "configure:11179: 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:11195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11084,15 +11226,15 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11088: checking for $ac_hdr" >&5 +echo "configure:11230: 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:11096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11238: \"$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* @@ -11128,15 +11270,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:11132: checking for $ac_hdr" >&5 +echo "configure:11274: 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:11140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11282: \"$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* @@ -11169,10 +11311,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:11173: checking for $ac_func" >&5 +echo "configure:11315: 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:11341: \"$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 @@ -11226,15 +11368,15 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11230: checking for $ac_hdr" >&5 +echo "configure:11372: 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:11238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11380: \"$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* @@ -11271,10 +11413,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:11275: checking for $ac_func" >&5 +echo "configure:11417: 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:11443: \"$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 @@ -11330,15 +11472,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:11334: checking for $ac_hdr" >&5 +echo "configure:11476: 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:11342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11484: \"$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* @@ -11374,12 +11516,12 @@ else echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:11378: checking for kstat_open in -lkstat" >&5 +echo "configure:11520: 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:11536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11425,15 +11567,15 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11429: checking for $ac_hdr" >&5 +echo "configure:11571: 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:11437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11579: \"$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* @@ -11465,12 +11607,12 @@ done echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:11469: checking for kvm_read in -lkvm" >&5 +echo "configure:11611: 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:11627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11515,16 +11657,16 @@ fi fi echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:11519: checking whether netdb declares h_errno" >&5 +echo "configure:11661: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext < int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:11528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11670: \"$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 @@ -11544,16 +11686,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:11548: checking for sigsetjmp" >&5 +echo "configure:11690: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:11557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11699: \"$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 @@ -11573,11 +11715,11 @@ fi rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:11577: checking whether localtime caches TZ" >&5 +echo "configure:11719: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext < #if STDC_HEADERS @@ -11612,7 +11754,7 @@ main() exit (0); } EOF -if { (eval echo configure:11616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -11642,9 +11784,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:11646: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:11788: 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:11811: \"$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 @@ -11687,19 +11829,19 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:11691: checking for inline" >&5 +echo "configure:11833: 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:11845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -11740,17 +11882,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:11744: checking for working alloca.h" >&5 +echo "configure:11886: 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:11754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11896: \"$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 @@ -11774,10 +11916,10 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:11778: checking for alloca" >&5 +echo "configure:11920: checking for alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11951: \"$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 @@ -11844,10 +11986,10 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:11848: checking whether alloca needs Cray hooks" >&5 +echo "configure:11990: 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:11875: checking for $ac_func" >&5 +echo "configure:12017: 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:12043: \"$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 @@ -11927,10 +12069,10 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:11931: checking stack direction for C alloca" >&5 +echo "configure:12073: 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:12095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -11979,15 +12121,15 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:11983: checking for vfork.h" >&5 +echo "configure:12125: 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:11991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12015,10 +12157,10 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:12019: checking for working vfork" >&5 +echo "configure:12161: checking for working vfork" >&5 cat > conftest.$ac_ext < @@ -12113,7 +12255,7 @@ main() { } } EOF -if { (eval echo configure:12117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_vfork_works=yes else @@ -12139,10 +12281,10 @@ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:12143: checking for working strcoll" >&5 +echo "configure:12285: checking for working strcoll" >&5 cat > conftest.$ac_ext < main () @@ -12152,7 +12294,7 @@ main () strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:12156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -12180,10 +12322,10 @@ fi for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12184: checking for $ac_func" >&5 +echo "configure:12326: 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:12352: \"$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 @@ -12234,10 +12376,10 @@ fi done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:12238: checking whether getpgrp takes no argument" >&5 +echo "configure:12380: 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:12438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -12319,10 +12461,10 @@ fi echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:12323: checking for working mmap" >&5 +echo "configure:12465: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext < #include @@ -12355,7 +12497,7 @@ int main (int argc, char *argv[]) return 1; } EOF -if { (eval echo configure:12359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:12501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -12384,9 +12526,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:12388: checking for M_MMAP_THRESHOLD" >&5 +echo "configure:12530: checking for M_MMAP_THRESHOLD" >&5 cat > conftest.$ac_ext < int main() { @@ -12398,7 +12540,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:12402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* rel_alloc=no; echo "$ac_t""yes" 1>&6; else @@ -12423,15 +12565,15 @@ EOF ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:12427: checking for termios.h" >&5 +echo "configure:12569: 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:12435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12474,15 +12616,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:12478: checking for termio.h" >&5 +echo "configure:12620: 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:12486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12628: \"$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* @@ -12514,10 +12656,10 @@ fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:12518: checking for socket" >&5 +echo "configure:12660: checking for socket" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12686: \"$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 @@ -12555,15 +12697,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:12559: checking for netinet/in.h" >&5 +echo "configure:12701: 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:12567: \"$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* @@ -12580,15 +12722,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:12584: checking for arpa/inet.h" >&5 +echo "configure:12726: 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:12592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12734: \"$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* @@ -12613,9 +12755,9 @@ EOF } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:12617: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:12759: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext < @@ -12626,7 +12768,7 @@ int main() { static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:12630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12772: \"$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 @@ -12644,9 +12786,9 @@ else fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:12648: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:12790: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext < @@ -12656,7 +12798,7 @@ int main() { static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:12660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12802: \"$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 @@ -12687,10 +12829,10 @@ fi echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:12691: checking for msgget" >&5 +echo "configure:12833: checking for msgget" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12859: \"$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 @@ -12728,15 +12870,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:12732: checking for sys/ipc.h" >&5 +echo "configure:12874: 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:12740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12882: \"$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* @@ -12753,15 +12895,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:12757: checking for sys/msg.h" >&5 +echo "configure:12899: 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:12765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12907: \"$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* @@ -12799,15 +12941,15 @@ fi ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:12803: checking for dirent.h" >&5 +echo "configure:12945: 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:12811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12953: \"$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* @@ -12834,15 +12976,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:12838: checking for sys/dir.h" >&5 +echo "configure:12980: 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:12846: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12988: \"$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* @@ -12875,15 +13017,15 @@ fi ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:12879: checking for nlist.h" >&5 +echo "configure:13021: 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:12887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13029: \"$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* @@ -12913,22 +13055,22 @@ fi echo "checking "for sound support"" 1>&6 -echo "configure:12917: checking "for sound support"" >&5 +echo "configure:13059: 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:12924: checking for multimedia/audio_device.h" >&5 +echo "configure:13066: 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:12932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13074: \"$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* @@ -12976,12 +13118,12 @@ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:12980: checking for ALopenport in -laudio" >&5 +echo "configure:13122: 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:13138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13023,12 +13165,12 @@ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:13027: checking for AOpenAudio in -lAlib" >&5 +echo "configure:13169: 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:13185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13084,15 +13226,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:13088: checking for ${dir}/soundcard.h" >&5 +echo "configure:13230: 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:13096: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13238: \"$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* @@ -13146,15 +13288,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:13150: checking for audio/audiolib.h" >&5 +echo "configure:13292: 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:13158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13300: \"$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* @@ -13172,12 +13314,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:13176: checking for AuOpenServer in -laudio" >&5 +echo "configure:13318: 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:13334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13227,7 +13369,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 @@ -13258,7 +13400,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:13262: checking for $ac_word" >&5 +echo "configure:13404: 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. @@ -13287,10 +13429,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:13291: checking for esd_play_stream" >&5 +echo "configure:13433: 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:13459: \"$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 @@ -13364,7 +13506,7 @@ test -z "$with_tty" && with_tty=yes if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:13368: checking for TTY-related features" >&5 +echo "configure:13510: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -13380,12 +13522,12 @@ EOF if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:13384: checking for tgetent in -lncurses" >&5 +echo "configure:13526: 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:13542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13429,15 +13571,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:13433: checking for ncurses/curses.h" >&5 +echo "configure:13575: 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:13441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13583: \"$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* @@ -13459,15 +13601,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:13463: checking for ncurses/term.h" >&5 +echo "configure:13605: 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:13471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13613: \"$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* @@ -13497,15 +13639,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:13501: checking for ncurses/curses.h" >&5 +echo "configure:13643: 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:13509: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13651: \"$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* @@ -13540,12 +13682,12 @@ fi for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:13544: checking for tgetent in -l$lib" >&5 +echo "configure:13686: 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:13702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13581,12 +13723,12 @@ fi else if test -n "$libs_termcap" -a "$opsys" = "openbsd"; then echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:13585: checking for tgoto in -ltermcap" >&5 +echo "configure:13727: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | 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:13743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13642,12 +13784,12 @@ fi else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:13646: checking for tgetent in -lcurses" >&5 +echo "configure:13788: 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:13804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13676,12 +13818,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:13680: checking for tgetent in -ltermcap" >&5 +echo "configure:13822: 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:13838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13740,15 +13882,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:13744: checking for gpm.h" >&5 +echo "configure:13886: 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:13752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13894: \"$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* @@ -13771,12 +13913,12 @@ fi } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:13775: checking for Gpm_Open in -lgpm" >&5 +echo "configure:13917: 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:13933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13837,20 +13979,20 @@ test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ != "no no no" && echo "checking for database support" 1>&6 -echo "configure:13841: checking for database support" >&5 +echo "configure:13983: 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:13846: checking for ndbm.h" >&5 +echo "configure:13988: 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:13854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13996: \"$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* @@ -13880,12 +14022,12 @@ fi if test "$with_database_gdbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:13884: checking for dbm_open in -lgdbm" >&5 +echo "configure:14026: 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:14042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13924,10 +14066,10 @@ fi if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:13928: checking for dbm_open" >&5 +echo "configure:14070: 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:14096: \"$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 @@ -13969,12 +14111,12 @@ else echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:13973: checking for dbm_open in -ldbm" >&5 +echo "configure:14115: 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:14131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14026,10 +14168,39 @@ EOF if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:14030: checking for Berkeley db.h" >&5 +echo "configure:14172: checking for Berkeley db.h" >&5 for header in "db/db.h" "db.h"; do + case "$opsys" in + *freebsd*) cat > conftest.$ac_ext < +#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) +#ifdef HAVE_INTTYPES_H +#define __BIT_TYPES_DEFINED__ +#include +#endif +#endif +#include <$header> + +int main() { + +; return 0; } +EOF +if { (eval echo configure:14193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + db_h_file="$header"; break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + ;; + *) + cat > conftest.$ac_ext < @@ -14051,7 +14222,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_file="$header"; break else @@ -14059,6 +14230,8 @@ else cat conftest.$ac_ext >&5 fi rm -f conftest* + ;; + esac done if test -z "$db_h_file" then echo "$ac_t""no" 1>&6; with_database_berkdb=no @@ -14067,9 +14240,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:14071: checking for Berkeley DB version" >&5 +echo "configure:14244: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 1 @@ -14081,7 +14254,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 @@ -14108,10 +14281,10 @@ fi rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:14112: checking for $dbfunc" >&5 +echo "configure:14285: checking for $dbfunc" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14311: \"$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 @@ -14153,12 +14326,12 @@ else echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:14157: checking for $dbfunc in -ldb" >&5 +echo "configure:14330: 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: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 @@ -14233,12 +14406,12 @@ fi if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:14237: checking for SOCKSinit in -lsocks" >&5 +echo "configure:14410: 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:14426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14304,22 +14477,22 @@ fi if test "$with_modules" != "no"; then echo "checking for module support" 1>&6 -echo "configure:14308: checking for module support" >&5 +echo "configure:14481: 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:14315: checking for dlfcn.h" >&5 +echo "configure:14488: 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:14323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14496: \"$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* @@ -14336,16 +14509,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:14340: checking for dlopen in -lc" >&5 +echo "configure:14513: checking for dlopen in -lc" >&5 cat > conftest.$ac_ext < int main() { dlopen ("", 0); ; return 0; } EOF -if { (eval echo configure:14349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14354,18 +14527,18 @@ else rm -rf conftest* echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:14358: checking for dlopen in -ldl" >&5 +echo "configure:14531: 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:14369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_dl=yes else @@ -14394,12 +14567,12 @@ EOF else echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:14398: checking for shl_load in -ldld" >&5 +echo "configure:14571: 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:14587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14437,12 +14610,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:14441: checking for dld_init in -ldld" >&5 +echo "configure:14614: 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:14630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14498,7 +14671,7 @@ xehost=$canonical xealias=$internal_configuration echo "checking how to build dynamic libraries for ${xehost}" 1>&6 -echo "configure:14502: checking how to build dynamic libraries for ${xehost}" >&5 +echo "configure:14675: checking how to build dynamic libraries for ${xehost}" >&5 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts. case "$xehost" in *-*-linux-gnu*) ;; @@ -14526,9 +14699,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:14530: checking checking whether we are using GNU C" >&5 +echo "configure:14703: checking checking whether we are using GNU C" >&5 cat > conftest.$ac_ext <&6 -echo "configure:14554: checking how to produce PIC code" >&5 +echo "configure:14727: checking how to produce PIC code" >&5 wl= can_build_shared=yes @@ -14651,18 +14824,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:14655: checking if PIC flag ${dll_cflags} really works" >&5 +echo "configure:14828: 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:14839: \"$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 @@ -14693,7 +14866,7 @@ cc_produces_so=no xldf= xcldf= echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6 -echo "configure:14697: checking if C compiler can produce shared libraries" >&5 +echo "configure:14870: checking if C compiler can produce shared libraries" >&5 if test "$XEGCC" = yes; then xcldf="-shared" xldf="-shared" @@ -14744,14 +14917,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:14928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cc_produces_so=yes else @@ -14776,7 +14949,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:14780: checking for ld used by GCC" >&5 +echo "configure:14953: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -14802,7 +14975,7 @@ echo "configure:14780: checking for ld used by GCC" >&5 esac else echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:14806: checking for GNU ld" >&5 +echo "configure:14979: checking for GNU ld" >&5 fi if test -z "$LTLD"; then @@ -14840,7 +15013,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:14844: checking if the linker is GNU ld" >&5 +echo "configure:15017: 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 @@ -14868,7 +15041,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:14872: checking whether the linker supports shared libraries" >&5 +echo "configure:15045: checking whether the linker supports shared libraries" >&5 dll_ld=$CC dll_ldflags=$LDFLAGS ld_shlibs=yes @@ -15079,10 +15252,10 @@ EOF for ac_func in dlerror _dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15083: checking for $ac_func" >&5 +echo "configure:15256: 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:15282: \"$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 @@ -15144,11 +15317,11 @@ done fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:15325: \"$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 7dbf2d9..e348ef6 100644 --- a/configure.in +++ b/configure.in @@ -1120,12 +1120,12 @@ case "$canonical" in *-*-ultrix* ) opsys=ultrix4-3 ;; dnl AIX - *-*-aix3.1* ) opsys=aix3-1 ;; - *-*-aix3.2.5 ) opsys=aix3-2-5 ;; - *-*-aix3* ) opsys=aix3-2 ;; - *-*-aix4.0* ) opsys=aix4 ;; - *-*-aix4.1* ) opsys=aix4-1 ;; - *-*-aix4* ) opsys=aix4-2 ;; + *-*-aix3.1* ) opsys=aix3-1 ;; + *-*-aix3.2.5 ) opsys=aix3-2-5 ;; + *-*-aix3* ) opsys=aix3-2 ;; + *-*-aix4.0* ) opsys=aix4 ;; + *-*-aix4.1* ) opsys=aix4-1 ;; + *-*-aix[[4-9]]* ) opsys=aix4-2 ;; dnl Other generic OSes *-gnu* ) opsys=gnu ;; @@ -1579,9 +1579,9 @@ dnl -------------------------------------------------------------- if test -z "$pdump"; then case "$opsys" in - linux* ) pdump=yes ;; dnl glibc 2.3.1 seems to hose unexec - *-*-darwin* ) pdump=yes ;; dnl No "native" working dumper available - *) pdump=no ;; + linux* ) pdump=yes ;; dnl glibc 2.3.1 seems to hose unexec + darwin ) pdump=yes ;; dnl No "native" working dumper available + *) pdump=no ;; esac fi @@ -1595,6 +1595,7 @@ if test "$dynamic" = "yes"; then case "$opsys" in hpux* | sunos4* | sco5 ) opsys="${opsys}-shr" ;; decosf* ) ld_call_shared="-call_shared" ;; + darwin ) AC_DEFINE(DLSYM_NEEDS_UNDERSCORE) ;; esac else dnl "$dynamic" = "no" case "$opsys" in @@ -2486,6 +2487,14 @@ AC_CHECK_SIZEOF(long) AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(void *) +dnl Cygwin from 1003022 has intptr_t, uintptr_t in +case $opsys in + cygwin* ) AC_EGREP_HEADER([typedef.*intptr_t;], [cygwin/types.h], + [AC_MSG_RESULT(yes) + AC_DEFINE(INTPTR_T_IN_CYGWIN_TYPES_H,1)], + [AC_MSG_RESULT(no)]) ;; +esac + dnl check for long file names AC_SYS_LONG_FILE_NAMES @@ -2735,22 +2744,29 @@ if test "$with_x11" = "yes"; then XE_APPEND(lwlib, MAKE_SUBDIR) XE_APPEND(lwlib, SRC_SUBDIR_DEPS) - dnl Try to find Motif/CDE/Tooltalk dirs - dnl These take precedence over other X libs/includes, so PRE-pend - for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do - inc_dir=`echo $lib_dir | sed -e 's/lib/include/'` - if test -d "$lib_dir" -a -d "$inc_dir"; then - case "$x_libraries" in *"$lib_dir"* ) ;; *) - x_libraries="$lib_dir $x_libraries" - XE_PREPEND(-L${lib_dir}, X_LIBS) ;; - esac - case "$x_includes" in "$inc_dir"* ) ;; *) - x_includes="$inc_dir $x_includes" - XE_PREPEND(-I${inc_dir}, X_CFLAGS) ;; - esac - break; dnl only need ONE Motif implementation! - fi - done + + dnl Look for Motif, but only if not found in $x_includes and $x_libraries + AC_CHECK_HEADER(Xm/Xm.h, [AC_CHECK_LIB(Xm, XmStringFree, got_motif=yes)]) + + if test "$got_motif" != "yes"; then + dnl Try to find Motif/CDE/Tooltalk dirs + dnl These take precedence over other X libs/includes, so PRE-pend + for lib_dir in "/usr/dt/lib" "/usr/lib/Motif2.1" \ + "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do + inc_dir=`echo $lib_dir | sed -e 's/lib/include/'` + if test -d "$lib_dir" -a -d "$inc_dir"; then + case "$x_libraries" in *"$lib_dir"* ) ;; *) + x_libraries="$lib_dir $x_libraries" + XE_PREPEND(-L${lib_dir}, X_LIBS) ;; + esac + case "$x_includes" in "$inc_dir"* ) ;; *) + x_includes="$inc_dir $x_includes" + XE_PREPEND(-I${inc_dir}, X_CFLAGS) ;; + esac + break; dnl only need ONE Motif implementation! + fi + done + fi dnl Contrib X libs/includes do NOT take precedence, so AP-pend for rel in "X11R6" "X11R5" "X11R4"; do @@ -2909,13 +2925,24 @@ extern Bool XRegisterIMInstantiateCallback( if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then dnl X11R6 requires thread-safe code on AIX for some reason if test "$GCC" = "yes"; then - XE_PREPEND(-mthreads, X_CFLAGS) - XE_PREPEND(-mthreads, libs_x) + dnl gcc changed the name of the `-mthreads' option to `-pthread' + dnl on 2000-06-12 + AC_MSG_CHECKING(for name of AIX gcc threads option) + case `$CC -v --help 2>&1` in + *-mthreads*) aix_threads=-mthreads ;; + *) aix_threads=-pthread ;; + esac + AC_MSG_RESULT($aix_threads) + XE_PREPEND($aix_threads, X_CFLAGS) + XE_PREPEND($aix_threads, libs_x) else - case "$CC" in - "xlc" ) CC="xlc_r" ;; - "xlC" ) CC="xlC_r" ;; - "cc" ) CC="cc_r" ;; + dnl Try to use the thread-safe "_r" versions of xlc + case "$CC" in *_r) : ;; + *) + xe_save_CC="$CC" + CC="${CC}_r" + AC_CHECK_SIZEOF(short) + test "$ac_cv_sizeof_short" = 0 && CC="$xe_save_CC" ;; esac fi fi @@ -3412,15 +3439,7 @@ if test "$with_x11" = "yes"; then AC_CHECKING(for X11 graphics libraries) fi -dnl We don't automatically trigger widgets if athena is present -dnl because of stability concerns. -dnl But if the user wants widgets, still offer him autodetections -case "$with_widgets" in - "yes" | "athena") detect_athena=yes ;; - *) detect_athena=no ;; -esac - -if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then +if test "$with_x11" = "yes"; then AC_CHECKING(for the Athena widgets) dnl What in heck did the user actually want? @@ -3434,22 +3453,24 @@ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then *) XE_DIE("Unknown Athena widget set \`$with_athena'. This should not happen.") ;; esac + athena_3d_function=Xaw3dComputeBottomShadowRGB + dnl Search for the Athena library... if test "$athena_3d" = "no"; then AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, [ dnl Must not be a 3d library... - AC_CHECK_LIB($athena_variant, threeDClassRec, + AC_CHECK_LIB($athena_variant, $athena_3d_function, AC_MSG_WARN("Could not find a non-3d Athena widget library."), athena_lib=$athena_variant) ], AC_MSG_WARN("Could not find an Athena widget library.")) else dnl The real configuration, need 3d library - AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant, + AC_CHECK_LIB($athena_variant, $athena_3d_function, athena_lib=$athena_variant, dnl OK, couldn't find it with a proper name, try the standard Athena lib dnl If that is 3d, presume the user asked for what they have installed. - AC_CHECK_LIB(Xaw, threeDClassRec, + AC_CHECK_LIB(Xaw, $athena_3d_function, [ athena_lib=Xaw; AC_MSG_WARN("Assuming that libXaw is actually $athena_variant."); @@ -3519,7 +3540,7 @@ if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then else have_xaw=no -fi dnl "$with_x11" = "yes" -a "detect_athena" = "yes" +fi dnl "$with_x11" = "yes" if test "$with_x11" = "yes"; then dnl autodetect Motif - but only add to libs_x later (if necessary) @@ -4372,6 +4393,20 @@ dnl Check for Berkeley DB. if test "$with_database_berkdb" != "no"; then AC_MSG_CHECKING(for Berkeley db.h) for header in "db/db.h" "db.h"; do + case "$opsys" in + *freebsd*) + AC_TRY_COMPILE([ +#include +#if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) +#ifdef HAVE_INTTYPES_H +#define __BIT_TYPES_DEFINED__ +#include +#endif +#endif +#include <$header> +],[], db_h_file="$header"; break) + ;; + *) AC_TRY_COMPILE([ #include #if !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) @@ -4388,6 +4423,8 @@ typedef uint64_t u_int64_t; #endif #include <$header> ],[], db_h_file="$header"; break) + ;; + esac done if test -z "$db_h_file" then AC_MSG_RESULT(no); with_database_berkdb=no diff --git a/configure.usage b/configure.usage index 4dce260..dc9e691 100644 --- a/configure.usage +++ b/configure.usage @@ -15,8 +15,8 @@ Conventions for options: useful default. Denoted `(Enum)'. - Set options accept one or more types from a list of implementations of the feature. All specified implementations will be included. Prefix a type - with `no' to disable only that implementation (e.g., `--with-sound=noesd' - to disable ESD). The special values `none' and `all' must be first in the + with `no' to disable only that implementation (e.g., `--with-sound=nonas' + to disable NAS). The special values `none' and `all' must be first in the list if used. They change the defaults for all types individually from autodetect to `no' or `yes' respectively. `--with-sound=none,native' and `--with-sound=noesd,nonas,native' have the same effect. Denoted `(Set)'. diff --git a/dynodump/_dynodump.h b/dynodump/_dynodump.h index 847c4eb..c09bd7f 100644 --- a/dynodump/_dynodump.h +++ b/dynodump/_dynodump.h @@ -32,7 +32,7 @@ * Mountain View, California 94043 */ -#pragma ident "@(#) $Id: _dynodump.h,v 1.3 1997/05/29 04:22:29 steve Exp $ - SMI" +#pragma ident "@(#) $Id: _dynodump.h,v 1.5 1996/05/23 18:39:07 georgn Exp $ - SMI" #ifndef _DYNODUMP_DOT_H #define _DYNODUMP_DOT_H diff --git a/dynodump/dynodump.c b/dynodump/dynodump.c index b7090ca..b39f93b 100644 --- a/dynodump/dynodump.c +++ b/dynodump/dynodump.c @@ -73,7 +73,7 @@ * N.B. The above commentary is not quite correct in the flags have been hardwired * to RTLD_SAVREL. */ -#pragma ident "@(#) $Id: dynodump.c,v 1.8 2001/04/12 18:20:43 michaels Exp $ - SMI" +#pragma ident "@(#) $Id: dynodump.c,v 1.6.2.2 2000/09/20 02:39:17 martinb Exp $ - SMI" #define __EXTENSIONS__ 1 diff --git a/dynodump/i386/_relocate.c b/dynodump/i386/_relocate.c index f97dd1b..d3ec59c 100644 --- a/dynodump/i386/_relocate.c +++ b/dynodump/i386/_relocate.c @@ -32,7 +32,7 @@ * Mountain View, California 94043 */ -#pragma ident "@(#) $Id: _relocate.c,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI" +#pragma ident "@(#) $Id: _relocate.c,v 1.4 1995/06/26 20:12:41 georgn Exp $ - SMI" /* LINTLIBRARY */ diff --git a/dynodump/i386/machdep.h b/dynodump/i386/machdep.h index 4dc66fe..c90e29c 100644 --- a/dynodump/i386/machdep.h +++ b/dynodump/i386/machdep.h @@ -32,7 +32,7 @@ * Mountain View, California 94043 */ -#pragma ident "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:02 steve Exp $ - SMI" +#pragma ident "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:43 georgn Exp $ - SMI" /* * Global include file for all sgs Intel machine dependent macros, constants diff --git a/dynodump/ppc/_relocate.c b/dynodump/ppc/_relocate.c index 754b417..feb5ca9 100644 --- a/dynodump/ppc/_relocate.c +++ b/dynodump/ppc/_relocate.c @@ -32,7 +32,7 @@ * Mountain View, California 94043 */ -#pragma ident "@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI" +#pragma ident "@(#) $Id: _relocate.c,v 1.3 1995/06/26 20:16:39 georgn Exp $ - SMI" /* LINTLIBRARY */ diff --git a/dynodump/ppc/machdep.h b/dynodump/ppc/machdep.h index a649a9c..2a3d1e6 100644 --- a/dynodump/ppc/machdep.h +++ b/dynodump/ppc/machdep.h @@ -32,7 +32,7 @@ * Mountain View, California 94043 */ -#pragma ident "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:20 steve Exp $ - SMI" +#pragma ident "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:49 georgn Exp $ - SMI" /* * Global include file for all sgs PowerPC machine dependent macros, constants diff --git a/dynodump/sparc/_relocate.c b/dynodump/sparc/_relocate.c index 14466f0..10b0fda 100644 --- a/dynodump/sparc/_relocate.c +++ b/dynodump/sparc/_relocate.c @@ -35,7 +35,7 @@ /* * Update the value of the `_edata' and `_end' symbols. */ -#pragma ident "@(#) $Id: _relocate.c,v 1.4 1998/03/31 20:10:55 steve Exp $ - SMI" +#pragma ident "@(#) $Id: _relocate.c,v 1.4 1995/06/26 20:13:26 georgn Exp $ - SMI" #include #include diff --git a/dynodump/sparc/machdep.h b/dynodump/sparc/machdep.h index b4b76d8..972081e 100644 --- a/dynodump/sparc/machdep.h +++ b/dynodump/sparc/machdep.h @@ -32,7 +32,7 @@ * Mountain View, California 94043 */ -#pragma ident "@(#) $Id: machdep.h,v 1.3 1997/05/29 04:23:26 steve Exp $ - SMI" +#pragma ident "@(#) $Id: machdep.h,v 1.2 1995/02/16 22:58:55 georgn Exp $ - SMI" /* * Global include file for all sgs SPARC machine dependent macros, constants diff --git a/dynodump/syms.c b/dynodump/syms.c index 0ac5cb8..c060f33 100644 --- a/dynodump/syms.c +++ b/dynodump/syms.c @@ -35,7 +35,7 @@ /* * Update the value of the `_edata' and `_end' symbols. */ -#pragma ident "@(#) $Id: syms.c,v 1.3 1997/05/29 04:22:30 steve Exp $ - SMI" +#pragma ident "@(#) $Id: syms.c,v 1.2 1995/03/06 22:39:22 georgn Exp $ - SMI" #include #include diff --git a/etc/BETA b/etc/BETA index 3670938..bc85993 100644 --- a/etc/BETA +++ b/etc/BETA @@ -5,7 +5,8 @@ You are running a potentially unstable version of XEmacs. Please do not report problems with Beta XEmacs to comp.emacs.xemacs. Report -them to xemacs-beta@xemacs.org. +them to , preferably with +'M-x report-xemacs-bug RET'. ** Mailing Lists ================ @@ -44,12 +45,12 @@ or whole modules, or reimplementation of existing functions, to XEmacs. In the descriptions below, the word LIST (all uppercase) is a variable. Substitute "beta", "design", or "patches" as appropriate (to get "xemacs-beta" as the mailbox for the XEmacs Beta mailing list, -or http://www.xemacs.org/Lists/#xemacs-beta for its URL). +or for its URL). The XEmacs mailing lists are managed by the Mailman mailing list package, and the usual Mailman commands work. Do not send mailing -list requests to the main address (xemacs-LIST@xemacs.org), always -send them to xemacs-LIST-request@xemacs.org. If you have problems +list requests to the main address (), always +send them to . If you have problems with the list itself, they should be brought to the attention of the XEmacs Mailing List manager (the same mailbox, "list-manager", for all lists). All public mailing lists @@ -65,37 +66,48 @@ Mailman software; it is NOT a synonym for xemacs-LIST-request. Subscription, unsubscription, and options (such as digests and temporarily suspending delivery) can be accomplished via the web -interface at http://www.xemacs.org/Lists/#xemacs-LIST. +interface at . *** Subscribing by e-mail ------------------------- -Send an email message to xemacs-LIST-request@xemacs.org with +Send an email message to with `subscribe' (without the quotes) as the BODY of the message. *** Unsubscribing by e-mail --------------------------- -Send an email message to xemacs-LIST-request@xemacs.org with +Send an email message to with `unsubscribe' (without the quotes) as the BODY of the message. ** Beta Release Schedule ======================== -Betas are now released rather sporadically. We would like to achieve -a weekly release schedule, but personnel availability does not -permit. For access to the most recent code, use CVS (see -http://www.xemacs.org/Develop/cvsaccess.html for more information). -If you have need for FTP access, please let us know. It will make it -more likely that we release betas more often. +We would like to achieve a weekly or fortnightly release cycle (you +know the Open Source model: release early, release often), and in a +perfect world that would indeed be the case. There are at least three +things that often get in the way of that goal: 1) The Release Manager +has a life outside of XEmacs (hard to believe, I know, but true), +2) we like to make releases that will build (at least on the Release +Manager's box), and 3) Murphy likes to throw a spanner in the works +right when you least expect it (Murphy's Law: Whatever can go wrong, +will go wrong). + +If you'd like to keep right up to date and ride the bleeding edge, use +CVS (see ). If you +can't use CVS for some reason and must use FTP, please let us know. +it will make it more likely that we release betas more often. + ** Reporting Problems ===================== The best way to get problems fixed in XEmacs is to submit good problem -reports. Since this is beta software, problems are certain to exist. -Please read through all of part II of the XEmacs FAQ for an overview -of problem reporting. Other items which are most important are: +reports, 'M-x report-xemacs-bug RET' will help you do this (assuming +you have a usable XEmacs). Since this is beta software, problems are +certain to exist. Please read through all of part II of the XEmacs +FAQ for an overview of problem reporting. Other items which are most +important are: 1. Do not submit C stack backtraces without line numbers. Since it is possible to compile optimized with debug information with GCC @@ -106,16 +118,16 @@ of problem reporting. Other items which are most important are: problem is actually occurring. 2. Attempt to recreate the problem starting with an invocation of - XEmacs with `xemacs -q -no-site-file -no-autoloads'. Quite often, - problems are due to package interdependencies, and the like. An - actual bug in XEmacs should be reproducible in a default - configuration without loading any special packages (or the one or - two specific packages that cause the bug to appear). If you have - trouble getting anything to work at all with the above invocation, - use `xemacs -q -no-site-file' instead. If you need to load your - user init file or the site file to get the problem to occur, then - it has something to do with them, and you should try to isolate - the issue in those files. + XEmacs with `xemacs -no-autoloads'. Quite often, problems are + due to package interdependencies, and the like. An actual bug + in XEmacs should be reproducible in a default configuration + without loading any special packages (or the one or two specific + packages that cause the bug to appear). If you have trouble + getting anything to work at all with the above invocation, use + `xemacs -vanilla' instead. If you need to load your user init + file or the site file to get the problem to occur, then it has + something to do with them, and you should try to isolate the + issue in those files. 3. A picture can be worth a thousand words. When reporting an unusual display, it is generally best to capture the problem in a @@ -139,15 +151,15 @@ available via CVS. Please see ** Building an XEmacs from patches ================================== -All beta releases of XEmacs are included with patches from the -previous version in an attempt to keep bandwidth requirements down. -Patches should be applied with the GNU patch program in something like -the following. Let's say you're upgrading XEmacs 20.15-beta10 to -XEmacs 20.15-beta11 and you have a full unmodified XEmacs 20.15-beta10 -source tree to work with. Cd to the top level directory and issue the +All beta releases of XEmacs are included with patches from the previous +version in an attempt to keep bandwidth requirements down. Patches +should be applied with the GNU patch program in something like the +following. Let's say you're upgrading XEmacs 21.5-beta9 to XEmacs +21.5-beta10 and you have a full unmodified XEmacs 21.5-beta9 source +tree to work with. Change to the top level directory and issue the shell command: -$ gunzip -c /tmp/xemacs-20.15-b10-20.15-b11.patch.gz | patch -p1 +$ gunzip -c /tmp/xemacs-21.5.9-21.5.10.patch.gz | patch -p1 After patching, check to see that no patches were missed by doing $ find . -name \*.rej -print @@ -158,10 +170,11 @@ before building XEmacs. After seeing that there were no rejections, issue the commands $ ./config.status --recheck -$ make beta +$ make beta > ./beta.err 2>&1 +$ make check > ./xemacs-make-check.err 2>&1 -and go play minesweep for a while on an older XEmacs while the binary -is rebuilt. +Redirect the output from make to those files because you'll use them +later when you send off a build report with 'M-x build-report RET' ** Building XEmacs from a full distribution =========================================== @@ -169,72 +182,98 @@ is rebuilt. Locate a convenient place where you have at least 100MB of free space and issue the command -$ gunzip -c /tmp/xemacs-20.15-b11.tar.gz | tar xvf - +$ gunzip -c /tmp/xemacs-21.5.10.tar.gz | tar xvf - -(or simply `tar zxvf /tmp/xemacs-20.15-b11.tar.gz' if you use GNU tar). +(or simply `tar zxvf /tmp/xemacs-21.5.10.tar.gz' if you use GNU tar). cd to the top level directory and issue an appropriate configure command. One maintainer uses the following at the time of this writing: ./configure \ - --cflags="-mpentium -march=pentium -O6 -g -fno-peep-spills" \ - --error-checking=all --debug=yes \ - --with-scrollbars=athena3d --with-dialogs=athena3d \ - --with-mule --with-xfs --with-xim=xlib - -Part of the configure output is a summary that looks something like -the following. (In XEmacs 21.1 and later, this summary is also -available as the file Installation in the top directory of your build -tree, and via the command M-x describe-installation.) - -uname -a: Linux altair.xemacs.org 2.0.32 #2 Sun Nov 16 18:52:14 PST 1997 i586 - -./configure '--cflags=-mpentium -march=pentium -O6 -g -fno-peep-spills' '--error-checking=all' '--debug=yes' '--with-scrollbars=athena3d' '--with-dialogs=athena3d' '--with-mule' '--with-xfs' '--with-xim=xlib' - - -XEmacs 21.0-b34 "Oberhasli-pre2" configured for `i586-pc-linux'. - - Where should the build process find the source code? /home/xemacs/xemacs-20.0 - What installation prefix should install use? /usr/local - What operating system and machine description files should XEmacs use? - `s/linux.h' and `m/intel386.h' - What compiler should XEmacs be built with? gcc -mpentium -march=pentium -O6 -g -fno-peep-spills - Should XEmacs use the GNU version of malloc? yes - (Using Doug Lea's new malloc from the GNU C Library.) - Should XEmacs use the relocating allocator for buffers? yes - What window system should XEmacs use? x11 - Where do we find X Windows header files? /usr/X11/include - Where do we find X Windows libraries? /usr/X11/lib - Compiling in support for XAUTH. - Compiling in support for XPM images. - Compiling in support for X-Face message headers. - Compiling in support for GIF image conversion. - Compiling in support for JPEG image conversion. - Compiling in support for PNG image conversion. - Compiling in support for TIFF image conversion. - Compiling in native sound support. - Compiling in support for Berkeley DB. - Compiling in support for GNU DBM. + --extra-verbose \ + --site-prefixes=/usr/local/pgsql:/usr/local/BerkeleyDB.4.1 \ + --dynamic=yes --with-gtk=no --with-gnome=no --with-toolbars \ + --with-wmcommand --with-athena=next --with-menubars=lucid \ + --with-scrollbars=athena --with-dialogs=athena --with-widgets=athena \ + --with-gif --with-sound=native,noesd --with-site-lisp=no \ + --with-site-modules --pdump --with-mule --with-xfs --debug \ + --error-checking=all --memory-usage-stats --use-kkcc \ + --with-clash-detection + +Part of the configure output is a summary that looks something +like the following. (this summary is also available as the file +'Installation' in the top directory of your build tree, and via +the command 'M-x describe-installation RET'). + +uname -a: Linux eicq 2.4.20 #1 Wed Dec 18 02:14:29 EST 2002 i586 unknown + +./configure '--extra-verbose' '--site-prefixes=/usr/local/pgsql:/usr/local/BerkeleyDB.4.1' '--dynamic=yes' '--with-gtk=no' '--with-gnome=no' '--with-toolbars' '--with-wmcommand' '--with-athena=next' '--with-menubars=lucid' '--with-scrollbars=athena' '--with-dialogs=athena' '--with-widgets=athena' '--with-gif' '--with-sound=native,noesd' '--with-site-lisp=no' '--with-site-modules' '--pdump' '--with-mule' '--with-xfs' '--debug' '--error-checking=all' '--memory-usage-stats' '--use-kkcc' '--with-clash-detection' + + +XEmacs 21.5-b10 "burdock" (+CVS-20030131) configured for `i586-pc-linux'. + + +Compilation / Installation: + Source code location: /usr/local/src/xemacs + Installation prefix: /usr/local + Additional prefixes: /usr/local/pgsql /usr/local/BerkeleyDB.4.1 + Operating system description file: `s/linux.h' + Machine description file: `m/intel386.h' + Compiler: gcc -Wall -Wno-switch -Winline -Wmissing-prototypes -Wsign-compare -Wundef -Wstrict-prototypes -Wshadow -Wmissing-declarations -O1 -ggdb3 -Wall -Wchar-subscripts -Wunused -Wundef -Wshadow -Wsign-compare -Wmissing-declarations -march=k6 + Relocating allocator for buffers: no + GNU version of malloc: yes + - Using Doug Lea's new malloc from the GNU C Library. + +Window System: + Compiling in support for the X window system: + - X Windows headers location: /usr/X11/include + - X Windows libraries location: /usr/X11/lib + - Handling WM_COMMAND properly. + Compiling in support for the Athena widget set: + - Athena headers location: X11/neXtaw + - Athena library to link: neXtaw + Using Lucid menubars. + Using Athena scrollbars. + Using Athena dialog boxes. + Using Athena native widgets. + +TTY: Compiling in support for ncurses. Compiling in support for GPM (General Purpose Mouse). - Compiling in Mule (multi-lingual) support. - Compiling in XIM (X11R5+ I18N input method) support. - Using raw Xlib to provide XIM support. - Using XFontSet to provide bilingual menubar. - Compiling in support for Canna on Mule. - Compiling in support for the WNN input method on Mule. - Using WNN version 6. - Compiling in support for OffiX. - Compiling in support for proper session-management. - Using Lucid menubars. - Using Athena-3d scrollbars. - Using Athena-3d dialog boxes. - Compiling in DLL support. - movemail will use "dot-locking" for locking mail spool files. - Using Lisp_Objects with minimal tagbits. - Compiling in extra code for debugging. - Compiling in code for checking XEmacs memory usage. + +Images: + Compiling in support for GIF images (builtin). + Compiling in support for XPM images. + Compiling in support for PNG images. + Compiling in support for JPEG images. + Compiling in support for TIFF images. + Compiling in support for X-Face message headers. + +Sound: + Compiling in support for sound (native). + +Databases: + Compiling in support for Berkeley database. + Compiling in support for PostgreSQL. + - Using PostgreSQL header file: libpq-fe.h + - Using PostgreSQL V7 bindings. + +Internationalization: + Compiling in support for Mule (multi-lingual Emacs). + Compiling in support for XIM (X11R5+ I18N input method). + - Using raw Xlib to provide XIM support. + - Using XFontSet to provide bilingual menubar. + +Mail: + Compiling in support for "dot-locking" mail spool file locking method. + +Other Features: + Inhibiting IPv6 canonicalization at startup. + Compiling in support for dynamic shared object modules. + Using the new GC algorithms. + Using the new portable dumper. + Compiling in support for extra debugging code. WARNING: --------------------------------------------------------- WARNING: Compiling in support for runtime error checking. WARNING: XEmacs will run noticeably more slowly as a result. @@ -243,19 +282,24 @@ XEmacs 21.0-b34 "Oberhasli-pre2" configured for `i586-pc-linux'. -Then type `make' and you should have a working XEmacs. +Then... + +$ make > ./beta.err 2>&1 +$ make check > ./xemacs-make-check.err 2>&1 + +...and you should have a working XEmacs. After you have verified that you have a functional editor, fire up your favorite mail program and send a build report to -xemacs-build-reports@xemacs.org. +. -Preferrably this is done from XEmacs, following these simple steps: +Preferably this is best done from XEmacs, following these simple steps: M-x customize-group RET build-report RET M-x build-report RET See also -http://www.xemacs.org/Releases/Public-21.2/tester.html#reporting + If you create the report manually by other means, here is what the build report should include: @@ -292,7 +336,7 @@ Manual) and on Packaging (in the Lisp Reference). When bootstrapping XEmacs, you may need to manually install some packages (at least xemacs-base and efs). These packages are available -by FTP at ftp://ftp.xemacs.org/pub/xemacs/packages/. +by FTP at . ** Binary package installation ============================== @@ -315,59 +359,60 @@ groups) must be kept in synch. Assuming one is manipulating a directory called `lisp-utils', the command to rebuild the auto-autoloads.el file is: -xemacs -vanilla -batch -l autoload -f batch-update-directory lisp-utils +xemacs -vanilla -batch \ + -eval \("setq autoload-package-name \"lisp-utils\""\) \ + -f batch-update-directory lisp-utils The command to rebuild the custom-load.el file is: -xemacs -vanilla -batch -l cus-dep -f Custom-make-dependencies lisp-utils +xemacs -vanilla -batch -f Custom-make-dependencies lisp-utils -To bytecompile both of these files the command is: +To byte-compile both of these files the command is: xemacs -vanilla -batch -f batch-byte-compile \ lisp-utils/auto-autoloads.el lisp-utils/custom-load.el +Of course, being a beta tester, you'd be aware that it is much easier +to manage your XEmacs packages with PUI. + ** Building XEmacs and XEmacs packages from scratch =================================================== -To build everything completely from scratch (not a high priority as a -design goal), the following procedure should work. (I don't recommend -building this way). - -*** Phase 1 -- Get a minimal XEmacs binary with mule to build the package - lisp with. - -**** Grab a mule-base tarball and install it into a newly created package - directory. +To build everything completely from scratch isn't hard, just time +consuming. -**** Configure XEmacs with mule and a package-path including the - directory created above. +*** Step 1 - grab the sources (core and packages) -**** Do a `make dist' to build an XEmacs binary. +$ cvs -d :pserver:cvs@cvs.xemacs.org:/pack/xemacscvs login + [password: "cvs" (sans quotes)] -*** Phase 2 -- Build and install the package lisp. +$ cvs -d :pserver:cvs@cvs.xemacs.org:/pack/xemacscvs co -d xemacs-21.5 xemacs -**** Modify XEmacs.rules for local paths and the XEmacs binary created in - Phase 1. +$ cvs -d :pserver:cvs@cvs.xemacs.org:/pack/xemacscvs co packages -**** Do a make from the top level package lisp source directory.[1] +*** Step 2 - build XEmacs -**** Do `make bindist's on all the packages you wish to install and - remove the byproduct .tar.gz's. +$ cd xemacs-21.5 +$ ./configure [options...] +$ make > ./beta.err 2>&1 +$ make check > ./xemacs-make-check.err 2>&1 -*** Phase 3 -- If necessary, redump XEmacs - with the packages that require dump-time support and install it. +And optionally: -**** Reconfigure without Mule if you don't wish a Mule-ish XEmacs, and - rebuild XEmacs. +$ make install > ./xemacs-make-install.err 2>&1 -- or - +*** Step 3 - build and install the packages -**** rm lib-src/DOC src/xemacs; make +$ cd packages +$ cp Local.rules.template Local.rules -**** Install or run in-place. +Then edit Local.rules to suit your needs/environment +see: (Info-goto-node "(xemacs)Local.rules file") for details about +this file. -Note that this is in essence what `make all-elc' has always done. +And then: +$ make install * Improving XEmacs ================= @@ -382,7 +427,7 @@ acknowledged and added to the distribution, or rejected with an explanation. Progress of the patch is tracked on the XEmacs Patches mailing list, which is open subscription. (If a patch is simply intended to facilitate discussion, "I mean something that works like -this but this is really rough", a CC to XEmacs Patches is optional, +this but this is really rough", a Cc to XEmacs Patches is optional, but doesn't hurt.) Patches to XEmacs Lisp packages should be sent to the maintainer of @@ -432,12 +477,12 @@ Patches should be as single-minded as possible. Mammoth patches can be very difficult to place into the right slot. They are much easier to deal with when broken down into functional or conceptual chunks. The patches submitted by Kyle Jones and Hrvoje Niksic are stellar -examples of how to Do The Right Thing. +examples of how to "Do The Right Thing". Each patch should be accompanied by an update to the appropriate ChangeLog file. Guidelines for writing ChangeLog entries is governed by the GNU coding standards. Please see - http://www.gnu.org/prep/standards_toc.html [Change Logs section] + [Change Logs section] for details. Do not submit context diffs (either -c or -u) of ChangeLogs. Because @@ -446,8 +491,8 @@ the top), context diffs will fail to apply more often than they succeed. Simply cutting and pasting the entry from an Emacs buffer to the mail buffer (beware of tab expansion!) is probably easiest. The Patcher library also will set up your ChangeLogs for you, and copy -them to the mail. Contextless unified diffs (-U 0) are also -acceptable but perhaps more trouble than they are worth. +them to the mail. Context-less unified diffs (-U 0) are also +acceptable. *** Patch discussion etiquette ------------------------------- @@ -457,7 +502,7 @@ post it to xemacs-patches, even if there are minor points you would like to have discussed by others. Not doing so will resulting in patches getting "lost". If you expect that the patch will not be acceptable, but are using it to stimulate discussion, then don't post -to xemacs-patches. Intermediate cases are up to your judgement; +to xemacs-patches. Intermediate cases are up to your judgment; unless you're sure you'll follow up with a "real" patch, better to err on the side of posting to xemacs-patches. @@ -536,10 +581,10 @@ rapid acceptance of the package. For help in creating new packages, see the (rather sparse) discussions in the XEmacs User's Guide and the Lisp Reference Manual. The XEmacs -Package Release Engineer (Ville Skyttä is -currently serving with Peter Brown -assisting; Steve Youngs and Stephen Turnbull - also can help) is the most likely source of advice. +Package Release Engineer (Ville Skyttä is currently +serving with Norbert Koch assisting; Steve +Youngs and Stephen Turnbull +also can help) are the most likely sources of advice. *** Syncing with GNU Emacs -------------------------- diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f0cbd83..33320e9 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,11 @@ +2003-05-25 XEmacs Build Bot + + * XEmacs 21.4.13 is released + +2003-01-30 Vin Shelton + + * rcs2log: Synch to GNU version [patch from Jens Petersen]. + 2003-01-15 Stephen J. Turnbull * XEmacs 21.4.12 "Portable Code" is released. diff --git a/lib-src/rcs2log b/lib-src/rcs2log index 8fa12d9..d5b1d3f 100755 --- a/lib-src/rcs2log +++ b/lib-src/rcs2log @@ -18,6 +18,7 @@ Options: -h HOSTNAME Use HOSTNAME in change log entries (default current host). -i INDENT Indent change log lines by INDENT spaces (default 8). -l LENGTH Try to limit log lines to LENGTH characters (default 79). + -L FILE Use rlog-format FILE for source of logs. -R If no FILEs are given and RCS is used, recurse through working directory. -r OPTION Pass OPTION to subsidiary log command. -t TABWIDTH Tab stops are every TABWIDTH characters (default 8). @@ -26,11 +27,12 @@ Options: --help Output help. --version Output version number. -Report bugs to .' +Report bugs to .' -Id='$Id: rcs2log,v 1.2 1997/07/09 04:31:03 steve Exp $' +Id='$Id: rcs2log,v 1.50 2002/02/03 17:31:31 eggert Exp $' -# Copyright 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002 +# Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -47,13 +49,29 @@ Id='$Id: rcs2log,v 1.2 1997/07/09 04:31:03 steve Exp $' # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -Copyright='Copyright 1997 Free Software Foundation, Inc. +Copyright='Copyright (C) 2002 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. For more information about these matters, see the files named COPYING. Author: Paul Eggert ' +# Use the traditional C locale. +LANG=C +LANGUAGE=C +LC_ALL=C +LC_COLLATE=C +LC_CTYPE=C +LC_MESSAGES=C +LC_NUMERIC=C +LC_TIME=C +export LANG LANGUAGE LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_TIME + +# These variables each contain a single ASCII character. +# Unfortunately, there's no portable way of writing these characters +# in older Unix implementations, other than putting them directly into +# this text file. +SOH='' # SOH, octal code 001 tab=' ' nl=' ' @@ -61,8 +79,8 @@ nl=' # Parse options. # defaults -: ${AWK=awk} -: ${TMPDIR=/tmp} +AWK=${AWK-awk} +TMPDIR=${TMPDIR-/tmp} changelog=ChangeLog # change log file name datearg= # rlog date option hostname= # name of local host (if empty, will deduce it later) @@ -74,6 +92,7 @@ logTZ= # time zone for log dates (if empty, use local time) recursive= # t if we want recursive rlog revision= # t if we want revision numbers rlog_options= # options to pass to rlog +rlogfile= # log file to read from tabwidth=8 # width of horizontal tab while : @@ -83,14 +102,16 @@ do -i) indent=${2?}; shift;; -h) hostname=${2?}; shift;; -l) length=${2?}; shift;; + -L) rlogfile=${2?}; shift;; -[nu]) # -n is obsolescent; it is replaced by -u. case $1 in -n) case ${2?}${3?}${4?} in *"$tab"* | *"$nl"*) echo >&2 "$0: -n '$2' '$3' '$4': tabs, newlines not allowed" - exit 1 + exit 1;; esac - loginFullnameMailaddrs=$loginFullnameMailaddrs$nl$2$tab$3$tab$4 + login=$2 + lfm=$2$tab$3$tab$4 shift; shift; shift;; -u) # If $2 is not tab-separated, use colon for separator. @@ -101,24 +122,41 @@ do *"$tab"*) t=$tab;; *) - t=: + t=':';; esac case $2 in *"$t"*"$t"*"$t"*) echo >&2 "$0: -u '$2': too many fields" exit 1;; *"$t"*"$t"*) - ;; + uf="[^$t]*$t" # An unselected field, followed by a separator. + sf="\\([^$t]*\\)" # The selected field. + login=`expr "X$2" : "X$sf"` + lfm="$login$tab"` + expr "X$2" : "$uf$sf" + `"$tab"` + expr "X$2" : "$uf$uf$sf" + `;; *) echo >&2 "$0: -u '$2': not enough fields" - exit 1 + exit 1;; esac - loginFullnameMailaddrs=$loginFullnameMailaddrs$nl$2 - shift + shift;; esac - logins=$logins$nl$login - ;; - -r) rlog_options=$rlog_options$nl${2?}; shift;; + case $logins in + '') logins=$login;; + ?*) logins=$logins$nl$login;; + esac + case $loginFullnameMailaddrs in + '') loginFullnameMailaddrs=$lfm;; + ?*) loginFullnameMailaddrs=$loginFullnameMailaddrs$nl$lfm;; + esac;; + -r) + case $rlog_options in + '') rlog_options=${2?};; + ?*) rlog_options=$rlog_options$nl${2?};; + esac + shift;; -R) recursive=t;; -t) tabwidth=${2?}; shift;; -v) revision=t;; @@ -130,9 +168,9 @@ do -*) echo >&2 "Usage: $0 [OPTION]... [FILE ...]$nl$Help" case $1 in --help) exit 0;; - *) exit 1 + *) exit 1;; esac;; - *) break + *) break;; esac shift done @@ -144,148 +182,182 @@ month_data=' m[9]="Oct"; m[10]="Nov"; m[11]="Dec" ' +logdir=$TMPDIR/rcs2log$$ +llogout=$logdir/l +trap exit 1 2 13 15 +trap "rm -fr $logdir 2>/dev/null" 0 +(umask 077 && exec mkdir $logdir) || exit -# Put rlog output into $rlogout. - -# If no rlog options are given, -# log the revisions checked in since the first ChangeLog entry. -# Since ChangeLog is only by date, some of these revisions may be duplicates of -# what's already in ChangeLog; it's the user's responsibility to remove them. -case $rlog_options in +# If no rlog-format log file is given, generate one into $rlogfile. +case $rlogfile in '') + rlogfile=$logdir/r + + # If no rlog options are given, + # log the revisions checked in since the first ChangeLog entry. + # Since ChangeLog is only by date, some of these revisions may be duplicates of + # what's already in ChangeLog; it's the user's responsibility to remove them. + case $rlog_options in + '') + if test -s "$changelog" + then + e=' + /^[0-9]+-[0-9][0-9]-[0-9][0-9]/{ + # ISO 8601 date + print $1 + exit + } + /^... ... [ 0-9][0-9] [ 0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9]+ /{ + # old-fashioned date and time (Emacs 19.31 and earlier) + '"$month_data"' + year = $5 + for (i=0; i<=11; i++) if (m[i] == $2) break + dd = $3 + printf "%d-%02d-%02d\n", year, i+1, dd + exit + } + ' + d=`$AWK "$e" <"$changelog"` || exit + case $d in + ?*) datearg="-d>$d";; + esac + fi;; + esac + + # Use TZ specified by ChangeLog local variable, if any. if test -s "$changelog" then - e=' - /^[0-9]+-[0-9][0-9]-[0-9][0-9]/{ - # ISO 8601 date - print $1 - exit + extractTZ=' + /^.*change-log-time-zone-rule['"$tab"' ]*:['"$tab"' ]*"\([^"]*\)".*/{ + s//\1/; p; q } - /^... ... [ 0-9][0-9] [ 0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9]+ /{ - # old-fashioned date and time (Emacs 19.31 and earlier) - '"$month_data"' - year = $5 - for (i=0; i<=11; i++) if (m[i] == $2) break - dd = $3 - printf "%d-%02d-%02d\n", year, i+1, dd - exit + /^.*change-log-time-zone-rule['"$tab"' ]*:['"$tab"' ]*t.*/{ + s//UTC0/; p; q } ' - d=`$AWK "$e" <"$changelog"` || exit - case $d in - ?*) datearg="-d>$d" + logTZ=`tail "$changelog" | sed -n "$extractTZ"` + case $logTZ in + ?*) TZ=$logTZ; export TZ;; esac fi -esac -# Use TZ specified by ChangeLog local variable, if any. -if test -s "$changelog" -then - extractTZ=' - /^.*change-log-time-zone-rule['"$tab"' ]*:['"$tab"' ]*"\([^"]*\)".*/{ - s//\1/; p; q - } - /^.*change-log-time-zone-rule['"$tab"' ]*:['"$tab"' ]*t.*/{ - s//UTC0/; p; q - } - ' - logTZ=`tail "$changelog" | sed -n "$extractTZ"` - case $logTZ in - ?*) TZ=$logTZ; export TZ - esac -fi - -# If CVS is in use, examine its repository, not the normal RCS files. -if test ! -f CVS/Repository -then - rlog=rlog - repository= -else - rlog='cvs -q log' - repository=`sed 1q &2 "$0: $CVSROOT: CVSROOT has multiple ':/'s" + exit 1;; + *:/*) + # remote repository + pository=`expr "X$repository" : '.*:\(/.*\)'`;; + *) + # local repository + case $repository in + /*) ;; + *) repository=${CVSROOT?}/$repository;; + esac + if test ! -d "$repository" + then + echo >&2 "$0: $repository: bad repository (see CVS/Repository)" + exit 1 + fi + pository=$repository;; esac - if test ! -d "$repository" - then - echo >&2 "$0: $repository: bad repository (see CVS/Repository)" - exit 1 - fi - esac -fi -# Use $rlog's -zLT option, if $rlog supports it. -case `$rlog -zLT 2>&1` in -*' option'*) ;; -*) rlog_options=-zLT$nl$rlog_options -esac + # Ensure that $pository ends in exactly one slash. + while : + do + case $pository in + *//) pository=`expr "X$pository" : 'X\(.*\)/'`;; + */) break;; + *) pository=$pository/; break;; + esac + done -# With no arguments, examine all files under the RCS directory. -case $# in -0) - case $repository in - '') - oldIFS=$IFS - IFS=$nl - case $recursive in - t) - RCSdirs=`find . -name RCS -type d -print` - filesFromRCSfiles='s|,v$||; s|/RCS/|/|; s|^\./||' - files=` - { - case $RCSdirs in - ?*) find $RCSdirs \ - -type f \ - ! -name '*_' \ - ! -name ',*,' \ - ! -name '.*_' \ - ! -name .rcsfreeze.log \ - ! -name .rcsfreeze.ver \ - -print + fi + + # Use $rlog's -zLT option, if $rlog supports it. + case `$rlog -zLT 2>&1` in + *' option'*) ;; + *) + case $rlog_options in + '') rlog_options=-zLT;; + ?*) rlog_options=-zLT$nl$rlog_options;; + esac;; + esac + + # With no arguments, examine all files under the RCS directory. + case $# in + 0) + case $repository in + '') + oldIFS=$IFS + IFS=$nl + case $recursive in + t) + RCSdirs=`find . -name RCS -type d -print` + filesFromRCSfiles='s|,v$||; s|/RCS/|/|; s|^\./||' + files=` + { + case $RCSdirs in + ?*) find $RCSdirs \ + -type f \ + ! -name '*_' \ + ! -name ',*,' \ + ! -name '.*_' \ + ! -name .rcsfreeze.log \ + ! -name .rcsfreeze.ver \ + -print;; + esac + find . -name '*,v' -print + } | + sort -u | + sed "$filesFromRCSfiles" + `;; + *) + files= + for file in RCS/.* RCS/* .*,v *,v + do + case $file in + RCS/. | RCS/.. | RCS/,*, | RCS/*_) continue;; + RCS/.rcsfreeze.log | RCS/.rcsfreeze.ver) continue;; + RCS/.\* | RCS/\* | .\*,v | \*,v) test -f "$file" || continue;; + RCS/*,v | RCS/.*,v) ;; + RCS/* | RCS/.*) test -f "$file" || continue;; esac - find . -name '*,v' -print - } | - sort -u | - sed "$filesFromRCSfiles" - `;; - *) - files= - for file in RCS/.* RCS/* .*,v *,v - do - case $file in - RCS/. | RCS/.. | RCS/,*, | RCS/*_) continue;; - RCS/.rcsfreeze.log | RCS/.rcsfreeze.ver) continue;; - RCS/.\* | RCS/\* | .\*,v | \*,v) test -f "$file" || continue - esac - files=$files$nl$file - done - case $files in - '') exit 0 + case $files in + '') files=$file;; + ?*) files=$files$nl$file;; + esac + done + case $files in + '') exit 0;; + esac;; esac - esac - set x $files - shift - IFS=$oldIFS + set x $files + shift + IFS=$oldIFS;; + esac;; esac + + case $datearg in + ?*) $rlog $rlog_options "$datearg" ${1+"$@"} >$rlogfile;; + '') $rlog $rlog_options ${1+"$@"} >$rlogfile;; + esac || exit;; esac -llogout=$TMPDIR/rcs2log$$l -rlogout=$TMPDIR/rcs2log$$r -trap exit 1 2 13 15 -trap "rm -f $llogout $rlogout; exit 1" 0 -case $datearg in -?*) $rlog $rlog_options "$datearg" ${1+"$@"} >$rlogout;; -'') $rlog $rlog_options ${1+"$@"} >$rlogout -esac || exit +# Prefer the POSIX-style -k options, since POSIX 1003.1-2001 prohibits +# support for the traditional-style +M -N options. +SORT_K_OPTIONS='-k 3,4r -k 5 -k 1' +sort $SORT_K_OPTIONS /dev/null || SORT_K_OPTIONS='+2 -4r +4 +0' # Get the full name of each author the logs mention, and set initialize_fullname @@ -303,17 +375,14 @@ case $loginFullnameMailaddrs in sed 's/["\\]/\\&/g' >$llogout <$llogout || exit + output_authors='/^date: / { if ($2 ~ /^[0-9]*[-\/][0-9][0-9][-\/][0-9][0-9]$/ && $3 ~ /^[0-9][0-9]:[0-9][0-9]:[0-9][0-9][-+0-9:]*;$/ && $4 == "author:" && $5 ~ /^[^;]*;$/) { print substr($5, 1, length($5)-1) } }' authors=` - $AWK "$output_authors" <$rlogout | - case $llogout in - '') sort -u;; - ?*) sort -u | comm -23 - $llogout - esac + $AWK "$output_authors" <"$rlogfile" | sort -u | comm -23 - $llogout ` case $authors in ?*) @@ -402,21 +472,24 @@ EOF ' initialize_fullname=` - ( - cat /etc/passwd - for author in $authors - do nismatch $author passwd.org_dir - done - ypmatch $authors passwd - ) 2>/dev/null | + { + (getent passwd $authors) || + ( + cat /etc/passwd + for author in $authors + do NIS_PATH= nismatch $author passwd.org_dir + done + ypmatch $authors passwd + ) + } 2>/dev/null | $AWK -F: "$awkscript" - `$initialize_fullname + `$initialize_fullname;; esac # Function to print a single log line. # We don't use awk functions, to stay compatible with old awk versions. -# `Log' is the log message (with \n replaced by \r). +# `Log' is the log message. # `files' contains the affected files. printlogline='{ @@ -424,21 +497,27 @@ printlogline='{ # * file: (function): comment # to # * file (function): comment - if (Log ~ /^\([^)]*\): /) { + if (Log ~ /^\([^)]*\):[\t\n ]/) { i = index(Log, ")") - files = files " " substr(Log, 1, i) + filefunc = substr(Log, 1, i) + while ((j = index(filefunc, "\n"))) { + files = files " " substr(filefunc, 1, j-1) + filefunc = substr(filefunc, j+1) + } + files = files " " filefunc Log = substr(Log, i+3) } # If "label: comment" is too long, break the line after the ":". sep = " " - if ('"$length"' <= '"$indent"' + 1 + length(files) + index(Log, CR)) sep = "\n" indent_string + i = index(Log, "\n") + if ('"$length"' <= '"$indent"' + 1 + length(files) + i) sep = "\n" indent_string # Print the label. printf "%s*%s:", indent_string, files - # Print each line of the log, transliterating \r to \n. - while ((i = index(Log, CR)) != 0) { + # Print each line of the log. + while (i) { logline = substr(Log, 1, i-1) if (logline ~ /[^'"$tab"' ]/) { printf "%s%s\n", sep, logline @@ -447,6 +526,7 @@ printlogline='{ } sep = indent_string Log = substr(Log, i+1) + i = index(Log, "\n") } }' @@ -467,24 +547,27 @@ case $hostname in *) domainname=`(domainname) 2>/dev/null` && case $domainname in - *.*) hostname=$hostname.$domainname - esac - esac + *.*) hostname=$hostname.$domainname;; + esac;; + esac;; esac # Process the rlog output, generating ChangeLog style entries. # First, reformat the rlog output so that each line contains one log entry. -# Transliterate \n to \r so that multiline entries fit on a single line. +# Transliterate \n to SOH so that multiline entries fit on a single line. # Discard irrelevant rlog output. -$AWK <$rlogout ' - BEGIN { repository = "'"$repository"'" } - /^RCS file:/ { - if (repository != "") { - filename = $3 - if (substr(filename, 1, length(repository) + 1) == repository "/") { - filename = substr(filename, length(repository) + 2) +$AWK ' + BEGIN { + pository = "'"$pository"'" + SOH="'"$SOH"'" + } + /^RCS file: / { + if (pository != "") { + filename = substr($0, 11) + if (substr(filename, 1, length(pository)) == pository) { + filename = substr(filename, length(pository) + 1) } if (filename ~ /,v$/) { filename = substr(filename, 1, length(filename) - 2) @@ -497,13 +580,14 @@ $AWK <$rlogout ' } rev = "?" } - /^Working file:/ { if (repository == "") filename = $3 } + /^Working file: / { if (repository == "") filename = substr($0, 15) } /'"$rlog_revision_pattern"'/, /^(-----------*|===========*)$/ { - if ($0 ~ /'"$rlog_revision_pattern"'/) { + line = $0 + if (line ~ /'"$rlog_revision_pattern"'/) { rev = $2 next } - if ($0 ~ /^date: [0-9][- +\/0-9:]*;/) { + if (line ~ /^date: [0-9][- +\/0-9:]*;/) { date = $2 if (date ~ /\//) { # This is a traditional RCS format date YYYY/MM/DD. @@ -517,38 +601,34 @@ $AWK <$rlogout ' } time = substr($3, 1, length($3) - 1) author = substr($5, 1, length($5)-1) - printf "%s %s %s %s %s %c", filename, rev, date, time, author, 13 + printf "%s%s%s%s%s%s%s%s%s%s", filename, SOH, rev, SOH, date, SOH, time, SOH, author, SOH rev = "?" next } - if ($0 ~ /^branches: /) { next } - if ($0 ~ /^(-----------*|===========*)$/) { print ""; next } - if ($0 == "Initial revision" || $0 ~ /^file .+ was initially added on branch .+\.$/) { - $0 = "New file." - } - printf "%s%c", $0, 13 + if (line ~ /^branches: /) { next } + if (line ~ /^(-----------*|===========*)$/) { print ""; next } + if (line == "Initial revision" || line ~ /^file .+ was initially added on branch .+\.$/) { + line = "New file." + } + printf "%s%s", line, SOH } -' | +' <"$rlogfile" | # Now each line is of the form -# FILENAME REVISION YYYY-MM-DD HH:MM:SS[+-TIMEZONE] AUTHOR \rLOG -# where \r stands for a carriage return, -# and each line of the log is terminated by \r instead of \n. +# FILENAME@REVISION@YYYY-MM-DD@HH:MM:SS[+-TIMEZONE]@AUTHOR@LOG +# where @ stands for an SOH (octal code 001), +# and each line of LOG is terminated by SOH instead of \n. # Sort the log entries, first by date+time (in reverse order), # then by author, then by log entry, and finally by file name and revision # (just in case). -sort +2 -4r +4 +0 | +sort -t"$SOH" $SORT_K_OPTIONS | # Finally, reformat the sorted log entries. -$AWK ' +$AWK -F"$SOH" ' BEGIN { logTZ = "'"$logTZ"'" revision = "'"$revision"'" - # Some awk variants do not understand "\r" or "\013", so we have to - # put a carriage return directly in the file. - CR=" " # <-- There is a single CR between the " chars here. - # Initialize the fullname and mailaddr associative arrays. '"$initialize_fullname"' '"$initialize_mailaddr"' @@ -564,7 +644,8 @@ $AWK ' } { - newlog = substr($0, 1 + index($0, CR)) + newlog = "" + for (i = 6; i < NF; i++) newlog = newlog $i "\n" # Ignore log entries prefixed by "#". if (newlog ~ /^#/) { next } @@ -588,7 +669,7 @@ $AWK ' newclumpname = substr(newlog, 1, i) while (substr(newlog, i+1) ~ /^['"$tab"' ]/) i++ newlog = substr(newlog, i+1) - if (clumpname == newclumpname) sep = "" + if (clumpname == newclumpname && date == $3 && author == $5) sep = "" } printf sep clumpname = newclumpname @@ -643,7 +724,7 @@ $AWK ' # Exit successfully. -exec rm -f $llogout $rlogout +exec rm -fr $logdir # Local Variables: # tab-width:4 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 999fad7..31b8a2b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,41 @@ +2003-05-25 XEmacs Build Bot + + * XEmacs 21.4.13 is released + +2003-03-18 Stephen J. Turnbull + + * gutter-items.el (buffers-tab-filter-functions): Improve docstring. + Suggested by a Chris Palmer patch. + +2003-02-14 Ben Wing + + * byte-optimize.el: + * byte-optimize.el (byte-compile-inline-expand): + * byte-optimize.el (byte-compile-unfold-lambda): + * byte-optimize.el (byte-optimize-form-code-walker): + * byte-optimize.el (byte-optimize-form): + * byte-optimize.el (byte-decompile-bytecode-1): + * byte-optimize.el (byte-optimize-lapcode): + Review carefully and sync up to 20.7 except for areas as noted. + Fixes problem with JDE compilation. + +2003-02-05 Ben Wing + + * simple.el: + * simple.el (motion-keys-for-shifted-motion): + Omit M-S-home/end from motion keys. + +2003-02-07 Ben Wing + + * text-props.el (text-property-any): + * text-props.el (text-property-not-all): + Fix bug when end > start. + +2003-01-17 Stephen J. Turnbull + + * info.el (Info-insert-dir): Make default-directory end in + separator. Patch due to Martin Buchholz. + 2003-01-15 Stephen J. Turnbull * XEmacs 21.4.12 "Portable Code" is released. diff --git a/lisp/byte-optimize.el b/lisp/byte-optimize.el index c84fd23..22e62ce 100644 --- a/lisp/byte-optimize.el +++ b/lisp/byte-optimize.el @@ -24,7 +24,11 @@ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -;;; Synched up with: FSF 20.7. +;;; Synched up with: FSF 20.7 except where marked. +;;; [[ Synched up with: FSF 20.7. ]] +;;; DO NOT PUT IN AN INVALID SYNC MESSAGE WHEN YOU DO A PARTIAL SYNC. --ben + +;; BEGIN SYNC WITH 20.7. ;;; Commentary: @@ -292,8 +296,10 @@ (compiled-function-constants fn) (compiled-function-stack-depth fn))) (cdr form))) - (if (not (eq (car fn) 'lambda)) (error "%s is not a lambda" name)) - (cons fn (cdr form))))))) + (if (eq (car-safe fn) 'lambda) + (cons fn (cdr form)) + ;; Give up on inlining. + form)))))) ;;; ((lambda ...) ...) ;;; @@ -351,6 +357,7 @@ (byte-compile-warn "attempt to open-code %s with too many arguments" name)) form) + (setq body (mapcar 'byte-optimize-form body)) (let ((newform (if bindings (cons 'let (cons (nreverse bindings) body)) @@ -520,6 +527,14 @@ byte-compile-macro-environment)))) (byte-optimize-form form for-effect)) + ;; Support compiler macros as in cl.el. + ((and (fboundp 'compiler-macroexpand) + (symbolp (car-safe form)) + (get (car-safe form) 'cl-compiler-macro) + (not (eq form + (setq form (compiler-macroexpand form))))) + (byte-optimize-form form for-effect)) + ((not (symbolp fn)) (or (eq 'mocklisp (car-safe fn)) ; ha! (byte-compile-warn "%s is a malformed function" @@ -567,7 +582,8 @@ (progn ;; (if (equal form new) (error "bogus optimizer -- %s" opt)) (byte-compile-log " %s\t==>\t%s" form new) - (byte-optimize-form new for-effect)) + (setq new (byte-optimize-form new for-effect)) + new) form))) @@ -699,6 +715,8 @@ (list (apply fun (nreverse constants))))))))) form)) +;; END SYNC WITH 20.7. + ;;; It is not safe to optimize calls to arithmetic ops with one arg ;;; away entirely (actually, it would be safe if we know the sole arg ;;; is not a marker or if it appears in other arithmetic). @@ -762,6 +780,8 @@ ;; We don't have to check for divide-by-zero because `/' does. (t (byte-optimize-predicate form))))) +;; BEGIN SYNC WITH 20.7. + (defun byte-optimize-logmumble (form) (setq form (byte-optimize-delay-constants-math form 1 (car form))) (byte-optimize-predicate @@ -945,6 +965,8 @@ (byte-optimize-predicate form) (nth 1 form)))) +;; END SYNC WITH 20.7. + ;;; For the byte optimizer, `cond' is just overly sweet syntactic sugar. ;;; So we rewrite (cond ...) in terms of `if' and `or', ;;; which are easier to optimize. @@ -963,6 +985,8 @@ (when (cdr clauses) (list (byte-optimize-cond-1 (cdr clauses)))))) (t (error "malformed cond clause %s" (car clauses))))) +;; BEGIN SYNC WITH 20.7. + (defun byte-optimize-if (form) ;; (if ) ==> ;; (if ) ==> (progn ) @@ -1355,7 +1379,9 @@ tags))))))) ((cond ((eq op 'byte-constant2) (setq op 'byte-constant) t) ((memq op byte-constref-ops))) - (setq tmp (aref constvec offset) + (setq tmp (if (>= offset (length constvec)) + (list 'out-of-range offset) + (aref constvec offset)) offset (if (eq op 'byte-constant) (byte-compile-get-constant tmp) (or (assq tmp byte-compile-variables) @@ -1467,33 +1493,7 @@ ;;; variables. ;(defconst byte-boolean-vars -; '(abbrev-all-caps purify-flag find-file-compare-truenames -; find-file-use-truenames delete-auto-save-files byte-metering-on -; x-seppuku-on-epipe zmacs-regions zmacs-region-active-p -; zmacs-region-stays atomic-extent-goto-char-p -; suppress-early-error-handler-backtrace noninteractive -; inhibit-early-packages inhibit-autoloads debug-paths -; inhibit-site-lisp debug-on-quit debug-on-next-call -; modifier-keys-are-sticky x-allow-sendevents -; mswindows-dynamic-frame-resize focus-follows-mouse -; inhibit-input-event-recording enable-multibyte-characters -; disable-auto-save-when-buffer-shrinks -; allow-deletion-of-last-visible-frame indent-tabs-mode -; load-in-progress load-warn-when-source-newer -; load-warn-when-source-only load-ignore-elc-files -; load-force-doc-strings fail-on-bucky-bit-character-escapes -; popup-menu-titles menubar-show-keybindings completion-ignore-case -; canna-empty-info canna-through-info canna-underline -; canna-inhibit-hankakukana enable-multibyte-characters -; re-short-flag x-handle-non-fully-specified-fonts -; print-escape-newlines print-readably delete-exited-processes -; windowed-process-io visible-bell no-redraw-on-reenter -; cursor-in-echo-area inhibit-warning-display -; column-number-start-at-one parse-sexp-ignore-comments -; words-include-escapes scroll-on-clipped-lines) -; "DEFVAR_BOOL variables. Giving these any non-nil value sets them to t. -;If this does not enumerate all DEFVAR_BOOL variables, the byte-optimizer -;may generate incorrect code.") +; ...) (defun byte-optimize-lapcode (lap &optional for-effect) "Simple peephole optimizer. LAP is both modified and returned." @@ -1954,14 +1954,16 @@ (while rest (setq lap0 (car rest) lap1 (nth 1 rest)) - (case (car lap0) - ((byte-varref byte-varset byte-varbind) - (incf (gethash (cdr lap0) variable-frequency 0)) - (unless (memq (cdr lap0) byte-compile-variables) - (push (cdr lap0) byte-compile-variables))) - ((byte-constant) - (unless (memq (cdr lap0) byte-compile-constants) - (push (cdr lap0) byte-compile-constants)))) + (if (memq (car lap0) byte-constref-ops) + (if (not (eq (car lap0) 'byte-constant)) + (progn + (incf (gethash (cdr lap0) variable-frequency 0)) + (or (memq (cdr lap0) byte-compile-variables) + (setq byte-compile-variables + (cons (cdr lap0) byte-compile-variables)))) + (or (memq (cdr lap0) byte-compile-constants) + (setq byte-compile-constants (cons (cdr lap0) + byte-compile-constants))))) (cond (;; ;; const-C varset-X const-C --> const-C dup varset-X ;; const-C varbind-X const-C --> const-C dup varbind-X @@ -2047,4 +2049,6 @@ byte-optimize-lapcode)))) nil) +;; END SYNC WITH 20.7. + ;;; byte-optimize.el ends here diff --git a/lisp/custom-load.el b/lisp/custom-load.el index 90a3c79..4d2a113 100644 --- a/lisp/custom-load.el +++ b/lisp/custom-load.el @@ -17,13 +17,12 @@ (custom-add-loads 'menu '("menubar-items")) (custom-add-loads 'minibuffer '("simple" "minibuf")) (custom-add-loads 'log-message '("simple")) -(custom-add-loads 'environment '("frame" "keydefs" "minibuf" "modeline" "window-xemacs" "menubar" "gutter" "toolbar-items" "x-init" "cus-edit" "gnuserv" "sound")) +(custom-add-loads 'environment '("frame" "keydefs" "minibuf" "modeline" "window-xemacs" "gutter" "cus-edit" "gnuserv" "menubar" "sound" "toolbar-items" "x-init")) (custom-add-loads 'sound '("sound")) (custom-add-loads 'pui '("package-ui")) (custom-add-loads 'terminals '("gnuserv")) (custom-add-loads 'auto-save '("files" "auto-save")) (custom-add-loads 'mail '("simple" "startup")) -(custom-add-loads 'lpr '("printer")) (custom-add-loads 'custom-menu '("cus-edit")) (custom-add-loads 'docs '("hyper-apropos" "info")) (custom-add-loads 'tools '("etags" "hyper-apropos")) @@ -45,7 +44,7 @@ (custom-add-loads 'widget-documentation '("wid-edit")) (custom-add-loads 'comm '("ldap")) (custom-add-loads 'backup '("files")) -(custom-add-loads 'frames '("frame" "window-xemacs" "gui" "gnuserv")) +(custom-add-loads 'frames '("frame" "window-xemacs" "gnuserv" "gui")) (custom-add-loads 'customize '("wid-edit" "cus-edit")) (custom-add-loads 'custom-browse '("cus-edit")) (custom-add-loads 'abbrev '("abbrev" "files")) @@ -73,7 +72,7 @@ (custom-add-loads 'languages '("lisp-mode" "cus-edit" "font-lock")) (custom-add-loads 'fill '("simple" "fill")) (custom-add-loads 'custom-magic-faces '("cus-edit")) -(custom-add-loads 'display '("modeline" "toolbar" "scrollbar" "auto-show")) +(custom-add-loads 'display '("modeline" "auto-show" "scrollbar" "toolbar")) (custom-add-loads 'faces '("faces" "cus-edit" "font-lock" "font" "hyper-apropos" "info" "wid-edit")) (custom-add-loads 'emacs '("faces" "help" "files" "cus-edit" "package-get")) (custom-add-loads 'processes '("process" "gnuserv")) @@ -83,11 +82,11 @@ (custom-add-loads 'isearch '("isearch-mode")) (custom-add-loads 'font-lock-faces '("font-lock")) (custom-add-loads 'modeline '("modeline")) -(custom-add-loads 'editing '("simple" "abbrev" "fill" "mouse" "cus-edit" "dragdrop")) +(custom-add-loads 'editing '("simple" "abbrev" "fill" "cus-edit" "dragdrop" "mouse")) (custom-add-loads 'matching '("simple" "isearch-mode" "hyper-apropos")) (custom-add-loads 'i18n '("cus-edit")) -(custom-add-loads 'info '("toolbar-items" "info")) -(custom-add-loads 'x '("x-faces" "gtk-faces")) +(custom-add-loads 'info '("info" "toolbar-items")) +(custom-add-loads 'x '("gtk-faces" "x-faces")) (custom-add-loads 'buffers-tab '("gutter-items")) ;;; custom-load.el ends here diff --git a/lisp/gutter-items.el b/lisp/gutter-items.el index 9feefa4..c71a172 100644 --- a/lisp/gutter-items.el +++ b/lisp/gutter-items.el @@ -100,11 +100,15 @@ list). Return non-nil if BUF1 should be added to the tab control." (defcustom buffers-tab-filter-functions '(select-buffers-tab-buffers-by-mode) "*A list of functions specifying buffers to display in the buffers tab. -May be empty. Each function in the list must take arguments (BUF1 BUF2). + +If nil, all buffers are kept, up to `buffers-tab-max-size', in usual order. +Otherwise, each function in the list must take arguments (BUF1 BUF2). BUF1 is the candidate, and BUF2 is the current buffer (first in the buffers -list). Return non-nil if BUF1 should be added to the buffers tab. The -default adds BUF1 if BUF1 and BUF2 have the same major mode, or if both -match `buffers-tab-grouping-regexp'." +list). The function should return non-nil if BUF1 should be added to the +buffers tab. BUF1 will be omitted if any of the functions returns nil. + +Defaults to `select-buffers-tab-buffers-by-mode', which adds BUF1 if BUF1 and +BUF2 have the same major mode, or both match `buffers-tab-grouping-regexp'." :type '(repeat function) :group 'buffers-tab) diff --git a/lisp/info.el b/lisp/info.el index 2bd88a1..8296b9c 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -1033,7 +1033,7 @@ actually get any text from." (setq lbuffers (cdr lbuffers))) (message "Composing main Info directory...done")) (setq Info-dir-contents (buffer-string))) - (setq default-directory Info-dir-contents-directory) + (setq default-directory (file-name-as-directory Info-dir-contents-directory)) (setq buffer-file-name (caar Info-dir-file-attributes))) (defmacro Info-directory-files (dir-file &optional all full nosort files-only) diff --git a/lisp/ldap.el b/lisp/ldap.el index 31f082f..8ddc567 100644 --- a/lisp/ldap.el +++ b/lisp/ldap.el @@ -5,7 +5,7 @@ ;; Author: Oscar Figueiredo ;; Maintainer: Oscar Figueiredo ;; Created: Jan 1998 -;; Version: $Revision: 1.10 $ +;; Version: $Revision: 1.7.2.11 $ ;; Keywords: help comm ;; This file is part of XEmacs diff --git a/lisp/simple.el b/lisp/simple.el index 763a897..55ae786 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1985-7, 1993-5, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp. -;; Copyright (C) 2000 Ben Wing. +;; Copyright (C) 2000, 2001, 2002, 2003 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: lisp, extensions, internal, dumped @@ -1988,8 +1988,12 @@ nil." :group 'editing-basics) (defcustom motion-keys-for-shifted-motion - '(left right up down home end prior next - kp-left kp-right kp-up kp-down kp-home kp-end kp-prior kp-next) + ;; meta-shift-home/end are NOT shifted motion commands. + '(left right up down (home) (control home) (meta control home) + (end) (control end) (meta control end) prior next + kp-left kp-right kp-up kp-down (kp-home) (control kp-home) + (meta control kp-home) (kp-end) (control kp-end) (meta control kp-end) + kp-prior kp-next) "*List of keys considered motion keys for the purpose of shifted selection. When one of these keys is pressed along with the Shift key, and the command invoked moves the cursor and preserves the active region (see @@ -2010,11 +2014,20 @@ alphabetic key without problem, and you can specify the key using either a character or a symbol, uppercase or lowercase." :type '(repeat (choice (const :tag "normal cursor-pad (\"gray\") keys" :inline t - (left right up down home end prior next)) + (left + right up down + (home) (control home) (meta control home) + (end) (control end) (meta control end) + prior next)) (const :tag "keypad motion keys" :inline t - (kp-left kp-right kp-up kp-down - kp-home kp-end kp-prior kp-next)) + (kp-left + kp-right kp-up kp-down + (kp-home) (control kp-home) + (meta control kp-home) + (kp-end) (control kp-end) + (meta control kp-end) + kp-prior kp-next)) (const :tag "alphabetic motion keys" :inline t ((control b) (control f) diff --git a/lisp/text-props.el b/lisp/text-props.el index 0e1baeb..4c30905 100644 --- a/lisp/text-props.el +++ b/lisp/text-props.el @@ -234,7 +234,7 @@ containing the text and defaults to the current buffer." (setq start (next-single-property-change start prop buffer-or-string end))) ;; we have to insert a special check for end due to the illogical ;; definition of next-single-property-change (blame FSF for this). - (if (eq start end) nil start)) + (if (and start (>= start end)) nil start)) (defun text-property-not-all (start end prop value &optional buffer-or-string) "Check text from START to END to see if PROP is ever not `eq' to VALUE. @@ -248,7 +248,7 @@ containing the text and defaults to the current buffer." buffer-or-string end))) ;; we have to insert a special check for end due to the illogical ;; definition of previous-single-property-change (blame FSF for this). - (if (eq retval end) nil retval)))) + (if (and retval (>= retval end)) nil retval)))) ;; Older versions that only work sometimes (when VALUE is non-nil ;; for text-property-any, and maybe only when VALUE is nil for diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index cc6b7a3..4020bc0 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,17 @@ +2003-05-25 XEmacs Build Bot + + * XEmacs 21.4.13 is released + +2003-01-31 Martin Buchholz + + * lwlib-Xm.c (xm_update_progress): + Don't define unless LWLIB_WIDGETS_MOTIF. + +2003-02-13 Martin Buchholz + + * xlwmenu.c (xlwMenuClassRec): + Use symbolic name `XtExposeCompressMaximal' instead of `TRUE'. + 2003-01-15 Stephen J. Turnbull * XEmacs 21.4.12 "Portable Code" is released. diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c index 55402d5..254691d 100644 --- a/lwlib/lwlib-Xm.c +++ b/lwlib/lwlib-Xm.c @@ -344,6 +344,7 @@ xm_update_pushbutton (widget_instance* instance, Widget widget, XtAddCallback (widget, XmNactivateCallback, xm_generic_callback, instance); } +#ifdef LWLIB_WIDGETS_MOTIF static void xm_update_progress (widget_instance* instance, Widget scale, widget_value* val) @@ -373,6 +374,7 @@ xm_update_progress (widget_instance* instance, Widget scale, XtSetValues (scale, al, 1); } +#endif /* LWLIB_WIDGETS_MOTIF */ #ifdef LWLIB_MENUBARS_MOTIF diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index ef1cc9f..cd013c8 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -197,7 +197,7 @@ XlwMenuClassRec xlwMenuClassRec = XtNumber(xlwMenuResources), /* resource_count */ NULLQUARK, /* xrm_class */ TRUE, /* compress_motion */ - TRUE, /* compress_exposure */ + XtExposeCompressMaximal, /* compress_exposure */ TRUE, /* compress_enterleave */ FALSE, /* visible_interest */ XlwMenuDestroy, /* destroy */ diff --git a/man/ChangeLog b/man/ChangeLog index 38a58f0..0eb82fa 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,31 @@ +2003-05-25 XEmacs Build Bot + + * XEmacs 21.4.13 is released + +2003-03-20 Martin Buchholz + + * xemacs-faq.texi: Fix minor typo. + +2003-03-19 Vin Shelton + + * widget.texi: Crib Stephen's updates and Ben's fixes en masse + from 21.5. + +2003-03-18 Stephen J. Turnbull + + * xemacs/frame.texi (Gutter Basics): Describe common options for + buffers tab control. + +2003-02-03 Steve Youngs + + * xemacs/packages.texi (Local.rules File): Update to reflect Ben's + recent dabble into the packages. + +2003-02-11 Adrian Aichner + + * lispref/backups.texi (Auto-Saving): Fix auto-save xref to user + manual. + 2003-01-15 Stephen J. Turnbull * XEmacs 21.4.12 "Portable Code" is released. diff --git a/man/info.texi b/man/info.texi index e4e05f9..8df0772 100644 --- a/man/info.texi +++ b/man/info.texi @@ -3,7 +3,7 @@ @setfilename ../info/info.info @settitle Info @comment %**end of header -@comment $Id: info.texi,v 1.8 2001/04/12 18:22:00 michaels Exp $ +@comment $Id: info.texi,v 1.4.2.6 2000/11/29 08:27:28 stephent Exp $ @dircategory Texinfo documentation system @direntry diff --git a/man/lispref/backups.texi b/man/lispref/backups.texi index 6dbcb22..7ea6cc4 100644 --- a/man/lispref/backups.texi +++ b/man/lispref/backups.texi @@ -357,8 +357,8 @@ automatically compare a file with its most recent backup. called @dfn{auto-saving}. Auto-saving prevents you from losing more than a limited amount of work if the system crashes. By default, auto-saves happen every 300 keystrokes, or after around 30 seconds of -idle time. @xref{Auto-Save, Auto-Save, Auto-Saving: Protection Against -Disasters, xemacs, The XEmacs Lisp Reference Manual}, for information on +idle time. @xref{Auto Save, Auto-Save, Auto-Saving: Protection Against +Disasters, xemacs, The XEmacs User's Manual}, for information on auto-save for users. Here we describe the functions used to implement auto-saving and the variables that control them. diff --git a/man/texinfo.texi b/man/texinfo.texi index b0408bb..8652dee 100644 --- a/man/texinfo.texi +++ b/man/texinfo.texi @@ -1,5 +1,5 @@ \input texinfo.tex @c -*-texinfo-*- -@c $Id: texinfo.texi,v 1.14.2.1 2002/08/20 11:35:25 stephent Exp $ +@c $Id: texinfo.texi,v 1.14.4.1 2002/07/09 08:36:53 stephent Exp $ @c %**start of header @c All text is ignored before the setfilename. diff --git a/man/widget.texi b/man/widget.texi index fe91363..50bbc14 100644 --- a/man/widget.texi +++ b/man/widget.texi @@ -33,6 +33,7 @@ * Widget Minor Mode:: * Utilities:: * Widget Wishlist:: +* Widget Internals:: @end menu @node Introduction, User Interface, Top, Top @@ -120,7 +121,7 @@ create any widgets, the code has been split in two files: @table @file @item widget.el This will declare the user variables, define the function -@code{widget-define}, and autoload the function @code{widget-create}. +@code{define-widget}, and autoload the function @code{widget-create}. @item wid-edit.el Everything else is here, there is no reason to load it explicitly, as it will be autoloaded when needed. @@ -133,7 +134,7 @@ it will be autoloaded when needed. A form consists of read only text for documentation and some fields, where each of the fields contains two parts, a tag and a value. The tags are used to identify the fields, so the documentation can refer to -the foo field, meaning the field tagged with @samp{Foo}. Here is an +the foo field, meaning the field tagged with @samp{Foo}. Here is an example form: @example @@ -542,7 +543,9 @@ A function called each time the widget or a nested widget is changed. The function is called with two or three arguments. The first argument is the widget itself, the second argument is the widget that was changed, and the third argument is the event leading to the change, if -any. +any. In editable fields, this includes all insertions, deletions, +@emph{etc}. To watch only for ``final'' actions, redefine the +@code{:action} callback. @item :menu-tag Tag used in the menu when the widget is used as an option in a @@ -1357,7 +1360,7 @@ you to create a shorthand for more complex widgets. This includes specifying component widgets and new default values for the keyword arguments. -@defun widget-define name class doc &rest args +@defun define-widget name class doc &rest args Define a new widget type named @var{name} from @code{class}. @var{name} and class should both be symbols, @code{class} should be one @@ -1382,32 +1385,49 @@ create identical widgets: @end defun -Using @code{widget-define} just stores the definition of the widget type +Using @code{define-widget} just stores the definition of the widget type in the @code{widget-type} property of @var{name}, which is what @code{widget-create} uses. If you just want to specify defaults for keywords with no complex -conversions, you can use @code{identity} as your conversion function. +conversions, you can use @code{identity} as your @code{:convert-widget} +function. The following additional keyword arguments are useful when defining new widgets: @table @code @item :convert-widget -Function to convert a widget type before creating a widget of that -type. It takes a widget type as an argument, and returns the converted -widget type. When a widget is created, this function is called for the -widget type and all the widget's parent types, most derived first. +Method to convert type-specific components of a widget type before +instantiating a widget of that type. Not normally called from user +code, it is invoked by @code{widget-convert}. Typical operations +include converting types of child widgets to widget instances and +converting values from external format (@emph{i.e.}, as expected by the +calling code) to internal format (which is often different for the +convenience of widget manipulation). It takes a widget type as an +argument, and returns the converted widget type. When a widget is +created, the value of this property is called for the widget type, then +for all the widget's parent types, most derived first. (The property is +reevaluated for each parent type.) The following predefined functions can be used here: @defun widget-types-convert-widget widget -Convert @code{:args} as widget types in @var{widget}. +Convert each member of @code{:args} in @var{widget} from a widget type +to a widget. @end defun @defun widget-value-convert-widget widget -Initialize @code{:value} from @code{:args} in @var{widget}. +Initialize @code{:value} from @code{(car :args)} in @var{widget}, and +reset @code{:args}. @end defun +@item :copy +A method to implement deep copying of the type. Any member of the +widget which might be changed in place (rather than replaced) should be +copied by this method. (@code{widget-copy} uses @code{copy-sequence} to +ensure that the top-level list is a copy.) This particularly applies to +child widgets. + @item :value-to-internal Function to convert the value to the internal format. The function takes two arguments, a widget and an external value. It returns the @@ -1424,8 +1444,14 @@ when the widget is created, and on any value set later with @item :create Function to create a widget from scratch. The function takes one -argument, a widget type, and creates a widget of that type, inserts it -in the buffer, and returns a widget object. +argument, a widget, and inserts it in the buffer. Not normally called +from user code. Instead, call @code{widget-create} or related +functions, which take a type argument, (usually) convert it to a widget, +call the @code{:create} function to insert it in the buffer, and then +return the (possibly converted) widget. + +The default, @code{widget-default-create}, is invariably appropriate. +(None of the standard widgets specify @code{:create}.) @item :delete Function to delete a widget. The function takes one argument, a widget, @@ -1469,7 +1495,9 @@ escape sequences as well as give an error for unknown escapes. @item :action Function to handle user initiated events. By default, @code{:notify} -the parent. +the parent. Actions normally do not include mere edits, but refer to +things like invoking buttons or hitting enter in an editable field. To +watch for any change, redefine the @code{:notify} callback. The following predefined function can be used here: @@ -1498,6 +1526,43 @@ It provides most of the functionality that is referred to as ``by default'' in this text. @end deffn +In implementing complex hierarchical widgets (@emph{e.g.}, using the +@samp{group} widget), the following functions may be useful. +The syntax for the @var{type} arguments to these functions is described +in @ref{Basic Types}. + +@defun widget-create-child-and-convert parent type &rest args +As a child of @var{parent}, create a widget with type @var{type} and +value @var{value}. @var{type} is copied, and the @code{:widget-contvert} +method is applied to the optional keyword arguments from @var{args}. +@end defun + +@defun widget-create-child parent type +As a child of @var{parent}, create a widget with type @var{type}. +@var{type} is copied, but no conversion method is applied. +@end defun + +@defun widget-create-child-value parent type value +As a child of @var{parent}, create a widget with type @var{type} and +value @var{value}. @var{type} is copied, but no conversion method is +applied. +@end defun + +@defun widget-convert type &rest args +Convert @var{type} to a widget without inserting it in the buffer. +The optional @var{args} are additional keyword arguments. + +The widget's @code{:args} property is set from the longest tail of +@var{args} whose @samp{cdr} is not a keyword, or if that is null, from +the longest tail of @var{type}'s @code{:args} property whose cdr is not +a keyword. Keyword arguments from @var{args} are set, and the +@code{:value} property (if any) is converted from external to internal +format. +@end defun + +@code{widget-convert} is typically not called from user code; rather it +is called implicitly through the @samp{widget-create*} functions. + @node Widget Browser, Widget Minor Mode, Defining New Widgets, Top @comment node-name, next, previous, up @section Widget Browser @@ -1554,7 +1619,7 @@ Get the item @var{widget} is assumed to toggle.@* This is only meaningful for radio buttons or checkboxes in a list. @end defun -@node Widget Wishlist, , Utilities, Top +@node Widget Wishlist, Widget Internals, Utilities, Top @comment node-name, next, previous, up @section Wishlist @@ -1616,7 +1681,7 @@ A mailto widget. the field, not the end of the field itself. @item -Use and overlay instead of markers to delimit the widget. Create +Use an overlay instead of markers to delimit the widget. Create accessors for the end points. @item @@ -1627,5 +1692,35 @@ symbol, it should pop up a menu. @end itemize +@node Widget Internals, , Widget Wishlist, Top +@section Internals + +This (very brief!) section provides a few notes on the internal +structure and implementation of Emacs widgets. Avoid relying on this +information. (We intend to improve it, but this will take some time.) +To the extent that it actually describes APIs, the information will be +moved to appropriate sections of the manual in due course. + +@subsection The @dfn{Widget} and @dfn{Type} Structures + +Widgets and types are currently both implemented as lists. + +A symbol may be defined as a @dfn{type name} using @code{define-widget}. +@xref{Defining New Widgets}. A @dfn{type} is a list whose car is a +previously defined type name, nil, or (recursively) a type. The car is +the @dfn{class} or parent type of the type, and properties which are not +specified in the new type will be inherited from ancestors. Probably +the only type without a class should be the @code{default} type. The +cdr of a type is a plist whose keys are widget property keywords. + +A type or type name may also be referred to as an @dfn{unconverted +widget}. + +A @dfn{converted widget} or @dfn{widget instance} is a list whose car is +a type name or a type, and whose cdr is a property list. Furthermore, +all children of the converted widget must be converted. Finally, in the +process of appropriate parts of the list structure are copied to ensure +that changes in values of one instance do not affect another's. + @contents @bye diff --git a/man/xemacs-faq.texi b/man/xemacs-faq.texi index ac40906..524dc3e 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: 2002/12/12 06:21:19 $ +@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2002/12/04 14:04:08 $ @sp 1 @author Tony Rossini @author Ben Wing @@ -1092,7 +1092,7 @@ XEmacs) is @uref{http://www.ibiblio.org/sergei/Software/Software.html} Partially, as an external encoding for files, processes, and terminals. It does not yet support Unicode fonts @ref{Q1.3.9, Does XEmacs support -Unicode Fonts?} +Unicode Fonts?}. To get Unicode support, you need a Mule-enabled XEmacs. Install Mule-UCS from packages in the usual way. Put diff --git a/man/xemacs/frame.texi b/man/xemacs/frame.texi index c12e49c..e82d418 100644 --- a/man/xemacs/frame.texi +++ b/man/xemacs/frame.texi @@ -425,6 +425,13 @@ if the list is too long, the least recently used buffers are deleted from the list. By default up to 6 most recently used buffers with the same mode are displayed on tabs in the gutter. +This behavior can be altered by customizing +@code{buffers-tab-filter-functions}. Setting this variable to +@code{nil} forces display of all buffers, up to +@code{buffers-tab-max-size} (also customizable). More complex behavior +may be available in 3rd party libraries. These, and some more +rarely customized options, are in the @code{buffers-tab} Customize group. + @node Inhibiting, Customizing, Gutter Basics, GUI Components @comment node-name, next, previous, up @section Inhibiting Display of GUI Components diff --git a/man/xemacs/packages.texi b/man/xemacs/packages.texi index 53db29e..fef6391 100644 --- a/man/xemacs/packages.texi +++ b/man/xemacs/packages.texi @@ -468,53 +468,63 @@ Remove all created files. @cindex local.rules @heading The Local.rules File: This file is used when building and installing packages from source. In -the top level of the CVS module, @file{xemacs-packages}, contains the +the top level of the CVS module, @file{packages}, contains the file, @file{Local.rules.template}. Simply copy that to @file{Local.rules} and edit it to suit your needs. These are the variables in 'Local.rules' that you will need to -address. +address. Items that have default settings have those defaults shown. @table @var +@item XEMACS = xemacs +If your XEmacs isn't in your path, change this. Native MS Windows users +should double quote this if the path has embedded spaces. + +@item BUILD_WITHOUT_MULE = +Building from CVS defaults to building the Mule +packages. Set this to 't' if you don't want/have Mule + +@item XEMACS_NATIVE_NT = +Set this to 't' if you are building on WinNT. NT users should note that +you still need the Cygwin environment to build the packages. + +@item XEMACS_INSTALLED_PACKAGES_ROOT = /usr/local/lib/xemacs +This is the directory tree under which the installed packages go. Under +this directory there would normally be @file{xemacs-packages/} for +standard (non-Mule) packages, @file{mule-packages/} for Mule packages +(if you built XEmacs with Mule), and possibly @file{site-packages/} for +3rd party packages that aren't distributed by XEmacs.org. + @item symlink = Set this to 't' if you want to do a "run in place". Setting this doesn't work well with 'make bindist' -@item XEMACS_PACKAGES = -This is where you set the normal packages that you -want to install. eg: +@item NONMULE_INSTALLED_PACKAGES_ROOT = $@{XEMACS_INSTALLED_PACKAGES_ROOT@}/xemacs-packages +This is where the non-Mule packages are installed to. You probably +don't want to change this. + +@item MULE_INSTALLED_PACKAGES_ROOT = $@{XEMACS_INSTALLED_PACKAGES_ROOT@}/mule-packages +This is where the Mule packages are installed to. You probably don't +want to change this. Please note that @code{make bindist} does +@emph{not} use this variable. When doing a @code{make bindist} +@emph{everything} goes into @var{NONMULE_INSTALLED_PACKAGES_ROOT}. + +@item NONMULE_PACKAGES = xemacs-packages +This is where you set the non-Mule packages that you want to install. eg: @example XEMACS_PACKAGES = xemacs-packages/xemacs-base xemacs-packages/bbdb @end example -@item XEMACS_STAGING = $@{XEMACS_PACKAGES_BASE@}/../Packages -Set this to where you want normal packages to be -installed to. - -@item PACKAGE_INDEX = package-index -If you want the package-index file to have a different -name, change this. - -@item BUILD_WITHOUT_MULE = -Building from CVS defaults to building the Mule -packages. Set this to 't' if you don't want/have Mule - -@item MULE_PACKAGES = +@item MULE_PACKAGES = mule-packages Same as for 'XEMACS_PACKAGES' except you list the Mule packages you want to install here. eg: @example MULE_PACKAGES = mule-packages/mule-base mule-packages/skk @end example -@item MULE_STAGING = $@{XEMACS_PACKAGES_BASE@}/../Mule-Packages -Set this to where you want Mule packages installed -to. Note: 'make bindist' does not use this variable. - -@item XEMACS = xemacs -If your XEmacs isn't in your path, change this. - -@item XEMACS_NATIVE_NT = -Set this to 't' if you are building on WinNT. +@item PACKAGE_INDEX = package-index +If you want the package-index file to have a different +name, change this. @item INSTALL = install -c The path to your BSD compatible install program. diff --git a/netinstall/ChangeLog b/netinstall/ChangeLog index 6fb11d5..e7bd315 100644 --- a/netinstall/ChangeLog +++ b/netinstall/ChangeLog @@ -1,3 +1,7 @@ +2003-05-25 XEmacs Build Bot + + * XEmacs 21.4.13 is released + 2003-01-15 Stephen J. Turnbull * XEmacs 21.4.12 "Portable Code" is released. diff --git a/netinstall/res.rc b/netinstall/res.rc index 349b6c2..4a7520b 100644 --- a/netinstall/res.rc +++ b/netinstall/res.rc @@ -516,7 +516,7 @@ BEGIN IDS_ERR_OPEN_READ "Can't open %s for reading: %s" IDS_ROOT_ABSOLUTE "The install directory must be absolute, with both a drive letter and leading slash, like C:\\Cygwin" IDS_DOWNLOAD_COMPLETE "Download Complete" - IDS_CVSID "\n%%% $Id: res.rc,v 1.2.2.2 2002/08/20 11:36:07 stephent Exp $\n" + IDS_CVSID "\n%%% $Id: res.rc,v 1.2.2.1.2.1 2002/05/18 07:47:27 stephent Exp $\n" IDS_NOLOGFILE "Cannot open log file %s for writing" IDS_UNINSTALL_COMPLETE "Uninstalls complete." IDS_WININET "Unable to find or load the Internet Explorer 5 DLLs" diff --git a/nt/ChangeLog b/nt/ChangeLog index b711a91..d13f415 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2003-05-25 XEmacs Build Bot + + * XEmacs 21.4.13 is released + 2003-01-15 Stephen J. Turnbull * XEmacs 21.4.12 "Portable Code" is released. diff --git a/src/ChangeLog b/src/ChangeLog index 03c25d8..a3e32bc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,93 @@ +2003-05-25 XEmacs Build Bot + + * XEmacs 21.4.13 is released + +2003-03-20 Stephen J. Turnbull + + * config.h.in (INTPTR_T_IN_CYGWIN_TYPES_H): + * lisp.h (): + Cygwin defines these types in . Don't duplicate + the definition. + +2003-03-15 Martin Buchholz + + * dumper.c (pdump_load): Pdump'ed XEmacs can't find its .dmp file. + Scenario: Prepend ~/bin to PATH; then `mkdir ~/bin/xemacs' + Result: "temacs can only be run in -batch mode." + Fix: Check xemacs executable candidate for directory-ness. + +2003-03-03 Robert Pluim + + * database.c: Don't use the u_int8_t etc typedefs on FreeBSD, + they conflict with . + +2003-02-14 Martin Buchholz + + * database.c: Berkeley DB wants __STDC__ to be defined. + +2003-02-13 Martin Buchholz + + * EmacsFrame.c: Use symbolic name `NotUseful' in lieu of `0'. + +2003-02-01 Martin Buchholz + + * process-unix.c (unix_send_process): Fix C++ compile error. + +2003-02-25 Andrew Begel + + * Added .dylib as an acceptable shared library file extension + * to support MacOSX. + +2003-02-01 Martin Buchholz + + * EmacsFrameP.h (EmacsFramePart): + Kludge to allow compiling with Motif1, but linking with Motif2. + +2003-01-28 Martin Buchholz + + * config.h.in (_ALL_SOURCE): Guard against multiple definition. + + +2003-02-23 Stephen J. Turnbull + + * config.h.in (DLSYM_NEEDS_UNDERSCORE): Define on darwin. + +2003-02-06 Andrew Begel + + * sysdll.c: Included lisp.h to define needed alloca_array. + +2003-02-13 Martin Buchholz + + Make XEmacs redisplay 10 times faster. + If, that is, you're using a slow X connection and MoveOpaque. + Use compress_exposure = XtExposeCompressMaximal | XtExposeNoRegion. + Use compress_motion = TRUE. + * EmacsFrame.c (emacsFrameClassRec): + * EmacsShell-sub.c (EMACS_SHELL_CLASS_REC): + * EmacsManager.c (emacsManagerClassRec): + * xintrinsicp.h: Make sure XtExposeNoRegion is defined. + +2003-01-30 Vin Shelton + + * s/linux.h (ORDINARY_LINK): define ORDINARY_LINK for linux. + +2003-01-17 Stephen J. Turnbull + + * glyphs-eimage.c (tiff_memory_seek): Lobotomize unsigned typedef. + Patch by Martin Buchholz. + +2003-01-16 Stephen J. Turnbull + + * glyphs-eimage.c (tiff_instantiate): Fix unsigned comparison. + Thanks to icc for warning and Martin Buchholz for reporting. + +2003-01-29 Vin Shelton + + Patch courtesy of Andrew Begel + + * dynarr.c (Dynarr_realloc): memcpy copies number of bytes, so + remember to multiply by the element size. + 2003-01-15 Stephen J. Turnbull * XEmacs 21.4.12 "Portable Code" is released. diff --git a/src/EmacsFrame.c b/src/EmacsFrame.c index 0a14334..8e4909d 100644 --- a/src/EmacsFrame.c +++ b/src/EmacsFrame.c @@ -185,7 +185,7 @@ static XtResource resources[] = { offset (bell_volume), XtRImmediate, (XtPointer)0 }, { XtNuseBackingStore, XtCUseBackingStore, XtRBoolean, sizeof (Boolean), - offset (use_backing_store), XtRImmediate, (XtPointer)0 }, + offset (use_backing_store), XtRImmediate, (XtPointer) NotUseful }, { XtNpreferredWidth, XtCPreferredWidth, XtRDimension, sizeof (Dimension), offset (preferred_width), XtRImmediate, (XtPointer)0 }, @@ -235,7 +235,7 @@ EmacsFrameClassRec emacsFrameClassRec = { /* resource_count */ XtNumber (resources), /* xrm_class */ NULLQUARK, /* compress_motion */ TRUE, - /* compress_exposure */ TRUE, + /* compress_exposure */ XtExposeCompressMaximal | XtExposeNoRegion, /* compress_enterleave */ TRUE, /* visible_interest */ FALSE, /* destroy */ NULL, diff --git a/src/EmacsFrameP.h b/src/EmacsFrameP.h index 377132e..5d0100b 100644 --- a/src/EmacsFrameP.h +++ b/src/EmacsFrameP.h @@ -32,6 +32,31 @@ Boston, MA 02111-1307, USA. */ #include "EmacsFrame.h" typedef struct { + +#ifdef LWLIB_USES_MOTIF +#if XmVERSION < 2 + /* It's easy to erroneously compile with Motif 1 headers, but link + with Motif 2 libraries. + + For example, AIX stupidly provides Motif headers in + /usr/dt/include, but fails to provide the corresponding libraries + in /usr/dt/lib. + + We actually try to survive such a version mismatch, since Motif 2 + is _almost_ binary compatible with Motif 1. Motif 2's + XmPrimitivePart has some trailing data members which overlay the + start of this struct. We create dummy members to make space for + XmPrimitivePart's added members. These must, of course, be at + the beginning of this struct. + + Delete this kludge when no one has Motif1 on their system anymore, + perhaps in 2010. */ + XtCallbackList Motif2_dummy_convert_callback; + XtCallbackList Motif2_dummy_popup_handler_callback; + long Motif2_dummy_layout_direction; +#endif +#endif + struct frame* frame; /* the *emacs* frame object */ /* Resources that can't be done from lisp. diff --git a/src/EmacsManager.c b/src/EmacsManager.c index 800801e..c2f325b 100644 --- a/src/EmacsManager.c +++ b/src/EmacsManager.c @@ -87,7 +87,7 @@ EmacsManagerClassRec emacsManagerClassRec = { /* num_resources */ XtNumber(resources), /* xrm_class */ NULLQUARK, /* compress_motion */ TRUE, - /* compress_exposure */ TRUE, + /* compress_exposure */ XtExposeCompressMaximal | XtExposeNoRegion, /* compress_enterleave*/ TRUE, /* visible_interest */ FALSE, /* destroy */ NULL, diff --git a/src/EmacsShell-sub.c b/src/EmacsShell-sub.c index 490530b..97be525 100644 --- a/src/EmacsShell-sub.c +++ b/src/EmacsShell-sub.c @@ -192,9 +192,9 @@ EMACS_SHELL_CLASS_REC_TYPE EMACS_SHELL_CLASS_REC = { /* resources */ resources, /* resource_count */ XtNumber (resources), /* xrm_class */ NULLQUARK, - /* compress_motion */ FALSE, - /* compress_exposure */ TRUE, - /* compress_enterleave*/ FALSE, + /* compress_motion */ TRUE, + /* compress_exposure */ XtExposeCompressMaximal | XtExposeNoRegion, + /* compress_enterleave*/ TRUE, /* visible_interest */ TRUE, /* destroy */ NULL, /* resize */ XtInheritResize, diff --git a/src/config.h.in b/src/config.h.in index 3a10221..7d3ba75 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -93,7 +93,10 @@ void *alloca (); #undef _XOPEN_SOURCE_EXTENDED /* Make all functions available on AIX. See AC_AIX. */ +/* Some AIX compilers (cc) pre-define _ALL_SOURCE, some (xlc) don't. */ +#ifndef _ALL_SOURCE #undef _ALL_SOURCE +#endif /* Make all functions available on GNU libc systems. See features.h. */ #undef _GNU_SOURCE @@ -259,6 +262,7 @@ void *alloca (); #undef HAVE_SHL_LOAD #undef HAVE_DLD_INIT #undef HAVE_SHLIB +#undef DLSYM_NEEDS_UNDERSCORE #undef HAVE_LIBINTL #undef HAVE_LIBDNET @@ -816,6 +820,8 @@ on various systems. */ #undef SIZEOF_LONG_LONG #undef SIZEOF_VOID_P +#undef INTPTR_T_IN_CYGWIN_TYPES_H + #ifndef BITS_PER_CHAR #define BITS_PER_CHAR 8 #endif diff --git a/src/database.c b/src/database.c index 57e3925..ccbe8b5 100644 --- a/src/database.c +++ b/src/database.c @@ -45,14 +45,20 @@ Boston, MA 02111-1307, USA. */ #ifdef HAVE_INTTYPES_H #define __BIT_TYPES_DEFINED__ #include +#ifndef __FreeBSD__ typedef uint8_t u_int8_t; typedef uint16_t u_int16_t; typedef uint32_t u_int32_t; #ifdef WE_DONT_NEED_QUADS typedef uint64_t u_int64_t; +#endif #endif /* WE_DONT_NEED_QUADS */ #endif /* HAVE_INTTYPES_H */ #endif /* !(defined __GLIBC__ && __GLIBC_MINOR__ >= 1) */ +/* Berkeley DB wants __STDC__ to be defined; else if does `#define const' */ +#if ! defined (__STDC__) && ! defined(__cplusplus) +#define __STDC__ 0 +#endif #include DB_H_FILE /* Berkeley db's header file */ #ifndef DB_VERSION_MAJOR # define DB_VERSION_MAJOR 1 diff --git a/src/depend b/src/depend index e120125..86d54e1 100644 --- a/src/depend +++ b/src/depend @@ -109,7 +109,7 @@ dired.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h elhash.h m doc.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h chartab.h insdel.h keymap.h mule-charset.h sysfile.h doprnt.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h lstream.h mule-charset.h dragdrop.o: $(LISP_H) dragdrop.h -dumper.o: $(LISP_H) conslots.h console-stream.h console.h dumper.h elhash.h nt.h specifier.h sysfile.h syswindows.h +dumper.o: $(LISP_H) conslots.h console-stream.h console.h dumper.h elhash.h nt.h specifier.h sysdep.h sysfile.h systime.h syswindows.h dynarr.o: $(LISP_H) ecrt0.o: config.h editfns.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h conslots.h console.h device.h events.h extents.h frame.h frameslots.h glyphs.h gui.h insdel.h line-number.h mule-charset.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h syspwd.h systime.h toolbar.h window.h winslots.h @@ -128,7 +128,7 @@ events.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console-g extents.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h debug.h device.h elhash.h extents.h faces.h frame.h frameslots.h glyphs.h gui.h gutter.h insdel.h keymap.h mule-charset.h opaque.h process.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h faces.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h device.h elhash.h extents.h faces.h frame.h frameslots.h glyphs.h gui.h mule-charset.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h file-coding.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h elhash.h file-coding.h insdel.h lstream.h mule-ccl.h mule-charset.h opaque.h -fileio.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h device.h events.h file-coding.h frame.h frameslots.h glyphs.h gui.h insdel.h lstream.h mule-charset.h ndir.h redisplay.h scrollbar.h specifier.h sysdep.h sysdir.h sysfile.h sysproc.h syspwd.h systime.h toolbar.h window.h winslots.h +fileio.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h device.h events.h file-coding.h frame.h frameslots.h glyphs.h gui.h insdel.h lstream.h mule-charset.h ndir.h nt.h redisplay.h scrollbar.h specifier.h sysdep.h sysdir.h sysfile.h sysproc.h syspwd.h systime.h syswindows.h toolbar.h window.h winslots.h filelock.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h mule-charset.h ndir.h paths.h sysdir.h sysfile.h syspwd.h syssignal.h filemode.o: $(LISP_H) sysfile.h floatfns.o: $(LISP_H) sysfloat.h syssignal.h @@ -175,16 +175,16 @@ minibuf.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h conslots miscplay.o: $(LISP_H) miscplay.h sysfile.h syssignal.h nas.o: $(LISP_H) sysdep.h syssignal.h native-gtk-toolbar.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console-gtk.h console.h device.h faces.h frame.h frameslots.h glyphs-gtk.h glyphs.h gui.h mule-charset.h objects-gtk.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h -nt.o: $(LISP_H) ndir.h nt.h ntheap.h sysdir.h sysfile.h sysproc.h syspwd.h syssignal.h systime.h syswindows.h +nt.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h mule-charset.h ndir.h nt.h ntheap.h sysdir.h sysfile.h sysproc.h syspwd.h syssignal.h systime.h syswindows.h ntheap.o: $(LISP_H) ntheap.h syswindows.h -ntplay.o: $(LISP_H) nativesound.h nt.h sysfile.h syswindows.h +ntplay.o: $(LISP_H) nativesound.h nt.h sysfile.h systime.h syswindows.h ntproc.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console-msw.h console.h mule-charset.h nt.h ntheap.h process.h syscommctrl.h sysfile.h sysproc.h syssignal.h systime.h syswait.h syswindows.h objects.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h device.h elhash.h faces.h frame.h frameslots.h glyphs.h gui.h mule-charset.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h offix.o: offix-cursors.h offix-types.h offix.h xintrinsic.h opaque.o: $(LISP_H) opaque.h postgresql.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h mule-charset.h postgresql.h sysdep.h print.o: $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h casetab.h chartab.h conslots.h console-msw.h console-stream.h console-tty.h console.h device.h extents.h frame.h frameslots.h glyphs.h gui.h insdel.h lstream.h mule-charset.h redisplay.h scrollbar.h specifier.h syscommctrl.h sysfile.h syssignal.h systty.h syswindows.h toolbar.h window.h winslots.h -process-nt.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console-msw.h console.h hash.h lstream.h mule-charset.h nt.h process.h procimpl.h syscommctrl.h sysdep.h syswindows.h +process-nt.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console-msw.h console.h hash.h lstream.h mule-charset.h nt.h process.h procimpl.h syscommctrl.h sysdep.h systime.h syswindows.h process-unix.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h device.h events.h file-coding.h frame.h frameslots.h glyphs.h gui.h hash.h lstream.h mule-charset.h opaque.h process.h procimpl.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h sysproc.h syssignal.h systime.h systty.h syswait.h toolbar.h window.h winslots.h process.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h conslots.h console.h device.h events.h file-coding.h frame.h frameslots.h glyphs.h gui.h hash.h insdel.h lstream.h mule-charset.h opaque.h process.h procimpl.h redisplay.h scrollbar.h specifier.h sysfile.h sysproc.h syssignal.h systime.h systty.h syswait.h toolbar.h window.h winslots.h profile.o: $(LISP_H) backtrace.h bytecode.h elhash.h hash.h syssignal.h systime.h @@ -212,7 +212,7 @@ sunpro.o: $(LISP_H) symbols.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console.h elhash.h mule-charset.h syntax.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h extents.h mule-charset.h syntax.h sysdep.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h conslots.h console-stream.h console-tty.h console.h device.h events.h frame.h frameslots.h glyphs.h gui.h mule-charset.h ndir.h nt.h ntheap.h process.h redisplay.h scrollbar.h specifier.h sysdep.h sysdir.h sysfile.h sysproc.h syssignal.h systime.h systty.h syswait.h syswindows.h toolbar.h window.h winslots.h -sysdll.o: config.h sysdll.h +sysdll.o: $(LISP_H) sysdll.h termcap.o: $(LISP_H) conslots.h console.h device.h terminfo.o: config.h tests.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h lstream.h mule-charset.h opaque.h @@ -234,11 +234,11 @@ unexfreebsd.o: config.h unexhp9k3.o: config.h sysdep.h unexhp9k800.o: $(LISP_H) unexmips.o: config.h getpagesize.h -unexnt.o: $(LISP_H) nt.h ntheap.h syswindows.h +unexnt.o: $(LISP_H) nt.h ntheap.h systime.h syswindows.h unexsunos4.o: config.h vm-limit.o: $(LISP_H) mem-limits.h widget.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h mule-charset.h -win32.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h mule-charset.h syswindows.h +win32.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h mule-charset.h syssignal.h systime.h syswindows.h window.o: $(LISP_H) buffer.h bufslots.h casetab.h chartab.h commands.h conslots.h console.h device.h elhash.h faces.h frame.h frameslots.h glyphs.h gui.h gutter.h mule-charset.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window.h winslots.h xgccache.o: $(LISP_H) hash.h xgccache.h xmu.o: config.h diff --git a/src/dumper.c b/src/dumper.c index b666812..b60496c 100644 --- a/src/dumper.c +++ b/src/dumper.c @@ -1415,13 +1415,17 @@ pdump_load (const char *argv0) } strcpy (w, name); - /* ### #$%$#^$^@%$^#%@$ ! */ -#ifdef access -#undef access -#endif + /* Check that exe_path is executable and not a directory */ +#undef access /* avoid !@#$%^& encapsulated access */ +#undef stat /* avoid !@#$%^& encapsulated stat */ + { + struct stat statbuf; + if (access (exe_path, X_OK) == 0 + && stat (exe_path, &statbuf) == 0 + && ! S_ISDIR (statbuf.st_mode)) + break; + } - if (!access (exe_path, X_OK)) - break; if (!*p) { /* Oh well, let's have some kind of default */ diff --git a/src/dynarr.c b/src/dynarr.c index 9a173a9..5dfc79d 100644 --- a/src/dynarr.c +++ b/src/dynarr.c @@ -116,7 +116,8 @@ Dynarr_realloc (Dynarr *dy, int new_size) if (DUMPEDP (dy->base)) { void *new_base = malloc (new_size); - memcpy (new_base, dy->base, dy->max > new_size ? new_size : dy->max); + int max_bytes = dy->max * dy->elsize; + memcpy (new_base, dy->base, max_bytes > new_size ? new_size : max_bytes); dy->base = new_base; } else diff --git a/src/emodules.c b/src/emodules.c index 88c81f0..22eda2b 100644 --- a/src/emodules.c +++ b/src/emodules.c @@ -582,7 +582,7 @@ when a dynamic module is loaded. */); /* #### Export this to Lisp */ - Vmodule_extensions = build_string (":.ell:.so:.dll"); + Vmodule_extensions = build_string (":.ell:.so:.dll:.dylib"); staticpro (&Vmodule_extensions); load_modules_quietly = 0; diff --git a/src/frame-msw.c b/src/frame-msw.c index effa87d..36a6983 100644 --- a/src/frame-msw.c +++ b/src/frame-msw.c @@ -307,10 +307,15 @@ static void mswindows_set_frame_size (struct frame *f, int width, int height) { RECT rect; + int columns, rows; + rect.left = rect.top = 0; rect.right = width; rect.bottom = height; + pixel_to_char_size (f, rect.right, rect.bottom, &columns, &rows); + change_frame_size (f, rows, columns, 0); + AdjustWindowRectEx (&rect, GetWindowLong (FRAME_MSWINDOWS_HANDLE(f), GWL_STYLE), GetMenu (FRAME_MSWINDOWS_HANDLE(f)) != NULL, diff --git a/src/glyphs-eimage.c b/src/glyphs-eimage.c index 3308449..c295834 100644 --- a/src/glyphs-eimage.c +++ b/src/glyphs-eimage.c @@ -1123,11 +1123,11 @@ static toff_t tiff_memory_seek(thandle_t data, toff_t off, int whence) break; default: fprintf(stderr,"Eh? invalid seek mode in tiff_memory_seek\n"); - return -1; + return (toff_t) -1; } if ((newidx > mem->len) || (newidx < 0)) - return -1; + return (toff_t) -1; mem->index = newidx; return newidx; @@ -1277,7 +1277,7 @@ tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, raster = (uint32*) _TIFFmalloc (width * height * sizeof (uint32)); if (raster != NULL) { - unsigned int i,j; + int i,j; uint32 *rp; ep = unwind.eimage; rp = raster; @@ -1288,7 +1288,7 @@ tiff_instantiate (Lisp_Object image_instance, Lisp_Object instantiator, /* This is to get around weirdness in the libtiff library where properly made TIFFs will come out upside down. libtiff bug or jhod-brainlock? */ rp = raster + (i * width); - for (j = 0; j < width; j++) + for (j = 0; (uint32) j < width; j++) { *ep++ = (unsigned char)TIFFGetR(*rp); *ep++ = (unsigned char)TIFFGetG(*rp); diff --git a/src/lisp.h b/src/lisp.h index 0db5378..2a9cacb 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2264,6 +2264,9 @@ struct overhead_stats #ifdef HAVE_INTTYPES_H #include +#elif defined(INTPTR_T_IN_CYGWIN_TYPES_H) +/* Recent Cygwin defines these types in + We can hope that if they ever get inttypes.h, they won't define twice */ #elif SIZEOF_VOID_P == SIZEOF_INT typedef int intptr_t; typedef unsigned int uintptr_t; diff --git a/src/process-unix.c b/src/process-unix.c index 0d57c95..af75a8e 100644 --- a/src/process-unix.c +++ b/src/process-unix.c @@ -1344,7 +1344,7 @@ unix_send_process (Lisp_Object proc, struct lstream* lstream) p->core_dumped = 0; p->tick++; process_tick++; - deactivate_process (vol_proc); + deactivate_process (*((Lisp_Object *) (&vol_proc))); invalid_operation ("SIGPIPE raised on process; closed it", p->name); } diff --git a/src/s/linux.h b/src/s/linux.h index e61fdf3..2de582a 100644 --- a/src/s/linux.h +++ b/src/s/linux.h @@ -140,11 +140,9 @@ Boston, MA 02111-1307, USA. */ #ifdef LINUX_ELF #define UNEXEC "unexelf.o" #define UNEXEC_USE_MAP_PRIVATE -#if 0 -/* mrb - Ordinary link is simple and effective */ -/* slb - Not any more ... :-( */ +/* Although slb thinks ORDINARY_LINK does not work on linux, ORDINARY_LINK + has been enabled in 21.5 for some time with no ill effects. */ #define ORDINARY_LINK -#endif /* 0 */ /* I still think ORDINARY_LINK should be the default, but since slb insists, ORDINARY_LINK will stay on until we expunge the dump code. diff --git a/src/sysdll.c b/src/sysdll.c index 537f3d6..bc911c4 100644 --- a/src/sysdll.c +++ b/src/sysdll.c @@ -24,6 +24,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #endif #include +#include "lisp.h" #include "sysdll.h" /* This whole file is conditional upon HAVE_SHLIB */ diff --git a/src/unexsol2.c b/src/unexsol2.c index 06e71e7..d9de182 100644 --- a/src/unexsol2.c +++ b/src/unexsol2.c @@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ -/* #pragma ident "@(#) $Id: unexsol2.c,v 1.3 1997/10/13 03:35:33 steve Exp $" */ +/* #pragma ident "@(#) $Id: unexsol2.c,v 1.2 1995/01/25 20:39:16 georgn Exp $" */ #include #include diff --git a/src/xintrinsicp.h b/src/xintrinsicp.h index 86836de..41d75f7 100644 --- a/src/xintrinsicp.h +++ b/src/xintrinsicp.h @@ -26,4 +26,8 @@ Boston, MA 02111-1307, USA. */ #include #include /* apparently some IntrinsicP.h don't have this */ +#ifndef XtExposeNoRegion +#define XtExposeNoRegion 0 +#endif + #endif /* INCLUDED_xintrinsicp_h_ */ diff --git a/tests/ChangeLog b/tests/ChangeLog index a3aeca8..d42766f 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2003-05-25 XEmacs Build Bot + + * XEmacs 21.4.13 is released + 2003-01-15 Stephen J. Turnbull * XEmacs 21.4.12 "Portable Code" is released. diff --git a/version.sh b/version.sh index 5b6ebaf..73fefe3 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=12 -xemacs_codename="Portable Code" +emacs_beta_version=13 +xemacs_codename="Rational FORTRAN" emacs_kit_version= infodock_major_version=4 infodock_minor_version=0