Mercurial > hg > xemacs-beta
changeset 243:f220cc83d72e r20-5b20
Import from CVS: tag r20-5b20
line wrap: on
line diff
--- a/CHANGES-beta Mon Aug 13 10:16:17 2007 +0200 +++ b/CHANGES-beta Mon Aug 13 10:17:07 2007 +0200 @@ -1,4 +1,13 @@ -*- indented-text -*- +to 20.5 beta20 "Don" +-- Miscellaneous patches from Damon Lipparelli, Jens Petersen, Karl Hegbloom, + and Christoph Wedler +-- overlay.el has been packaged (xemacs-base) +-- Configure changes from Martin Buchholz +-- Hashing changes from Hrvoje Niksic +-- IBM AIX build fix to work with MIT X11 courtesy of Michael Sperber +-- Miscellaneous bug fixes + to 20.5 beta19 "Damani" -- Package building update -- Hash and profile patches from Hrvoje Niksic
--- a/ChangeLog Mon Aug 13 10:16:17 2007 +0200 +++ b/ChangeLog Mon Aug 13 10:17:07 2007 +0200 @@ -1,5 +1,48 @@ +1998-01-18 SL Baur <steve@altair.xemacs.org> + + * XEmacs 20.5-beta20 is released. + +1998-01-13 Martin Buchholz <martin@xemacs.org> + + * configure.usage: + * etc/NEWS: + Remove doc for configure-time INFOPATH, no longer used. + + * etc/BETA: Update ftp addresses. + * etc/INSTALL: Update ftp addresses. + * etc/MAILINGLISTS: Sync with Emacs 20.2. Update ftp addresses. + + * configure.in: + * src/config.h.in: + Define HAVE_INVERSE_HYPERBOLIC using 1 configure test, not 3. + + * lwlib/lwlib.h: + * lwlib/lwlib.c: + * lwlib/lwlib-config.c: + * lwlib/lwlib-Xm.c: + * lwlib/lwlib-Xaw.c: + * lwlib/lwlib-Xlw.c: + * lwlib/config.h.in: + * src/menubar-x.c: + Prepend LWLIB_ to (SCROLLBARS|MENUBARS|DIALOGS)_(MOTIF|LUCID|ATHENA). + Maintain only one set of variables. + + * etc/xemacs.1: Update author list. + + * Makefile.in (install-arch-dep): Simplify. + Replace construct `test -d $dir && foo' with + `if test -d $dir; then foo; fi' + + * lwlib/xlwmenu.c: + * lwlib/xlwscrollbar.c: + * lwlib/lwlib-Xlw.c: + * lwlib/lwlib-Xm.c: + Always assume presence of limits.h (ANSI). + 1998-01-12 SL Baur <steve@altair.xemacs.org> + * INSTALL: Updated for recent Mule/package changes. + * XEmacs 20.5-beta19 is released. 1998-01-12 Damon Lipparelli <lipp@primus.com>
--- a/INSTALL Mon Aug 13 10:16:17 2007 +0200 +++ b/INSTALL Mon Aug 13 10:17:07 2007 +0200 @@ -27,14 +27,15 @@ -l loadup dump', found in `./src/Makefile.in.in', or possibly when running the final dumped XEmacs. -Building XEmacs requires about 88 Mb of disk space (including the -XEmacs sources). Once installed, XEmacs occupies about 50 Mb in the +Building XEmacs requires about 41 Mb of disk space (including the +XEmacs sources). Once installed, XEmacs occupies about 16 Mb in the file system where it is installed; this includes the executable files, Lisp libraries, miscellaneous data files, and on-line documentation. The amount of storage of the Lisp directories may be reduced by compressing the .el files. If the building and installation take place in different directories, then the installation procedure temporarily -requires 88+50 Mb. +requires 41+16 Mb. Adjust this value upwards depending upon what +additional Lisp support is installed. XEmacs requires an ANSI C compiler, such as GCC. @@ -48,10 +49,10 @@ before building XEmacs. The packages XEmacs can use are: Xaw3d, XPM, JPEG, compface, PNG, zlib, OffiX, GNU DBM, Berkeley DB, - socks, term, NAS, Canna, Wnn. + socks, term, NAS, Canna, Kinput2, SJ3, Wnn. You can get (most of) them from the XEmacs ftp site at -ftp://ftp.xemacs.org/pub/aux +ftp://ftp.xemacs.org/pub/xemacs/aux If you want users on other systems to be able to use the XEmacs you have built, try to build those packages so that the generated @@ -64,13 +65,27 @@ to the --site-runtime-libraries option. -3) In the top level directory of the XEmacs distribution, run the +3) Decide what Initial Lisp you need with XEmacs. XEmacs is distributed +separately from most of its runtime environment. This is done to make it +easier for administrators to tune an installation for what the local users +need. See the file etc/PACKAGES for an overview of what is available and +which packages need to be installed prior to building XEmacs. At this +point you only need a minimum to get started at which point you may install +what you wish without further changes to the XEmacs binary. A sample +minimum configuration for a Linux system using Mule and Wnn6 from OMRON +corporation would be the packages `mule-base' and `egg-its'. By default, +packages will be searched for in the directory $prefix/lib/xemacs/packages. +This may be changed by specifying a different value with the --package-path +configuration option. Multiple directories may be specified. + + +4) In the top level directory of the XEmacs distribution, run the program `configure' as follows: ./configure [CONFIGURATION-NAME] [--OPTION[=VALUE]] ... -Usually, you should let `configure' (actually the shell script -`config.guess') guess your system type, by omitting the +Almost always, you should let `configure' (actually the shell script +`config.guess') guess your host type, by omitting the CONFIGURATION-NAME argument. If you like to experiment, specify a configuration name in the form MACHINE-VENDOR-OPSYS, for example: @@ -162,8 +177,8 @@ - The architecture-independent files go in PREFIXDIR/lib/xemacs-VERSION (where VERSION is the version number of XEmacs, like `20.5'). - The architecture-dependent files go in - PREFIXDIR/lib/xemacs-VERSION/CONFIGURATION - (where CONFIGURATION is the configuration name, like mips-dec-ultrix4.2), + PREFIXDIR/lib/xemacs-VERSION/CONFIGURATION-NAME + (where CONFIGURATION-NAME is the host type, like mips-dec-ultrix4.2), unless the `--exec-prefix' option says otherwise. The `--exec-prefix=EXECDIR' option allows you to specify a separate @@ -171,7 +186,7 @@ files, like executables and utility programs. If specified, - XEmacs (and the other utilities users run) go in EXECDIR/bin, and - The architecture-dependent files go in - EXECDIR/lib/xemacs-VERSION/CONFIGURATION. + EXECDIR/lib/xemacs-VERSION/CONFIGURATION-NAME. EXECDIR/bin should be a directory that is normally in users' PATHs. For example, the command @@ -196,9 +211,9 @@ 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', -`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 +`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. @@ -206,10 +221,6 @@ support. The default is `yes' as long as support for a windowing system is included. -The `--with-gif' option specifies that XEmacs should support GIF image -conversion. No extra libraries are required. This options defaults -to `yes'. - The `--with-xpm' option specifies that XEmacs should support X11 Pixmaps. `configure' will attempt to detect if you have the Xpm libraries and define `--with-xpm' for you. @@ -218,19 +229,6 @@ X-Faces. `configure' will attempt to detect if you have the compface library and define `--with-xface' for you. -The `--with-jpeg' option specifies that XEmacs should support JPEG -image conversion. This option requires libjpeg from the Independent -JPEG Group which is available on the XEmacs ftp site. `configure' -will attempt to detect if you have libjpeg and define `--with-jpeg' -for you. - -The `--with-png' option specifies that XEmacs should support PNG image -conversion. The valid options are `yes' and `no'. This option -requires libpng which is available on the XEmacs ftp site. This -option also requires a decompression library, either libz or -libgz. XEmacs will detect whether libz is available, and use that, -else it will use libgz. - The `--with-database' option specifies that XEmacs should be built with additional database support. The valid options are `no' or a comma-separated list of one or more of `dbm', `gnudbm' or `berkdb'. @@ -240,20 +238,17 @@ The `--with-socks' option specifies that XEmacs should be built with SOCKS support. This requires the libsocks library. -The `--with-term' option specifies that XEmacs should be built with -TERM support. TERM is a way to multiplex serial lines over a simple -dialup connection, used on Linux and other systems. We cannot -guarantee that our TERM support coexists well with standard Internet -connections. - The `--with-tooltalk' option specifies that XEmacs should be built with ToolTalk support for interconnecting with other applications. -ToolTalk is not yet supported on all architectures. +ToolTalk is not yet supported on all architectures. If you use this +option, you should have the tooltalk package (see etc/PACKAGES) +installed prior to building XEmacs. The `--with-sparcworks' option specifies that XEmacs should be built with support for Sun Sparcworks 3.0.1 and up (including Sun WorkShop). This functionality is only of use on SunOS 4.1.x and Solaris 2.x -systems. +systems. If you use this option, you should have the Sun package (see +etc/PACKAGES) installed prior to building XEmacs. The `--with-cde' option allows you to enable or disable CDE drag and drop support. `configure' will attempt to detect this option and @@ -272,7 +267,7 @@ The `--puresize' option can be used to change the amount of purespace allocated for the dumped XEmacs. As of XEmacs 20.1 usage of this -parameter is deprecated and, in fact, ignored. +parameter is deprecated and will be ignored. The `--with-sound=TYPE' option specifies that XEmacs should be built with sound support. Native (`--with-sound=native') sound support is @@ -321,26 +316,54 @@ The `--with-mule' option enables (MUlti-Lingual Emacs) support, needed to suport non-Latin-1 (including Asian) languages. The Mule support -is not yet as stable or efficient as the `Latin1' support. The -following options require 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: 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 among all the X applications sharing an X display and using the same language. The XIM support comes in two flavors: `motif' and `xlib'. The Motif support (the XmIm* functions) is preferred when available. -The xlib XIM support does not work quite as well. The XIM support has -been known to cause crashes due to bugs in X11, so it defaults to `no' -except on Solaris, where it is known to be stable. +The xlib XIM support works reasonably well so long as the X11 libraries +are recent enough. It has been fairly well tested on Linux with glibc +2.0.5 and 2.0.6 and Kinput2 as an XIM server. In this configuration +X11 must be recompiled with X_LOCALE defined because glibc is lacking +localization for Japanese. The XIM support defaults to `no' except +when Motif is detected where it is stable with OSF libraries. The XIM +support in Lesstif (a Free Motif replacement) does not work as of +v0.82. If you enable this option, you will probably wish to install +the `locale' package which contains localized Splash screens and +Menubars. + +The `--with-xfs' option enables use of a multilingual Menubar. At the +present time, only Japanese and French locales are supported. In +order to use a multilingual Menubar you must have the `locale' package +installed. The `locale' package does not have to be installed when +building XEmacs. The `--with-canna' option enables the use of the Canna Japanese input -method. +method. This is stable code and fairly well tested. In order to use +it, you will have to have the Canna server installed and running. +Canna versions 3.2pl2 and 3.5b2 are known to work. Version 3.2pl2 is +considered most stable than version 3.5b2. If Canna is already +installed, configure will autodetect it, so you never need to +explicitly use this option unless your Canna libraries are somewhere +strange. Canna run time support is currently bundled with the +`mule-base' package so there is nothing additional to install in order +to use it. -The `--with-wnn' and `--with-wnn6' options are for compiling with the -Wnn multi-language input method. `--with-wnn' is for compiling with -Wnn-4.2, the free version of WNN. This is beta level code. -`--with-wnn6' is for compiling against WNN6, the commercial version -of WNN. This is alpha level code and very lightly tested at present. +The `--with-wnn' and `--with-wnn6' options are for compiling with the Wnn +multi-language input method. `--with-wnn' is for compiling with Wnn-4.2, +the Free version of WNN. `--with-wnn6' is for compiling against WNN6, +the commercial version of WNN available from OMRON Corporation. This is +stable code and fairly well tested. In order to build with this +option, you will need to have the `egg-its' lisp package already +installed. + +Please note that it is safe to build with as many of the options +`--with-xim', `--with-canna' and `--with-wnn' as your system +supports. `configure' doesn't do any compilation or installation itself. It just creates the files that influence those things: `./src/config.h', @@ -448,17 +471,15 @@ programs used by XEmacs that users are not expected to run themselves, and the DOC file. `VERSION' is the number of the XEmacs version you are installing, and - `CONFIGURATION-NAME' is the argument you gave to the - `configure' program to identify the architecture and - operating system of your machine, like - `mips-dec-ultrix' or `sparc-sun-sunos'. Since these - files are specific to the version of XEmacs, operating - system, and architecture in use, including the - configuration name in the path allows you to have - several versions of XEmacs for any mix of machines and - operating systems installed at the same time; this is - useful for sites at which different kinds of machines - share the file system XEmacs is installed on. + `CONFIGURATION-NAME' is the host type of your system. + Since these files are specific to the version of + XEmacs, operating system, and architecture in use, + including the configuration name in the path allows + you to have several versions of XEmacs for any mix of + machines and operating systems installed at the same + time; this is useful for sites at which different + kinds of machines share the file system XEmacs is + installed on. `/usr/local/lib/xemacs-VERSION/info' holds the on-line documentation for XEmacs, known as "info files". @@ -478,11 +499,13 @@ The setuid/setgid bits need not be set on any other XEmacs-related executables. -9) You are done! You can remove executables and object files from -the build directory by typing `make clean'. To also remove the files -that `configure' created (so you can compile XEmacs for a different -configuration), type `make distclean'. +9) You are done with the hard part! You can remove executables and +object files from the build directory by typing `make clean'. To also +remove the files that `configure' created (so you can compile XEmacs +for a different configuration), type `make distclean'. +10) You should now go to the XEmacs web page at http://www.xemacs.org/ +and decide what additional Lisp support you wish to have. MAKE VARIABLES @@ -531,16 +554,14 @@ programs used by XEmacs that users are not expected to run themselves and the DOC file. `VERSION' is the number of the XEmacs version you are installing, - and `CONFIGURATION-NAME' is the argument you gave to the - `configure' program to identify the architecture and operating - system of your machine, like `mips-dec-ultrix' or - `sparc-sun-sunos'. Since these files are specific to the version - of XEmacs, operating system, and architecture in use, including - the configuration name in the path allows you to have several - versions of XEmacs for any mix of machines and operating systems - installed at the same time; this is useful for sites at which - different kinds of machines share the file system XEmacs is - installed on. + and `CONFIGURATION-NAME' is the host type of your system. + Since these files are specific to the version of XEmacs, + operating system, and architecture in use, including the + configuration name in the path allows you to have several + versions of XEmacs for any mix of machines and operating + systems installed at the same time; this is useful for sites + at which different kinds of machines share the file system + XEmacs is installed on. `infodir' indicates where to put the info files distributed with XEmacs; it defaults to `/usr/local/lib/xemacs-VERSION/info'.
--- a/Makefile.in Mon Aug 13 10:16:17 2007 +0200 +++ b/Makefile.in Mon Aug 13 10:17:07 2007 +0200 @@ -424,17 +424,14 @@ -chmod 0755 ${bindir}/${progname}-${version} cd ${bindir} && $(RM) ./xemacs && ${LN_S} ${progname}-${version} ./xemacs if test "${prefix}" != "${exec_prefix}"; then \ - test ! -d ${exec_prefix}/lib/xemacs && \ - $(LN_S) ${prefix}/lib/xemacs ${exec_prefix}/lib/xemacs; \ - test ! -d ${exec_prefix}/lib/${progname}-${version}/etc && \ - $(LN_S) ${prefix}/lib/${progname}-${version}/etc \ - ${exec_prefix}/lib/${progname}-${version}/etc; \ - test ! -d ${exec_prefix}/lib/${progname}-${version}/info && \ - $(LN_S) ${prefix}/lib/${progname}-${version}/info \ - ${exec_prefix}/lib/${progname}-${version}/info; \ - test ! -d ${exec_prefix}/lib/${progname}-${version}/lisp && \ - $(LN_S) ${prefix}/lib/${progname}-${version}/lisp \ - ${exec_prefix}/lib/${progname}-${version}/lisp; \ + for dir in \ + lib/xemacs \ + lib/${progname}-${version}/etc \ + lib/${progname}-${version}/info \ + lib/${progname}-${version}/lisp; do \ + if test ! -d ${exec_prefix}/$${dir}; then \ + $(LN_S) ${prefix}/$${dir} ${exec_prefix}/$${dir}; fi; \ + done; \ fi install-arch-indep: mkdir info @@ -488,7 +485,7 @@ MAKEPATH=./lib-src/make-path ## Build all the directories to install XEmacs in. ## Since we may be creating several layers of directories, -## (e.g. /usr/local/lib/${progname}20.5/sparc-sun-solaris2.6), we use +## (e.g. /usr/local/lib/${progname}-20.5/sparc-sun-solaris2.6), we use ## make-path instead of mkdir. Not all mkdirs have the `-p' flag. mkdir: FRC.mkdir ${MAKEPATH} ${COPYDESTS} ${lockdir} ${infodir} ${archlibdir} \
--- a/configure Mon Aug 13 10:16:17 2007 +0200 +++ b/configure Mon Aug 13 10:17:07 2007 +0200 @@ -280,11 +280,15 @@ ;; -*) opt=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*\(.*\)$:\1:'` - val="yes" - valomitted=yes + val="yes" valomitted=yes ;; esac + case "${valomitted}-${opt}" in yes-without_* ) + opt=`echo $opt | sed 's/without/with/'` + valomitted="no" val="no" ;; + esac + optname="$opt" opt="`echo '' $opt | sed -e 's:^ ::' | tr - _`" @@ -563,7 +567,11 @@ esac ;; - *) configuration="$arg" ;; + *-*-*) configuration="$arg" ;; + + *) (echo "$progname: Usage error:" +echo " " "Unrecognized argument: $arg" +echo " Use \`$progname --help' to show usage.") >&2 && exit 1 ;; esac done @@ -585,20 +593,6 @@ echo "configure: warning: "The --run-in-place option is ignored because it is unnecessary."" 1>&2 fi -if test "$configuration" = "" ; then - echo '- You did not tell me what kind of host system you want to configure. -- I will attempt to guess the kind of system this is.' 1>&2 - guesssys=`echo $progname | sed 's/configure$/config.guess/'` - if configuration=`${CONFIG_SHELL-/bin/sh} $guesssys | \ - sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` ; then - echo "- Looks like this is a $configuration" 1>&2 - else - (echo "$progname: Usage error:" -echo " " "Failed to guess the system type. You need to tell me." -echo " Use \`$progname --help' to show usage.") >&2 && exit 1 - fi -fi - case "$srcdir" in "" ) @@ -621,8 +615,7 @@ ;; * ) - if test ! -d "$srcdir" -o \ - ! -f "$srcdir/src/lisp.h" -o \ + if test ! -f "$srcdir/src/lisp.h" -o \ ! -f "$srcdir/lisp/version.el" ; then (echo "$progname: Usage error:" echo " " "The directory specified with the \`--srcdir' option, @@ -634,8 +627,23 @@ ;; esac +if test -z "$configuration"; then + echo $ac_n "checking "host system type"""... $ac_c" 1>&6 +echo "configure:633: checking "host system type"" >&5 + if configuration=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess | \ + sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'` ; then + echo "$ac_t""$configuration" 1>&6 + else + echo "$ac_t""unknown" 1>&6 + (echo "$progname: Usage error:" +echo " " "XEmacs has not been ported to this host type. +Try explicitly specifying the CONFIGURATION when rerunning configure." +echo " Use \`$progname --help' to show usage.") >&2 && exit 1 + fi +fi + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:639: checking whether ln -s works" >&5 +echo "configure:647: checking whether ln -s works" >&5 rm -f conftestdata if ln -s X conftestdata 2>/dev/null @@ -812,7 +820,7 @@ echo "checking "the configuration name"" 1>&6 -echo "configure:816: checking "the configuration name"" >&5 +echo "configure:824: checking "the configuration name"" >&5 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'` if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else exit $? @@ -1269,7 +1277,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1273: checking for $ac_word" >&5 +echo "configure:1281: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1295,7 +1303,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1299: checking for $ac_word" >&5 +echo "configure:1307: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1340,7 +1348,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1344: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1352: 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' @@ -1352,11 +1360,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1356 "configure" +#line 1364 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1376,19 +1384,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1380: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1388: 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:1385: checking whether we are using GNU C" >&5 +echo "configure:1393: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1400: \"$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 @@ -1402,7 +1410,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1406: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1414: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1431,7 +1439,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1435: checking for $ac_word" >&5 +echo "configure:1443: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1457,7 +1465,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1461: checking for $ac_word" >&5 +echo "configure:1469: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1502,7 +1510,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1506: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1514: 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' @@ -1514,11 +1522,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1518 "configure" +#line 1526 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1538,19 +1546,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1542: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1550: 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:1547: checking whether we are using GNU C" >&5 +echo "configure:1555: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1562: \"$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 @@ -1564,7 +1572,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1568: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1576: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1593,7 +1601,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1597: checking for $ac_word" >&5 +echo "configure:1605: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1619,7 +1627,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1623: checking for $ac_word" >&5 +echo "configure:1631: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1664,7 +1672,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1668: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1676: 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' @@ -1676,11 +1684,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1680 "configure" +#line 1688 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1700,19 +1708,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1704: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1712: 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:1709: checking whether we are using GNU C" >&5 +echo "configure:1717: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1724: \"$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 @@ -1726,7 +1734,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1730: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1738: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1759,7 +1767,7 @@ test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1763: checking how to run the C preprocessor" >&5 +echo "configure:1771: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1772,13 +1780,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1776 "configure" +#line 1784 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1789,13 +1797,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1793 "configure" +#line 1801 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1818,9 +1826,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1822: checking for AIX" >&5 -cat > conftest.$ac_ext <<EOF -#line 1824 "configure" +echo "configure:1830: checking for AIX" >&5 +cat > conftest.$ac_ext <<EOF +#line 1832 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1846,10 +1854,45 @@ +echo $ac_n "checking for GNU libc""... $ac_c" 1>&6 +echo "configure:1859: checking for GNU libc" >&5 +cat > conftest.$ac_ext <<EOF +#line 1861 "configure" +#include "confdefs.h" +#include <features.h> +int main() { + +#if ! (defined __GLIBC__ || defined __GNU_LIBRARY__) +#error Not a GNU libc system :-( +******* ======= ******** &&&&&&&& +#endif + +; return 0; } +EOF +if { (eval echo configure:1873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + have_glibc=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + have_glibc=no +fi +rm -f conftest* +echo "$ac_t""$have_glibc" 1>&6 +test "$have_glibc" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF + Defining _GNU_SOURCE +EOF +cat >> confdefs.h <<\EOF +#define _GNU_SOURCE 1 +EOF +} + + echo $ac_n "checking whether we are using SunPro C""... $ac_c" 1>&6 -echo "configure:1851: checking whether we are using SunPro C" >&5 -cat > conftest.$ac_ext <<EOF -#line 1853 "configure" +echo "configure:1894: checking whether we are using SunPro C" >&5 +cat > conftest.$ac_ext <<EOF +#line 1896 "configure" #include "confdefs.h" int main() { @@ -1860,7 +1903,7 @@ ; return 0; } EOF -if { (eval echo configure:1864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* __sunpro_c=yes else @@ -2136,7 +2179,7 @@ fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:2140: checking for dynodump" >&5 +echo "configure:2183: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -2234,19 +2277,19 @@ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:2238: checking "for runtime libraries flag"" >&5 +echo "configure:2281: checking "for runtime libraries flag"" >&5 dash_r="" for try_dash_r in "-R" "-R " "-rpath "; do xe_check_libs="${try_dash_r}/no/such/file-or-directory" cat > conftest.$ac_ext <<EOF -#line 2243 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +#line 2286 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:2293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* dash_r="$try_dash_r" else @@ -2344,7 +2387,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2348: checking for $ac_word" >&5 +echo "configure:2391: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -2397,7 +2440,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2401: checking for a BSD compatible install" >&5 +echo "configure:2444: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" @@ -2448,7 +2491,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2452: checking for $ac_word" >&5 +echo "configure:2495: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -2479,15 +2522,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2483: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2486 "configure" +echo "configure:2526: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2529 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2520,15 +2563,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2524: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2527 "configure" +echo "configure:2567: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2570 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2532: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2557,60 +2600,19 @@ fi done -for ac_hdr in linux/version.h kstat.h sys/pstat.h inttypes.h limits.h +for ac_hdr in linux/version.h kstat.h sys/pstat.h inttypes.h sys/un.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2565: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2568 "configure" +echo "configure:2608: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2611 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` -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 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - { test "$extra_verbose" = "yes" && cat << EOF - Defining $ac_tr_hdr -EOF -cat >> confdefs.h <<EOF -#define $ac_tr_hdr 1 -EOF -} - -else - echo "$ac_t""no" 1>&6 -fi -done - -for ac_hdr in sys/un.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2606: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2609 "configure" -#include "confdefs.h" -#include <$ac_hdr> -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2640,10 +2642,10 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2644: checking for sys/wait.h that is POSIX.1 compatible" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2647 "configure" +echo "configure:2646: checking for sys/wait.h that is POSIX.1 compatible" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2649 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -2659,7 +2661,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2683,10 +2685,10 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2687: checking for ANSI C header files" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2690 "configure" +echo "configure:2689: checking for ANSI C header files" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2692 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2694,7 +2696,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2711,7 +2713,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2715 "configure" +#line 2717 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2729,7 +2731,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2733 "configure" +#line 2735 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2747,7 +2749,7 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. cat > conftest.$ac_ext <<EOF -#line 2751 "configure" +#line 2753 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2758,7 +2760,7 @@ exit (0); } EOF -if { (eval echo configure:2762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:2764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then : else @@ -2783,10 +2785,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2787: checking whether time.h and sys/time.h may both be included" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2790 "configure" +echo "configure:2789: checking whether time.h and sys/time.h may both be included" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2792 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2795,7 +2797,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2819,10 +2821,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2823: checking for sys_siglist declaration in signal.h or unistd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2826 "configure" +echo "configure:2825: checking for sys_siglist declaration in signal.h or unistd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2828 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2834,7 +2836,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2859,9 +2861,9 @@ echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 -echo "configure:2863: checking for struct utimbuf" >&5 -cat > conftest.$ac_ext <<EOF -#line 2865 "configure" +echo "configure:2865: checking for struct utimbuf" >&5 +cat > conftest.$ac_ext <<EOF +#line 2867 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -2880,7 +2882,7 @@ static struct utimbuf x; x.actime = x.modtime; ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2886: \"$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 @@ -2900,10 +2902,10 @@ rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2904: checking return type of signal handlers" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2907 "configure" +echo "configure:2906: checking return type of signal handlers" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2909 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2920,7 +2922,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2942,10 +2944,10 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2946: checking for size_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2949 "configure" +echo "configure:2948: checking for size_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2951 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2976,10 +2978,10 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2980: checking for pid_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2983 "configure" +echo "configure:2982: checking for pid_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2985 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3010,10 +3012,10 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3014: checking for uid_t in sys/types.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3017 "configure" +echo "configure:3016: checking for uid_t in sys/types.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3019 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3049,10 +3051,10 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3053: checking for mode_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3056 "configure" +echo "configure:3055: checking for mode_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3058 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3083,10 +3085,10 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3087: checking for off_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3090 "configure" +echo "configure:3089: checking for off_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3092 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3118,9 +3120,9 @@ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:3122: checking for struct timeval" >&5 -cat > conftest.$ac_ext <<EOF -#line 3124 "configure" +echo "configure:3124: checking for struct timeval" >&5 +cat > conftest.$ac_ext <<EOF +#line 3126 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -3136,7 +3138,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:3140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -3158,10 +3160,10 @@ rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3162: checking whether struct tm is in sys/time.h or time.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3165 "configure" +echo "configure:3164: checking whether struct tm is in sys/time.h or time.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3167 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -3169,7 +3171,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3193,10 +3195,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3197: checking for tm_zone in struct tm" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3200 "configure" +echo "configure:3199: checking for tm_zone in struct tm" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3202 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -3204,7 +3206,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3227,10 +3229,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3231: checking for tzname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3234 "configure" +echo "configure:3233: checking for tzname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3236 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -3240,7 +3242,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3266,10 +3268,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3270: checking for working const" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3273 "configure" +echo "configure:3272: checking for working const" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3275 "configure" #include "confdefs.h" int main() { @@ -3318,7 +3320,7 @@ ; return 0; } EOF -if { (eval echo configure:3322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3343,7 +3345,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:3347: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:3349: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -3368,12 +3370,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3372: checking whether byte ordering is bigendian" >&5 +echo "configure:3374: checking whether byte ordering is bigendian" >&5 ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 3377 "configure" +#line 3379 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3384,11 +3386,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 3392 "configure" +#line 3394 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3399,7 +3401,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3416,7 +3418,7 @@ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 3420 "configure" +#line 3422 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -3429,7 +3431,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:3433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_bigendian=no else @@ -3455,10 +3457,10 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:3459: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3462 "configure" +echo "configure:3461: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3464 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3469,7 +3471,7 @@ exit(0); } EOF -if { (eval echo configure:3473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -3496,10 +3498,10 @@ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3500: checking size of int" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3503 "configure" +echo "configure:3502: checking size of int" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3505 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3510,7 +3512,7 @@ exit(0); } EOF -if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -3531,10 +3533,10 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3535: checking size of long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3538 "configure" +echo "configure:3537: checking size of long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3540 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3545,7 +3547,7 @@ exit(0); } EOF -if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -3566,10 +3568,10 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:3570: checking size of long long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3573 "configure" +echo "configure:3572: checking size of long long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3575 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3580,7 +3582,7 @@ exit(0); } EOF -if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3586: \"$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 @@ -3601,10 +3603,10 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:3605: checking size of void *" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3608 "configure" +echo "configure:3607: checking size of void *" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3610 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3615,7 +3617,7 @@ exit(0); } EOF -if { (eval echo configure:3619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3621: \"$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 @@ -3637,7 +3639,7 @@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:3641: checking for long file names" >&5 +echo "configure:3643: 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: @@ -3684,12 +3686,12 @@ echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:3688: checking for sin in -lm" >&5 +echo "configure:3690: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` xe_check_libs=" -lm " cat > conftest.$ac_ext <<EOF -#line 3693 "configure" +#line 3695 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3700,7 +3702,7 @@ sin() ; return 0; } EOF -if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3741,8 +3743,32 @@ } +cat > conftest.$ac_ext <<EOF +#line 3748 "configure" +#include "confdefs.h" +#include <math.h> +int main() { +return atanh(1.0) + asinh(1.0) + acosh(1.0); +; return 0; } +EOF +if { (eval echo configure:3755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + { test "$extra_verbose" = "yes" && cat << \EOF + Defining HAVE_INVERSE_HYPERBOLIC +EOF +cat >> confdefs.h <<\EOF +#define HAVE_INVERSE_HYPERBOLIC 1 +EOF +} + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + echo "checking type of mail spool file locking" 1>&6 -echo "configure:3746: checking type of mail spool file locking" >&5 +echo "configure:3772: checking type of mail spool file locking" >&5 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf if test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF @@ -3766,12 +3792,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:3770: checking for kstat_open in -lkstat" >&5 +echo "configure:3796: checking for kstat_open in -lkstat" >&5 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lkstat " cat > conftest.$ac_ext <<EOF -#line 3775 "configure" +#line 3801 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3782,7 +3808,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3816,12 +3842,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:3820: checking for kvm_read in -lkvm" >&5 +echo "configure:3846: checking for kvm_read in -lkvm" >&5 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'` xe_check_libs=" -lkvm " cat > conftest.$ac_ext <<EOF -#line 3825 "configure" +#line 3851 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3832,7 +3858,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:3836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3866,12 +3892,12 @@ echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:3870: checking for cma_open in -lpthreads" >&5 +echo "configure:3896: checking for cma_open in -lpthreads" >&5 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lpthreads " cat > conftest.$ac_ext <<EOF -#line 3875 "configure" +#line 3901 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3882,7 +3908,7 @@ cma_open() ; return 0; } EOF -if { (eval echo configure:3886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3918,7 +3944,7 @@ fi echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:3922: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:3948: 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; @@ -3929,7 +3955,7 @@ if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:3933: checking for \"-z ignore\" linker flag" >&5 +echo "configure:3959: 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 ;; @@ -3939,7 +3965,7 @@ echo "checking "for specified window system"" 1>&6 -echo "configure:3943: checking "for specified window system"" >&5 +echo "configure:3969: checking "for specified window system"" >&5 if test "$with_x11" != "no"; then test "$x_includes $x_libraries" != "NONE NONE" && \ @@ -3969,7 +3995,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3973: checking for X" >&5 +echo "configure:3999: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4029,12 +4055,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 4033 "configure" +#line 4059 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4103,14 +4129,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 4107 "configure" +#line 4133 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:4114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -4219,17 +4245,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:4223: checking whether -R must be followed by a space" >&5 +echo "configure:4249: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 4226 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +#line 4252 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:4259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -4245,14 +4271,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 4249 "configure" -#include "confdefs.h" - -int main() { - -; return 0; } -EOF -if { (eval echo configure:4256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +#line 4275 "configure" +#include "confdefs.h" + +int main() { + +; return 0; } +EOF +if { (eval echo configure:4282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -4288,12 +4314,12 @@ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4292: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4318: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet " cat > conftest.$ac_ext <<EOF -#line 4297 "configure" +#line 4323 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4304,7 +4330,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4328,12 +4354,12 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:4332: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4358: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` xe_check_libs=" -ldnet_stub " cat > conftest.$ac_ext <<EOF -#line 4337 "configure" +#line 4363 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4344,7 +4370,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4373,10 +4399,10 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:4377: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4380 "configure" +echo "configure:4403: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4406 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -4399,7 +4425,7 @@ ; return 0; } EOF -if { (eval echo configure:4403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4420,12 +4446,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4424: checking for gethostbyname in -lnsl" >&5 +echo "configure:4450: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` xe_check_libs=" -lnsl " cat > conftest.$ac_ext <<EOF -#line 4429 "configure" +#line 4455 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4436,7 +4462,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:4440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4466,10 +4492,10 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:4470: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4473 "configure" +echo "configure:4496: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4499 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -4492,7 +4518,7 @@ ; return 0; } EOF -if { (eval echo configure:4496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -4515,12 +4541,12 @@ xe_msg_checking="for connect in -lsocket" test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:4519: checking "$xe_msg_checking"" >&5 +echo "configure:4545: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocket $X_EXTRA_LIBS" cat > conftest.$ac_ext <<EOF -#line 4524 "configure" +#line 4550 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4531,7 +4557,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4555,10 +4581,10 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:4559: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4562 "configure" +echo "configure:4585: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4588 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -4581,7 +4607,7 @@ ; return 0; } EOF -if { (eval echo configure:4585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -4602,12 +4628,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4606: checking for remove in -lposix" >&5 +echo "configure:4632: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` xe_check_libs=" -lposix " cat > conftest.$ac_ext <<EOF -#line 4611 "configure" +#line 4637 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4618,7 +4644,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4642,10 +4668,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4646: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4649 "configure" +echo "configure:4672: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4675 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -4668,7 +4694,7 @@ ; return 0; } EOF -if { (eval echo configure:4672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -4689,12 +4715,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4693: checking for shmat in -lipc" >&5 +echo "configure:4719: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` xe_check_libs=" -lipc " cat > conftest.$ac_ext <<EOF -#line 4698 "configure" +#line 4724 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4705,7 +4731,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4739,12 +4765,12 @@ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4743: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4769: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` xe_check_libs=" -lICE " cat > conftest.$ac_ext <<EOF -#line 4748 "configure" +#line 4774 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4755,7 +4781,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4792,22 +4818,22 @@ if test "$window_system" = "none"; then echo "checking for MS-Windows" 1>&6 -echo "configure:4796: checking for MS-Windows" >&5 +echo "configure:4822: checking for MS-Windows" >&5 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6 -echo "configure:4799: checking for main in -lgdi32" >&5 +echo "configure:4825: checking for main in -lgdi32" >&5 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdi32 " cat > conftest.$ac_ext <<EOF -#line 4804 "configure" +#line 4830 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4951,7 +4977,7 @@ fi echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:4955: checking for X defines extracted by xmkmf" >&5 +echo "configure:4981: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -4983,15 +5009,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:4987: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4990 "configure" +echo "configure:5013: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5016 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5015,12 +5041,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:5019: checking for XOpenDisplay in -lX11" >&5 +echo "configure:5045: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 5024 "configure" +#line 5050 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5031,7 +5057,7 @@ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:5035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5056,12 +5082,12 @@ xe_msg_checking="for XGetFontProperty in -lX11" test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:5060: checking "$xe_msg_checking"" >&5 +echo "configure:5086: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 -b i486-linuxaout" cat > conftest.$ac_ext <<EOF -#line 5065 "configure" +#line 5091 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5072,7 +5098,7 @@ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5099,12 +5125,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:5103: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:5129: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` xe_check_libs=" -lXext " cat > conftest.$ac_ext <<EOF -#line 5108 "configure" +#line 5134 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5115,7 +5141,7 @@ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:5119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5138,12 +5164,12 @@ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:5142: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:5168: checking for XtOpenDisplay in -lXt" >&5 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'` xe_check_libs=" -lXt " cat > conftest.$ac_ext <<EOF -#line 5147 "configure" +#line 5173 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5154,7 +5180,7 @@ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:5158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5177,14 +5203,14 @@ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:5181: checking the version of X11 being used" >&5 +echo "configure:5207: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 5183 "configure" +#line 5209 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:5188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:5214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ./conftest foobar; x11_release=$? else @@ -5208,15 +5234,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5212: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5215 "configure" +echo "configure:5238: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5241 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5247,7 +5273,7 @@ echo $ac_n "checking for XFree86""... $ac_c" 1>&6 -echo "configure:5251: checking for XFree86" >&5 +echo "configure:5277: checking for XFree86" >&5 if test -d "/usr/X386/include" -o \ -f "/etc/XF86Config" -o \ -f "/etc/X11/XF86Config" -o \ @@ -5267,12 +5293,12 @@ test -z "$with_xmu" && { echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 -echo "configure:5271: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +echo "configure:5297: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <<EOF -#line 5276 "configure" +#line 5302 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5283,7 +5309,7 @@ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:5287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5322,19 +5348,19 @@ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:5326: checking for main in -lXbsd" >&5 +echo "configure:5352: checking for main in -lXbsd" >&5 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'` xe_check_libs=" -lXbsd " cat > conftest.$ac_ext <<EOF -#line 5331 "configure" +#line 5357 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5355,6 +5381,10 @@ + if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then + libs_x="$libs_x -lc_r" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lc_r\" to \$libs_x"; fi + fi + fi test -z "$window_system" && window_system="none" @@ -5389,7 +5419,7 @@ esac echo "checking for session-management option" 1>&6 -echo "configure:5393: checking for session-management option" >&5; +echo "configure:5423: checking for session-management option" >&5; if test "$with_session" != "no"; then { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SESSION @@ -5404,15 +5434,15 @@ test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6 -echo "configure:5408: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5411 "configure" +echo "configure:5438: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5441 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5435,12 +5465,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:5439: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:5469: checking for XauGetAuthByAddr in -lXau" >&5 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'` xe_check_libs=" -lXau " cat > conftest.$ac_ext <<EOF -#line 5444 "configure" +#line 5474 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5451,7 +5481,7 @@ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:5455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5511,15 +5541,15 @@ for dir in "" "Tt/" "desktop/" ; do ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6 -echo "configure:5515: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5518 "configure" +echo "configure:5545: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5548 "configure" #include "confdefs.h" #include <${dir}tt_c.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5548,12 +5578,12 @@ xe_msg_checking="for tt_message_create in -ltt" test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:5552: checking "$xe_msg_checking"" >&5 +echo "configure:5582: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'` xe_check_libs=" -ltt $extra_libs" cat > conftest.$ac_ext <<EOF -#line 5557 "configure" +#line 5587 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5564,7 +5594,7 @@ tt_message_create() ; return 0; } EOF -if { (eval echo configure:5568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5613,15 +5643,15 @@ test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6 -echo "configure:5617: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5620 "configure" +echo "configure:5647: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5650 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5644,12 +5674,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:5648: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:5678: checking for DtDndDragStart in -lDtSvc" >&5 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'` xe_check_libs=" -lDtSvc " cat > conftest.$ac_ext <<EOF -#line 5653 "configure" +#line 5683 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5660,7 +5690,7 @@ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:5664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5700,12 +5730,13 @@ if test "$with_x11" = "yes"; then echo "checking for X11 graphics libraries" 1>&6 -echo "configure:5704: checking for X11 graphics libraries" >&5 +echo "configure:5734: checking for X11 graphics libraries" >&5 + echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:5706: checking for Xpm - no older than 3.4f" >&5 +echo "configure:5737: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF -#line 5709 "configure" +#line 5740 "configure" #include "confdefs.h" #include <X11/xpm.h> int main(int c, char **v) { @@ -5715,7 +5746,7 @@ 0 ; } EOF -if { (eval echo configure:5719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:5750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ./conftest foobar; xpm_status=$?; if test "$xpm_status" = "0"; then with_xpm=yes; else with_xpm=no; fi; @@ -5753,15 +5784,15 @@ test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for compface.h""... $ac_c" 1>&6 -echo "configure:5757: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5760 "configure" +echo "configure:5788: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5791 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5784,12 +5815,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:5788: checking for UnGenFace in -lcompface" >&5 +echo "configure:5819: checking for UnGenFace in -lcompface" >&5 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'` xe_check_libs=" -lcompface " cat > conftest.$ac_ext <<EOF -#line 5793 "configure" +#line 5824 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5800,7 +5831,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5836,15 +5867,15 @@ test "$with_imagick" != "no" && { ac_safe=`echo "magick/magick.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for magick/magick.h""... $ac_c" 1>&6 -echo "configure:5840: checking for magick/magick.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5843 "configure" +echo "configure:5871: checking for magick/magick.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5874 "configure" #include "confdefs.h" #include <magick/magick.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5864,15 +5895,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "X11/magick/magick.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/magick/magick.h""... $ac_c" 1>&6 -echo "configure:5868: checking for X11/magick/magick.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5871 "configure" +echo "configure:5899: checking for X11/magick/magick.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5902 "configure" #include "confdefs.h" #include <X11/magick/magick.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5903,15 +5934,92 @@ fi } test "$with_imagick" != "no" && { - imagick_libs="" + z_libs="" + +echo $ac_n "checking for inflateInit_ in -lz""... $ac_c" 1>&6 +echo "configure:5941: checking for inflateInit_ in -lz" >&5 +ac_lib_var=`echo z'_'inflateInit_ | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lz " +cat > conftest.$ac_ext <<EOF +#line 5946 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char inflateInit_(); + +int main() { +inflateInit_() +; return 0; } +EOF +if { (eval echo configure:5957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + z_libs="$z_libs -lz" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lz\" to \$z_libs"; fi +else + echo "$ac_t""no" 1>&6 +echo $ac_n "checking for inflateInit_ in -lgz""... $ac_c" 1>&6 +echo "configure:5975: checking for inflateInit_ in -lgz" >&5 +ac_lib_var=`echo gz'_'inflateInit_ | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lgz " +cat > conftest.$ac_ext <<EOF +#line 5980 "configure" +#include "confdefs.h" +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char inflateInit_(); + +int main() { +inflateInit_() +; return 0; } +EOF +if { (eval echo configure:5991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + z_libs="$z_libs -lgz" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lgz\" to \$z_libs"; fi +else + echo "$ac_t""no" 1>&6 +fi + + +fi + + + + imagick_libs="" echo $ac_n "checking for XDPSPixelsPerPoint in -ldps""... $ac_c" 1>&6 -echo "configure:5910: checking for XDPSPixelsPerPoint in -ldps" >&5 +echo "configure:6018: checking for XDPSPixelsPerPoint in -ldps" >&5 ac_lib_var=`echo dps'_'XDPSPixelsPerPoint | sed 'y%./+-%__p_%'` xe_check_libs="-ldpstk -ldps " cat > conftest.$ac_ext <<EOF -#line 5915 "configure" +#line 6023 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5922,7 +6030,7 @@ XDPSPixelsPerPoint() ; return 0; } EOF -if { (eval echo configure:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5944,12 +6052,12 @@ echo $ac_n "checking for FPX_SetToolkitMemoryLimit in -lfpx""... $ac_c" 1>&6 -echo "configure:5948: checking for FPX_SetToolkitMemoryLimit in -lfpx" >&5 +echo "configure:6056: checking for FPX_SetToolkitMemoryLimit in -lfpx" >&5 ac_lib_var=`echo fpx'_'FPX_SetToolkitMemoryLimit | sed 'y%./+-%__p_%'` xe_check_libs=" -lfpx " cat > conftest.$ac_ext <<EOF -#line 5953 "configure" +#line 6061 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5960,7 +6068,7 @@ FPX_SetToolkitMemoryLimit() ; return 0; } EOF -if { (eval echo configure:5964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5982,12 +6090,12 @@ echo $ac_n "checking for DF24getdims in -ldf""... $ac_c" 1>&6 -echo "configure:5986: checking for DF24getdims in -ldf" >&5 +echo "configure:6094: checking for DF24getdims in -ldf" >&5 ac_lib_var=`echo df'_'DF24getdims | sed 'y%./+-%__p_%'` xe_check_libs=" -ldf " cat > conftest.$ac_ext <<EOF -#line 5991 "configure" +#line 6099 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5998,7 +6106,7 @@ DF24getdims() ; return 0; } EOF -if { (eval echo configure:6002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6020,12 +6128,12 @@ echo $ac_n "checking for jbg_dec_init in -ljbig""... $ac_c" 1>&6 -echo "configure:6024: checking for jbg_dec_init in -ljbig" >&5 +echo "configure:6132: checking for jbg_dec_init in -ljbig" >&5 ac_lib_var=`echo jbig'_'jbg_dec_init | sed 'y%./+-%__p_%'` xe_check_libs=" -ljbig " cat > conftest.$ac_ext <<EOF -#line 6029 "configure" +#line 6137 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6036,7 +6144,7 @@ jbg_dec_init() ; return 0; } EOF -if { (eval echo configure:6040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6058,12 +6166,12 @@ echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 -echo "configure:6062: checking for jpeg_read_header in -ljpeg" >&5 +echo "configure:6170: checking for jpeg_read_header in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'` xe_check_libs=" -ljpeg " cat > conftest.$ac_ext <<EOF -#line 6067 "configure" +#line 6175 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6074,7 +6182,7 @@ jpeg_read_header() ; return 0; } EOF -if { (eval echo configure:6078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6096,12 +6204,12 @@ echo $ac_n "checking for OpenMPEG in -lmpeg""... $ac_c" 1>&6 -echo "configure:6100: checking for OpenMPEG in -lmpeg" >&5 +echo "configure:6208: checking for OpenMPEG in -lmpeg" >&5 ac_lib_var=`echo mpeg'_'OpenMPEG | sed 'y%./+-%__p_%'` xe_check_libs=" -lmpeg " cat > conftest.$ac_ext <<EOF -#line 6105 "configure" +#line 6213 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6112,7 +6220,7 @@ OpenMPEG() ; return 0; } EOF -if { (eval echo configure:6116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6134,12 +6242,12 @@ echo $ac_n "checking for TT_Init_FreeType in -lttf""... $ac_c" 1>&6 -echo "configure:6138: checking for TT_Init_FreeType in -lttf" >&5 +echo "configure:6246: checking for TT_Init_FreeType in -lttf" >&5 ac_lib_var=`echo ttf'_'TT_Init_FreeType | sed 'y%./+-%__p_%'` xe_check_libs=" -lttf " cat > conftest.$ac_ext <<EOF -#line 6143 "configure" +#line 6251 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6150,7 +6258,7 @@ TT_Init_FreeType() ; return 0; } EOF -if { (eval echo configure:6154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6171,13 +6279,15 @@ -echo $ac_n "checking for png_create_read_struct in -lpng""... $ac_c" 1>&6 -echo "configure:6176: checking for png_create_read_struct in -lpng" >&5 +xe_msg_checking="for png_create_read_struct in -lpng" +test -n "$z_libs" && xe_msg_checking="$xe_msg_checking using extra libs $z_libs" +echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 +echo "configure:6286: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo png'_'png_create_read_struct | sed 'y%./+-%__p_%'` -xe_check_libs=" -lpng " -cat > conftest.$ac_ext <<EOF -#line 6181 "configure" +xe_check_libs=" -lpng $z_libs" +cat > conftest.$ac_ext <<EOF +#line 6291 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6188,7 +6298,7 @@ png_create_read_struct() ; return 0; } EOF -if { (eval echo configure:6192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6205,56 +6315,17 @@ imagick_libs="$imagick_libs -lpng" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lpng\" to \$imagick_libs"; fi else echo "$ac_t""no" 1>&6 -xe_msg_checking="for png_create_read_struct in -lpng" -test -n "-lz" && xe_msg_checking="$xe_msg_checking using extra libs -lz" -echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6212: checking "$xe_msg_checking"" >&5 -ac_lib_var=`echo png'_'png_create_read_struct | sed 'y%./+-%__p_%'` - -xe_check_libs=" -lpng -lz" -cat > conftest.$ac_ext <<EOF -#line 6217 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char png_create_read_struct(); - -int main() { -png_create_read_struct() -; return 0; } -EOF -if { (eval echo configure:6228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -xe_check_libs="" - -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then - echo "$ac_t""yes" 1>&6 - imagick_libs="$imagick_libs -lpng -lz" && if test "$extra_verbose" = "yes"; then echo " Appending \"-lpng -lz\" to \$imagick_libs"; fi -else - echo "$ac_t""no" 1>&6 -fi - - fi echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6 -echo "configure:6253: checking for TIFFOpen in -ltiff" >&5 +echo "configure:6324: checking for TIFFOpen in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` -xe_check_libs=" -ltiff " -cat > conftest.$ac_ext <<EOF -#line 6258 "configure" +xe_check_libs="$z_libs -ltiff " +cat > conftest.$ac_ext <<EOF +#line 6329 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6265,7 +6336,7 @@ TIFFOpen() ; return 0; } EOF -if { (eval echo configure:6269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6283,14 +6354,14 @@ else echo "$ac_t""no" 1>&6 xe_msg_checking="for TIFFOpen in -ltiff" -test -n "-ljpeg -lz" && xe_msg_checking="$xe_msg_checking using extra libs -ljpeg -lz" +test -n "-ljpeg $z_libs" && xe_msg_checking="$xe_msg_checking using extra libs -ljpeg $z_libs" echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6 -echo "configure:6289: checking "$xe_msg_checking"" >&5 +echo "configure:6360: checking "$xe_msg_checking"" >&5 ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'` -xe_check_libs=" -ltiff -ljpeg -lz" -cat > conftest.$ac_ext <<EOF -#line 6294 "configure" +xe_check_libs=" -ltiff -ljpeg $z_libs" +cat > conftest.$ac_ext <<EOF +#line 6365 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6301,7 +6372,7 @@ TIFFOpen() ; return 0; } EOF -if { (eval echo configure:6305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6315,25 +6386,26 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 - imagick_libs="$imagick_libs -ltiff -ljpeg -lz" && if test "$extra_verbose" = "yes"; then echo " Appending \"-ltiff -ljpeg -lz\" to \$imagick_libs"; fi -else - echo "$ac_t""no" 1>&6 -fi - - -fi - - + imagick_libs="$imagick_libs -ltiff -ljpeg" && if test "$extra_verbose" = "yes"; then echo " Appending \"-ltiff -ljpeg\" to \$imagick_libs"; fi +else + echo "$ac_t""no" 1>&6 +fi + + +fi + + + imagick_libs="$imagick_libs $z_libs" && if test "$extra_verbose" = "yes"; then echo " Appending \"$z_libs\" to \$imagick_libs"; fi libs_x="$libs_x $imagick_libs" && if test "$extra_verbose" = "yes"; then echo " Appending \"$imagick_libs\" to \$libs_x"; fi } test -z "$with_imagick" && { echo $ac_n "checking for MogrifyImage in -lMagick""... $ac_c" 1>&6 -echo "configure:6332: checking for MogrifyImage in -lMagick" >&5 +echo "configure:6404: checking for MogrifyImage in -lMagick" >&5 ac_lib_var=`echo Magick'_'MogrifyImage | sed 'y%./+-%__p_%'` xe_check_libs=" -lMagick " cat > conftest.$ac_ext <<EOF -#line 6337 "configure" +#line 6409 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6344,7 +6416,7 @@ MogrifyImage() ; return 0; } EOF -if { (eval echo configure:6348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6380,12 +6452,12 @@ echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6 -echo "configure:6384: checking for XawScrollbarSetThumb in -lXaw" >&5 +echo "configure:6456: checking for XawScrollbarSetThumb in -lXaw" >&5 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'` xe_check_libs=" -lXaw " cat > conftest.$ac_ext <<EOF -#line 6389 "configure" +#line 6461 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6396,7 +6468,7 @@ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:6400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6420,15 +6492,15 @@ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:6424: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6427 "configure" +echo "configure:6496: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6499 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6445,12 +6517,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:6449: checking for XmStringFree in -lXm" >&5 +echo "configure:6521: checking for XmStringFree in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 6454 "configure" +#line 6526 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6461,7 +6533,7 @@ XmStringFree() ; return 0; } EOF -if { (eval echo configure:6465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6490,10 +6562,10 @@ fi -case "$with_menubars" in "" | "yes" | "athena" ) +case "$with_menubars" in "" | "yes" | "athena" | "athena3d" ) with_menubars="lucid" ;; esac -case "$with_dialogs" in "" | "yes" | "lucid" ) +case "$with_dialogs" in "" | "yes" | "lucid" ) if test "$have_motif" = "yes"; then with_dialogs="motif" elif test "$have_xaw" = "yes"; then with_dialogs="athena" else with_dialogs=no @@ -6718,7 +6790,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:6722: checking for Mule-related features" >&5 +echo "configure:6794: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -6735,15 +6807,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6739: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6742 "configure" +echo "configure:6811: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6814 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6774,12 +6846,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:6778: checking for strerror in -lintl" >&5 +echo "configure:6850: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <<EOF -#line 6783 "configure" +#line 6855 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6790,7 +6862,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:6794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6823,19 +6895,19 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:6827: checking for Mule input methods" >&5 +echo "configure:6899: checking for Mule input methods" >&5 test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:6831: checking for XIM" >&5 +echo "configure:6903: checking for XIM" >&5 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:6834: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:6906: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <<EOF -#line 6839 "configure" +#line 6911 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6846,7 +6918,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:6850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6911,15 +6983,15 @@ if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:6915: checking for XFontSet" >&5 +echo "configure:6987: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:6918: checking for XmbDrawString in -lX11" >&5 +echo "configure:6990: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <<EOF -#line 6923 "configure" +#line 6995 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6930,7 +7002,7 @@ XmbDrawString() ; return 0; } EOF -if { (eval echo configure:6934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6970,15 +7042,15 @@ test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:6974: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6977 "configure" +echo "configure:7046: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7049 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7003,10 +7075,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7007: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7010 "configure" +echo "configure:7079: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7082 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7029,7 +7101,7 @@ ; return 0; } EOF -if { (eval echo configure:7033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7058,12 +7130,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:7062: checking for crypt in -lcrypt" >&5 +echo "configure:7134: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <<EOF -#line 7067 "configure" +#line 7139 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7074,7 +7146,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:7078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7108,12 +7180,12 @@ fi test -z "$with_wnn" && { echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:7112: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:7184: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 7117 "configure" +#line 7189 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7124,7 +7196,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:7128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7161,12 +7233,12 @@ fi echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6 -echo "configure:7165: checking for jl_fi_dic_list in -lwnn" >&5 +echo "configure:7237: checking for jl_fi_dic_list in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <<EOF -#line 7170 "configure" +#line 7242 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7177,7 +7249,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:7181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7209,15 +7281,15 @@ test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:7213: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7216 "configure" +echo "configure:7285: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7288 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7240,12 +7312,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:7244: checking for RkBgnBun in -lRKC" >&5 +echo "configure:7316: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <<EOF -#line 7249 "configure" +#line 7321 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7256,7 +7328,7 @@ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:7260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7279,12 +7351,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:7283: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:7355: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <<EOF -#line 7288 "configure" +#line 7360 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7295,7 +7367,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:7299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7344,12 +7416,12 @@ libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:7348: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:7420: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <<EOF -#line 7353 "configure" +#line 7425 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7360,7 +7432,7 @@ layout_object_getvalue() ; return 0; } EOF -if { (eval echo configure:7364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7430,13 +7502,13 @@ fi -for ac_func in acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset ulimit usleep utimes waitpid +for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset ulimit usleep utimes waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7437: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7440 "configure" +echo "configure:7509: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7512 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7459,7 +7531,7 @@ ; return 0; } EOF -if { (eval echo configure:7463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7496,10 +7568,10 @@ for ac_func in realpath do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7500: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7503 "configure" +echo "configure:7572: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7575 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7522,7 +7594,7 @@ ; return 0; } EOF -if { (eval echo configure:7526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7555,16 +7627,16 @@ esac echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:7559: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 7561 "configure" +echo "configure:7631: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 7633 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:7568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6 { test "$extra_verbose" = "yes" && cat << \EOF @@ -7584,16 +7656,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:7588: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 7590 "configure" +echo "configure:7660: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 7662 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:7597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7669: \"$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 @@ -7613,11 +7685,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:7617: checking whether localtime caches TZ" >&5 +echo "configure:7689: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 7621 "configure" +#line 7693 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -7652,7 +7724,7 @@ exit (0); } EOF -if { (eval echo configure:7656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then emacs_cv_localtime_cache=no else @@ -7681,9 +7753,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6 -echo "configure:7685: checking whether gettimeofday cannot accept two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 7687 "configure" +echo "configure:7757: checking whether gettimeofday cannot accept two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 7759 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -7705,7 +7777,7 @@ ; return 0; } EOF -if { (eval echo configure:7709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -7727,19 +7799,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:7731: checking for inline" >&5 +echo "configure:7803: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 7736 "configure" +#line 7808 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:7743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -7789,17 +7861,17 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:7793: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7796 "configure" +echo "configure:7865: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7868 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:7803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -7823,10 +7895,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:7827: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7830 "configure" +echo "configure:7899: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7902 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -7849,7 +7921,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -7888,10 +7960,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:7892: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7895 "configure" +echo "configure:7964: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7967 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -7915,10 +7987,10 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7919: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7922 "configure" +echo "configure:7991: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7994 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7941,7 +8013,7 @@ ; return 0; } EOF -if { (eval echo configure:7945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7971,10 +8043,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:7975: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7978 "configure" +echo "configure:8047: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8050 "configure" #include "confdefs.h" find_stack_direction () { @@ -7993,7 +8065,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:7997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_stack_direction=1 else @@ -8021,15 +8093,15 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:8025: checking for vfork.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8028 "configure" +echo "configure:8097: checking for vfork.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8100 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8057,10 +8129,10 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:8061: checking for working vfork" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8064 "configure" +echo "configure:8133: checking for working vfork" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8136 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -8155,7 +8227,7 @@ } } EOF -if { (eval echo configure:8159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_vfork_works=yes else @@ -8180,10 +8252,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:8184: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8187 "configure" +echo "configure:8256: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8259 "configure" #include "confdefs.h" #include <string.h> main () @@ -8193,7 +8265,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:8197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -8220,10 +8292,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8224: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8227 "configure" +echo "configure:8296: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8299 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8246,7 +8318,7 @@ ; return 0; } EOF -if { (eval echo configure:8250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8274,10 +8346,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:8278: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8281 "configure" +echo "configure:8350: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8353 "configure" #include "confdefs.h" /* @@ -8332,7 +8404,7 @@ } EOF -if { (eval echo configure:8336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -8358,10 +8430,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:8362: checking for working mmap" >&5 +echo "configure:8434: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 8365 "configure" +#line 8437 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -8394,7 +8466,7 @@ return 1; } EOF -if { (eval echo configure:8398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then have_mmap=yes else @@ -8428,15 +8500,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:8432: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8435 "configure" +echo "configure:8504: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8507 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8479,15 +8551,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:8483: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8486 "configure" +echo "configure:8555: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8558 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8519,10 +8591,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:8523: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8526 "configure" +echo "configure:8595: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8598 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -8545,7 +8617,7 @@ ; return 0; } EOF -if { (eval echo configure:8549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -8560,15 +8632,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:8564: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8567 "configure" +echo "configure:8636: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8639 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8585,15 +8657,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:8589: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8592 "configure" +echo "configure:8661: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8664 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8618,9 +8690,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:8622: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:8694: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 8624 "configure" +#line 8696 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8631,7 +8703,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:8635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_SOCKADDR_SUN_LEN @@ -8662,10 +8734,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:8666: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8669 "configure" +echo "configure:8738: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8741 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -8688,7 +8760,7 @@ ; return 0; } EOF -if { (eval echo configure:8692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -8703,15 +8775,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:8707: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8710 "configure" +echo "configure:8779: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8782 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8728,15 +8800,15 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:8732: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8735 "configure" +echo "configure:8804: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8807 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8774,15 +8846,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:8778: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8781 "configure" +echo "configure:8850: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8853 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8858: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8809,15 +8881,15 @@ echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:8813: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8816 "configure" +echo "configure:8885: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8888 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8850,15 +8922,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:8854: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8857 "configure" +echo "configure:8926: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8929 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8888,7 +8960,7 @@ echo "checking "for sound support"" 1>&6 -echo "configure:8892: checking "for sound support"" >&5 +echo "configure:8964: checking "for sound support"" >&5 case "$with_sound" in native | both ) with_native_sound=yes;; nas | no ) with_native_sound=no;; @@ -8899,15 +8971,15 @@ if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:8903: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8906 "configure" +echo "configure:8975: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8978 "configure" #include "confdefs.h" #include <multimedia/audio_device.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8911: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8955,12 +9027,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:8959: checking for ALopenport in -laudio" >&5 +echo "configure:9031: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <<EOF -#line 8964 "configure" +#line 9036 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8971,7 +9043,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:8975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9002,12 +9074,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:9006: checking for AOpenAudio in -lAlib" >&5 +echo "configure:9078: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <<EOF -#line 9011 "configure" +#line 9083 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9018,7 +9090,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:9022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9056,15 +9128,15 @@ for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:9060: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9063 "configure" +echo "configure:9132: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9135 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9134,7 +9206,7 @@ fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext <<EOF -#line 9138 "configure" +#line 9210 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -9161,7 +9233,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:9165: checking for TTY-related features" >&5 +echo "configure:9237: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -9177,12 +9249,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:9181: checking for tgetent in -lncurses" >&5 +echo "configure:9253: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <<EOF -#line 9186 "configure" +#line 9258 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9193,7 +9265,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9226,15 +9298,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:9230: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9233 "configure" +echo "configure:9302: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9305 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9256,15 +9328,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:9260: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9263 "configure" +echo "configure:9332: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9335 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9294,15 +9366,15 @@ c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:9298: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9301 "configure" +echo "configure:9370: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9373 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9337,12 +9409,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:9341: checking for tgetent in -l$lib" >&5 +echo "configure:9413: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -l$lib " cat > conftest.$ac_ext <<EOF -#line 9346 "configure" +#line 9418 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9353,7 +9425,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9384,12 +9456,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:9388: checking for tgetent in -lcurses" >&5 +echo "configure:9460: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <<EOF -#line 9393 "configure" +#line 9465 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9400,7 +9472,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9418,12 +9490,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:9422: checking for tgetent in -ltermcap" >&5 +echo "configure:9494: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <<EOF -#line 9427 "configure" +#line 9499 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9434,7 +9506,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9482,15 +9554,15 @@ test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:9486: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9489 "configure" +echo "configure:9558: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9561 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9513,12 +9585,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:9517: checking for Gpm_Open in -lgpm" >&5 +echo "configure:9589: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <<EOF -#line 9522 "configure" +#line 9594 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9529,7 +9601,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:9533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9578,17 +9650,17 @@ echo "checking for database support" 1>&6 -echo "configure:9582: checking for database support" >&5 +echo "configure:9654: checking for database support" >&5 if test "$with_database_gnudbm" != "no"; then echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:9587: checking for dbm_open in -lgdbm" >&5 +echo "configure:9659: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <<EOF -#line 9592 "configure" +#line 9664 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9599,7 +9671,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:9603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9621,10 +9693,10 @@ if test "$with_database_gnudbm" != "yes"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:9625: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9628 "configure" +echo "configure:9697: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9700 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -9647,7 +9719,7 @@ ; return 0; } EOF -if { (eval echo configure:9651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -9683,10 +9755,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:9687: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9690 "configure" +echo "configure:9759: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9762 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -9709,7 +9781,7 @@ ; return 0; } EOF -if { (eval echo configure:9713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -9730,12 +9802,12 @@ if test "$need_libdbm" != "no"; then echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:9734: checking for dbm_open in -ldbm" >&5 +echo "configure:9806: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <<EOF -#line 9739 "configure" +#line 9811 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9746,7 +9818,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:9750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9783,10 +9855,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:9787: checking for dbopen" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9790 "configure" +echo "configure:9859: checking for dbopen" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9862 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbopen(); below. */ @@ -9809,7 +9881,7 @@ ; return 0; } EOF -if { (eval echo configure:9813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -9830,12 +9902,12 @@ if test "$need_libdb" != "no"; then echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:9834: checking for dbopen in -ldb" >&5 +echo "configure:9906: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <<EOF -#line 9839 "configure" +#line 9911 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9846,7 +9918,7 @@ dbopen() ; return 0; } EOF -if { (eval echo configure:9850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9870,7 +9942,7 @@ if test "$with_database_berkdb" = "yes"; then for path in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 9874 "configure" +#line 9946 "configure" #include "confdefs.h" #ifdef HAVE_INTTYPES_H #define __BIT_TYPES_DEFINED__ @@ -9888,7 +9960,7 @@ ; return 0; } EOF -if { (eval echo configure:9892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_path="$path"; break else @@ -9940,12 +10012,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:9944: checking for SOCKSinit in -lsocks" >&5 +echo "configure:10016: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <<EOF -#line 9949 "configure" +#line 10021 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9956,7 +10028,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:9960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else
--- a/configure.in Mon Aug 13 10:16:17 2007 +0200 +++ b/configure.in Mon Aug 13 10:17:07 2007 +0200 @@ -423,11 +423,16 @@ dnl --FOO=yes. Otherwise, the value comes from the next dnl argument - see below. opt=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*\(.*\)$:\1:'` - val="yes" - valomitted=yes + val="yes" valomitted=yes ;; esac + dnl Support --without-FOO as a synonym for --with-FOO=no + case "${valomitted}-${opt}" in yes-without_* ) + opt=`echo $opt | sed 's/without/with/'` + valomitted="no" val="no" ;; + esac + dnl translate "-" in option string to "_" optname="$opt" opt="`echo '' $opt | sed -e 's:^ ::' | tr - _`" @@ -716,9 +721,11 @@ esac ;; - dnl Anything not starting with a hyphen we assume is a - dnl configuration name. - *) configuration="$arg" ;; + dnl Assume anything with multiple hyphens is a configuration name. + *-*-*) configuration="$arg" ;; + + dnl Anything else is an error + *) USAGE_ERROR("Unrecognized argument: $arg") ;; esac done @@ -754,20 +761,6 @@ AC_MSG_WARN("The --run-in-place option is ignored because it is unnecessary.") fi -dnl ########################################################################### -if test "$configuration" = "" ; then - echo '- You did not tell me what kind of host system you want to configure. -- I will attempt to guess the kind of system this is.' 1>&2 - guesssys=`echo $progname | sed 's/configure$/config.guess/'` - dnl Guess the configuration and remove 4th name component, if present. - if configuration=`${CONFIG_SHELL-/bin/sh} $guesssys | \ - sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'` ; then - echo "- Looks like this is a $configuration" 1>&2 - else - USAGE_ERROR("Failed to guess the system type. You need to tell me.") - fi -fi - dnl Find the source directory. case "$srcdir" in @@ -791,8 +784,7 @@ dnl Otherwise, check if the directory they specified is okay. * ) - if test ! -d "$srcdir" -o \ - ! -f "$srcdir/src/lisp.h" -o \ + if test ! -f "$srcdir/src/lisp.h" -o \ ! -f "$srcdir/lisp/version.el" ; then USAGE_ERROR(["The directory specified with the \`--srcdir' option, \`$srcdir', doesn't seem to contain the XEmacs sources. You should @@ -802,6 +794,20 @@ ;; esac +dnl ########################################################################### +if test -z "$configuration"; then + AC_MSG_CHECKING("host system type") + dnl Guess the configuration and remove 4th name component, if present. + if configuration=`${CONFIG_SHELL-/bin/sh} $srcdir/config.guess | \ + sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'` ; then + AC_MSG_RESULT($configuration) + else + AC_MSG_RESULT(unknown) + USAGE_ERROR(["XEmacs has not been ported to this host type. +Try explicitly specifying the CONFIGURATION when rerunning configure."]) + fi +fi + AC_PROG_LN_S dnl Make symlinks for etc, lisp, and info directories while the path @@ -1475,6 +1481,16 @@ AC_AIX +AC_MSG_CHECKING(for GNU libc) +AC_TRY_COMPILE([#include <features.h>],[ +#if ! (defined __GLIBC__ || defined __GNU_LIBRARY__) +#error Not a GNU libc system :-( +******* ======= ******** &&&&&&&& +#endif +], have_glibc=yes, have_glibc=no) +AC_MSG_RESULT($have_glibc) +test "$have_glibc" = "yes" && AC_DEFINE(_GNU_SOURCE) + AC_MSG_CHECKING(whether we are using SunPro C) AC_TRY_COMPILE([],[#ifndef __SUNPRO_C #error Not a SunPro compiler :-( @@ -1916,8 +1932,7 @@ dnl checks for header files AC_CHECK_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h) AC_CHECK_HEADERS(utime.h locale.h libgen.h fcntl.h ulimit.h) -AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h limits.h) -AC_CHECK_HEADERS(sys/un.h) +AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h sys/un.h) AC_HEADER_SYS_WAIT AC_HEADER_STDC AC_HEADER_TIME @@ -2002,6 +2017,10 @@ dnl Floating operation support is now unconditional AC_DEFINE(LISP_FLOAT_TYPE) +AC_TRY_LINK([#include <math.h>], + [return atanh(1.0) + asinh(1.0) + acosh(1.0); ], + AC_DEFINE(HAVE_INVERSE_HYPERBOLIC)) + dnl Determine type of mail locking from configure args and s&m headers AC_CHECKING(type of mail spool file locking) test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock @@ -2234,6 +2253,11 @@ dnl #### Someone, please add a better function than main AC_CHECK_LIB(Xbsd, main, XE_PREPEND(-lXbsd, libs_x)) + dnl Problem with the MIT distribution of X on AIX + if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then + XE_APPEND(-lc_r, libs_x) + fi + fi dnl $with_x11 = yes test -z "$window_system" && window_system="none" @@ -2341,6 +2365,7 @@ if test "$with_x11" = "yes"; then AC_CHECKING(for X11 graphics libraries) + dnl Autodetect Xpm AC_MSG_CHECKING(for Xpm - no older than 3.4f) xe_check_libs=-lXpm @@ -2384,6 +2409,11 @@ test "$with_imagick" != "no" && { AC_CHECK_HEADER(magick/magick.h, ,AC_CHECK_HEADER(X11/magick/magick.h,AC_DEFINE(MAGICK_HEADERS_ARE_UNDER_X11),with_imagick=no)) } test "$with_imagick" != "no" && { dnl check the appropriate libraries for ImageMagick + dnl First, let's check libz or libgz for png... + z_libs="" + AC_CHECK_LIB(z, inflateInit_, XE_APPEND(-lz, z_libs), + AC_CHECK_LIB(gz, inflateInit_, XE_APPEND(-lgz, z_libs))) + imagick_libs="" AC_CHECK_LIB(dps, XDPSPixelsPerPoint, XE_APPEND(-ldpstk -ldps, imagick_libs),,,-ldpstk) AC_CHECK_LIB(fpx, FPX_SetToolkitMemoryLimit, XE_APPEND(-lfpx, imagick_libs)) @@ -2392,10 +2422,10 @@ AC_CHECK_LIB(jpeg, jpeg_read_header, XE_APPEND(-ljpeg, imagick_libs)) AC_CHECK_LIB(mpeg, OpenMPEG, XE_APPEND(-lmpeg, imagick_libs)) AC_CHECK_LIB(ttf, TT_Init_FreeType, XE_APPEND(-lttf, imagick_libs)) - AC_CHECK_LIB(png, png_create_read_struct, XE_APPEND(-lpng, imagick_libs), - AC_CHECK_LIB(png, png_create_read_struct, XE_APPEND(-lpng -lz, imagick_libs),,-lz)) + AC_CHECK_LIB(png, png_create_read_struct, XE_APPEND(-lpng, imagick_libs),,$z_libs) AC_CHECK_LIB(tiff, TIFFOpen, XE_APPEND(-ltiff, imagick_libs), - AC_CHECK_LIB(tiff, TIFFOpen, XE_APPEND(-ltiff -ljpeg -lz, imagick_libs),,-ljpeg -lz)) + AC_CHECK_LIB(tiff, TIFFOpen, XE_APPEND(-ltiff -ljpeg, imagick_libs),,-ljpeg $z_libs),,$z_libs) + XE_APPEND($z_libs, imagick_libs) XE_APPEND($imagick_libs, libs_x) } test -z "$with_imagick" && { AC_CHECK_LIB(Magick, MogrifyImage,[:],with_imagick=no) } @@ -2424,10 +2454,10 @@ dnl Not all toolkits support all widgets dnl if Motif is available we use it for the dialog boxes. -case "$with_menubars" in "" | "yes" | "athena" ) +case "$with_menubars" in "" | "yes" | "athena" | "athena3d" ) with_menubars="lucid" ;; esac -case "$with_dialogs" in "" | "yes" | "lucid" ) +case "$with_dialogs" in "" | "yes" | "lucid" ) if test "$have_motif" = "yes"; then with_dialogs="motif" elif test "$have_xaw" = "yes"; then with_dialogs="athena" else with_dialogs=no @@ -2606,7 +2636,7 @@ XE_COMPUTE_RUNPATH() fi -AC_CHECK_FUNCS(acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset ulimit usleep utimes waitpid) +AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset ulimit usleep utimes waitpid) dnl realpath is buggy on linux, decosf and aix4
--- a/configure.usage Mon Aug 13 10:16:17 2007 +0200 +++ b/configure.usage Mon Aug 13 10:17:07 2007 +0200 @@ -1,7 +1,6 @@ -Usage: configure CONFIGURATION [[--OPTION[=VALUE] ...]] +Usage: configure [--OPTION[=VALUE] ...] [CONFIGURATION] Set compilation and installation parameters for XEmacs, and report. -CONFIGURATION specifies the machine and operating system to build for. Note that for most of the following options, you can explicitly enable them using `--OPTION=yes' and explicitly disable them using `--OPTION=no'. @@ -32,8 +31,8 @@ --cflags=FLAGS Compiler flags. Overrides environment variable CFLAGS. --site-includes=PATH List of directories to search first for header files. --site-libraries=PATH List of directories to search first for libraries. ---site-prefixes=PATH List of directories to search for include/ and lib/ - subdirectories, just after 'site-includes' and +--site-prefixes=PATH List of directories to search for include/ and lib/ + subdirectories, just after 'site-includes' and 'site-libraries'. --site-runtime-libraries=PATH List of ALL directories to search for dynamically @@ -211,14 +210,13 @@ If successful, configure leaves its status in config.status. If unsuccessful after disturbing the status quo, it removes config.status. -The configure build process also used the following environment variables: +The configure build process also uses the following environment variables: + CC C compiler to use (but configure flags take precedence) CPP C preprocessor to use (such as /usr/ccs/lib/cpp or cc -E) CFLAGS C compiler compilation flags (such as -O) -CPPFLAGS Additional compilation flags (such as -I/foo) used only by the preprocessor +CPPFLAGS Compilation flags (such as -I/foo) used only by the preprocessor LDFLAGS Additional linker flags (such as -L/foo) LIBS Additional libraries (such as -lfoo) -INFOPATH Path to search for Info documentation. - For more details on the install process, consult the INSTALL file.
--- a/etc/BETA Mon Aug 13 10:16:17 2007 +0200 +++ b/etc/BETA Mon Aug 13 10:17:07 2007 +0200 @@ -38,12 +38,12 @@ ** Beta Release Schedule ======================== -The URL ftp://ftp.xemacs.org/pub/beta/README always contains the best -estimate of when the next beta XEmacs will be released. For weekend -betas the release time is generally in the vicinity of 2PM to 5PM US -Pacific Time (Universal Time minus 8 hours). For weekday betas, the -release time is generally in the vicinity of 8PM to Midnight US -Pacific Time on the listed day. +The URL ftp://ftp.xemacs.org/pub/xemacs/beta/README always contains +the best estimate of when the next beta XEmacs will be released. For +weekend betas the release time is generally in the vicinity of 2PM to +5PM US Pacific Time (Universal Time minus 8 hours). For weekday +betas, the release time is generally in the vicinity of 8PM to +Midnight US Pacific Time on the listed day. Betas are nominally a week apart, scheduled on every Saturday. Midweek releases are made when a serious enough problem warrants it. @@ -267,7 +267,7 @@ AUCTeX and Gnus have package tarballs in - ftp://ftp.xemacs.org/pub/beta/xemacs-20.4/packages/ + ftp://ftp.xemacs.org/pub/xemacs/beta/xemacs-20.5/packages/ that you can simply untar in a package directory to install. Karl Hegbloom has a set of packages in
--- a/etc/MAILINGLISTS Mon Aug 13 10:16:17 2007 +0200 +++ b/etc/MAILINGLISTS Mon Aug 13 10:17:07 2007 +0200 @@ -1,5 +1,5 @@ - XEmacs Electronic Mailing Lists. Last Modified: 3-Feb-95. + XEmacs Electronic Mailing Lists. Last Modified: 1997-01-13 XEmacs has its own mailing list and newsgroup which are distinct from the FSF GNU Emacs mailing lists and newsgroups. The mailing list is: @@ -23,8 +23,10 @@ GNU Emacs. People who aren't subscribed to the XEmacs mailing list most likely are not interested in hearing about problems with it. -The XEmacs mailing list is archived at ftp.xemacs.org in the directory -/pub/mlists/. +The XEmacs mailing list is archived at ftp://ftp.xemacs.org/pub/xemacs/mlists/. + +See the file etc/BETA for more information about mailing lists for use +by beta testers and XEmacs developers. IMPORTANT IMPORTANT IMPORTANT: @@ -33,8 +35,8 @@ Please read them before sending a message. ----------------------------------------------------------------------- - - GNU Project Electronic Mailing Lists. Last Updated 23 Feb 94 + GNU Project Electronic Mailing Lists and gnUSENET Newsgroups + Last Updated 1 July 97 Please report improvements to: gnu@prep.ai.mit.edu @@ -77,7 +79,7 @@ people. Please don't send them anything that is not seriously important to all their readers. All GNU mailing lists are unmoderated, mail reflectors, except info-gnu, info-gnu-emacs, info-gcc, info-g++, -info-gnu-fortran, info-gnu-utils, info-gnu-chess and info-gnu-shogi. +info-gnu-fortran. All addresses below are in internet format. Consult the mail guru for your computer to figure out address syntaxes from other networks. From @@ -246,8 +248,8 @@ ** gnUSENET newsgroup: gnu.misc.discuss ** Send contributions to: gnu-misc-discuss@prep.ai.mit.edu -This list is for serious discussion of freed software, the GNU -Project, the GNU Manifesto and their implications. It's THE place for +This list is for serious discussion of freed software, the GNU Project, +the GNU Manifesto, and their implications. It's THE place for discussion that is not appropriate in the other GNU mailing lists and gnUSENET newsgroups. @@ -257,7 +259,7 @@ Good READING and writing are expected. Before posting, wait a while, cool off, and think. -Don't use this group for complaints about GNU software! +Don't use this group for complaints and bug reports about GNU software! The maintainers don't read this group; they won't see your complaint. Use the appropriate bug-reporting mailing list instead, so that people who can do something about the problem will see it. @@ -270,9 +272,8 @@ USENET and gnUSENET readers are expected to have read ALL the articles in news.announce.newusers before posting. If news.announce.newusers is empty at your site, wait (the articles are posted monthly), your posting -isn't that urgent! Readers on the Internet can anonymous ftp these -articles from wsmr-simtel20.army.mil under directory -PD2:<UNIX-C.USENET>. +isn't that urgent! Readers on the Internet can anonymous FTP these +articles from host ftp.uu.net under directory ?? Someone from the Free Software Foundation will attempt to follow this group as time and volume permits. @@ -285,20 +286,158 @@ appropriate mailing list or gnUSENET newsgroup, since more technical people read those. -* hurd-ann-request@prep.ai.mit.edu to subscribe to hurd-ann -** gnUSENET newsgroup: gnu.hurd.announce -** Send announcements to: hurd-ann@prep.ai.mit.edu +* bug-gnu-sql-request@prep.ai.mit.edu to subscribe to bug-gnu-sql +** gnUSENET newsgroup: NONE PLANNED +** GNU-SQL BUG reports to: bug-gnu-sql@prep.ai.mit.edu + +This list distributes, to the active maintainers of GNU's SQL (GNU's SQL +full scale database server), bug reports and fixes for, and suggestions +for improvements to GNU's SQL. User discussion of GNU's SQL also occurs +here. + +There are no other GNU mailing lists or gnUSENET newsgroups for GNU's SQL. + +See section '* General Information about bug-* lists and reporting +program bugs'. + +* bug-guile-request@prep.ai.mit.edu to subscribe to bug-guile +** gnUSENET newsgroup: NONE PLANNED +** GUILE BUG reports to: bug-guile@prep.ai.mit.edu + +This list distributes, to the active maintainers of GUILE (GNU's +Ubiquitous Extension Language), bug reports and fixes for, and suggestions for +improvements to GUILE. User discussion of GUILE also occurs here. + +There are no other GNU mailing lists or gnUSENET newsgroups for GUILE . + +See section '* General Information about bug-* lists and reporting +program bugs'. + +* guile-sources-request@prep.ai.mit.edu to subscribe to guile-sources +** gnUSENET newsgroup: NONE PLANNED +** Guile source code to: guile-sources@prep.ai.mit.edu + +This list will be for the posting, by their authors, of GUILE, Scheme, +and C sources and patches that improve Guile. Its contents will be +reviewed by the FSF for inclusion in future releases of GUILE. + +Please do NOT discuss or request source code here. Use bug-guile for +those purposes. This allows the automatic archiving of sources posted +to this list. + +Please do NOT post such sources to any other GNU mailing list (e.g +bug-guile) or gnUSENET newsgroups. It's up to each poster to decide +whether to cross-post to any non-gnUSENET newsgroup. + +Please do NOT announce that you have posted source code to guile.sources +to any other GNU mailing list (e.g. bug-guile) or gnUSENET newsgroups. +People who want to keep up with sources will read this list. It's up to +each poster to decide whether to announce a guile.sources article in any +non-gnUSENET newsgroup (e.g. comp.emacs or comp.sources.d). + +If source or patches that were previously posted or a simple fix is +requested in bug-guile, please mail it to the requester. Do NOT +repost it. If you also want something that is requested, send mail to +the requester asking him to forward it to you. This kind of traffic is +best handled by e-mail, not by a broadcast medium that reaches millions +of sites. -This list distributes progress reports on the GNU Hurd. It is also to -ask people for various kinds of help on the Hurd. It is NOT for general -discussion. +If the requested source is very long (>10k bytes) send mail offering to +send it. This prevents the requester from getting many redundant copies +and saves network bandwidth. + +* bug-gnustep-request@prep.ai.mit.edu to subscribe to bug-gnustep +** gnUSENET newsgroup: gnu.gnustep.bug +** Gnustep bug reports to: bug-gnustep@prep.ai.mit.edu +** FAQ-URL: none known +** FAQ-Archive-name: none known +** FAQ-Posting-frequency: none known + +This list distributes bug reports for, fixes for bugs in, and +suggestions for improvements in GNUstep to its active developers. + +Subscribers to bug-gnustep get all info-gnustep messages. + +See section '* General Information about bug-* lists and reporting +program bugs'. + +* help-gnustep-request@prep.ai.mit.edu to subscribe to help-gnustep +** gnUSENET newsgroup: gnu.gnustep.help +** Send contributions to: help-gnustep@prep.ai.mit.edu +** FAQ-URL: none known +** FAQ-Archive-name: none known +** FAQ-Posting-frequency: none known -The list is filtered to remove items meant for hurd-ann-request, that +This list is the place for users and installers of the GNUstep to ask +for help. Please send bug reports to bug-gnustep@prep.ai.mit.edu +instead of posting them here. + +See section '* General Information about help-* lists'. + +* discuss-gnustep-request@prep.ai.mit.edu to subscribe to discuss-gnustep +** gnUSENET newsgroup: gnu.gnustep.discuss +** Send contributions to: discuss-gnustep@prep.ai.mit.edu +** FAQ-URL: none known +** FAQ-Archive-name: none known +** FAQ-Posting-frequency: none known + +This list is the place for GNUstep users and developers to discuss +GNUstep. Please send bug reports to bug-gnustep@prep.ai.mit.edu +instead of posting them here. + +See section '* General Information about discuss-* lists'. + +* info-gnustep-request@prep.ai.mit.edu to subscribe to info-gnustep +** gnUSENET newsgroup: gnu.gnustep.announce +** Send announcements to: info-gnustep@prep.ai.mit.edu +** FAQ-URL: none known +** FAQ-Archive-name: none known +** FAQ-Posting-frequency: none known + +This list distributes announcements and progress reports on GNUstep. +It is NOT for general discussion; please use discuss-gnustep for that. + +The list is filtered to remove items meant for info-gnustep-request, that can be answered by the moderator without bothering the list, or should have been sent to another list. +Do not report GNUstep bugs to info-gnustep, help-gnustep, or +discuss-gnustep, mail them to bug-gnustep@prep.ai.mit.edu instead. + See section '* General Information about info-* lists'. +* bug-hurd-request@prep.ai.mit.edu to subscribe to bug-hurd +** gnUSENET newsgroup: gnu.hurd.bug +** Hurd bug reports to: bug-hurd@prep.ai.mit.edu + +This list distributes bug reports for, fixes for bugs in, and +suggestions for improvements in the GNU Hurd to its active developers. + +No info-gnu-hurd list is planned. Announcements about the GNU Hurd will +be made to the list info-gnu@prep.ai.mit.edu (see above). + +See section '* General Information about bug-* lists and reporting +program bugs'. + +* help-hurd-request@prep.ai.mit.edu to subscribe to help-hurd +** gnUSENET newsgroup: gnu.hurd.help +** Send contributions to: help-hurd@prep.ai.mit.edu + +This list is the place for users and installers of the GNU Hurd to ask +for help. + +No info-gnu-hurd list is planned. Announcements about the GNU Hurd will +be made to the list info-gnu@prep.ai.mit.edu (see above). + +See section '* General Information about help-* lists'. + +* hurd-ann-request@prep.ai.mit.edu IS NOW DEFUNCT +** gnUSENET newsgroup: NEVER EXISTED +** DEAD address: hurd-ann@prep.ai.mit.edu + +This list is dead. Announcements about the GNU Hurd will be made to the +list info-gnu@prep.ai.mit.edu (see above). + * bug-gnu-emacs-request@prep.ai.mit.edu to subscribe to bug-gnu-emacs ** gnUSENET newsgroup: gnu.emacs.bug ** Gnu Emacs bug reports to: bug-gnu-emacs@prep.ai.mit.edu @@ -321,9 +460,10 @@ ** gnUSENET newsgroup: gnu.emacs.sources ** Gnu Emacs source code to: gnu-emacs-sources@prep.ai.mit.edu -This list/newsgroup will be for the posting, by their authors, of lisp -and C sources and patches that improve GNU Emacs. Its contents will -be reviewed by FSF for inclusion in future releases of GNU Emacs. +This list/newsgroup will be for the posting, by their authors, of Emacs +Lisp and C sources and patches that improve GNU Emacs. Its contents +will be reviewed by the FSF for inclusion in future releases of GNU +Emacs. Please do NOT discuss or request source code here. Use help-gnu-emacs/gnu.emacs.help for those purposes. This allows the @@ -339,18 +479,18 @@ gnUSENET newsgroups (e.g. gnu.emacs.help). People who want to keep up with sources will read this list/newsgroup. It's up to each poster to decide whether to announce a gnu.emacs.sources article in any -non-gnUSENET newsgroup (e.g comp.emacs or comp.sources.d). +non-gnUSENET newsgroup (e.g. comp.emacs or comp.sources.d). If source or patches that were previously posted or a simple fix is requested in help-gnu-emacs, please mail it to the requester. Do NOT repost it. If you also want something that is requested, send mail to the requester asking him to forward it to you. This kind of traffic is -best handled by e-mail, not by a broadcast medium that reaches thousands +best handled by e-mail, not by a broadcast medium that reaches millions of sites. -If the source is very long (>10k bytes) send mail offering to send it. -This prevents the requester from getting many redundant copies and saves -network bandwidth. +If the requested source is very long (>10k bytes) send mail offering to +send it. This prevents the requester from getting many redundant copies +and saves network bandwidth. * help-gnu-emacs-request@prep.ai.mit.edu to subscribe to help-gnu-emacs ** gnUSENET newsgroup: gnu.emacs.help (and one-way into comp.emacs) @@ -367,7 +507,7 @@ requested in help-gnu-emacs, please mail it to the requester. Do NOT repost it. If you also want something that is requested, send mail to the requester asking him to forward it to you. This kind of traffic is -best handled by e-mail, not a broadcast medium that reaches thousands of +best handled by e-mail, not a broadcast medium that reaches millions of sites. This list is also gated one way to USENET's newsgroup comp.emacs (once @@ -672,8 +812,21 @@ See section '* General Information about bug-* lists and reporting program bugs'. +* bug-pine-request@prep.ai.mit.edu to subscribe to bug-pine +** gnUSENET newsgroup: NONE PLANNED +** pine bug reports to: bug-pine@prep.ai.mit.edu + +This list distributes, to the active maintainers of pine (the GNU +version of the pine mail reader), bug reports and fixes for, and suggestions +for improvements to pine. User discussion of pine also occurs here. + +There are no other GNU mailing lists or gnUSENET newsgroups for pine . + +See section '* General Information about bug-* lists and reporting +program bugs'. + * bug-cfengine-request@prep.ai.mit.edu to subscribe to bug-cfengine -** gnUSENET newsgroup: NONE PLANNED +** gnUSENET newsgroup: gnu.cfengine.bug ** cfengine bug reports to: bug-cfengine@prep.ai.mit.edu This list distributes, to the active maintainers of cfengine (configure @@ -681,23 +834,33 @@ bug reports and fixes for, and suggestions for improvements to cfengine. User discussion of cfengine also occurs here. -There are no other GNU mailing lists or gnUSENET newsgroups for cfengine . - See section '* General Information about bug-* lists and reporting program bugs'. -* bug-guile-request@prep.ai.mit.edu to subscribe to bug-guile -** gnUSENET newsgroup: NONE PLANNED -** GUILE BUG reports to: bug-guile@prep.ai.mit.edu +* help-cfengine-request@prep.ai.mit.edu to subscribe to help-cfengine +** gnUSENET newsgroup: gnu.cfengine.help +** Send contributions to: help-cfengine@prep.ai.mit.edu + +This list is the place for users and installers of cfengine to ask for +help. Please send bug reports to bug-cfengine instead of posting them +here. + +This list is also used for announcements about cfengine and related +programs, and small but important patches. Announcements of cfengine +releases are also made to info-gnu@prep.ai.mit.edu (see above) -This list distributes, to the active maintainers of GUILE (GNU's -Ubiquitous Extension Language), bug reports and fixes for, and suggestions for -improvements to GUILE. User discussion of GUILE also occurs here. +Since help-cfengine is a large list, send it only those items that +are seriously important to many people. -There are no other GNU mailing lists or gnUSENET newsgroups for GUILE . +If source or patches that were previously posted or a simple fix is +requested in help-cfengine, please mail it to the requester. Do NOT +repost it. If you also want something that is requested, send mail to +the requester asking him to forward it to you. This kind of traffic is +best handled by e-mail, not a broadcast medium that reaches millions of +sites. -See section '* General Information about bug-* lists and reporting -program bugs'. +See section '* General Information about help-* lists'. +Also see section '* General Information about info-* lists'. * bug-gnu-smalltalk-request@prep.ai.mit.edu to subscribe to bug-gnu-smalltalk ** gnUSENET newsgroup: gnu.smalltalk.bug @@ -745,7 +908,7 @@ ** gnUSENET newsgroup: gnu.ghostscript.bug ** Ghostscript bug reports to: bug-ghostscript@prep.ai.mit.edu -GhostScript is the GNU project implementation of a language and graphics +Ghostscript is the GNU project implementation of a language and graphics library with a remarkable similarity to PostScript. This list distributes, to the active maintainers of Ghostscript, bug @@ -754,7 +917,7 @@ For now, new releases of Ghostscript will also be announced on this list. There are no other GNU mailing lists or gnUSENET newsgroups for -GhostScript. +Ghostscript. See section '* General Information about bug-* lists and reporting program bugs'. @@ -767,8 +930,6 @@ reports and fixes for, and suggestions for improvements in GNU programs not covered by other bug-* mailing lists/gnu.*.bug newsgroups. -Subscribers to bug-gnu-utils get all info-gnu-utils messages. - See section '* General Information about bug-* lists and reporting program bugs'. @@ -784,19 +945,12 @@ See section '* General Information about help-* lists'. -* info-gnu-utils-request@prep.ai.mit.edu to subscribe to info-gnu-utils -** gnUSENET newsgroup: gnu.utils.announce -** Send announcements to: info-gnu-utils@prep.ai.mit.edu +* info-gnu-utils-request@prep.ai.mit.edu IS NOW DEFUNCT +** a gnUSENET newsgroup bever existed +** DEAD address: info-gnu-utils@prep.ai.mit.edu -This list distributes announcements and progress reports on GNU programs -not covered by other GNU mailing lists/gnu.* newsgroups. It is NOT for -general discussion; please use help-gnu-utils for that. - -The list is filtered to remove items meant for info-gnu-utils-request, -that can be answered by the moderator without bothering the list, or -should have been sent to another list. - -See section '* General Information about info-* lists'. +This list is dead. Announcements about GNU Utilities will be made to the +list info-gnu@prep.ai.mit.edu (see above). * info-cvs-request@prep.ai.mit.edu to subscribe to info-cvs. ** USENET newsgroup: (none) @@ -810,9 +964,7 @@ ** CVS bug reports to: bug-cvs@prep.ai.mit.edu This list distributes bug reports, fixes, and suggestions for -improvements to the maintainers of CVS. It also feeds directly into a -GNATS database, so it's best if bug reports are sent in the from of -GNATS Problem Reports. +improvements to the maintainers of CVS. * bug-fortran-mode-request@erl.mit.edu to subscribe to bug-fortran-mode ** USENET newsgroup: (none) @@ -925,9 +1077,18 @@ See section '* General Information about bug-* lists and reporting program bugs'. -* help-gnu-chess-request@prep.ai.mit.edu to subscribe to help-gnu-chess +* help-gnu-chess-request@prep.ai.mit.edu IS NOW DEFUNCT +** gnUSENET newsgroup: NONE PLANNED +** DEAD address: help-gnu-chess@prep.ai.mit.edu + +This list is dead. Use info-gnu-chess@prep.ai.mit.edu/gnu.chess instead. + +* info-gnu-chess-request@prep.ai.mit.edu to subscribe to info-gnu-chess ** gnUSENET newsgroup: gnu.chess -** Send contributions to: help-gnu-chess@prep.ai.mit.edu +** Send contributions to: info-gnu-chess@prep.ai.mit.edu +** FAQ-URL: http://www.research.digital.com/SRC/personal/Tim_Mann/chess.html +** FAQ-Archive-name: games/chess/gnu-faq +** FAQ-Posting-frequency: monthly This list is the place for users and installers of GNU Chess to ask for help. This list is also used for games played by people or other @@ -935,30 +1096,22 @@ non-enhancement data. Please send bug reports to bug-gnu-chess instead of posting them here. -Since help-gnu-chess is a large list, send it only those items that +This list is also used for announcements about GNU Chess and related +programs, and small but important patches. Announcements of GNU Chess +releases are also made to info-gnu@prep.ai.mit.edu (see above) + +Since info-gnu-chess is a large list, send it only those items that are seriously important to many people. If source or patches that were previously posted or a simple fix is -requested in help-gnu-chess, please mail it to the requester. Do NOT +requested in info-gnu-chess, please mail it to the requester. Do NOT repost it. If you also want something that is requested, send mail to the requester asking him to forward it to you. This kind of traffic is -best handled by e-mail, not a broadcast medium that reaches thousands of +best handled by e-mail, not a broadcast medium that reaches millions of sites. See section '* General Information about help-* lists'. - -* info-gnu-chess-request@prep.ai.mit.edu to subscribe to info-gnu-chess -** gnUSENET newsgroup: gnu.chess.announce -** Send contributions to: info-gnu-chess@prep.ai.mit.edu - -This list is used for announcements about GNU Chess and related -programs, and small but important patches. - -The list is filtered to remove items meant for info-gnu-chess-request, -that can be answered by the moderator without bothering the list, or -should have been sent to another list. - -See section '* General Information about info-* lists'. +Also see section '* General Information about info-* lists'. * bug-gnu-shogi-request@prep.ai.mit.edu to subscribe to bug-gnu-shogi ** gnUSENET newsgroup: NONE PLANNED @@ -979,9 +1132,15 @@ (and used). Due to this last difference from Western chess, a Shogi game never simplifies. -* help-gnu-shogi-request@prep.ai.mit.edu to subscribe to help-gnu-shogi +* help-gnu-shogi-request@prep.ai.mit.edu IS NOW DEFUNCT ** gnUSENET newsgroup: NONE PLANNED -** Send contributions to: help-gnu-shogi@prep.ai.mit.edu +** DEAD address: help-gnu-shogi@prep.ai.mit.edu + +This list is dead. + +* info-gnu-shogi-request@prep.ai.mit.edu to subscribe to info-gnu-shogi +** gnUSENET newsgroup: NONE PLANNED +** Send contributions to: info-gnu-shogi@prep.ai.mit.edu This list is the place for users and installers of GNU Shogi to ask for help. This list is also used for games played by people or other @@ -989,30 +1148,22 @@ non-enhancement data. Please send bug reports to bug-gnu-shogi instead of posting them here. -Since help-gnu-shogi is a large list, send it only those items that +This list is also used for announcements about GNU Shogi and related +programs, and small but important patches. Announcements of GNU Shogi +releases are also made to info-gnu@prep.ai.mit.edu (see above) + +Since info-gnu-shogi is a large list, send it only those items that are seriously important to many people. If source or patches that were previously posted or a simple fix is -requested in help-gnu-shogi, please mail it to the requester. Do NOT +requested in info-gnu-shogi, please mail it to the requester. Do NOT repost it. If you also want something that is requested, send mail to the requester asking him to forward it to you. This kind of traffic is -best handled by e-mail, not a broadcast medium that reaches thousands of +best handled by e-mail, not a broadcast medium that reaches millions of sites. See section '* General Information about help-* lists'. - -* info-gnu-shogi-request@prep.ai.mit.edu to subscribe to info-gnu-shogi -** gnUSENET newsgroup: NONE PLANNED -** Send contributions to: info-gnu-shogi@prep.ai.mit.edu - -This list is used for announcements about GNU Shogi and related -programs, and small but important patches. - -The list is filtered to remove items meant for info-gnu-shogi-request, -that can be answered by the moderator without bothering the list, or -should have been sent to another list. - -See section '* General Information about info-* lists'. +Also see section '* General Information about info-* lists'. * gnu-manual-request@a.cs.uiuc.edu IS NOW DEFUNCT ** DEAD: Gnusenet newsgroup: gnu.emacs.lisp.manual
--- a/etc/NEWS Mon Aug 13 10:16:17 2007 +0200 +++ b/etc/NEWS Mon Aug 13 10:17:07 2007 +0200 @@ -217,7 +217,7 @@ 19.34. XEmacs will now correctly merge all the `dir' files in -`Info-directory-list' (initialized from either `INFOPATH' +`Info-directory-list' (initialized from either the `INFOPATH' env. variable or `Info-default-directory-list'.) These files may be full-fledged info files containing subnodes or menus. Previously supported `localdir' files are looked for also, secondary to `dir's. @@ -1103,8 +1103,8 @@ then XIM support is automatically configured in as well. -- TM (Tools for Mime) now comes with XEmacs. This provides MIME - (Multi-purpose Internet Multi-media Extensions?) support for Mail - and News. The primary author is Morioka Tomohiko. + (Multipurpose Internet Mail Extensions) support for Mail and News. + The primary author is Morioka Tomohiko. -- Japanese input can also be input using the `canna' input method. This support was contributed by Morioka Tomohiko. Setting up canna
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/PACKAGES Mon Aug 13 10:17:07 2007 +0200 @@ -0,0 +1,463 @@ + -*- mode:outline -*- +* Introduction to XEmacs Packages +================================= + +As of XEmacs 20.5, XEmacs is no longer distributed in a large +monolithic distribution. The distribution has been broken up into +separate units called packages. In the general case, one may install +and uninstall various packages freely without having to modify the +XEmacs binary. This gives an installer the ability to tailor an +XEmacs installation for local needs with safe removal of unnecessary +code. + +There are two main flavors of packages. + +** Regular Packages +=================== + +A regular package is one in which multiple files are involved and one +may not in general safely remove any of them. + +** Single-File Packages +======================= + +A single-file package is an aggregate collection of thematically +related but otherwise independent lisp files. These files are bundled +together for download convenience and individual files may deleted at +will without any loss of functionality. + +* Package mechanics +=================== + +This section describes how package hierarchy directories are put +together and how they may be configured into XEmacs. + +** Package Path +=============== + +For backwards compatibility and for ease of transition to XEmacs +20.5+, it is possible to use previous XEmacs installations as package +directories. Specify something like +--package-path="~/.xemacs::/usr/local/lib/xemacs-20.3" to configure +when building. You will have extra messages at dump time relating to +lisp shadows which you may ignore. The magical null directory `::' is +a marker indicating where Lisp bundled with the running XEmacs gets +put into the load path. By specifing the older directories after the +current one, the newer lisp overrides the older lisp. + +** The anatomy of an XEmacs Package hierarchy +============================================= + +An XEmacs package is laid out just like a normal installed XEmacs lisp +directory. It may have lisp, etc, info, and lib-src subdirectories. +These directories get added at XEmacs startup to whatever directories +it was already using. + +There may be any number of Package hierarchy directories. + +* Package Distributions +======================= + +XEmacs lisp packages are distributed in two ways depending on the +intended use. Binary Packages are for installers and end-users and +may be installed directly into an XEmacs package directory. Source +Packages are for developers and include all files necessary for +rebuilding bytecompiled lisp and creating tarballs for distribution. + +** Binary Packages +================== + +Binary packages may be installed directly into an XEmacs package +directory. XEmacs package directories are determined at the time +XEmacs is configured for building. The default is +${prefix}/lib/xemacs/packages. `prefix' defaults to /usr/local unless +changed by the XEmacs configurer. This may be changed by specifying a +path of the form --package-path=directory:directory:directory... (all +directories separated by colons). There is no restriction on the +number of directories. There may be no package directories, but +XEmacs won't be very useful. + +** Source Packages +================== + +Source packages contain all of the Package author's (where appropriate +in regular packages) source code plus all of the files necessary to +build distribution tarballs (Unix Tar format files and gzipped for +space savings). + +*** Prerequisites for building Source Packages + +You must have GNU cp, GNU ginstall (or a BSD compatible install +program) GNU make (3.75 or later preferred), makeinfo (1.68 from +texinfo-3.11 or later required), GNU tar and XEmacs 20.5 :-). The +source packages will untar into a correct directory structure. At +the top level you must have XEmacs.rules and package-compile.el. +These files are available from the XEmacs FTP site from the same +place you obtained your source package distributions. + +*** What you can do with Source Packages + +NB: A global build operation doesn't exist yet as of 13 January 1998. + +Source packages are most useful for creating XEmacs package tarballs +for installation into your own XEmacs installations or for +distributing to others. + +Supported operations from Make are: + +**** clean + +Remove all built files except auto-autoloads.el and custom-load.el. + +**** distclean + +Remove XEmacs backups as well as the files deleted by `make clean'. + +**** all + +Byte compile all files, build and bytecompile byproduct files like +auto-autoloads.el and custom-load.el. Create info version of TeXinfo +documentation if present. + +**** srckit + +Usually aliased to `make srckit-std'. This does a `make distclean' +and creates a Package source tarball in the staging directory. This +is generally only of use for package maintainers. + +**** binkit + +May be aliased to binkit-sourceonly, binkit-sourceinfo, +binkit-sourcedata, or binkit-sourcedatainfo. `sourceonly' indicates +there is nothing to install in a data directory or info directory. +`sourceinfo' indicates that source and info files are to be +installed. `sourcedata' indicates that source and etc (data) files +are to be installed. `sourcedatainfo' indicates source, etc (data), +and info files are to be installed. A few packages have needs beyond +the basic templates so this is not yet complete. + +**** dist + +Runs the rules `srckit' followed by `binkit'. This is primarily of +use by XEmacs maintainers producing files for distribution. + +* Description of available packages by category +=============================================== + +This data is up-to-date as of 13 January 1998. + +** Library Packages (libs) +========================== + +These packages are required to build and support most of the rest of +XEmacs. By design, xemacs-base is a `regular' package. Use restraint +when adding new files there as it is required by almost everything. + +*** Sun + +Support for Sparcworks. Must be installed prior to XEmacs build to be +effective. + +*** apel + +A Portable Emacs Library. Used by XEmacs MIME support. + +*** edebug + +A Lisp debugger. + +*** efs + +Treat files on remote systems the same as local files. Also contains +dired. + +*** mail-lib + +Fundamental lisp files for providing email support. + +*** tooltalk + +Support for building with Tooltalk. Must be installed prior to XEmacs +build to be effective. + +*** xemacs-base + +Fundamental XEmacs support. Install this unless you wish a totally +naked XEmacs. + +*** xemacs-devel + +XEmacs Lisp developer support. This package contains utilities for +supporting Lisp development. It is a single-file package so it may be +tailored. + +** Communications Packages (comm) +================================= + +These packages provide support for various communications, primarily +email and usenet. + +*** footnote + +Footnoting in mail message editing modes. + +*** gnats + +XEmacs bug reports. + +*** gnus + +The Gnus Newsreader and Mailreader. + +*** mailcrypt + +Support for messaging encryption with PGP. + +*** mh-e + +Front end support for MH. + +*** net-utils + +Miscellaneous Networking Utilities. This is a single-file package and +files may be deleted at will. + +*** ph + +Emacs implementation of the ph client to CCSO/qi directory servers. + +*** rmail + +An obsolete Emacs mailer. If you do not already use it don't start. + +*** supercite + +An Emacs citation tool. Useful with all Emacs Mailers and Newsreaders. + +*** tm + +Emacs MIME support. + +*** vm + +An Emacs mailer. This package must be installed prior to building XEmacs. + +*** w3 + +A Web browser. + +** Games and Amusements (games) +=============================== + +*** cookie + +Spook and Yow (Zippy quotes). + +*** games + +Tetris, Sokoban, and Snake. + +*** mine + +Minehunt. + +*** misc-games + +Other amusements and diversions. + +** Mule Support (mule) +====================== + +*** egg-its + +Wnn (4.2 and 6) support. SJ3 support. Must be installed prior to +XEmacs build. + +*** leim + +Quail. Used for everything other than English and Japanese. + +*** locale + +Used for localized menubars (French and Japanese) and localized splash +screens (Japanese). + +*** mule-base + +Basic Mule support. Must be installed prior to building with Mule. + +*** skk + +Another Japanese Language Input Method. Can be used without a +separate process running as a dictionary server. + +** Productivity Packages (oa) +============================= + +*** calendar + +Calendar and diary support. + +*** edit-utils + +Single file lisp packages for various XEmacs goodies. Load this and +weed out the junk you don't want. + +*** forms + +Forms editing support (obsolete, use the builtin Widget instead). + +*** frame-icon + +Provide a WM icon based on major mode. + +*** hm--html-menus + +HTML editing. + +*** ispell + +Spell-checking with ispell. + +*** pc + +PC style interface emulation. + +*** psgml + +Validated HTML/SGML editing. + +*** sgml + +SGML/Linuxdoc-SGML editing. + +*** slider + +User interface tool. + +*** speedbar + +??? Document me. + +*** strokes + +Mouse enhancement utility. + +*** text-modes + +Various single file lisp packages for editing text files. + +*** time + +Display time & date on the modeline. + +** Operating System Utilities (os) +================================== + +*** eterm + +Terminal emulator. + +*** igrep + +Enhanced front-end for Grep. + +*** ilisp + +Front-end for Inferior Lisp. + +*** os-utils + +Miscellaneous single-file O/S utilities. + +*** view-process + +A Unix process browsing tool. + +** Program Editing Support (prog) +================================= + +*** ada + +Ada language support. + +*** c-support + +Basic single-file add-ons for editing C code. + +*** cc-mode + +C, C++ and Java language support. + +*** debug + +GUD, gdb, dbx debugging support. + +*** ediff + +Interface over patch. + +*** emerge + +Another interface over patch. + +*** pcl-cvs + +CVS frontend. + +*** prog-modes + +Miscellaneous single-file lisp files for various programming languages. + +*** scheme + +Front-end support for Inferior Scheme. + +*** sh-script + +Support for editing shell scripts. + +*** vc + +Version Control for Free systems. This package must be installed +prior to building XEmacs. + +*** vc-cc + +Version Control for ClearCase. This package must be installed prior +to building XEmacs [broken as of XEmacs 20.5-beta19]. + +*** vhdl + +Support for VHDL. + +** Word Processing (wp) +======================= + +*** auctex + +Basic TeX/LaTeX support. + +*** crisp + +Crisp/Brief emulation. + +*** edt + +DEC EDIT/EDT emulation. + +*** texinfo + +XEmacs TeXinfo support. + +*** textools + +Single-file TeX support. + +*** tpu + +DEC EDIT/TPU support. + +*** viper + +VI emulation support.
--- a/etc/xemacs.1 Mon Aug 13 10:16:17 2007 +0200 +++ b/etc/xemacs.1 Mon Aug 13 10:17:07 2007 +0200 @@ -1,4 +1,4 @@ -.TH XEMACS 1 "1997 November 19" +.TH XEMACS 1 "1998 January 13" .UC 4 .SH NAME xemacs \- Emacs: The Next Generation @@ -12,7 +12,7 @@ .br .SH DESCRIPTION .I XEmacs -is a version of +is a version of .IR Emacs , compatible with and containing many improvements over .I GNU @@ -55,8 +55,8 @@ windows and buffers. CTRL-h enters the Help facility. Help Tutorial (CTRL-h t) requests an interactive tutorial which can teach beginners the fundamentals -of -.I XEmacs +of +.I XEmacs in a few minutes. Help Apropos (CTRL-h a) helps you find a command given its functionality, Help Key Binding (CTRL-h k) @@ -126,7 +126,7 @@ .B \-eval options to specify files to execute and functions to call. .TP -.B \-nw\ +.B \-nw\ Inhibit the use of any window-system-specific display code: use the current TTY. .TP @@ -567,7 +567,7 @@ .B pointerBackground (\fPclass\fB Background) The background color of the mouse cursor. .PP -.SM Using the Mouse +.SM Using the Mouse .PP The following lists the mouse button bindings for the .I XEmacs @@ -623,7 +623,7 @@ that define most editing commands. The files are contained in subdirectories, categorized by function or individual package. Some are preloaded; others are autoloaded from these directories when used. - + /usr/local/lib/xemacs-$VERSION/etc - some files of information, pixmap files, other data files used by certain packages, etc. @@ -686,15 +686,15 @@ file /usr/local/lib/xemacs-$VERSION/etc/MAILINGLISTS. .SH UNRESTRICTIONS .PP -.I XEmacs -is free; anyone may redistribute copies of -.I XEmacs +.I XEmacs +is free; anyone may redistribute copies of +.I XEmacs to -anyone under the terms stated in the -.I XEmacs +anyone under the terms stated in the +.I XEmacs General Public License, -a copy of which accompanies each copy of -.I XEmacs +a copy of which accompanies each copy of +.I XEmacs and which also appears in the reference manual. .PP @@ -705,20 +705,26 @@ systems. Such inclusion violates the terms on which distribution is permitted. In fact, the primary purpose of the General Public License is to prohibit anyone from attaching any other restrictions -to redistribution of +to redistribution of .IR XEmacs \. .SH SEE ALSO X(1), xlsfonts(1), xterm(1), xrdb(1), emacs(1), vi(1) .SH AUTHORS .PP .I XEmacs -was written by Chuck Thompson <cthomp@xemacs.org>, Ben Wing -<wing@666.com>, Jamie Zawinski <jwz@netscape.com>, Richard Mlynarik -<mly@adoc.xerox.com>, Martin Buchholz <mrb@eng.sun.com> and many -others. It was based on an early version of +was written by +Steve Baur <steve@xemacs.org>, +Martin Buchholz <martin@xemacs.org>, +Richard Mlynarik <mly@adoc.xerox.com>, +Hrvoje Niksic <hniksic@srce.hr>, +Chuck Thompson <cthomp@xemacs.org>, +Ben Wing <wing@666.com>, +Jamie Zawinski <jwz@netscape.com>, +and many others. +It was based on an early version of .I GNU Emacs Version .IR 19 , -written by Richard Stallman of the Free Software +written by Richard Stallman <rms@gnu.org> of the Free Software Foundation, and has tracked subsequent releases of .I GNU Emacs as they have become available. It was originally written by Lucid, Inc.
--- a/lib-src/ChangeLog Mon Aug 13 10:16:17 2007 +0200 +++ b/lib-src/ChangeLog Mon Aug 13 10:17:07 2007 +0200 @@ -1,3 +1,10 @@ +1998-01-13 Martin Buchholz <martin@xemacs.org> + + * lib-src/add-little-package.sh: + * lib-src/add-big-package.sh: + Use proper paranoid quoting for sh variables. + -batch implies -q. + Thu Jan 08 09:42:36 1998 <andyp@parallax.co.uk> * gnuserv.h: only set UNIX_DOMAIN_SOCKETS if HAVE_SYS_UN_H is
--- a/lib-src/add-big-package.sh Mon Aug 13 10:16:17 2007 +0200 +++ b/lib-src/add-big-package.sh Mon Aug 13 10:17:07 2007 +0200 @@ -39,24 +39,23 @@ ### Code: -XEMACS=$1 # Not used at present -LISP_FILE=$2 # Should be a binary package tarball -DEST_DIR=$3 # Should be a top level package directory +XEMACS="$1" # Not used at present +LISP_FILE="$2" # Should be a binary package tarball +DEST_DIR="$3" # Should be a top level package directory # Test for valid XEmacs executable and valid input file -if [ \( ! -f ${LISP_FILE} \) -o \( ! -x ${XEMACS} \) ]; then +if [ ! -f "${LISP_FILE}" -o ! -x "${XEMACS}" ]; then exit 1 fi # Test for destination directory, creating if necessary -if [ ! -d ${DEST_DIR} ]; then - mkdir ${DEST_DIR} -fi +test -d "${DEST_DIR}" || mkdir "${DEST_DIR}" +test -d "${DEST_DIR}" || exit 1; # Very simple minded extraction for the first cut # We'll get more sophisticated later -cd ${DEST_DIR} -gunzip -c ${LISP_FILE} | tar xvf - +cd "${DEST_DIR}" +gunzip -c "${LISP_FILE}" | tar xvf - # Need to refresh the info/dir file, I don't know how to do that.
--- a/lib-src/add-little-package.sh Mon Aug 13 10:16:17 2007 +0200 +++ b/lib-src/add-little-package.sh Mon Aug 13 10:17:07 2007 +0200 @@ -39,40 +39,39 @@ ### Code: -XEMACS=$1 -LISP_FILE=$2 -DEST_DIR=$3 +XEMACS="$1" +LISP_FILE="$2" +DEST_DIR="$3" # Test for valid XEmacs executable and valid input file -if [ \( ! -f ${LISP_FILE} \) -o \( ! -x ${XEMACS} \) ]; then +if [ ! -f "${LISP_FILE}" -o ! -x "${XEMACS}" ]; then exit 1 fi # Test for destination directory, creating if necessary -if [ ! -d ${DEST_DIR} ]; then - mkdir ${DEST_DIR} -fi +test -d "${DEST_DIR}" || mkdir "${DEST_DIR}" +test -d "${DEST_DIR}" || exit 1; -cp ${LISP_FILE} ${DEST_DIR} -${XEMACS} -batch -q -no-site-file -f batch-byte-compile \ - ${DEST_DIR}/`basename ${LISP_FILE}` +cp -p "${LISP_FILE}" "${DEST_DIR}" || exit 1; +"${XEMACS}" -batch -no-site-file -f batch-byte-compile \ + "${DEST_DIR}/"`basename ${LISP_FILE}` # recompute autoloads ... -${XEMACS} -batch -q -no-site-file -l autoload \ - -f batch-update-directory ${DEST_DIR} +"${XEMACS}" -batch -no-site-file -l autoload \ + -f batch-update-directory "${DEST_DIR}" # and bytecompile if one was created -if [ -f ${DEST_DIR}/auto-autoloads.el ]; then - ${XEMACS} -batch -q -no-site-file -f batch-byte-compile \ - ${DEST_DIR}/auto-autoloads.el +if [ -f "${DEST_DIR}/auto-autoloads.el" ]; then + "${XEMACS}" -batch -no-site-file -f batch-byte-compile \ + "${DEST_DIR}"/auto-autoloads.el fi # recompute custom-loads -${XEMACS} -batch -q -no-site-file -l cus-dep \ - -f Custom-make-dependencies ${DEST_DIR} +"${XEMACS}" -batch -no-site-file -l cus-dep \ + -f Custom-make-dependencies "${DEST_DIR}" # and bytecompile if one was created -if [ -f ${DEST_DIR}/custom-load.el ]; then - ${XEMACS} -batch -q -no-site-file -f batch-byte-compile \ - ${DEST_DIR}/custom-load.el +if [ -f "${DEST_DIR}/custom-load.el" ]; then + "${XEMACS}" -batch -no-site-file -f batch-byte-compile \ + "${DEST_DIR}"/custom-load.el fi exit 0
--- a/lisp/ChangeLog Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/ChangeLog Mon Aug 13 10:17:07 2007 +0200 @@ -1,3 +1,68 @@ +1998-01-18 SL Baur <steve@altair.xemacs.org> + + * about.el: Add xemacs.org email manager. + + * package-get-base.el (package-get-base): Updated with most recent + package updates. + +1998-01-14 Jens-Ulrik Holger Petersen <petersen@kurims.kyoto-u.ac.jp> + + * help.el (function-arglist): Use `indirect-function' instead of + `symbol-function' so that aliases are treated correctly. + +1998-01-13 Jens-Ulrik Holger Petersen <petersen@kurims.kyoto-u.ac.jp> + + * help.el (help-map): Add f1 binding to `help-for-help'. + Suggested by Karl M. Hegbloom <karlheg@inetarena.com>. + (describe-key-briefly): Use `princ' "%s" to print object. + (with-displaying-help-buffer): Kill buffer if it exists, again. + (describe-key): Use `princ' "%s" to print object. + (describe-function-1): Use `princ' "%s" to print object. + Commented out alias lines removed. + (help-pretty-print-limit): New variable to control pretty-printing + of variable values. + (help-maybe-pretty-print-value): Steve wins! Renamed back from + `help-pretty-print-value' again. Only print-print when OBJECT is + list of length less than `help-pretty-print-limit'. + (describe-variable): Use `help-maybe-pretty-print-value' again. + +1998-01-18 SL Baur <steve@altair.xemacs.org> + + * simple.el (blink-matching-open): Remove C++ kludge. + Suggested by Bob Weiner <weiner@wave.altrasoft.com> + +1998-01-14 Karl M. Hegbloom <karlheg@bittersweet.inetarena.com> + + * info.el (Info-default-directory-list): Made the documentation + more explanitory. + +1998-01-13 Martin Buchholz <martin@xemacs.org> + + * lisp/packages.el: + * lisp/package-admin.el: + * lisp/build-report.el: + Fix typos. + +1998-01-14 Christoph Wedler <wedler@fmi.uni-passau.de> + + * Patches/font-lock.el (java-font-lock-keywords-*): Would produce + warnings in Java buffers without final newline and editing the + last line. + +1998-01-17 SL Baur <steve@altair.xemacs.org> + + * packages.el (packages-find-packages-1): Don't allow a backwards + compatible lisp tree to overwrite `preloaded-file-list'. + Suggested by Colin Rafferty <colin@xemacs.org> + + * mouse.el (mouse-offix-drop): Set undo-boundary. + From Oliver Graf <ograf@fga.de> + +1998-01-13 SL Baur <steve@altair.xemacs.org> + + * loadup.el (load-gc): rewrite as defun. + Print something sensical if a required dump-time file isn't found. + 1998-01-12 SL Baur <steve@altair.xemacs.org> * menubar.el (check-menu-syntax): Emergency dirty fix -- the 0 plist
--- a/lisp/about.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/about.el Mon Aug 13 10:17:07 2007 +0200 @@ -64,6 +64,7 @@ (dv "Didier Verna" "verna@inf.enst.fr") (hniksic "Hrvoje Niksic" "hniksic@srce.hr") (jareth "Jareth Hein" "jhod@camelot-soft.com") + (jason "Jason Mastaler" "jason@mastaler.com") (jens "Jens Lautenbacher" "jens@lemcbed.lem.uni-karlsruhe.de") (juhp "Jens-Ulrik Holger Petersen" "petersen@kurims.kyoto-u.ac.jp") (jwz "Jamie Zawinski" "jwz@netscape.com") @@ -100,6 +101,7 @@ (cc-mode . "http://www.python.org/ftp/emacs/") (dkindred . "http://www.cs.cmu.edu/People/dkindred/me.html") (dmoore . "http://oj.egbt.org/dmoore/") + (jason . "http://www.mastaler.com/") (juhp . "http://www.kurims.kyoto-u.ac.jp/~petersen/") (jwz . "http://people.netscape.com/jwz/") (kazz . "http://www.imasy.or.jp/~kazz/") @@ -964,7 +966,17 @@ My homepage is ") (about-url-link 'juhp "Visit Jens' homepage") (widget-insert ".\n")) + (jason + (widget-insert "\ +Beta tester and manager of the various XEmacs mailing lists. +Originator and maintainer of the gnus.org domain. +Jason resides in Albuquerque, New Mexico where he keeps himself +busy with studies at the university and consulting work. + +See: ") + (about-url-link 'jason "Visit Jason's homepage") + (widget-insert ".\n")) )) ;; Setup the buffer for a maintainer. @@ -1160,6 +1172,9 @@ into the event system of XEmacs.\n") (about-show-linked-info 'juhp "\ Author of \"find-func.el\".\n") + (about-show-linked-info 'jason "\ +Beta tester and manager of the various XEmacs mailing lists. +Originator and maintainer of the gnus.org domain.\n") (flet ((print-short (name addr &optional shortinfo) (concat (about-with-face name 'italic) (about-tabs name)
--- a/lisp/auto-autoloads.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/auto-autoloads.el Mon Aug 13 10:17:07 2007 +0200 @@ -1169,7 +1169,7 @@ Install a single file Lisp package into XEmacs package hierarchy. `file' should be the full path to the lisp file to install. `destdir' should be a simple directory name. -The optional `pkg-dir' can be used to override the default package hiearchy +The optional `pkg-dir' can be used to override the default package hierarchy \(last package-path)." t nil) (autoload 'package-admin-add-binary-package "package-admin" "\
--- a/lisp/build-report.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/build-report.el Mon Aug 13 10:17:07 2007 +0200 @@ -50,7 +50,7 @@ (require 'config) (provide 'build-report) -;; Due to recommandation by developers on xemacs-beta@xemacs.org, +;; Due to recommendation by developers on xemacs-beta@xemacs.org, ;; release versions are to be checked out using `co -u -kv ...'. (defconst build-report-version "1.35" @@ -282,12 +282,12 @@ (buffer-string))) (defun build-report-keep () - "build-report-internal fuction of no general value." + "build-report-internal function of no general value." (mapconcat '(lambda (item) item) (cons "^--\\[\\[\\|\\]\\]$" build-report-keep-regexp) "\\|")) (defun build-report-delete () - "build-report-internal fuction of no general value." + "build-report-internal function of no general value." (mapconcat '(lambda (item) item) build-report-delete-regexp "\\|"))
--- a/lisp/font-lock.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/font-lock.el Mon Aug 13 10:17:07 2007 +0200 @@ -2317,12 +2317,10 @@ '(2 font-lock-reference-face) (list (concat "\\=\\.\\(" java-font-lock-identifier-regexp "\\)") - nil nil '(1 (let ((c (char-after (match-end 0)))) - (if (and (characterp c) - (= c ?.)) - 'font-lock-reference-face - 'font-lock-type-face))))) - + nil nil '(1 (if (equal (char-after (match-end 0)) ?.) + 'font-lock-reference-face + 'font-lock-type-face)))) + ;; Constructors: (list (concat "^\\s *\\(" java-modifier-regexp "\\s +\\)*" @@ -2369,22 +2367,22 @@ ;; Keywords followed by a type: (list (concat "\\<\\(extends\\|instanceof\\|new\\)\\>\\s *" java-font-lock-identifier-regexp) - '(2 (if (= (char-after (match-end 0)) ?.) + '(2 (if (equal (char-after (match-end 0)) ?.) 'font-lock-reference-face 'font-lock-type-face)) (list (concat "\\=\\." java-font-lock-identifier-regexp) '(goto-char (match-end 0)) nil - '(1 (if (= (char-after (match-end 0)) ?.) + '(1 (if (equal (char-after (match-end 0)) ?.) 'font-lock-reference-face 'font-lock-type-face)))) ;; Keywords followed by a type list: (list (concat "\\<\\(implements\\|throws\\)\\>\\ s*" java-font-lock-identifier-regexp) - '(2 (if (= (char-after (match-end 0)) ?.) + '(2 (if (equal (char-after (match-end 0)) ?.) font-lock-reference-face font-lock-type-face)) (list (concat "\\=\\(\\.\\|\\s *\\(,\\)\\s *\\)" java-font-lock-identifier-regexp) '(goto-char (match-end 0)) nil - '(3 (if (= (char-after (match-end 0)) ?.) + '(3 (if (equal (char-after (match-end 0)) ?.) font-lock-reference-face font-lock-type-face)))) ;; primitive types, can't be confused with anything else. @@ -2460,11 +2458,11 @@ ;; Doc tag - Exception types (list (concat "@exception\\ s*" java-font-lock-identifier-regexp) - '(1 (if (= (char-after (match-end 0)) ?.) + '(1 (if (equal (char-after (match-end 0)) ?.) font-lock-reference-face font-lock-type-face) t) (list (concat "\\=\\." java-font-lock-identifier-regexp) '(goto-char (match-end 0)) nil - '(1 (if (= (char-after (match-end 0)) ?.) + '(1 (if (equal (char-after (match-end 0)) ?.) 'font-lock-reference-face 'font-lock-type-face) t))) ;; Doc tag - Cross-references, usually to methods
--- a/lisp/help.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/help.el Mon Aug 13 10:17:07 2007 +0200 @@ -61,6 +61,7 @@ (define-key help-map (vector help-char) 'help-for-help) (define-key help-map "?" 'help-for-help) (define-key help-map 'help 'help-for-help) +(define-key help-map '(f1) 'help-for-help) (define-key help-map "\C-l" 'describe-copying) ; on \C-c in FSFmacs (define-key help-map "\C-d" 'describe-distribution) @@ -383,7 +384,7 @@ ;; be a scrollbar event. We can't distinguish at the ;; moment. (if menup "This item" (key-description key)) - (if (symbolp defn) defn (prin1-to-string defn))))))) + (format (if (symbolp defn) "`%s'" "%s") defn)))))) ;; #### this is a horrible piece of shit function that should ;; not exist. In FSF 19.30 this function has gotten three times @@ -441,6 +442,8 @@ (member (selected-frame) (mapcar 'window-frame (windows-of-buffer buffer-name))))))) + (if (get-buffer buffer-name) + (kill-buffer buffer-name)) (prog1 (with-output-to-temp-buffer buffer-name (prog1 ,@body (save-excursion @@ -480,8 +483,9 @@ (with-displaying-help-buffer (format "key `%s'" key-string) (princ key-string) (princ " runs ") - (if (symbolp defn) (princ (format "`%S'" defn)) - (prin1 defn)) + (if (symbolp defn) + (princ (format "`%s'" defn)) + (princ defn)) (princ "\n\n") (cond ((or (stringp defn) (vectorp defn)) (let ((cmd (key-binding defn))) @@ -489,7 +493,7 @@ (princ "a keyboard macro") (progn (princ "a keyboard macro which runs the command ") - (prin1 cmd) + (princ cmd) (princ ":\n\n") (if (documentation cmd) (princ (documentation cmd))))))) ((and (consp defn) (not (eq 'lambda (car-safe defn)))) @@ -924,7 +928,7 @@ This function is used by `describe-function-1' to list function arguments in the standard Lisp style." - (let* ((fndef (symbol-function function)) + (let* ((fndef (indirect-function function)) (arglist (cond ((compiled-function-p fndef) (compiled-function-arglist fndef)) @@ -962,7 +966,7 @@ (defun describe-function-1 (function &optional nodoc) "This function does the work for `describe-function'." - (princ (format "`%S' is " function)) + (princ (format "`%s' is " function)) (let* ((def function) aliases file-name autoload-file kbd-macro-p fndef macrop) (while (and (symbolp def) (fboundp def)) @@ -1004,10 +1008,6 @@ (funcall int "built-in" nil macrop)) ((compiled-function-p fndef) (funcall int "compiled Lisp" nil macrop)) -; XEmacs -- we handle aliases above. -; ((symbolp fndef) -; (princ (format "alias for `%s'" -; (prin1-to-string def)))) ((eq (car-safe fndef) 'lambda) (funcall int "Lisp" nil macrop)) ((eq (car-safe fndef) 'mocklisp) @@ -1037,7 +1037,8 @@ (princ "These characters are executed:\n\n\t") (princ (key-description def)) (cond ((setq def (key-binding def)) - (princ (format "\n\nwhich executes the command %S.\n\n" def)) + (princ (format "\n\nwhich executes the command `%s'.\n\n" + def)) (describe-function-1 def)))) (nodoc nil) (t @@ -1132,21 +1133,34 @@ (if type "an unknown type of built-in variable?" "a variable declared in Lisp"))))) -(defun help-pretty-print-value (object) - "Print OBJECT in current buffer. -Use `pp-internal' if defined, otherwise `cl-prettyprint'" +(defcustom help-pretty-print-limit 100 + "Limit on length of lists above which pretty-printing of values is stopped. +Setting this to 0 disables pretty-printing." + :type 'integer + :group 'help) + +(defun help-maybe-pretty-print-value (object) + "Pretty-print OBJECT, unless it is a long list. +OBJECT is printed in the current buffer. Unless it is a list with +more than `help-pretty-print-limit' elements, it is pretty-printed. + +Uses `pp-internal' if defined, otherwise `cl-prettyprint'" (princ - (with-output-to-string - (with-syntax-table emacs-lisp-mode-syntax-table - ;; print `#<...>' values better - (modify-syntax-entry ?< "(>") - (modify-syntax-entry ?> ")<") - (let ((indent-line-function 'lisp-indent-line)) - (if (fboundp 'pp-internal) - (progn - (pp-internal object "\n") - (terpri)) - (cl-prettyprint object))))))) + (if (and (or (listp object) (vectorp object)) + (< (length object) + help-pretty-print-limit)) + (with-output-to-string + (with-syntax-table emacs-lisp-mode-syntax-table + ;; print `#<...>' values better + (modify-syntax-entry ?< "(>") + (modify-syntax-entry ?> ")<") + (let ((indent-line-function 'lisp-indent-line)) + (if (fboundp 'pp-internal) + (progn + (pp-internal object "\n") + (terpri)) + (cl-prettyprint object))))) + (format "\n%s\n" object)))) (defun describe-variable (variable) "Display the full documentation of VARIABLE (a symbol)." @@ -1186,7 +1200,7 @@ (princ "\nValue: ") (if (not (boundp variable)) (princ "void\n") - (help-pretty-print-value (symbol-value variable))) + (help-maybe-pretty-print-value (symbol-value variable))) (terpri) (cond ((local-variable-p variable (current-buffer)) (let* ((void (cons nil nil)) @@ -1204,7 +1218,7 @@ (progn (princ "Default-value: ") (if (eq def void) (princ "void\n") - (help-pretty-print-value def)) + (help-maybe-pretty-print-value def)) (terpri))))) ((local-variable-p variable (current-buffer) t) (princ "Setting it would make its value buffer-local.\n\n"))))
--- a/lisp/info.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/info.el Mon Aug 13 10:17:07 2007 +0200 @@ -379,13 +379,14 @@ "*List of directories to search for Info documents, and `dir' or `localdir' files. The value of `Info-default-directory-list' will be initialized to a reasonable default by the startup code, and usually doesn't need to be -changed in your personal configuration, though you may do so if you like. +changed in your personal configuration, though you may do so if you +like, and this is where to do that. The first directory on this list must contain a `dir' file like the one supplied with XEmacs, which will be used as the (dir)Top node. -For more information, see the documentation to the variable: -`Info-directory-list'.") +For more information, see the documentation to the variables: +`Info-additional-search-directory-list' and `Info-directory-list'.") (defcustom Info-additional-search-directory-list nil "*List of additional directories to search for Info documentation @@ -405,10 +406,12 @@ (split-string path path-separator) Info-default-directory-list)) "List of directories to search for Info documentation files. -Default is to use the environment variable INFOPATH if it exists, -else to use `Info-default-directory-list'. -The first directory in this list, the \"dir\" file there will become -the (dir)Top node of the Info documentation tree.") + +The default is to use the environment variable INFOPATH if it exists, +else to use `Info-default-directory-list'. The first directory in +this list, the \"dir\" file there will become the (dir)Top node of the +Info documentation tree. If you wish to modify the info search path, +use `M-x customize-variable, Info-default-directory-list' to do so.") (defcustom Info-localdir-heading-regexp "^Locally installed XEmacs Packages:?"
--- a/lisp/loadup.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/loadup.el Mon Aug 13 10:17:07 2007 +0200 @@ -88,22 +88,29 @@ ;; minimize the size of the dumped image (if we don't do this, ;; there will be lots of extra space in the data segment filled ;; with garbage-collected junk) - (defmacro load-gc (file) - (list 'prog1 - (list 'load - (list 'locate-file file - 'load-path - (list 'if 'load-ignore-elc-files - ".el:" - ".elc:.el:"))) - ;; '(test-atoms) - '(garbage-collect))) + (defun load-gc (file) + (let ((full-path (locate-file file + load-path + (if load-ignore-elc-files + ".el:" + ".elc:.el:")))) + (if full-path + (prog1 + (load full-path) + ;; '(test-atoms) + '(garbage-collect)) + (external-debugging-output (format "\nLoad file %s: not found\n" + file)) + nil))) (load (concat default-directory "../lisp/dumped-lisp.el")) (let ((dumped-lisp-packages preloaded-file-list) file) (while (setq file (car dumped-lisp-packages)) - (load-gc file) + (or (load-gc file) + (progn + (external-debugging-output "Fatal error during load, aborting") + (kill-emacs 1))) (setq dumped-lisp-packages (cdr dumped-lisp-packages))) (if (not (featurep 'toolbar)) (progn
--- a/lisp/mouse.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/mouse.el Mon Aug 13 10:17:07 2007 +0200 @@ -244,7 +244,8 @@ (pop-to-buffer buf nil frame) (insert data) (hexlify-buffer) - (make-frame-visible frame)))))) + (make-frame-visible frame)))) + (undo-boundary))) (defun mouse-eval-sexp (click force-window) "Evaluate the sexp under the mouse. Usually, this is the last sexp before
--- a/lisp/overlay.el Mon Aug 13 10:16:17 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,243 +0,0 @@ -;;; overlay.el --- overlay support. - -;; Copyright (C) 1997 Free Software Foundation, Inc. - -;; Author: Joe Nuspl <nuspl@sequent.com> -;; Maintainer: XEmacs Development Team (in <hniksic@srce.hr> incarnation) -;; Keywords: internal - -;; This file is part of XEmacs. - -;; XEmacs is free software; you can redistribute it and/or modify it -;; under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. - -;; XEmacs is distributed in the hope that it will be useful, but -;; WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with XEmacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. - -;;; Synched up with: Not in FSF. - -;;; Commentary: - -;; Unlike the text-properties interface, these functions are in fact -;; totally useless in XEmacs. They are a more or less straightforward -;; interface to the much better extent API, provided exclusively for -;; GNU Emacs compatibility. If you notice an incompatibility not -;; mentioned below, be sure to mention it. Anyways, you should really -;; not use this. - -;; Known incompatibilities with the FSF interface: - -;; 1. There is not an `overlay' type. Any extent with non-nil -;; 'overlay property is considered an "overlay". -;; -;; 2. Some features of FSF overlays have not been implemented in -;; extents (or are unneeded). Specifically, those are the -;; following special properties: window, insert-in-front-hooks, -;; insert-behind-hooks, and modification-hooks. Some of these will -;; probably be implemented for extents in the future. -;; -;; 3. In FSF, beginning and end of an overlay are markers, which means -;; that you can use `insert-before-markers' to change insertion -;; property of overlay. It will not work in this emulation, and we -;; have no plans of providing it. -;; -;; 4. The `overlays-in' and `overlays-at' functions in some cases -;; don't work as they should. To be fixed RSN. -;; -;; 5. Finally, setting or modification of overlay properties specific -;; to extents will have unusual results. While (overlay-put -;; overlay 'start-open t) does nothing under FSF, it has a definite -;; effect under XEmacs. This is solved by simply avoiding such -;; names (see `set-extent-property' for a list). - -;; Some functions were broken; fixed-up by Hrvoje Niksic, June 1997. - - -;;; Code: - -(defun overlayp (object) - "Return t if OBJECT is an overlay." - (and (extentp object) - (extent-property object 'overlay))) - -(defun make-overlay (beg end &optional buffer front-advance rear-advance) - "Create a new overlay with range BEG to END in BUFFER. -If omitted, BUFFER defaults to the current buffer. -BEG and END may be integers or markers. -The fourth arg FRONT-ADVANCE, if non-nil, makes the -front delimiter advance when text is inserted there. -The fifth arg REAR-ADVANCE, if non-nil, makes the -rear delimiter advance when text is inserted there." - (if (null buffer) - (setq buffer (current-buffer)) - (check-argument-type 'bufferp buffer)) - (when (> beg end) - (setq beg (prog1 end (setq end beg)))) - - (let ((overlay (make-extent beg end buffer))) - (set-extent-property overlay 'overlay t) - (if front-advance - (set-extent-property overlay 'start-open t) - (set-extent-property overlay 'start-closed t)) - (if rear-advance - (set-extent-property overlay 'end-closed t) - (set-extent-property overlay 'end-open t)) - - overlay)) - -(defun move-overlay (overlay beg end &optional buffer) - "Set the endpoints of OVERLAY to BEG and END in BUFFER. -If BUFFER is omitted, leave OVERLAY in the same buffer it inhabits now. -If BUFFER is omitted, and OVERLAY is in no buffer, put it in the current -buffer." - (check-argument-type 'overlayp overlay) - (if (null buffer) - (setq buffer (extent-object overlay))) - (if (null buffer) - (setq buffer (current-buffer))) - (check-argument-type 'bufferp buffer) - (and (= beg end) - (extent-property overlay 'evaporate) - (delete-overlay overlay)) - (when (> beg end) - (setq beg (prog1 end (setq end beg)))) - (set-extent-endpoints overlay beg end buffer) - overlay) - -(defun delete-overlay (overlay) - "Delete the overlay OVERLAY from its buffer." - (check-argument-type 'overlayp overlay) - (detach-extent overlay) - nil) - -(defun overlay-start (overlay) - "Return the position at which OVERLAY starts." - (check-argument-type 'overlayp overlay) - (extent-start-position overlay)) - -(defun overlay-end (overlay) - "Return the position at which OVERLAY ends." - (check-argument-type 'overlayp overlay) - (extent-end-position overlay)) - -(defun overlay-buffer (overlay) - "Return the buffer OVERLAY belongs to." - (check-argument-type 'overlayp overlay) - (extent-object overlay)) - -(defun overlay-properties (overlay) - "Return a list of the properties on OVERLAY. -This is a copy of OVERLAY's plist; modifying its conses has no effect on -OVERLAY." - (check-argument-type 'overlayp overlay) - (extent-properties overlay)) - -(defun overlays-at (pos) - "Return a list of the overlays that contain position POS." - (overlays-in pos pos)) - -(defun overlays-in (beg end) - "Return a list of the overlays that overlap the region BEG ... END. -Overlap means that at least one character is contained within the overlay -and also contained within the specified region. -Empty overlays are included in the result if they are located at BEG -or between BEG and END." - (mapcar-extents #'identity nil nil beg end - 'all-extents-closed-open 'overlay)) - -(defun next-overlay-change (pos) - "Return the next position after POS where an overlay starts or ends. -If there are no more overlay boundaries after POS, return (point-max)." - (let ((next (point-max)) - tmp) - (map-extents - (lambda (overlay ignore) - (when (or (and (< (setq tmp (extent-start-position overlay)) next) - (> tmp pos)) - (and (< (setq tmp (extent-end-position overlay)) next) - (> tmp pos))) - (setq next tmp)) - nil) - nil pos nil nil 'all-extents-closed-open 'overlay) - next)) - -(defun previous-overlay-change (pos) - "Return the previous position before POS where an overlay starts or ends. -If there are no more overlay boundaries before POS, return (point-min)." - (let ((prev (point-min)) - tmp) - (map-extents - (lambda (overlay ignore) - (when (or (and (> (setq tmp (extent-end-position overlay)) prev) - (< tmp pos)) - (and (> (setq tmp (extent-start-position overlay)) prev) - (< tmp pos))) - (setq prev tmp)) - nil) - nil nil pos nil 'all-extents-closed-open 'overlay) - prev)) - -(defun overlay-lists () - "Return a pair of lists giving all the overlays of the current buffer. -The car has all the overlays before the overlay center; -the cdr has all the overlays after the overlay center. -Recentering overlays moves overlays between these lists. -The lists you get are copies, so that changing them has no effect. -However, the overlays you get are the real objects that the buffer uses." - (or (boundp 'xemacs-internal-overlay-center-pos) - (overlay-recenter (1+ (/ (- (point-max) (point-min)) 2)))) - (let ((pos xemacs-internal-overlay-center-pos) - before after) - (map-extents (lambda (overlay ignore) - (if (> pos (extent-end-position overlay)) - (push overlay before) - (push overlay after)) - nil) - nil nil nil nil 'all-extents-closed-open 'overlay) - (cons (nreverse before) (nreverse after)))) - -(defun overlay-recenter (pos) - "Recenter the overlays of the current buffer around position POS." - (set (make-local-variable 'xemacs-internal-overlay-center-pos) pos)) - -(defun overlay-get (overlay prop) - "Get the property of overlay OVERLAY with property name PROP." - (check-argument-type 'overlayp overlay) - (let ((value (extent-property overlay prop)) - category) - (if (and (null value) - (setq category (extent-property overlay 'category))) - (get category prop) - value))) - -(defun overlay-put (overlay prop value) - "Set one property of overlay OVERLAY: give property PROP value VALUE." - (check-argument-type 'overlayp overlay) - (cond ((eq prop 'evaporate) - (set-extent-property overlay 'detachable value)) - ((eq prop 'before-string) - (set-extent-property overlay 'begin-glyph - (make-glyph (vector 'string :data value)))) - ((eq prop 'after-string) - (set-extent-property overlay 'end-glyph - (make-glyph (vector 'string :data value)))) - ((eq prop 'local-map) - (set-extent-property overlay 'keymap value)) - ((memq prop '(window insert-in-front-hooks insert-behind-hooks - modification-hooks)) - (error "cannot support overlay '%s property under XEmacs" - prop))) - (set-extent-property overlay prop value)) - -(provide 'overlay) - -;;; overlay.el ends here
--- a/lisp/package-admin.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/package-admin.el Mon Aug 13 10:17:07 2007 +0200 @@ -43,7 +43,7 @@ "Install a single file Lisp package into XEmacs package hierarchy. `file' should be the full path to the lisp file to install. `destdir' should be a simple directory name. -The optional `pkg-dir' can be used to override the default package hiearchy +The optional `pkg-dir' can be used to override the default package hierarchy \(last package-path)." (interactive "fLisp File: \nsDestination: ") (when (null pkg-dir)
--- a/lisp/package-get-base.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/package-get-base.el Mon Aug 13 10:17:07 2007 +0200 @@ -17,6 +17,16 @@ requires (mail-lib xemacs-base) type regular )) +(gnus + (version "1.02" + description "The Gnus Newsreader and Mailreader." + filename "gnus-1.02-pkg.tar.gz" + md5sum "ec5ed0322e46b8f672997d27a128b58e" + size 1663754 + provides (gnus message) + requires (gnus w3 mh-e mailcrypt rmail mail-lib xemacs-base) + type regular +)) (mailcrypt (version "1.02" filename "mailcrypt-1.02-pkg.tar.gz" @@ -72,12 +82,13 @@ type regular )) (tm - (version "1.02" - filename "tm-1.02-pkg.tar.gz" - md5sum "fa55affd4762141dc1a8090565438bbe" - size 180988 + (version "1.03" + description "Emacs MIME support." + filename "tm-1.03-pkg.tar.gz" + md5sum "1bc0d0c17ca472c793b0eceafa10624b" + size 251874 provides (tm tm-edit tm-view mime-setup) - requires (gnus vm mailcrypt mail-lib xemacs-base) + requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base) type regular )) (vm @@ -99,10 +110,11 @@ type regular )) (cookie - (version "1.03" - filename "cookie-1.03-pkg.tar.gz" - md5sum "28b2fee1f0acbc8f19af12a415743c3f" - size 33784 + (version "1.04" + description "Spook and Yow (Zippy quotes)." + filename "cookie-1.04-pkg.tar.gz" + md5sum "e2c77311b5483e9e700d28f7b2993aca" + size 33833 provides (cookie1 yow) requires (xemacs-base) type regular @@ -162,20 +174,22 @@ type regular )) (efs - (version "1.03" - filename "efs-1.03-pkg.tar.gz" - md5sum "7bc6786f8dee4d955d6365f0cbe2b610" - size 540959 + (version "1.04" + description "Treat files on remote systems the same as local files." + filename "efs-1.04-pkg.tar.gz" + md5sum "ba6bce39196f5d63fdc15f21c4cd1294" + size 542848 provides (efs diff dired efs-auto) - requires (xemacs-base) + requires (vm xemacs-base) type regular )) (mail-lib - (version "1.04" - filename "mail-lib-1.04-pkg.tar.gz" - md5sum "59b9cd8aefaa035cb6de8ebdfc141b0a" - size 118703 - provides (browse-url highlight-headers mail-abbrevs mail-extr mail-utils reporter rfc822 rmail-mini sendmail smtpmail) + (version "1.05" + description "Fundamental lisp files for providing email support." + filename "mail-lib-1.05-pkg.tar.gz" + md5sum "da865a128c4ce310fab6bc2704b58d2a" + size 118732 + provides (browse-url highlight-headers mail-abbrevs mail-extr mail-utils reporter rfc822 rmail-mini rmailout sendmail smtpmail) requires (xemacs-base) type single )) @@ -189,11 +203,12 @@ type regular )) (xemacs-base - (version "1.07" - filename "xemacs-base-1.07-pkg.tar.gz" - md5sum "b1b4c6a7005a2ee33fee0c992e256ceb" - size 376530 - provides (add-log advice annotations assoc case-table chistory comint-xemacs comint compile edmacro ehelp electric enriched env facemenu helper imenu iso-syntax outline passwd pp regi ring shell skeleton sort thing time-stamp timezone xbm-button xpm-button) + (version "1.08" + description "Fundamental XEmacs support, you almost certainly need this." + filename "xemacs-base-1.08-pkg.tar.gz" + md5sum "5bf009bdb7b0d0478987319d71bcacc4" + size 380727 + provides (add-log advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu helper imenu iso-syntax macros novice outline overlay passwd pp regi ring shell skeleton sort thing time-stamp timezone xbm-button xpm-button) requires () type regular )) @@ -207,10 +222,11 @@ type single )) (egg-its - (version "1.02" - filename "egg-its-1.02-pkg.tar.gz" - md5sum "e7fa42a1121fc260f459e4dabac061ac" - size 257713 + (version "1.03" + description "Wnn (4.2 and 6) support. SJ3 support." + filename "egg-its-1.03-pkg.tar.gz" + md5sum "6dcae480cb0351da8533e6b95abeb2f5" + size 259771 provides () requires (leim mule-base xemacs-base) type regular @@ -279,12 +295,13 @@ type regular )) (hm--html-menus - (version "1.02" - filename "hm--html-menus-1.02-pkg.tar.gz" - md5sum "79a9958a08c7e40f8316a9bf8637b3c5" - size 144731 + (version "1.03" + description "HTML editing." + filename "hm--html-menus-1.03-pkg.tar.gz" + md5sum "cce45f2664aa9cd3c931cfff23c621a5" + size 146847 provides (adapt hm--date hm--html-configuration hm--html-drag-and-drop hm--html-indentation hm--html-keys hm--html-menu hm--html-mode hm--html-not-standard hm--html html-view tmpl-minor-mode) - requires () + requires (xemacs-base) type regular )) (ispell @@ -423,19 +440,21 @@ type regular )) (c-support - (version "1.02" - filename "c-support-1.02-pkg.tar.gz" - md5sum "9d6e3bb330ca128c13dea88f321c74c3" - size 41817 + (version "1.03" + description "Basic single-file add-ons for editing C code." + filename "c-support-1.03-pkg.tar.gz" + md5sum "18815426732ff136a9eedfbcfa5f3a86" + size 41780 provides (c-comment-edit cmacexp hideif hideshow) requires (cc-mode xemacs-base) type regular )) (cc-mode - (version "1.03" - filename "cc-mode-1.03-pkg.tar.gz" - md5sum "c943e700b28d9c0fe9a870403b913959" - size 126973 + (version "1.04" + description "C, C++ and Java language support." + filename "cc-mode-1.04-pkg.tar.gz" + md5sum "4594ac91bbe114ceea4f06a1196076f6" + size 128650 provides (cc-mode) requires (xemacs-base) type regular @@ -531,10 +550,11 @@ type regular )) (auctex - (version "1.02" - filename "auctex-1.02-pkg.tar.gz" - md5sum "31f3845c0cd3178cbd07478da9a0e70e" - size 289385 + (version "1.03" + description "Basic TeX/LaTeX support." + filename "auctex-1.03-pkg.tar.gz" + md5sum "1b0403e3b22e3a8fb0f46019e2c245ba" + size 289505 provides (auc-old bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-site tex) requires (xemacs-base) type regular @@ -585,10 +605,11 @@ type regular )) (viper - (version "1.02" - filename "viper-1.02-pkg.tar.gz" - md5sum "99145b4a71030c0fc8c93e24ddc29dd3" - size 260582 + (version "1.03" + description "VI emulation support." + filename "viper-1.03-pkg.tar.gz" + md5sum "b1f8a6543aacc5c2d79c76082c739b81" + size 260554 provides (viper) requires (xemacs-base) type regular
--- a/lisp/packages.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/packages.el Mon Aug 13 10:17:07 2007 +0200 @@ -252,7 +252,7 @@ "Search the supplied directory for associated directories. The top level is assumed to look like: info/ Contain texinfo files for lisp installed in this hierarchy -etc/ Contain data files for lisp installled in this hiearchy +etc/ Contain data files for lisp installled in this hierarchy lisp/ Contain directories which either have straight lisp code or are self-contained packages of their own. @@ -287,7 +287,8 @@ (if (and (running-temacs-p) (file-exists-p (concat package "/lisp/dumped-lisp.el"))) (let (package-lisp) - (load (concat package "/lisp/dumped-lisp.el")) + (let (preloaded-file-list) + (load (concat package "/lisp/dumped-lisp.el"))) (if package-lisp (progn (if (boundp 'preloaded-file-list)
--- a/lisp/simple.el Mon Aug 13 10:16:17 2007 +0200 +++ b/lisp/simple.el Mon Aug 13 10:17:07 2007 +0200 @@ -2890,7 +2890,6 @@ (skip-syntax-backward "/\\") (point))))) (let* ((oldpos (point)) - (parse-sexp-ignore-comments t) ; to avoid C++ lossage (blinkpos) (mismatch)) (save-excursion
--- a/lwlib/config.h.in Mon Aug 13 10:16:17 2007 +0200 +++ b/lwlib/config.h.in Mon Aug 13 10:17:07 2007 +0200 @@ -24,77 +24,9 @@ #define _LWLIB_CONFIG_H_ #include <../src/config.h> -#if 0 -/* alloca twiddling belongs in one place, not the s&m headers - AIX requires this to be the first thing in the file. */ -#undef HAVE_ALLOCA_H - -#ifndef NOT_C_CODE - -#ifdef __GNUC__ -#undef alloca -#define alloca __builtin_alloca -#elif defined(_AIX) -#pragma alloca -#elif HAVE_ALLOCA_H -#include <alloca.h> -#endif - -#endif /* C code */ - -#undef HAVE_UNISTD_H -#undef HAVE_LIMITS_H -#undef STDC_HEADERS -#undef CONST_IS_LOSING - -#ifndef NeedFunctionPrototypes -#define NeedFunctionPrototypes 1 -#endif - -#ifndef FUNCPROTO -#define FUNCPROTO 15 -#endif - -/* Required for most XFree86 systems */ -#undef NARROWPROTO -#endif -/* widget feature definitions */ -#undef LWLIB_MENUBARS_LUCID -#undef LWLIB_MENUBARS_MOTIF - -#if defined (LWLIB_MENUBARS_LUCID) -#define MENUBARS_LUCID -#elif defined (LWLIB_MENUBARS_MOTIF) -#define MENUBARS_MOTIF -#endif - -#undef LWLIB_SCROLLBARS_LUCID -#undef LWLIB_SCROLLBARS_MOTIF -#undef LWLIB_SCROLLBARS_ATHENA - -#if defined (LWLIB_SCROLLBARS_LUCID) -#define SCROLLBARS_LUCID -#elif defined(LWLIB_SCROLLBARS_MOTIF) -#define SCROLLBARS_MOTIF -#elif defined (LWLIB_SCROLLBARS_ATHENA) -#define SCROLLBARS_ATHENA -#endif - -#undef LWLIB_DIALOGS_MOTIF -#undef LWLIB_DIALOGS_ATHENA - -#if defined (LWLIB_DIALOGS_MOTIF) -#define DIALOGS_MOTIF -#elif defined (LWLIB_DIALOGS_ATHENA) -#define DIALOGS_ATHENA -#endif #undef NEED_MOTIF #undef NEED_ATHENA -#undef USE_XFONTSET - -#if defined (LWLIB_MENUBARS_LUCID) || defined (LWLIB_SCROLLBARS_LUCID) -#define NEED_LUCID -#endif +#undef NEED_LUCID #endif /* _LWLIB_CONFIG_H_ */
--- a/lwlib/lwlib-Xaw.c Mon Aug 13 10:16:17 2007 +0200 +++ b/lwlib/lwlib-Xaw.c Mon Aug 13 10:17:07 2007 +0200 @@ -32,10 +32,10 @@ #include <X11/CoreP.h> #include <X11/Shell.h> -#ifdef SCROLLBARS_ATHENA +#ifdef LWLIB_SCROLLBARS_ATHENA #include <X11/Xaw/Scrollbar.h> #endif -#ifdef DIALOGS_ATHENA +#ifdef LWLIB_DIALOGS_ATHENA #include <X11/Xaw/Dialog.h> #include <X11/Xaw/Form.h> #include <X11/Xaw/Command.h> @@ -51,16 +51,16 @@ lw_xaw_widget_p (Widget widget) { return (0 -#ifdef SCROLLBARS_ATHENA +#ifdef LWLIB_SCROLLBARS_ATHENA || XtIsSubclass (widget, scrollbarWidgetClass) #endif -#ifdef DIALOGS_ATHENA +#ifdef LWLIB_DIALOGS_ATHENA || XtIsSubclass (widget, dialogWidgetClass) #endif ); } -#ifdef SCROLLBARS_ATHENA +#ifdef LWLIB_SCROLLBARS_ATHENA static void xaw_update_scrollbar (widget_instance *instance, Widget widget, widget_value *val) @@ -104,7 +104,7 @@ XawScrollbarSetThumb (widget, new_topOfThumb, new_shown); } } -#endif /* SCROLLBARS_ATHENA */ +#endif /* LWLIB_SCROLLBARS_ATHENA */ void xaw_update_one_widget (widget_instance *instance, Widget widget, @@ -112,13 +112,13 @@ { if (0) ; -#ifdef SCROLLBARS_ATHENA +#ifdef LWLIB_SCROLLBARS_ATHENA else if (XtIsSubclass (widget, scrollbarWidgetClass)) { xaw_update_scrollbar (instance, widget, val); } #endif -#ifdef DIALOGS_ATHENA +#ifdef LWLIB_DIALOGS_ATHENA else if (XtIsSubclass (widget, dialogWidgetClass)) { Arg al [1]; @@ -144,7 +144,7 @@ XtSetArg (al [0], XtNborderWidth, 1); XtSetValues (widget, al, 1); } -#endif +#endif /* ! LWLIB_DIALOGS_ATHENA3D */ XtSetArg (al [0], XtNlabel, val->value); XtSetArg (al [1], XtNsensitive, val->enabled); @@ -155,7 +155,7 @@ XtRemoveAllCallbacks (widget, XtNcallback); XtAddCallback (widget, XtNcallback, xaw_generic_callback, instance); } -#endif +#endif /* LWLIB_DIALOGS_ATHENA */ } void @@ -170,7 +170,7 @@ void xaw_destroy_instance (widget_instance *instance) { -#ifdef DIALOGS_ATHENA +#ifdef LWLIB_DIALOGS_ATHENA if (XtIsSubclass (instance->widget, dialogWidgetClass)) /* Need to destroy the Shell too. */ XtDestroyWidget (XtParent (instance->widget)); @@ -193,7 +193,7 @@ if (up) { -#ifdef DIALOGS_ATHENA +#ifdef LWLIB_DIALOGS_ATHENA if (XtIsSubclass (widget, dialogWidgetClass)) { /* For dialogs, we need to call XtPopup on the parent instead @@ -237,12 +237,12 @@ XtPopup (shell, XtGrabNonexclusive); } else -#endif /* DIALOGS_ATHENA */ +#endif /* LWLIB_DIALOGS_ATHENA */ XtManageChild (widget); } else { -#ifdef DIALOGS_ATHENA +#ifdef LWLIB_DIALOGS_ATHENA if (XtIsSubclass (widget, dialogWidgetClass)) XtUnmanageChild (XtParent (widget)); else @@ -252,7 +252,7 @@ } -#ifdef DIALOGS_ATHENA +#ifdef LWLIB_DIALOGS_ATHENA /* Dialog boxes */ static char overrideTrans[] = @@ -430,7 +430,7 @@ return widget; } -#endif /* DIALOGS_ATHENA */ +#endif /* LWLIB_DIALOGS_ATHENA */ static void @@ -483,7 +483,7 @@ instance->info->selection_cb (widget, id, user_data); } -#ifdef DIALOGS_ATHENA +#ifdef LWLIB_DIALOGS_ATHENA static XtActionProc wm_delete_window (Widget shell, XtPointer closure, XtPointer call_data) @@ -515,12 +515,12 @@ return NULL; } -#endif /* DIALOGS_ATHENA */ +#endif /* LWLIB_DIALOGS_ATHENA */ /* Scrollbars */ -#ifdef SCROLLBARS_ATHENA +#ifdef LWLIB_SCROLLBARS_ATHENA static void xaw_scrollbar_scroll (Widget widget, XtPointer closure, XtPointer call_data) { @@ -612,12 +612,12 @@ { return xaw_create_scrollbar (instance, 0); } -#endif /* SCROLLBARS_ATHENA */ +#endif /* LWLIB_SCROLLBARS_ATHENA */ widget_creation_entry xaw_creation_table [] = { -#ifdef SCROLLBARS_ATHENA +#ifdef LWLIB_SCROLLBARS_ATHENA {"vertical-scrollbar", xaw_create_vertical_scrollbar}, {"horizontal-scrollbar", xaw_create_horizontal_scrollbar}, #endif
--- a/lwlib/lwlib-Xlw.c Mon Aug 13 10:16:17 2007 +0200 +++ b/lwlib/lwlib-Xlw.c Mon Aug 13 10:17:07 2007 +0200 @@ -20,9 +20,7 @@ #include <config.h> #include <stdlib.h> /* for abort () */ -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include "lwlib-Xlw.h" #include <X11/StringDefs.h> @@ -30,16 +28,16 @@ #include <X11/ObjectP.h> #include <X11/CompositeP.h> #include <X11/Shell.h> -#ifdef MENUBARS_LUCID +#ifdef LWLIB_MENUBARS_LUCID #include "xlwmenu.h" #endif -#ifdef SCROLLBARS_LUCID +#ifdef LWLIB_SCROLLBARS_LUCID #include "xlwscrollbar.h" #endif -#ifdef MENUBARS_LUCID +#ifdef LWLIB_MENUBARS_LUCID /* Menu callbacks */ @@ -134,9 +132,9 @@ return popup_shell; } -#endif /* MENUBARS_LUCID */ +#endif /* LWLIB_MENUBARS_LUCID */ -#ifdef SCROLLBARS_LUCID +#ifdef LWLIB_SCROLLBARS_LUCID static void xlw_scrollbar_callback (Widget widget, XtPointer closure, XtPointer call_data) { @@ -301,16 +299,16 @@ } } -#endif /* SCROLLBARS_LUCID */ +#endif /* LWLIB_SCROLLBARS_LUCID */ widget_creation_entry xlw_creation_table [] = { -#ifdef MENUBARS_LUCID +#ifdef LWLIB_MENUBARS_LUCID {"menubar", xlw_create_menubar}, {"popup", xlw_create_popup_menu}, #endif -#ifdef SCROLLBARS_LUCID +#ifdef LWLIB_SCROLLBARS_LUCID {"vertical-scrollbar", xlw_create_vertical_scrollbar}, {"horizontal-scrollbar", xlw_create_horizontal_scrollbar}, #endif @@ -321,15 +319,15 @@ lw_lucid_widget_p (Widget widget) { WidgetClass the_class = XtClass (widget); -#ifdef MENUBARS_LUCID +#ifdef LWLIB_MENUBARS_LUCID if (the_class == xlwMenuWidgetClass) return True; #endif -#ifdef SCROLLBARS_LUCID +#ifdef LWLIB_SCROLLBARS_LUCID if (the_class == xlwScrollBarWidgetClass) return True; #endif -#ifdef MENUBARS_LUCID +#ifdef LWLIB_MENUBARS_LUCID if (the_class == overrideShellWidgetClass) return XtClass (((CompositeWidget)widget)->composite.children [0]) @@ -348,7 +346,7 @@ if (0) ; -#ifdef MENUBARS_LUCID +#ifdef LWLIB_MENUBARS_LUCID else if (class == xlwMenuWidgetClass) { XlwMenuWidget mw; @@ -361,7 +359,7 @@ XtSetValues (widget, al, 1); } #endif -#ifdef SCROLLBARS_LUCID +#ifdef LWLIB_SCROLLBARS_LUCID else if (class == xlwScrollBarWidgetClass) { xlw_update_scrollbar (instance, widget, val); @@ -381,7 +379,7 @@ { } -#ifdef MENUBARS_LUCID +#ifdef LWLIB_MENUBARS_LUCID void xlw_popup_menu (Widget widget, XEvent *event) { @@ -398,7 +396,7 @@ else abort (); } -#endif +#endif /* LWLIB_MENUBARS_LUCID */ /* Destruction of instances */ void
--- a/lwlib/lwlib-Xm.c Mon Aug 13 10:16:17 2007 +0200 +++ b/lwlib/lwlib-Xm.c Mon Aug 13 10:17:07 2007 +0200 @@ -23,9 +23,7 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif @@ -63,7 +61,7 @@ #include <Xm/DialogS.h> #include <Xm/Form.h> -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF static void xm_pull_down_callback (Widget, XtPointer, XtPointer); #if 0 static void xm_pop_down_callback (Widget, XtPointer, XtPointer); @@ -72,14 +70,14 @@ static void xm_internal_update_other_instances (Widget, XtPointer, XtPointer); static void xm_generic_callback (Widget, XtPointer, XtPointer); -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF static void xm_nosel_callback (Widget, XtPointer, XtPointer); #endif -#ifdef SCROLLBARS_MOTIF +#ifdef LWLIB_SCROLLBARS_MOTIF static void xm_scrollbar_callback (Widget, XtPointer, XtPointer); #endif -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF static void xm_update_menu (widget_instance* instance, Widget widget, widget_value* val, Boolean deep_p); @@ -146,7 +144,7 @@ lw_motif_widget_p (Widget widget) { return -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF XtClass (widget) == xmDialogShellWidgetClass || #endif XmIsPrimitive (widget) || XmIsManager (widget) || XmIsGadget (widget); @@ -171,7 +169,7 @@ return result; } -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF static void destroy_all_children (Widget widget) @@ -198,11 +196,11 @@ } } -#endif /* MENUBARS_MOTIF */ +#endif /* LWLIB_MENUBARS_MOTIF */ -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF static Boolean is_in_dialog_box (Widget w) @@ -219,9 +217,9 @@ return False; } -#endif /* DIALOGS_MOTIF */ +#endif /* LWLIB_DIALOGS_MOTIF */ -#if defined (DIALOGS_MOTIF) || defined (MENUBARS_MOTIF) +#if defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_MENUBARS_MOTIF) /* update the label of anything subclass of a label */ static void @@ -236,7 +234,7 @@ if (val->value) { -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF /* * Sigh. The main text of a label is the name field for menubar * entries. The value field is a possible additional field to be @@ -256,7 +254,7 @@ XmStringCreateLtoR (value_name, XmSTRING_DEFAULT_CHARSET); } else -#endif /* DIALOGS_MOTIF */ +#endif /* LWLIB_DIALOGS_MOTIF */ { char *value_name = NULL; char *res_name = NULL; @@ -305,7 +303,7 @@ XmStringFree (name_string); } -#endif /* defined (DIALOGS_MOTIF) || defined (MENUBARS_MOTIF) */ +#endif /* defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_MENUBARS_MOTIF) */ /* update of list */ static void @@ -340,7 +338,7 @@ XtAddCallback (widget, XmNactivateCallback, xm_generic_callback, instance); } -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF static void xm_update_cascadebutton (widget_instance* instance, Widget widget, @@ -368,7 +366,7 @@ } } -#endif /* MENUBARS_MOTIF */ +#endif /* LWLIB_MENUBARS_MOTIF */ /* update toggle and radiobox */ static void @@ -425,7 +423,7 @@ } } -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF /* update a popup menu, pulldown menu or a menubar */ static void @@ -657,10 +655,10 @@ } } -#endif /* MENUBARS_MOTIF */ +#endif /* LWLIB_MENUBARS_MOTIF */ -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF /* update text widgets */ @@ -687,9 +685,9 @@ xm_internal_update_other_instances, instance); } -#endif /* DIALOGS_MOTIF */ +#endif /* LWLIB_DIALOGS_MOTIF */ -#ifdef SCROLLBARS_MOTIF +#ifdef LWLIB_SCROLLBARS_MOTIF /* * If this function looks like it does a lot more work than it needs to, @@ -760,7 +758,7 @@ } } -#endif /* SCROLLBARS_MOTIF */ +#endif /* LWLIB_SCROLLBARS_MOTIF */ /* update a motif widget */ @@ -780,7 +778,7 @@ XtSetArg (al [1], XmNuserData, val->call_data); XtSetValues (widget, al, 2); -#if defined (DIALOGS_MOTIF) || defined (MENUBARS_MOTIF) +#if defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_MENUBARS_MOTIF) /* Common to all label like widgets */ if (XtIsSubclass (widget, xmLabelWidgetClass)) xm_update_label (instance, widget, val); @@ -793,7 +791,7 @@ { xm_update_pushbutton (instance, widget, val); } -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF else if (class == xmCascadeButtonWidgetClass) { xm_update_cascadebutton (instance, widget, val); @@ -813,12 +811,12 @@ if (radiobox) xm_update_radiobox (instance, widget, val); -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF else xm_update_menu (instance, widget, val, deep_p); #endif } -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF else if (class == xmTextWidgetClass) { xm_update_text (instance, widget, val); @@ -832,7 +830,7 @@ { xm_update_list (instance, widget, val); } -#ifdef SCROLLBARS_MOTIF +#ifdef LWLIB_SCROLLBARS_MOTIF else if (class == xmScrollBarWidgetClass) { xm_update_scrollbar (instance, widget, val); @@ -863,7 +861,7 @@ XtGetValues (widget, al, 1); val->edited = True; } -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF else if (class == xmTextWidgetClass) { if (val->value) @@ -935,7 +933,7 @@ XtFree ((char *) pos_list); } } -#ifdef SCROLLBARS_MOTIF +#ifdef LWLIB_SCROLLBARS_MOTIF else if (class == xmScrollBarWidgetClass) { /* This function is not used by the scrollbar. */ @@ -960,7 +958,7 @@ /* creation functions */ -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF /* dialogs */ @@ -1490,9 +1488,9 @@ return widget; } -#endif /* DIALOGS_MOTIF */ +#endif /* LWLIB_DIALOGS_MOTIF */ -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF static Widget make_menubar (widget_instance* instance) { @@ -1527,9 +1525,9 @@ parent->core.window = parent_window; return result; } -#endif /* MENUBARS_MOTIF */ +#endif /* LWLIB_MENUBARS_MOTIF */ -#ifdef SCROLLBARS_MOTIF +#ifdef LWLIB_SCROLLBARS_MOTIF static Widget make_scrollbar (widget_instance *instance, int vertical) { @@ -1571,18 +1569,18 @@ return make_scrollbar (instance, 0); } -#endif /* SCROLLBARS_MOTIF */ +#endif /* LWLIB_SCROLLBARS_MOTIF */ /* Table of functions to create widgets */ widget_creation_entry xm_creation_table [] = { -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF {"menubar", make_menubar}, {"popup", make_popup_menu}, #endif -#ifdef SCROLLBARS_MOTIF +#ifdef LWLIB_SCROLLBARS_MOTIF {"vertical-scrollbar", make_vertical_scrollbar}, {"horizontal-scrollbar", make_horizontal_scrollbar}, #endif @@ -1593,7 +1591,7 @@ void xm_destroy_instance (widget_instance* instance) { -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF /* It appears that this is used only for dialog boxes. */ Widget widget = instance->widget; /* recycle the dialog boxes */ @@ -1624,11 +1622,11 @@ XtDestroyWidget (instance->widget); } -#endif /* DIALOGS_MOTIF */ +#endif /* LWLIB_DIALOGS_MOTIF */ } /* popup utility */ -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF void xm_popup_menu (Widget widget, XEvent *event) @@ -1658,7 +1656,7 @@ #endif -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF static void set_min_dialog_size (Widget w) @@ -1683,7 +1681,7 @@ { Widget widget = instance->widget; -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF if (XtClass (widget) == xmDialogShellWidgetClass) { Widget widget_to_manage = first_child (widget); @@ -1777,7 +1775,7 @@ static void xm_generic_callback (Widget widget, XtPointer closure, XtPointer call_data) { -#if (defined (MENUBARS_MOTIF) || defined (DIALOGS_MOTIF)) +#if (defined (LWLIB_MENUBARS_MOTIF) || defined (LWLIB_DIALOGS_MOTIF)) /* We want the selected status to change only when we decide it should change. Yuck but correct. */ if (XtClass (widget) == xmToggleButtonWidgetClass @@ -1797,7 +1795,7 @@ do_call (widget, closure, selection); } -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF static void xm_nosel_callback (Widget widget, XtPointer closure, XtPointer call_data) @@ -1816,7 +1814,7 @@ #endif -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF static void xm_pull_down_callback (Widget widget, XtPointer closure, XtPointer call_data) @@ -1840,9 +1838,9 @@ } #endif /* 0 */ -#endif /* MENUBARS_MOTIF */ +#endif /* LWLIB_MENUBARS_MOTIF */ -#ifdef SCROLLBARS_MOTIF +#ifdef LWLIB_SCROLLBARS_MOTIF static void xm_scrollbar_callback (Widget widget, XtPointer closure, XtPointer call_data) { @@ -1930,7 +1928,7 @@ if (instance->info->pre_activate_cb) instance->info->pre_activate_cb (widget, id, (XtPointer) &event_data); } -#endif /* SCROLLBARS_MOTIF */ +#endif /* LWLIB_SCROLLBARS_MOTIF */ /* set the keyboard focus */
--- a/lwlib/lwlib-config.c Mon Aug 13 10:16:17 2007 +0200 +++ b/lwlib/lwlib-config.c Mon Aug 13 10:17:07 2007 +0200 @@ -55,23 +55,23 @@ int lwlib_does_not_use_motif_1_2; #endif -#ifdef MENUBARS_LUCID +#ifdef LWLIB_MENUBARS_LUCID int lwlib_menubars_lucid; #else -# ifdef MENUBARS_MOTIF +# ifdef LWLIB_MENUBARS_MOTIF int lwlib_menubars_motif; # else int lwlib_does_not_support_menubars; # endif #endif -#ifdef SCROLLBARS_LUCID +#ifdef LWLIB_SCROLLBARS_LUCID int lwlib_scrollbars_lucid; #else -# ifdef SCROLLBARS_MOTIF +# ifdef LWLIB_SCROLLBARS_MOTIF int lwlib_scrollbars_motif; # else -# ifdef SCROLLBARS_ATHENA +# ifdef LWLIB_SCROLLBARS_ATHENA int lwlib_scrollbars_athena; # else int lwlib_does_not_support_scrollbars; @@ -79,10 +79,10 @@ # endif #endif -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF int lwlib_dialogs_motif; #else -# ifdef DIALOGS_ATHENA +# ifdef LWLIB_DIALOGS_ATHENA int lwlib_dialogs_athena; # else int lwlib_does_not_support_dialogs;
--- a/lwlib/lwlib.c Mon Aug 13 10:16:17 2007 +0200 +++ b/lwlib/lwlib.c Mon Aug 13 10:17:07 2007 +0200 @@ -842,15 +842,15 @@ { if (dialog_spec_p (instance->info->type)) { -#ifdef DIALOGS_MOTIF +#ifdef LWLIB_DIALOGS_MOTIF if (!function) function = xm_create_dialog; #endif -#ifdef DIALOGS_ATHENA +#ifdef LWLIB_DIALOGS_ATHENA if (!function) function = xaw_create_dialog; #endif -#ifdef DIALOGS_LUCID +#ifdef LWLIB_DIALOGS_LUCID /* not yet (not ever?) */ #endif } @@ -1109,15 +1109,15 @@ void lw_popup_menu (Widget widget, XEvent *event) { -#ifdef MENUBARS_LUCID +#ifdef LWLIB_MENUBARS_LUCID if (lw_lucid_widget_p (widget)) xlw_popup_menu (widget, event); #endif -#ifdef MENUBARS_MOTIF +#ifdef LWLIB_MENUBARS_MOTIF if (lw_motif_widget_p (widget)) xm_popup_menu (widget, event); #endif -#ifdef MENUBARS_ATHENA +#ifdef LWLIB_MENUBARS_ATHENA if (lw_xaw_widget_p (widget)) xaw_popup_menu (widget, event); /* not implemented */ #endif
--- a/lwlib/lwlib.h Mon Aug 13 10:16:17 2007 +0200 +++ b/lwlib/lwlib.h Mon Aug 13 10:17:07 2007 +0200 @@ -11,13 +11,13 @@ # define CONST const #endif -#if defined (MENUBARS_LUCID) || defined (MENUBARS_MOTIF) || defined (MENUBARS_ATHENA) +#if defined (LWLIB_MENUBARS_LUCID) || defined (LWLIB_MENUBARS_MOTIF) || defined (LWLIB_MENUBARS_ATHENA) #define NEED_MENUBARS #endif -#if defined (SCROLLBARS_LUCID) || defined (SCROLLBARS_MOTIF) || defined (SCROLLBARS_ATHENA) +#if defined (LWLIB_SCROLLBARS_LUCID) || defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_ATHENA) #define NEED_SCROLLBARS #endif -#if defined (DIALOGS_LUCID) || defined (DIALOGS_MOTIF) || defined (DIALOGS_ATHENA) +#if defined (LWLIB_DIALOGS_LUCID) || defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_DIALOGS_ATHENA) #define NEED_DIALOGS #endif @@ -171,9 +171,9 @@ #define lw_kill_menus xlw_kill_menus #define lw_get_entries xlw_get_entries #define lw_menu_level xlw_menu_level -#else /* MENUBARS_LUCID */ +#else /* LWLIB_MENUBARS_LUCID */ /* do this for the other toolkits too */ -#endif /* MENUBARS_LUCID */ +#endif /* LWLIB_MENUBARS_LUCID */ void lw_register_widget (CONST char* type, CONST char* name, LWLIB_ID id, widget_value* val, lw_callback pre_activate_cb,
--- a/lwlib/xlwmenu.c Mon Aug 13 10:16:17 2007 +0200 +++ b/lwlib/xlwmenu.c Mon Aug 13 10:17:07 2007 +0200 @@ -27,9 +27,7 @@ #include <ctype.h> #include <stdio.h> #include <sys/types.h> -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #ifdef HAVE_UNISTD_H #include <unistd.h> #endif
--- a/lwlib/xlwscrollbar.c Mon Aug 13 10:16:17 2007 +0200 +++ b/lwlib/xlwscrollbar.c Mon Aug 13 10:17:07 2007 +0200 @@ -71,9 +71,7 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_LIMITS_H #include <limits.h> -#endif #include <X11/IntrinsicP.h> #include <X11/StringDefs.h>
--- a/src/ChangeLog Mon Aug 13 10:16:17 2007 +0200 +++ b/src/ChangeLog Mon Aug 13 10:17:07 2007 +0200 @@ -1,3 +1,68 @@ +1998-01-18 SL Baur <steve@altair.xemacs.org> + + * glyphs-x.c (imagick_instantiate): Dynamically allocate pixar + with alloca. + From Damon Lipparelli <lipp@primus.com> + +1998-01-14 Martin Buchholz <martin@xemacs.org> + + * eval.c (For, Fand, Fif, Fcond, Fprogn, Fprog1, Fprog2): + Modernize and streamline. + Replace Fcdr with XCDR, Fcar with XCAR for efficiency. + Remove REGISTER declarations. + +1998-01-13 Martin Buchholz <martin@xemacs.org> + + * emacsfns.h: + * alloc.c: + Add proper prototypes for print_cons, print_vector, print_string. + + * dired.c (directory-files): + * elhash.c (elisp_maphash): + * elhash.h (elisp_maphash): + * lrecord.h: + * mule-ccl.c (setup_ccl_program): + * mule-coding.c (coding_system_charset): + * offix-cursors.h (cursor_bits): + Warning elimination. + + * redisplay.c (add_blank_rune): + * redisplay.c (add_glyph_rune): + * redisplay.c (add_emchar_rune): + Warning elimination. Avoid useless computation in non-mule case. + + * config.h.in: + Define HAVE_INVERSE_HYPERBOLIC using 1 configure test, not 3. + * src/alloc.c: + * src/events.c: + Rearrange order of declarations and definitions to avoid forward + * src/mem-limits.h: Add motivating comment for future cleanup. + + * s/linux.h: Cleanup. Remove old cruft. + + * config.h.in: + Always define _GNU_SOURCE when using GNU libc. + Support --without-FOO as a synonym for --with-FOO=no. + Always use $srcdir to locate config.guess. + Make it clear that CONFIGURATION is optional. + De-emphasize CONFIGURATION parameter. Random cleanup. + More compatible with standard GNU install instructions. + --with-menubars=athena3d ==> --with-menubars=lucid. + +1998-01-14 Hrvoje Niksic <hniksic@srce.hr> + + * fileio.c (Fexpand_file_name): Synched with FSF. + +1998-01-13 Hrvoje Niksic <hniksic@srce.hr> + + * objects-msw.c (mswindows_color_instance_rgb_components): + Multiply components by 257 instead of shifting by 8. + +1998-01-15 Hrvoje Niksic <hniksic@srce.hr> + + * elhash.c (Fhashtable_type): New function. + (Fhashtable_test_function): Ditto. + 1998-01-12 SL Baur <steve@altair.xemacs.org> * profile.c (Fclear_profiling_info): Fix typing error.
--- a/src/alloc.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/alloc.c Mon Aug 13 10:17:07 2007 +0200 @@ -505,8 +505,6 @@ */ static struct lcrecord_header *all_lcrecords; -int lrecord_type_index (CONST struct lrecord_implementation *implementation); - void * alloc_lcrecord (int size, CONST struct lrecord_implementation *implementation) { @@ -994,19 +992,6 @@ #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_cons 2000 #ifdef LRECORD_CONS -static Lisp_Object mark_cons (Lisp_Object, void (*) (Lisp_Object)); -static int cons_equal(Lisp_Object, Lisp_Object, int); -extern void print_cons (Lisp_Object, Lisp_Object, int); -DEFINE_BASIC_LRECORD_IMPLEMENTATION ("cons", cons, - mark_cons, print_cons, 0, - cons_equal, - /* - * No `hash' method needed. - * internal_hash knows how to - * handle conses. - */ - 0, - struct Lisp_Cons); static Lisp_Object mark_cons (Lisp_Object obj, void (*markobj) (Lisp_Object)) { @@ -1029,6 +1014,17 @@ } return 0; } + +DEFINE_BASIC_LRECORD_IMPLEMENTATION ("cons", cons, + mark_cons, print_cons, 0, + cons_equal, + /* + * No `hash' method needed. + * internal_hash knows how to + * handle conses. + */ + 0, + struct Lisp_Cons); #endif /* LRECORD_CONS */ DEFUN ("cons", Fcons, 2, 2, 0, /* @@ -1183,20 +1179,6 @@ /**********************************************************************/ #ifdef LRECORD_VECTOR -static Lisp_Object mark_vector (Lisp_Object, void (*) (Lisp_Object)); -static unsigned int size_vector (CONST void *); -static int vector_equal(Lisp_Object, Lisp_Object, int); -extern void print_vector (Lisp_Object, Lisp_Object, int); -DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION("vector", vector, - mark_vector, print_vector, 0, - vector_equal, - /* - * No `hash' method needed for - * vectors. internal_hash - * knows how to handle vectors. - */ - 0, - size_vector, struct Lisp_Vector); static Lisp_Object mark_vector (Lisp_Object obj, void (*markobj) (Lisp_Object)) { @@ -1237,6 +1219,17 @@ return 1; } +DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION("vector", vector, + mark_vector, print_vector, 0, + vector_equal, + /* + * No `hash' method needed for + * vectors. internal_hash + * knows how to handle vectors. + */ + 0, + size_vector, struct Lisp_Vector); + /* #### should allocate `small' vectors from a frob-block */ static struct Lisp_Vector * make_vector_internal (EMACS_INT sizei) @@ -1274,7 +1267,7 @@ return p; } -#endif +#endif /* ! LRECORD_VECTOR */ Lisp_Object make_vector (EMACS_INT length, Lisp_Object init) @@ -1914,23 +1907,6 @@ #define MINIMUM_ALLOWED_FIXED_TYPE_CELLS_string 1000 #ifdef LRECORD_STRING -static Lisp_Object mark_string (Lisp_Object, void (*) (Lisp_Object)); -static int string_equal (Lisp_Object, Lisp_Object, int); -extern void print_string (Lisp_Object, Lisp_Object, int); -DEFINE_BASIC_LRECORD_IMPLEMENTATION ("string", string, - mark_string, print_string, - /* - * No `finalize', or `hash' methods. - * internal_hash already knows how - * to hash strings and finalization - * is done with the - * ADDITIONAL_FREE_string macro, - * which is the standard way to do - * finalization when using - * SWEEP_FIXED_TYPE_BLOCK(). - */ - 0, string_equal, 0, - struct Lisp_String); static Lisp_Object mark_string (Lisp_Object obj, void (*markobj) (Lisp_Object)) { @@ -1951,6 +1927,21 @@ return 0; return 1; } + +DEFINE_BASIC_LRECORD_IMPLEMENTATION ("string", string, + mark_string, print_string, + /* + * No `finalize', or `hash' methods. + * internal_hash already knows how + * to hash strings and finalization + * is done with the + * ADDITIONAL_FREE_string macro, + * which is the standard way to do + * finalization when using + * SWEEP_FIXED_TYPE_BLOCK(). + */ + 0, string_equal, 0, + struct Lisp_String); #endif /* LRECORD_STRING */ /* String blocks contain this many useful bytes. */ @@ -2357,11 +2348,6 @@ */ -static Lisp_Object mark_lcrecord_list (Lisp_Object, void (*) (Lisp_Object)); -DEFINE_LRECORD_IMPLEMENTATION ("lcrecord-list", lcrecord_list, - mark_lcrecord_list, internal_object_printer, - 0, 0, 0, struct lcrecord_list); - static Lisp_Object mark_lcrecord_list (Lisp_Object obj, void (*markobj) (Lisp_Object)) { @@ -2398,6 +2384,9 @@ return Qnil; } +DEFINE_LRECORD_IMPLEMENTATION ("lcrecord-list", lcrecord_list, + mark_lcrecord_list, internal_object_printer, + 0, 0, 0, struct lcrecord_list); Lisp_Object make_lcrecord_list (int size, CONST struct lrecord_implementation *implementation) @@ -2685,7 +2674,7 @@ for (size = 0; size < len; size++) v->contents[size] = init; - XSETVECTOR (new, v); + XSETVECTOR (new, v); return new; } @@ -4519,7 +4508,7 @@ Lisp_Object ret[6]; int i; #ifdef LRECORD_VECTOR - int gc_count_vector_total_size; + int gc_count_vector_total_size = 0; #endif if (purify_flag && pure_lossage)
--- a/src/config.h.in Mon Aug 13 10:16:17 2007 +0200 +++ b/src/config.h.in Mon Aug 13 10:17:07 2007 +0200 @@ -67,6 +67,9 @@ /* Make all functions available on AIX. See AC_AIX. */ #undef _ALL_SOURCE +/* Make all functions available on GNU libc systems. See features.h. */ +#undef _GNU_SOURCE + /* Used to identify the XEmacs version in stack traces. */ #undef STACK_TRACE_EYE_CATCHER @@ -108,7 +111,6 @@ #undef AIXV3 #undef _POSIX_SOURCE #undef _BSD_SOURCE -#undef _GNU_SOURCE #undef X_LOCALE #undef NARROWPROTO /* The following should always be defined, no matter what xmkmf thinks. */ @@ -168,7 +170,6 @@ #undef HAVE_X11_XLOCALE_H #undef HAVE_LINUX_VERSION_H #undef HAVE_INTTYPES_H -#undef HAVE_LIMITS_H #undef HAVE_SYS_UN_H #undef STDC_HEADERS #undef TIME_WITH_SYS_TIME @@ -222,13 +223,7 @@ #undef SIZEOF_LONG_LONG #undef SIZEOF_VOID_P -#undef HAVE_ACOSH -#undef HAVE_ASINH -#undef HAVE_ATANH - -#if defined (HAVE_ACOSH) && defined (HAVE_ASINH) && defined (HAVE_ATANH) -#define HAVE_INVERSE_HYPERBOLIC -#endif +#undef HAVE_INVERSE_HYPERBOLIC #undef HAVE_CBRT #undef HAVE_CLOSEDIR
--- a/src/dired.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/dired.c Mon Aug 13 10:17:07 2007 +0200 @@ -97,7 +97,7 @@ name_as_dir = Ffile_name_as_directory (dirname); name_as_dir_length = XSTRING_LENGTH (name_as_dir); - statbuf = alloca (name_as_dir_length + MAXNAMLEN + 1); + statbuf = (char *) alloca (name_as_dir_length + MAXNAMLEN + 1); memcpy (statbuf, XSTRING_DATA (name_as_dir), name_as_dir_length); statbuf_tail = statbuf + name_as_dir_length;
--- a/src/elhash.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/elhash.c Mon Aug 13 10:17:07 2007 +0200 @@ -838,6 +838,49 @@ return make_int (htbl.fullness); } +DEFUN ("hashtable-type", Fhashtable_type, 1, 1, 0, /* +Return type of HASHTABLE. +This can be one of `non-weak', `weak', `key-weak' and `value-weak'. +*/ + (hashtable)) +{ + CHECK_HASHTABLE (hashtable); + + switch (XHASHTABLE (hashtable)->type) + { + case HASHTABLE_WEAK: + return Qweak; + break; + case HASHTABLE_KEY_WEAK: + return Qkey_weak; + break; + case HASHTABLE_VALUE_WEAK: + return Qvalue_weak; + break; + default: + return Qnon_weak; + } +} + +DEFUN ("hashtable-test-function", Fhashtable_test_function, 1, 1, 0, /* +Return test function of HASHTABLE. +This can be one of `eq', `eql' or `equal'. +*/ + (hashtable)) +{ + int (*fun) (CONST void *, CONST void *); + + CHECK_HASHTABLE (hashtable); + + fun = XHASHTABLE (hashtable)->test_function; + + if (fun == lisp_object_eql_equal) + return Qeql; + else if (fun == lisp_object_equal_equal) + return Qequal; + else + return Qeq; +} static void verify_function (Lisp_Object function, CONST char *description) @@ -900,7 +943,7 @@ lisp hashtable. */ void -elisp_maphash (void (*function) (CONST void *key, void *contents, +elisp_maphash (int (*function) (CONST void *key, void *contents, void *extra_arg), Lisp_Object hashtable, void *closure) { @@ -1284,6 +1327,8 @@ DEFSUBR (Fclrhash); DEFSUBR (Fmaphash); DEFSUBR (Fhashtable_fullness); + DEFSUBR (Fhashtable_type); + DEFSUBR (Fhashtable_test_function); DEFSUBR (Fmake_weak_hashtable); DEFSUBR (Fmake_key_weak_hashtable); DEFSUBR (Fmake_value_weak_hashtable);
--- a/src/elhash.h Mon Aug 13 10:16:17 2007 +0200 +++ b/src/elhash.h Mon Aug 13 10:17:07 2007 +0200 @@ -63,7 +63,7 @@ enum hashtable_type type, enum hashtable_test_fun test_fun); -void elisp_maphash (void (*fn) (CONST void *key, void *contents, +void elisp_maphash (int (*fn) (CONST void *key, void *contents, void *extra_arg), Lisp_Object table, void *extra_arg);
--- a/src/emacsfns.h Mon Aug 13 10:16:17 2007 +0200 +++ b/src/emacsfns.h Mon Aug 13 10:17:07 2007 +0200 @@ -1548,6 +1548,9 @@ /* Same goes for this function. */ void write_string_1 (CONST Bufbyte *s, Bytecount size, Lisp_Object printcharfun); +extern void print_cons (Lisp_Object, Lisp_Object, int); +extern void print_vector (Lisp_Object, Lisp_Object, int); +extern void print_string (Lisp_Object, Lisp_Object, int); void print_internal (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag);
--- a/src/eval.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/eval.c Mon Aug 13 10:17:07 2007 +0200 @@ -654,24 +654,18 @@ (args)) { /* This function can GC */ - REGISTER Lisp_Object val; - Lisp_Object args_left; + Lisp_Object val = Qnil; struct gcpro gcpro1; - if (NILP (args)) - return Qnil; - - args_left = args; - GCPRO1 (args_left); - - do + GCPRO1 (args); + + while (!NILP (args)) { - val = Feval (Fcar (args_left)); + val = Feval (XCAR (args)); if (!NILP (val)) break; - args_left = Fcdr (args_left); + args = XCDR (args); } - while (!NILP (args_left)); UNGCPRO; return val; @@ -685,24 +679,18 @@ (args)) { /* This function can GC */ - REGISTER Lisp_Object val; - Lisp_Object args_left; + Lisp_Object val = Qt; struct gcpro gcpro1; - if (NILP (args)) - return Qt; - - args_left = args; - GCPRO1 (args_left); - - do + GCPRO1 (args); + + while (!NILP (args)) { - val = Feval (Fcar (args_left)); + val = Feval (XCAR (args)); if (NILP (val)) break; - args_left = Fcdr (args_left); + args = XCDR (args); } - while (!NILP (args_left)); UNGCPRO; return val; @@ -721,12 +709,14 @@ struct gcpro gcpro1; GCPRO1 (args); - cond = Feval (Fcar (args)); + cond = Feval (XCAR (args)); UNGCPRO; + args = XCDR (args); + if (!NILP (cond)) - return Feval (Fcar (Fcdr (args))); - return Fprogn (Fcdr (Fcdr (args))); + return Feval (XCAR (args)); + return Fprogn (XCDR (args)); } DEFUN ("cond", Fcond, 0, UNEVALLED, 0, /* @@ -742,15 +732,14 @@ (args)) { /* This function can GC */ - REGISTER Lisp_Object clause, val; + Lisp_Object val = Qnil; struct gcpro gcpro1; - val = Qnil; GCPRO1 (args); while (!NILP (args)) { - clause = Fcar (args); - val = Feval (Fcar (clause)); + Lisp_Object clause = XCAR (args); + val = Feval (XCAR (clause)); if (!NILP (val)) { if (!EQ (XCDR (clause), Qnil)) @@ -770,22 +759,16 @@ (args)) { /* This function can GC */ - REGISTER Lisp_Object val; - Lisp_Object args_left; + Lisp_Object val = Qnil; struct gcpro gcpro1; - if (! CONSP (args)) - return Qnil; - - args_left = args; - GCPRO1 (args_left); - - do + GCPRO1 (args); + + while (!NILP (args)) { - val = Feval (XCAR (args_left)); - args_left = XCDR (args_left); + val = Feval (XCAR (args)); + args = XCDR (args); } - while (CONSP (args_left)); UNGCPRO; return val; @@ -800,26 +783,18 @@ { /* This function can GC */ Lisp_Object val; - REGISTER Lisp_Object args_left; struct gcpro gcpro1, gcpro2; - REGISTER int argnum = 0; - - if (NILP (args)) - return Qnil; - - args_left = args; - val = Qnil; + GCPRO2 (args, val); - do + val = Feval (XCAR (args)); + args = XCDR (args); + + while (!NILP (args)) { - if (!(argnum++)) - val = Feval (Fcar (args_left)); - else - Feval (Fcar (args_left)); - args_left = Fcdr (args_left); + Feval (XCAR (args)); + args = XCDR (args); } - while (!NILP (args_left)); UNGCPRO; return val; @@ -834,28 +809,20 @@ { /* This function can GC */ Lisp_Object val; - REGISTER Lisp_Object args_left; struct gcpro gcpro1, gcpro2; - REGISTER int argnum = -1; - - val = Qnil; - - if (NILP (args)) - return Qnil; - - args_left = args; - val = Qnil; + GCPRO2 (args, val); - do + Feval (XCAR (args)); + args = XCDR (args); + val = Feval (XCAR (args)); + args = XCDR (args); + + while (!NILP (args)) { - if (!(argnum++)) - val = Feval (Fcar (args_left)); - else - Feval (Fcar (args_left)); - args_left = Fcdr (args_left); + Feval (XCAR (args)); + args = XCDR (args); } - while (!NILP (args_left)); UNGCPRO; return val; @@ -961,7 +928,7 @@ The order of execution is thus TEST, BODY, TEST, BODY and so on until TEST returns nil. */ -(args)) + (args)) { /* This function can GC */ Lisp_Object test, body, tem; @@ -1008,7 +975,7 @@ /* * uncomment the QUIT if there is some way a circular * arglist can get in here. I think Feval or Fapply would - * spin first and the list would never get here. + * spin first and the list would never get here. */ /* QUIT; */ }
--- a/src/events.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/events.c Mon Aug 13 10:17:07 2007 +0200 @@ -78,14 +78,6 @@ Vevent_resource = Qnil; } -static Lisp_Object mark_event (Lisp_Object, void (*) (Lisp_Object)); -static void print_event (Lisp_Object, Lisp_Object, int); -static int event_equal (Lisp_Object, Lisp_Object, int); -static unsigned long event_hash (Lisp_Object obj, int depth); -DEFINE_BASIC_LRECORD_IMPLEMENTATION ("event", event, - mark_event, print_event, 0, event_equal, - event_hash, struct Lisp_Event); - /* Make sure we lose quickly if we try to use this event */ static void deinitialize_event (Lisp_Object ev) @@ -397,6 +389,10 @@ return 0; /* unreached */ } +DEFINE_BASIC_LRECORD_IMPLEMENTATION ("event", event, + mark_event, print_event, 0, event_equal, + event_hash, struct Lisp_Event); + DEFUN ("make-event", Fmake_event, 0, 2, 0, /* Create a new event of type TYPE, with properties described by PLIST.
--- a/src/fileio.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/fileio.c Mon Aug 13 10:17:07 2007 +0200 @@ -686,21 +686,21 @@ } DEFUN ("expand-file-name", Fexpand_file_name, 1, 2, 0, /* -Convert FILENAME to absolute, and canonicalize it. -Second arg DEFAULT is directory to start with if FILENAME is relative - (does not start with slash); if DEFAULT is nil or missing, +Convert filename NAME to absolute, and canonicalize it. +Second arg DEFAULT-DIRECTORY is directory to start with if NAME is relative + (does not start with slash); if DEFAULT-DIRECTORY is nil or missing, the current buffer's value of default-directory is used. -Path components that are `.' are removed, and -path components followed by `..' are removed, along with the `..' itself; +File name components that are `.' are removed, and +so are file name components followed by `..', along with the `..' itself; note that these simplifications are done without checking the resulting -paths in the file system. +file names in the file system. An initial `~/' expands to your home directory. An initial `~USER/' expands to USER's home directory. See also the function `substitute-in-file-name'. */ - (name, default_)) + (name, default_directory)) { - /* This function can GC. GC checked 1997.04.06. */ + /* This function can GC */ Bufbyte *nm; Bufbyte *newdir, *p, *o; @@ -710,8 +710,8 @@ #ifdef DOS_NT int drive = 0; int collapse_newdir = 1; +#endif /* DOS_NT */ int length; -#endif /* DOS_NT */ Lisp_Object handler; CHECK_STRING (name); @@ -720,38 +720,27 @@ call the corresponding file handler. */ handler = Ffind_file_name_handler (name, Qexpand_file_name); if (!NILP (handler)) - return call3_check_string (handler, Qexpand_file_name, name, default_); - - /* Use the buffer's default-directory if DEFAULT_ is omitted. */ - if (NILP (default_)) - default_ = current_buffer->directory; - if (NILP (default_)) /* this should be a meaningful error */ + return call3_check_string (handler, Qexpand_file_name, name, + default_directory); + + /* Use the buffer's default-directory if DEFAULT_DIRECTORY is omitted. */ + if (NILP (default_directory)) + default_directory = current_buffer->directory; + if (! STRINGP (default_directory)) + default_directory = build_string ("/"); + + if (!NILP (default_directory)) { - /* #### If we had a minibuffer-only frame up then current_buffer - is likely to not have a directory setting. We should - probably redo things to make sure that current_buffer stays - set to something sensible. */ - if (!preparing_for_armageddon) - signal_simple_error ("default-directory is not set", - make_buffer (current_buffer)); + handler = Ffind_file_name_handler (default_directory, Qexpand_file_name); + if (!NILP (handler)) + return call3 (handler, Qexpand_file_name, name, default_directory); } - else - CHECK_STRING (default_); - - if (!NILP (default_)) - { - struct gcpro gcpro1; - - GCPRO1 (default_); /* might be current_buffer->directory */ - handler = Ffind_file_name_handler (default_, Qexpand_file_name); - UNGCPRO; - if (!NILP (handler)) - return call3 (handler, Qexpand_file_name, name, default_); - } - - /* Make sure DEFAULT_ is properly expanded. + + o = XSTRING_DATA (default_directory); + + /* Make sure DEFAULT_DIRECTORY is properly expanded. It would be better to do this down below where we actually use - default_. Unfortunately, calling Fexpand_file_name recursively + default_directory. Unfortunately, calling Fexpand_file_name recursively could invoke GC, and the strings might be relocated. This would be annoying because we have pointers into strings lying around that would need adjusting, and people would add new pointers to @@ -759,34 +748,28 @@ Putting this call here avoids all that crud. The EQ test avoids infinite recursion. */ - if (! NILP(default_) && !EQ (default_, name) + if (! NILP (default_directory) && !EQ (default_directory, name) /* Save time in some common cases - as long as default_directory is not relative, it can be canonicalized with name below (if it is needed at all) without requiring it to be expanded now. */ - && ! (XSTRING_LENGTH (default_) >= 3 #ifdef DOS_NT - /* Detect MSDOS file names with drive specifiers. */ - && (IS_DRIVE (XSTRING_BYTE (default_, 0)) - && (IS_DEVICE_SEP (XSTRING_BYTE (default_, 1)) - && IS_DIRECTORY_SEP (XSTRING_BYTE (default_, 2)))) + /* Detect MSDOS file names with drive specifiers. */ + && ! (IS_DRIVE (o[0]) && (IS_DEVICE_SEP (o[1]) && IS_DIRECTORY_SEP (o[2]))) #ifdef WINDOWSNT - /* Detect Windows file names in UNC format. */ - && ! (XSTRING_LENGTH (default_) >= 2 - && IS_DIRECTORY_SEP (XSTRING_BYTE (default_, 0)) - && IS_DIRECTORY_SEP (XSTRING_BYTE (default_, 1))) + /* Detect Windows file names in UNC format. */ + && ! (IS_DIRECTORY_SEP (o[0]) && IS_DIRECTORY_SEP (o[1])) #endif #else /* not DOS_NT */ - /* Detect Unix absolute file names (/... alone is not absolute on - DOS or Windows). */ - && (IS_DIRECTORY_SEP (XSTRING_BYTE (default_, 0)) - || IS_DEVICE_SEP (XSTRING_BYTE (default_, 1))) + /* Detect Unix absolute file names (/... alone is not absolute on + DOS or Windows). */ + && ! (IS_DIRECTORY_SEP (o[0])) #endif /* not DOS_NT */ - )) + ) { struct gcpro gcpro1; - GCPRO1 (default_); /* may be current_buffer->directory */ - default_ = Fexpand_file_name (default_, Qnil); + GCPRO1 (name); + default_directory = Fexpand_file_name (default_directory, Qnil); UNGCPRO; } @@ -794,8 +777,8 @@ name = FILE_SYSTEM_CASE (name); #endif - /* #### dmoore - this is ugly, clean this up. Looks like nm - pointing into name should be safe during all of this, though. */ + /* #### dmoore - this is ugly, clean this up. Looks like nm pointing + into name should be safe during all of this, though. */ nm = XSTRING_DATA (name); #ifdef DOS_NT @@ -807,13 +790,14 @@ even if the rest of the name appears to be relative. */ { Bufbyte *colon = strrchr (nm, ':'); + if (colon) /* Only recognize colon as part of drive specifier if there is a single alphabetic character preceeding the colon (and if the character before the drive letter, if present, is a directory separator); this is to support the remote system syntax used by ange-ftp, and the "po:username" syntax for POP mailboxes. */ - look_again: + look_again: if (nm == colon) nm++; else if (IS_DRIVE (colon[-1]) @@ -839,36 +823,6 @@ #endif /* WINDOWSNT */ #endif /* DOS_NT */ - /* We *don't* want to handle // and /~ that way. */ -#if 0 - /* Handle // and /~ in middle of file name - by discarding everything through the first / of that sequence. */ - p = nm; - while (*p) - { - /* Since we know the path is absolute, we can assume that each - element starts with a "/". */ - - /* "//" anywhere isn't necessarily hairy; we just start afresh - with the second slash. */ - if (IS_DIRECTORY_SEP (p[0]) && IS_DIRECTORY_SEP (p[1]) -#if defined (APOLLO) || defined (WINDOWSNT) - /* // at start of filename is meaningful on Apollo - and WindowsNT systems */ - && nm != p -#endif /* APOLLO || WINDOWSNT */ - ) - nm = p + 1; - - /* "~" is hairy as the start of any path element. */ - if (IS_DIRECTORY_SEP (p[0]) && p[1] == '~') - nm = p + 1; - - p++; - } - -#endif /* 0 */ - #ifdef WINDOWSNT /* Discard any previous drive specifier if nm is now in UNC format. */ if (IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) @@ -880,7 +834,11 @@ /* If nm is absolute, look for /./ or /../ sequences; if none are found, we can probably return right away. We will avoid allocating a new string if name is already fully expanded. */ - if (IS_DIRECTORY_SEP (nm[0]) + if ( + IS_DIRECTORY_SEP (nm[0]) +#ifdef MSDOS + && drive +#endif #ifdef WINDOWSNT && (drive || IS_DIRECTORY_SEP (nm[1])) #endif @@ -897,7 +855,7 @@ p = nm; while (*p) { - /* Since we know the path is absolute, we can assume that each + /* Since we know the name is absolute, we can assume that each element starts with a "/". */ /* "." and ".." are hairy. */ @@ -925,20 +883,19 @@ } else #endif - /* drive must be set, so this is okay */ - if (strcmp (nm - 2, XSTRING_DATA (name)) != 0) - { - name = make_string (nm - 2, p - nm + 2); - XSTRING_DATA (name)[0] = DRIVE_LETTER (drive); - XSTRING_DATA (name)[1] = ':'; - } + /* drive must be set, so this is okay */ + if (strcmp (nm - 2, XSTRING_DATA (name)) != 0) + { + name = make_string (nm - 2, p - nm + 2); + XSTRING_DATA (name)[0] = DRIVE_LETTER (drive); + XSTRING_DATA (name)[1] = ':'; + } return name; #else /* not DOS_NT */ - /* Unix */ if (nm == XSTRING_DATA (name)) return name; - return build_string ((char *) nm); -#endif /* DOS_NT */ + return build_string (nm); +#endif /* not DOS_NT */ } } @@ -948,10 +905,10 @@ and /foo/../ sequences. We set newdir to be the appropriate prefix if one is needed: - - the relevant user directory if nm starts with ~ or ~user - - the specified drive's working dir (DOS/NT only) if nm does not - start with / - - the value of default_directory. + - the relevant user directory if nm starts with ~ or ~user + - the specified drive's working dir (DOS/NT only) if nm does not + start with / + - the value of default_directory. Note that these prefixes are not guaranteed to be absolute (except for the working dir of a drive). Therefore, to ensure we always @@ -963,26 +920,14 @@ if (nm[0] == '~') /* prefix ~ */ { if (IS_DIRECTORY_SEP (nm[1]) - || nm[1] == 0) /* ~ by itself */ + || nm[1] == 0) /* ~ by itself */ { if (!(newdir = (Bufbyte *) egetenv ("HOME"))) newdir = (Bufbyte *) ""; -/* Syncing with FSF 19.34.6 note: this is not in FSF. Since it is dated 1995, - I doubt it is coming from XEmacs. I (#if 0) it but let the code - stay there just in case. --marcpa */ -#if 0 -#ifdef DOS_NT - /* Problem when expanding "~\" if HOME is not on current drive. - Ulrich Leodolter, Wed Jan 11 10:20:35 1995 */ - if (newdir[1] == ':') - drive = newdir[0]; - dostounix_filename (newdir); -#endif /* DOS_NT */ -#endif /* 0 */ nm++; #ifdef DOS_NT collapse_newdir = 0; -#endif /* DOS_NT */ +#endif } else /* ~user/filename */ { @@ -991,19 +936,19 @@ memcpy (o, (char *) nm, p - nm); o [p - nm] = 0; -/* Syncing with FSF 19.34.6 note: FSF uses getpwnam even on NT, which does - not work. The following works only if ~USER names the user who runs - this instance of XEmacs. While NT is single-user (for the moment) you - still can have multiple user profiles users defined, each with its - HOME. Therefore, the following should be reworked to handle this case. - --marcpa */ + /* #### marcpa's syncing note: FSF uses getpwnam even on NT, + which does not work. The following works only if ~USER + names the user who runs this instance of XEmacs. While + NT is single-user (for the moment) you still can have + multiple user profiles users defined, each with its HOME. + Therefore, the following should be reworked to handle + this case. */ #ifdef WINDOWSNT - /* - ** Now if the file given is "~foo/file" and HOME="c:/", then we - ** want the file to be named "c:/file" ("~foo" becomes "c:/"). - ** The variable o has "~foo", so we can use the length of - ** that string to offset nm. August Hill, 31 Aug 1998. - */ + /* Now if the file given is "~foo/file" and HOME="c:/", then + we want the file to be named "c:/file" ("~foo" becomes + "c:/"). The variable o has "~foo", so we can use the + length of that string to offset nm. August Hill, 31 Aug + 1998. */ newdir = (Bufbyte *) egetenv ("HOME"); dostounix_filename (newdir); nm += strlen(o) + 1; @@ -1051,17 +996,18 @@ /* Finally, if no prefix has been specified and nm is not absolute, then it must be expanded relative to default_directory. */ + if (1 #ifndef DOS_NT - && !IS_ANY_SEP (nm[0]) -#endif /* not DOS_NT */ + /* /... alone is not absolute on DOS and Windows. */ + && !IS_DIRECTORY_SEP (nm[0]) +#endif #ifdef WINDOWSNT && !(IS_DIRECTORY_SEP (nm[0]) && IS_DIRECTORY_SEP (nm[1])) #endif - && !newdir - && STRINGP (default_)) + && !newdir) { - newdir = XSTRING_DATA (default_); + newdir = XSTRING_DATA (default_directory); } #ifdef DOS_NT @@ -1133,16 +1079,13 @@ } } #endif /* DOS_NT */ - if (newdir != 0) + + if (newdir) { /* Get rid of any slash at the end of newdir, unless newdir is just // (an incomplete UNC name). */ - int length = strlen ((char *) newdir); - /* Adding `length > 1 &&' makes ~ expand into / when homedir - is the root dir. People disagree about whether that is right. - Anyway, we can't take the risk of this change now. */ - /* Syncing with FSF 19.34.6 note: FSF does the above. */ - if (IS_DIRECTORY_SEP (newdir[length - 1]) + length = strlen (newdir); + if (length > 0 && IS_DIRECTORY_SEP (newdir[length - 1]) #ifdef WINDOWSNT && !(length == 2 && IS_DIRECTORY_SEP (newdir[0])) #endif @@ -1159,7 +1102,7 @@ tlen = 0; /* Now concatenate the directory and name to new space in the stack frame */ - tlen += strlen ((char *) nm) + 1; + tlen += strlen (nm) + 1; #ifdef DOS_NT /* Add reserved space for drive name. (The Microsoft x86 compiler produces incorrect code if the following two lines are combined.) */ @@ -1167,18 +1110,20 @@ target += 2; #else /* not DOS_NT */ target = (Bufbyte *) alloca (tlen); -#endif /* DOS_NT */ +#endif /* not DOS_NT */ *target = 0; if (newdir) { if (nm[0] == 0 || IS_DIRECTORY_SEP (nm[0])) - strcpy ((char *) target, (char *) newdir); + strcpy (target, newdir); else - file_name_as_directory ((char *) target, (char *) newdir); + file_name_as_directory (target, newdir); } - strcat ((char *) target, (char *) nm); + strcat (target, nm); + + /* ASSERT (IS_DIRECTORY_SEP (target[0])) if not VMS */ /* Now canonicalize by removing /. and /foo/.. if they appear. */ @@ -1191,19 +1136,8 @@ { *o++ = *p++; } - else if (IS_DIRECTORY_SEP (p[0]) && IS_DIRECTORY_SEP (p[1]) -#if defined (APOLLO) || defined (WINDOWSNT) - /* // at start of filename is meaningful in Apollo - and WindowsNT systems */ - && o != target -#endif /* APOLLO || WINDOWSNT */ - ) - { - o = target; - p++; - } else if (IS_DIRECTORY_SEP (p[0]) - && p[1] == '.' + && p[1] == '.' && (IS_DIRECTORY_SEP (p[2]) || p[2] == 0)) { @@ -1220,11 +1154,8 @@ { while (o != target && (--o) && !IS_DIRECTORY_SEP (*o)) ; - if (o == target && IS_ANY_SEP (*o) -#ifdef DOS_NT - && p[3] == 0 -#endif - ) + /* Keep initial / only if this is the whole name. */ + if (o == target && IS_ANY_SEP (*o) && p[3] == 0) ++o; p += 3; }
--- a/src/glyphs-x.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/glyphs-x.c Mon Aug 13 10:17:07 2007 +0200 @@ -1918,7 +1918,7 @@ int i,j,x,b; unsigned int bytes_per_pixel, scanline_pad; unsigned long pixval; - unsigned char *q, pixar[3]; + unsigned char *q, *pixar; RunlengthPacket *p; q = (unsigned char *) unwind.ximage->data; @@ -1930,6 +1930,8 @@ /* Convert to multi-byte color-mapped X image. */ bytes_per_pixel=unwind.ximage->bits_per_pixel >> 3; + pixar = (unsigned char *) alloca (bytes_per_pixel); + for (i=0; i < unwind.image->packets; i++) { if (unwind.image->class == PseudoClass) pixval = unwind.pixels[p->index];
--- a/src/lisp.h Mon Aug 13 10:16:17 2007 +0200 +++ b/src/lisp.h Mon Aug 13 10:17:07 2007 +0200 @@ -39,10 +39,8 @@ #include <stdio.h> /* NULL, etc. */ #include <ctype.h> #include <stdarg.h> +#include <limits.h> -#ifdef HAVE_LIMITS_H -#include <limits.h> -#endif /* Define INT_MAX, DBL_DIG if not in limits.h */ #ifndef INT_MAX #define INT_MAX ((int) ((1U << (INTBITS - 1)) - 1))
--- a/src/lrecord.h Mon Aug 13 10:16:17 2007 +0200 +++ b/src/lrecord.h Mon Aug 13 10:17:07 2007 +0200 @@ -100,7 +100,10 @@ #endif }; + #ifdef USE_INDEXED_LRECORD_IMPLEMENTATION +struct lrecord_implementation; +int lrecord_type_index (CONST struct lrecord_implementation *implementation); # define set_lheader_implementation(header,imp) \ do { (header)->type = lrecord_type_index((imp)); \ (header)->mark = 0; \
--- a/src/m/ibmrs6000.inp Mon Aug 13 10:16:17 2007 +0200 +++ b/src/m/ibmrs6000.inp Mon Aug 13 10:17:07 2007 +0200 @@ -1,6 +1,2 @@ #! pthread_yield -gethostbyname_r -getservbyname_r -getpwnam_r -getpwuid_r
--- a/src/mem-limits.h Mon Aug 13 10:16:17 2007 +0200 +++ b/src/mem-limits.h Mon Aug 13 10:17:07 2007 +0200 @@ -20,6 +20,13 @@ /* Synched up with: FSF 19.30. */ +/* #### This ancient code really sucks. + configure should check for: + HAVE_SYS_RESOURCE_H, HAVE_ULIMIT_H, HAVE_GETRLIMIT, HAVE_ULIMIT, + and select action based on those values. + getrlimit() should be preferred to ulimit(). + On Linux, ulimit() is deprecated and always returns -1. */ + #ifndef _XEMACS_MEM_LIMITS_H_ #define _XEMACS_MEM_LIMITS_H_ @@ -47,7 +54,7 @@ extern int etext, __data_start; weak_symbol (__data_start) #define start_of_data() (&__data_start ?: &etext) -#else /* not _LIBC */ +#else /* not GNU libc */ #if defined (__osf__) && (defined (__mips) || defined (mips) || defined (__alpha)) #include <sys/time.h>
--- a/src/menubar-x.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/menubar-x.c Mon Aug 13 10:17:07 2007 +0200 @@ -216,7 +216,7 @@ incr_wv->call_data = LISP_TO_VOID (incremental_data); goto menu_item_done; } -#endif /* LWLIB_MENUBARS_LUCID */ +#endif /* LWLIB_MENUBARS_LUCID || LWLIB_MENUBARS_MOTIF */ } if (menu_type == POPUP_TYPE && popup_menu_titles && depth == 0) { @@ -331,7 +331,7 @@ in_menu_callback = XINT(val); return Qnil; } -#endif /* LWLIB_MENUBARS_LUCID */ +#endif /* LWLIB_MENUBARS_LUCID || LWLIB_MENUBARS_MOTIF */ /* The order in which callbacks are run is funny to say the least.
--- a/src/mule-ccl.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/mule-ccl.c Mon Aug 13 10:17:07 2007 +0200 @@ -931,9 +931,7 @@ /* Setup fields of the structure pointed by CCL appropriately for the execution of compiled CCL code in VEC (vector of integer). */ void -setup_ccl_program (ccl, vec) - struct ccl_program *ccl; - Lisp_Object vec; +setup_ccl_program (struct ccl_program *ccl, Lisp_Object vec) { int i;
--- a/src/mule-coding.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/mule-coding.c Mon Aug 13 10:17:07 2007 +0200 @@ -962,6 +962,7 @@ return Qnil; /* not reached */ } +static Lisp_Object coding_system_charset (Lisp_Object coding_system, int gnum) { Lisp_Object cs
--- a/src/objects-msw.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/objects-msw.c Mon Aug 13 10:17:07 2007 +0200 @@ -829,9 +829,13 @@ mswindows_color_instance_rgb_components (struct Lisp_Color_Instance *c) { COLORREF color = COLOR_INSTANCE_MSWINDOWS_COLOR (c); - return (list3 (make_int (GetRValue(color)<<8), - make_int (GetGValue(color)<<8), - make_int (GetBValue(color)<<8))); + /* This used to say GetXValue(color)<<8, but that made, e.g. white + show as (#xff00 #xff00 #xff00) instead of (#xffff #xffff #xffff). + This slightly kludgier variant gives the expected results for + black and white, while hopefully not introducing too much error. */ + return list3 (make_int (GetRValue (color) * 257), + make_int (GetGValue (color) * 257), + make_int (GetBValue (color) * 257)); } static int
--- a/src/offix-cursors.h Mon Aug 13 10:16:17 2007 +0200 +++ b/src/offix-cursors.h Mon Aug 13 10:17:07 2007 +0200 @@ -44,10 +44,12 @@ #define cursor_height 16 #define cursor_x_hot 0 #define cursor_y_hot 0 +#if 0 /* unused */ static unsigned char cursor_bits[] = { 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x0e, 0x00, 0x1e, 0x00, 0x3e, 0x00, 0x7e, 0x00, 0xfe, 0x00, 0xfe, 0x01, 0x3e, 0x00, 0x36, 0x00, 0x62, 0x00, 0x60, 0x00, 0xc0, 0x00, 0xc0, 0x00, 0x00, 0x00}; +#endif /* unused */ #define dir_width 42 #define dir_height 24 #define dir_x_hot 1
--- a/src/redisplay.c Mon Aug 13 10:16:17 2007 +0200 +++ b/src/redisplay.c Mon Aug 13 10:17:07 2007 +0200 @@ -934,10 +934,9 @@ crb->xpos = data->pixpos; crb->width = width; if (data->bi_bufpos) - { - struct buffer *buf = XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))); - crb->bufpos = bytind_to_bufpos (buf, data->bi_bufpos); - } + crb->bufpos = + bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))), + data->bi_bufpos); else if (data->is_modeline) crb->bufpos = data->modeline_charpos; else @@ -1079,10 +1078,9 @@ rb.xpos = data->pixpos; rb.width = data->blank_width; if (data->bi_bufpos) - { - struct buffer *buf = XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))); - rb.bufpos = bytind_to_bufpos (buf, data->bi_bufpos); - } + rb.bufpos = + bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (XWINDOW (data->window))), + data->bi_bufpos); else /* #### and this is really correct too? */ rb.bufpos = 0; @@ -1661,11 +1659,9 @@ rb.width = width; rb.bufpos = 0; /* glyphs are never "at" anywhere */ if (data->bi_endpos) - { - /* #### is this necessary at all? */ - struct buffer *buf = XBUFFER (WINDOW_BUFFER (w)); - rb.endpos = bytind_to_bufpos (buf, data->bi_endpos); - } + /* #### is this necessary at all? */ + rb.endpos = bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (w)), + data->bi_endpos); else rb.endpos = 0; rb.type = RUNE_DGLYPH; @@ -1682,10 +1678,8 @@ if (allow_cursor) { - { - struct buffer *buf = XBUFFER (WINDOW_BUFFER (w)); - rb.bufpos = bytind_to_bufpos (buf, data->bi_bufpos); - } + rb.bufpos = bytind_to_bufpos (XBUFFER (WINDOW_BUFFER (w)), + data->bi_bufpos); if (data->cursor_type == CURSOR_ON) { @@ -4807,7 +4801,7 @@ } /* Given a window and a point, update the given display lines such - that point is displayed in the middle of the window. + that point is displayed in the middle of the window. Return the window's new start position. */ static Bufpos
--- a/src/s/linux.h Mon Aug 13 10:16:17 2007 +0200 +++ b/src/s/linux.h Mon Aug 13 10:17:07 2007 +0200 @@ -23,10 +23,7 @@ /* This file was put together by Michael K. Johnson and Rik Faith. */ -/* #define UNIPLUS */ -/* #define USG5 */ #define USG -/* #define BSD */ #define LINUX /* SYSTEM_TYPE should indicate the kind of system you are using. @@ -66,12 +63,6 @@ #define INTERRUPTIBLE_CLOSE #define INTERRUPTIBLE_IO -/* If you mount the proc file system somewhere other than /proc - you will have to uncomment the following and make the proper - changes */ - -/* #define LINUX_LDAV_FILE "/proc/loadavg" */ - /* This is needed for dispnew.c:update_frame */ #ifndef NOT_C_CODE @@ -117,17 +108,6 @@ #define LIB_STANDARD "-lgcc -lc -lgcc /usr/lib/crtn.o" #endif -/* Don't use -g in test compiles in configure. - This is so we will use the same shared libs for that linking - that are used when linking temacs. */ -#ifdef THIS_IS_CONFIGURE -#define C_DEBUG_SWITCH -#endif - -/* Let's try this out, just in case. - Nah. Rik Faith <faith@cs.unc.edu> says it doesn't work well. */ -/* #define SIGNALS_VIA_CHARACTERS */ - #ifdef TERM #define LIBS_SYSTEM "-lclient" /* #define C_SWITCH_SYSTEM "-D_BSD_SOURCE -I/usr/src/term" - mrb */ @@ -136,14 +116,8 @@ /* alane@wozzle.linet.org says that -lipc is not a separate library, since libc-4.4.1. So -lipc was deleted. */ #define LIBS_SYSTEM - /* #define _BSD_SOURCE 1 - mrb */ #endif - -/* XEmacs change: configure doesn't find this because math.h aliases - rint to __rint so that it's not found. */ -#define HAVE_RINT 1 - #ifdef __ELF__ #define UNEXEC "unexelf.o" #define UNEXEC_USE_MAP_PRIVATE