From 7e7e32d8c43ebad1d3e115269d251075abbfdf91 Mon Sep 17 00:00:00 2001 From: tomo Date: Mon, 17 May 1999 09:41:41 +0000 Subject: [PATCH 1/1] XEmacs 21.2.7 --- CHANGES-beta | 16 ++ ChangeLog | 229 ++++++++++++--------- configure | 649 ++++++++++++++++++++++++++-------------------------------- configure.in | 68 +++--- etc/NEWS | 2 + version.sh | 4 +- 6 files changed, 481 insertions(+), 487 deletions(-) diff --git a/CHANGES-beta b/CHANGES-beta index cc2d7c0..847627f 100644 --- a/CHANGES-beta +++ b/CHANGES-beta @@ -1,4 +1,20 @@ -*- indented-text -*- +to 21.2 beta7 "Ares" +-- mswindows modeline crash fix from Jonathan Harris +-- picon glyph fix from Gunnar Evermann +-- widgets-in-buffers and subwindow support from Andy Piper +-- movemail pop support under mswindows from Fabrice Popineau +-- ldap fixes from Oscar Figueiredo +-- fns cleanup from Hrvoje Niksic +-- menubar fixes from Didier Verna +-- mswindows accelerator fix from Jonathan Harris +-- dired mule fix from Didier Verna +-- sound doc cleanup from Charles Waldman +-- new display table functionality from Hrvoje Niksic +-- minor cleanups +-- package fixes from Jan Vroonhof +-- subwindow support fixes from Martin Buchholz + to 21.2 beta6 "Apollo" -- mswindows compile fixes from Martin Buchholz, Andy Piper, Greg Klanderman and Adrian Aichner diff --git a/ChangeLog b/ChangeLog index 11f667a..14386a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +1998-12-24 Martin Buchholz + + * XEmacs 21.2.7 is released. + +1998-12-20 Martin Buchholz + + * configure.in: Redo DBM support + - die if dbm support requested, but not provided. + - properly check for libgdbm, then libc, then libdbm + - properly check for ndbm.h + - comments improved + - XE_DIE should always prefix messages with Error: for clarity + +1998-12-07 Martin Buchholz + + * xemacs.mak (TEMACS_OBJS): + (DOC_SRC4): + - Remove pure.c, pure.obj + +1998-12-06 Martin Buchholz + + * Makefile.in.in (distclean): + * dynodump/Makefile.in.in (distclean): + * src/Makefile.in.in (distclean): + * lib-src/Makefile.in.in (distclean): + * lwlib/Makefile.in.in (distclean): + - Make sure GNUmakefile is deleted. + +1998-12-17 Andy Piper + + * configure.in (all_widgets): remove gui.o addition - its always + in the makefile now. + + * configure.in: add gui-msw.o to msw objects. + 1998-12-16 Andy Piper * XEmacs 21.2.6 is released @@ -146,7 +181,7 @@ 1998-07-12 Björn Torkelsson - * Makefile.in: added LDFLAGS. + * Makefile.in: added LDFLAGS. 1998-07-12 SL Baur @@ -215,7 +250,7 @@ 1998-06-20 Michael Sperber [Mr. Preprocessor] - * etc/PACKAGES: + * etc/PACKAGES: * etc/BETA: Moved some package stuff into Texinfo docs. Other nitpicks 1998-06-20 Kazuyuki IENAGA @@ -346,7 +381,7 @@ * PROBLEMS: Document problems with Solaris 2.6 + XSUNTRANSPORT - * Makefile.in: + * Makefile.in: * lwlib/Makefile.in.in: * modules/Makefile.in: - Adjust for luser's CDPATH being set to something weird. @@ -409,7 +444,7 @@ 1998-04-27 SL Baur - * configure.in (progname): Parameterize program name on `progname' + * configure.in (progname): Parameterize program name on `progname' and add --with-infodock. 1998-04-26 SL Baur @@ -474,7 +509,7 @@ Wed Apr 22 12:59:35 1998 Andy Piper * info/dir: Fixed the explanatory notes for `Info-default-directory-list' removal and the new automatic dir rebuilding facility. Reindented the menu. Added an entry for - term.info + term.info 1998-04-20 SL Baur @@ -494,14 +529,14 @@ Fri Apr 17 12:59:35 1998 Andy Piper * configure.in: enable install pre-processing for mswindows Fri Apr 17 12:59:35 1998 Andy Piper - + * Makefile.in.in: add install_pp to install incantation. * installexe.sh: new file. Add .exe to install targets if the result is executable. Fri Apr 17 12:59:35 1998 Andy Piper - + * Makefile.in: add install_pp to install incantation. 1998-04-14 Itay Ben-Yaacov @@ -515,7 +550,7 @@ Thu Apr 16 12:59:35 1998 Andy Piper 1998-04-06 Martin Buchholz - * config.h.in: Add _SVID_SOURCE to list of xmkmf #defines. + * config.h.in: Add _SVID_SOURCE to list of xmkmf #defines. Used (at least) by RedHat 4.2. 1998-04-11 Michael Sperber [Mr. Preprocessor] @@ -598,7 +633,7 @@ Thu Apr 16 12:59:35 1998 Andy Piper * configure.in: Check for -lz, -lgz unconditionally. Too many system linkers don't properly die when there are cascaded link dependencies, so we can't rely on the linker for that. The only - downside is that we might link with an extra unneeded library. If + downside is that we might link with an extra unneeded library. If you really really care about this, you can go fix it. * configure.in: Enhance PANIC msg to make it clear that @@ -607,13 +642,13 @@ Thu Apr 16 12:59:35 1998 Andy Piper 1998-03-27 Martin Buchholz * configure.in: $debug was not properly dependent on $beta - - * configure.in: Move offix configuration out of src/Makefile.in.in + + * configure.in: Move offix configuration out of src/Makefile.in.in into configure.in. * configure.in: Reorganize xpm detection code. - * configure.in: XIM default to ON if Motif which is not Lesstif is + * configure.in: XIM default to ON if Motif which is not Lesstif is found. * configure.in: Keep auto-generated makefile dependencies out of @@ -702,7 +737,7 @@ Thu Apr 16 12:59:35 1998 Andy Piper * configure.in (quoted_arguments): Fix unquoted variable in error-checking test. - fix bogus substitution. - + 1998-03-17 SL Baur * configure.in: In -lpng test, look for png_set_strip_alpha. @@ -841,7 +876,7 @@ Wed Mar 04 08:55:12 1998 Andy Piper 1998-02-21 SL Baur - * configure.in (after_morecore_hook_exists): Modify dlmalloc tests + * configure.in (after_morecore_hook_exists): Modify dlmalloc tests to also test for Linux libc5. 1998-02-19 SL Baur @@ -855,7 +890,7 @@ Wed Mar 04 08:55:12 1998 Andy Piper * configure.usage (--with-gung): Document. Turns on USE_MINIMAL_TAGBITS and USE_INDEXED_LRECORD_IMPLEMENTATION. (--with-term): Remove. - + * XEmacs-20.5-beta26 is released. 1998-02-18 SL Baur @@ -943,8 +978,8 @@ Wed Jan 21 10:49:47 1998 Andy Piper 1998-01-13 Martin Buchholz - * configure.usage: - * etc/NEWS: + * configure.usage: + * etc/NEWS: Remove doc for configure-time INFOPATH, no longer used. * etc/BETA: Update ftp addresses. @@ -955,13 +990,13 @@ Wed Jan 21 10:49:47 1998 Andy Piper * 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: + * 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. @@ -969,13 +1004,13 @@ Wed Jan 21 10:49:47 1998 Andy Piper * etc/xemacs.1: Update author list. * Makefile.in (install-arch-dep): Simplify. - Replace construct `test -d $dir && foo' with + 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: + * 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 @@ -1058,7 +1093,7 @@ Thu Jan 08 09:42:36 1998 1997-12-21 SL Baur - * etc/BETA (Prerequisite): Add cookbook procedures for maintaining + * etc/BETA (Prerequisite): Add cookbook procedures for maintaining package lisp directories. 1997-12-20 SL Baur @@ -1067,7 +1102,7 @@ Thu Jan 08 09:42:36 1998 1997-12-19 SL Baur - * configure.in (bitmapdir): Reenable --with-session by default for + * configure.in (bitmapdir): Reenable --with-session by default for testing. 1997-12-18 Kyle Jones @@ -1078,7 +1113,7 @@ Thu Jan 08 09:42:36 1998 1997-12-18 Kyle Jones * etc/toolbar: Added support for foregroundToolBarColor - symbol to most icons. + symbol to most icons. 1997-12-17 SL Baur @@ -1278,7 +1313,7 @@ Thu Jan 08 09:42:36 1998 device-msw.c, emacs.c, event-msw.c, event-msw.h, event-stream.c, events.c, events.h, faces.c, frame-msw.c, frame.c, general.c, msw-proc.c, objects-msw.c, objects-msw.h, redisplay-msw.c, - redisplay.c, symsinit.h, + redisplay.c, symsinit.h, * Didn't change 'win32' in nt.c, nt.h, ntproc.c @@ -1314,7 +1349,7 @@ Sun November 01 12:00:00 1997 1997-11-05 Didier Verna * configure.in: Added the --site-prefixes options for the configure - script. You give a colon or space separated list of prefixes, and + script. You give a colon or space separated list of prefixes, and subdirectories include/ and lib/ will be added with -I and -L. 1997-11-05 Martin Buchholz > @@ -1406,7 +1441,7 @@ Sun November 01 12:00:00 1997 TIFF(broken) and replace with test for ImageMagick. 1997-10-30 Kyle Jones - + * etc/Emacs.ad: Added *XlwMenu*highlightForeground entry. Added *XlwMenu*titleForeground entry. @@ -1445,7 +1480,7 @@ Sun November 01 12:00:00 1997 * lib-src/gnuslib.c: Always include config.h before system headers * configure.in: Improve AIX configure support - NON_GNU_CC defaults to `xlc' - - CFLAGS defaults to "-O3 -qstrict -qlibansi -qinfo -qro + - CFLAGS defaults to "-O3 -qstrict -qlibansi -qinfo -qro -qmaxmem=20000" - check for sin instead of sqrt in -lm to avoid xlc internal error - Detect -li18n for use with Motif @@ -1482,7 +1517,7 @@ Sun November 01 12:00:00 1997 1997-10-18 SL Baur - * XEmacs 20.3-beta91 is released. + * XEmacs 20.3-beta91 is released. 1997-10-16 Hrvoje Niksic @@ -1571,7 +1606,7 @@ Sun November 01 12:00:00 1997 * Makefile.in: Add `make configure' target - * etc/BETA: + * etc/BETA: - remove Chuck as contact name - random small improvements - remove I/me references - the message should be that XEmacs @@ -1622,8 +1657,8 @@ Sun November 01 12:00:00 1997 1997-10-03 Martin Buchholz * lib-src/etags.c: etags 12.28 + prototypization - * INSTALL: Better document --site-runtime-libraries - * src/scrollbar-x.c (x_update_scrollbar_instance_status): + * INSTALL: Better document --site-runtime-libraries + * src/scrollbar-x.c (x_update_scrollbar_instance_status): FIX: M-x scroll-left; horizontal scrollbar appears; drag it left; scrollbar disappears; keyboard inoperative. * configure.in: Remove left-over references to *_switch_x_* @@ -1643,7 +1678,7 @@ Sun November 01 12:00:00 1997 * etc/BETA: Document existence of `Installation' file. - Document requirement of rebuilding finder-inf.el when building from the full tarball. - + * Makefile.in (top_distclean): Remove finder-inf.el*. * configure.in (use_union_type): Default to "yes". @@ -1696,11 +1731,11 @@ Sun November 01 12:00:00 1997 * src/redisplay-tty.c: Fix crashes with non-7bit tty escape sequences (needs more testing). - * */Makefile*: + * */Makefile*: - Cleanup man/*/Makefile for consistency. - use $(MAKEFINFO), $(TEXI2DVI), etc... - Make combination --with-srcdir + Sun make work properly. - - Change construct: test -d $${dir} || mkdir $${dir} + - Change construct: test -d $${dir} || mkdir $${dir} --> if test ! -d $${dir}; then mkdir $${dir}; fi * lisp/x11/x-win-sun.el: Fix remaining glitches with re-mappings of Sun function keys. @@ -1743,9 +1778,9 @@ Sun November 01 12:00:00 1997 - x-keysym-on-keyboard-sans-modifiers-p introduced. - x-keysym-hashtable introduced. - allow X11R4 libs to guess keysyms on X11R5 servers. - - A better workaround for the bug that some Xlibs generate + - A better workaround for the bug that some Xlibs generate Multi_key a adiaeresis when pressing Multi_key a " - + * src/dgif_lib.c: Make sure size_t is defined before using it. 1997-09-12 SL Baur @@ -1810,7 +1845,7 @@ Sun November 01 12:00:00 1997 - new variable `blddir' introduced for informational purposes. * lib-src/config.values.in: new config.el implementation * lib-src/config.values.sh: new config.el implementation - * lisp/modes/pascal.el: Sync with GNU Emacs, fix infloop problem + * lisp/modes/pascal.el: Sync with GNU Emacs, fix infloop problem (thanks to Espen Skoglund, pascal.el maintainer) * src/chartab.c: maintainability improvements. * src/mule-coding.c: FIX for: editing DOS files with ISO2022* @@ -1869,10 +1904,10 @@ Sun November 01 12:00:00 1997 * src/fns.c (require): Print messages when loading a file as a result of require. - + * configure.in: * lisp/utils/config.el: - * lib-src/config.values: + * lib-src/config.values: - new file created and installed by building. - Allow configuration time values to be queried by the lisp code. @@ -1902,7 +1937,7 @@ Sun November 01 12:00:00 1997 1997-07-10 Hrvoje Niksic * extents.c (print_extent): Print correctly. - + 1997-07-13 Steven L Baur * configure.in (CPP): Add -Wall to default gcc CFLAGS. @@ -1927,12 +1962,12 @@ Sun November 01 12:00:00 1997 * lisp/x11/x-select.el: * src/xselect.c: Try STRING if selection owner couldn't convert - COMPOUND_TEXT. + COMPOUND_TEXT. * src/*.c: Change defalt to default_, and in general allow doc-snarfing functions to recognize and ignore trailing `_' - * src/*.[ch]: Introduce XVECTOR_DATA and XVECTOR_LENGTH macros and + * src/*.[ch]: Introduce XVECTOR_DATA and XVECTOR_LENGTH macros and convert source code to use them consistently. 1997-07-08 Steven L Baur @@ -1941,7 +1976,7 @@ Sun November 01 12:00:00 1997 1997-07-08 Martin Buchholz - * configure.in: Set options differently, depending on beta-ness of + * configure.in: Set options differently, depending on beta-ness of build tree. * *Makefile*: Clean up *clean: targets, esp. Steven's beloved distclean. @@ -1980,7 +2015,7 @@ Sun November 01 12:00:00 1997 - Autodetect usleep * src/s/sol2.h: Support gcc on various Solaris releases. - + * lib-src/*.c: Ansify prototypes. * lisp/prim/files.el: Optimize auto-mode-alist. @@ -2012,7 +2047,7 @@ Sun November 01 12:00:00 1997 * configure.in (CPP): Correct typo `print-lib-gcc-file-name' should be `print-libgcc-file-name' From Katsumi Yamaoka - + * XEmacs 20.3-beta10 is released. 1997-06-29 MORIOKA Tomohiko @@ -2178,7 +2213,7 @@ Sun November 01 12:00:00 1997 * lwlib/lwlib-Xaw.c, lwlib/lwlib-Xlw.c, lwlib/lwlib-Xm.c, lwlib/lwlib.c: Make 64 bit clean. - + 1997-06-20 Steven L Baur * etc/gnuserv.1: Updates and cleanup. @@ -2196,7 +2231,7 @@ Sun November 01 12:00:00 1997 * */Makefile.in.in: Another rewrite Make makefiles immune from being mangled by various cpp - implementations by quoting non-preprocessor directive lines. + implementations by quoting non-preprocessor directive lines. - random cleanup - Use $(RM) and $(pwd) macros consistently - Add dependencies for balloon-help source files @@ -2236,11 +2271,11 @@ Wed Jun 18 16:41:43 1997 Steven L Baur previously commented out and normalized everything vis a vis 'backspace and 'delete keysyms. * lisp/packages/*.el: Normalized all the "\177" bindings - * lisp/modes/cperl-mode.el: Created cperl-electric-delete function + * lisp/modes/cperl-mode.el: Created cperl-electric-delete function which is a "smart" version of the cperl-electric-backspace function (it honors the desired delete direction). Bound it to 'delete and the electric-backspace to 'backspace. - * lisp/packages/pending-del.el: Added cperl-electric-backspace and + * lisp/packages/pending-del.el: Added cperl-electric-backspace and cperl-electric-delete to the 'supersede list. 1997-06-11 Steven L Baur @@ -2252,16 +2287,16 @@ Wed Jun 18 16:41:43 1997 Steven L Baur 1997-06-11 Martin Buchholz - * src/Makefile.in: - * lwlib/Makefile.in: - * lib-src/Makefile.in: + * src/Makefile.in: + * lwlib/Makefile.in: + * lib-src/Makefile.in: * Makefile.in: More Makefile cleanup - add .PHONY targets where necessary - remove most builtin rules using .SUFFIXES - -lXau only gets used for linking gnuserv binaries - No VPATH for root Makefile - remove gcc v1 support - * configure.in: + * configure.in: - A new test to autodetect need to define NARROWPROTO, needed by XFree86 - Consistently use idiom foo=`echo '' $foo | sed -s 's:^ ::' -e ...` @@ -2269,7 +2304,7 @@ Wed Jun 18 16:41:43 1997 Steven L Baur - Check for libPW - Use more sophisticated Xpm test that confirms xpm.h and libXpm are in sync. - * src/s/linux.h: + * src/s/linux.h: * src/m/intel386.h: Yet another attempt to clean up linux defines. 1997-06-10 Steven L Baur @@ -2335,7 +2370,7 @@ Tue Jun 10 15:11:16 1997 Steven L Baur smiley faces. 1997-06-10 Gary D. Foster - + * lisp/modes/view-less.el: Changed \177 bindings to 'delete * lisp/modes/help.el: Changed \177 bindings to 'delete @@ -2355,7 +2390,7 @@ Tue Jun 10 15:11:16 1997 Steven L Baur * lisp/modes/cc-mode.el: * lisp/modes/cperl-mode.el: Fixed references to delete functions to use the new names. - + 1997-06-09 Steven L Baur * XEmacs 20.3-b5 is released. @@ -2380,24 +2415,24 @@ Tue Jun 10 15:11:16 1997 Steven L Baur * src/s/netbsd.h: complete rewrite, use ORDINARY_LINK, #ifdef out old cruft that can be obtained from system header files. * lib-src/getopt*: Synch with FSF, remove compiler warnings. - - * lib-src/b2m.c: - * src/gifalloc.c: - * lib-src/gnuslib.c: - * lib-src/profile.c: + + * lib-src/b2m.c: + * src/gifalloc.c: + * lib-src/gnuslib.c: + * lib-src/profile.c: * lib-src/movemail.c: Fix compiler warnings - + * lib-src/Makefile.in.in: Remove unused -DCONFIG_BROKETS flag - Fix up compile flags for new etags version - * etc/NEWS: - * etc/etags.1: - * man/xemacs/programs.texi: + * etc/NEWS: + * etc/etags.1: + * man/xemacs/programs.texi: * lib-src/etags.c: Upgraded to etags 12.11 * src/config.h.in: Fix inline keyword support - - * configure.in: Use a different mechanism for removing extra white + + * configure.in: Use a different mechanism for removing extra white space. Avoid using foo=`echo $bar`, which loses with various echos. - new M4 macro XE_SPACE(var, words...) - Use autoconf 2's AC_HEADER_SYS_WAIT @@ -2413,11 +2448,11 @@ Tue Jun 10 15:11:16 1997 Steven L Baur 1997-06-04 Gary D. Foster - * lisp/modes/cc-mode.el: Modified `c-electric-delete' to honor the + * lisp/modes/cc-mode.el: Modified `c-electric-delete' to honor the desired delete direction in both normal and "hungry" modes. - * lisp/modes/cperl-mode.el: Modified `cperl-electric-backspace' to + * lisp/modes/cperl-mode.el: Modified `cperl-electric-backspace' to honor the desired delete direction. - + 1997-05-30 Martin Buchholz * configure.in: Automagically compute -R path for gcc @@ -2426,7 +2461,7 @@ Tue Jun 10 15:11:16 1997 Steven L Baur * lisp/vm/vm-vars.el: Fixed delete key binding to call `vm-scroll-down' - + Thu May 29 15:35:07 1997 Martin Buchholz * configure.in: Add support for Solaris2.6 -z ignore linker flags @@ -2445,9 +2480,9 @@ Thu May 29 15:35:07 1997 Martin Buchholz * lisp/modes/*.el: Removed conflicting \177 bindings. * lisp/modes/cc-mode.el: Modified `c-electric-delete' to use new delete bindings. - * lisp/modes/cperl-mode.el: Modified `cperl-electric-backspace' to + * lisp/modes/cperl-mode.el: Modified `cperl-electric-backspace' to use new delete bindings. - + 1997-06-03 MORIOKA Tomohiko * lisp/x11/x-menubar.el (default-menubar): Add menu for Mule. @@ -2629,14 +2664,14 @@ Thu May 22 04:19:09 1997 Martin Buchholz depend on it. with-xim=motif only default on Solaris. realpath moved from s&m to configure.in. - xemacs-version.h removed. main_1 now contains $canonical as well, + xemacs-version.h removed. main_1 now contains $canonical as well, for even more useful backtraces. termcap handling rewritten. Create .sbinit for Sun's source browser. Warn user if no XPM support present. Warn user if compiling in error checking. - * Makefile.in: use MAKE_SUBDIR consistently. Remove references to + * Makefile.in: use MAKE_SUBDIR consistently. Remove references to dynodump. Remove core when cleaning. Remove config.log. make distclean now functional. @@ -2730,7 +2765,7 @@ Sat Apr 12 09:01:32 1997 Hrvoje Niksic 3) Rearranging the entries by relevance. I have tried to put the most relevant entries in front. - + Thu Apr 10 19:07:26 1997 Steven L Baur * XEmacs 20.1-b14 is released. (Beta 13 was skipped). @@ -2750,7 +2785,7 @@ Sat Apr 5 09:11:36 1997 Steven L Baur Wed Apr 2 15:27:35 1997 Steven L Baur - * Makefile.in (install-only): New target. Functionality suggested + * Makefile.in (install-only): New target. Functionality suggested by Larry Schwimmer, correct way of doing it suggested by Chuck Thompson. @@ -2774,7 +2809,7 @@ Thu Mar 27 18:24:19 1997 Steven L Baur Wed Mar 26 22:31:10 1997 Steven L Baur * Remove vms top-level directory. - + * XEmacs 19.15 final released to beta testers. Tue Mar 25 19:13:27 1997 Steven L Baur @@ -3020,7 +3055,7 @@ Sat Jan 11 12:05:31 1997 Steven L Baur * XEmacs 20.0 beta90 (prerelease 1) is released. * XEmacs 19.15 beta90 (prerelease 1) is released. - + Tue Jan 7 08:45:16 1997 Steven L Baur * configure.in (LIBS): Revise test for XFree86 (look for XF86Config). @@ -3035,8 +3070,8 @@ Fri Jan 3 15:18:59 1997 Jeff Miller Wed Jan 1 08:30:48 1997 Martin Buchholz - * src/emacs.c: Make sure - `./temacs -batch -l loadup.el run-temacs ' + * src/emacs.c: Make sure + `./temacs -batch -l loadup.el run-temacs ' works properly * src/Makefile.in.in (rtcmacs): Add support for RTC, Sun's @@ -3055,20 +3090,20 @@ Tue Dec 31 09:46:13 1996 Martin Buchholz * lib-src/update-autoloads.sh: Rewritten to use auto-autoloads.el. * lisp/utils/autoload.el: Reorganization of autoload mechanism: Errors during autoload generation are just that - errors. - + Generated autoloads are now in a separate file of their own. - + Reliability of autoload generation greatly increased. - + Distribution smaller by about 100k. - + `make autoloads' is still the preferred mechanism for update. - + Autoloads are always regenerated completely from scratch. This avoids errors with obsolete or corrupted autoload entries. Caching of autoload entries using timestamps has been eliminated. - + Files that have no autoloads no longer have a comment placed into the generated autoloads file. @@ -3126,7 +3161,7 @@ Sun Dec 29 05:37:43 1996 Martin Buchholz that various tools can recognize the filename as such. * src/event-Xt.c (x_to_emacs_keysym): Fix crash when - --with-xim=xlib and key event on window frame. + --with-xim=xlib and key event on window frame. Change return foo to return (foo) when return is a macro. * src/editfns.c (Ffollowing_char): docstring fixes. diff --git a/configure b/configure index 65b7a02..25bf198 100755 --- a/configure +++ b/configure @@ -2450,7 +2450,7 @@ if test -n "$site_libraries"; then case "$arg" in -* ) ;; * ) test -d "$arg" || \ - { echo "Invalid site library \`$arg': no such directory" >&2; exit 1; } + { echo "Error:" "Invalid site library \`$arg': no such directory" >&2; exit 1; } arg="-L${arg}" ;; esac ld_switch_site="$ld_switch_site $arg" && if test "$extra_verbose" = "yes"; then echo " Appending \"$arg\" to \$ld_switch_site"; fi @@ -2463,7 +2463,7 @@ if test -n "$site_includes"; then case "$arg" in -* ) ;; * ) test -d "$arg" || \ - { echo "Invalid site include \`$arg': no such directory" >&2; exit 1; } + { echo "Error:" "Invalid site include \`$arg': no such directory" >&2; exit 1; } arg="-I${arg}" ;; esac c_switch_site="$c_switch_site $arg" && if test "$extra_verbose" = "yes"; then echo " Appending \"$arg\" to \$c_switch_site"; fi @@ -2476,11 +2476,11 @@ if test -n "$site_prefixes"; then inc_dir="${dir}/include" lib_dir="${dir}/lib" if test ! -d "$dir"; then - { echo "Invalid site prefix \`$dir': no such directory" >&2; exit 1; } + { echo "Error:" "Invalid site prefix \`$dir': no such directory" >&2; exit 1; } elif test ! -d "$inc_dir"; then - { echo "Invalid site prefix \`$dir': no such directory \`$inc_dir'" >&2; exit 1; } + { echo "Error:" "Invalid site prefix \`$dir': no such directory \`$inc_dir'" >&2; exit 1; } elif test ! -d "$lib_dir"; then - { echo "Invalid site prefix \`$dir': no such directory \`$lib_dir'" >&2; exit 1; } + { echo "Error:" "Invalid site prefix \`$dir': no such directory \`$lib_dir'" >&2; exit 1; } else c_switch_site="$c_switch_site "-I$inc_dir"" && if test "$extra_verbose" = "yes"; then echo " Appending \""-I$inc_dir"\" to \$c_switch_site"; fi ld_switch_site="$ld_switch_site "-L$lib_dir"" && if test "$extra_verbose" = "yes"; then echo " Appending \""-L$lib_dir"\" to \$ld_switch_site"; fi @@ -5900,8 +5900,8 @@ rm -fr conftest* with_file_coding=yes use_minimal_tagbits=yes use_indexed_lrecord_implementation=yes - extra_objs="$extra_objs console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o" && if test "$extra_verbose" = "yes"; then - echo " xemacs will be linked with \"console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o\"" + extra_objs="$extra_objs console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o\"" fi fi fi @@ -7489,9 +7489,6 @@ test "$with_dialogs" != "no" && extra_objs="$extra_objs dialog.o" && if test "$with_toolbars" != "no" && extra_objs="$extra_objs toolbar.o" && if test "$extra_verbose" = "yes"; then echo " xemacs will be linked with \"toolbar.o\"" fi -test "$all_widgets" != "no no no no" && extra_objs="$extra_objs gui.o" && if test "$extra_verbose" = "yes"; then - echo " xemacs will be linked with \"gui.o\"" - fi if test "$with_x11" = "yes"; then test "$with_menubars" != "no" && extra_objs="$extra_objs menubar-x.o" && if test "$extra_verbose" = "yes"; then @@ -7556,7 +7553,7 @@ fi if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:7560: checking for Mule-related features" >&5 +echo "configure:7557: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -7581,15 +7578,15 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7585: checking for $ac_hdr" >&5 +echo "configure:7582: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7620,12 +7617,12 @@ done echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:7624: checking for strerror in -lintl" >&5 +echo "configure:7621: checking for strerror in -lintl" >&5 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'` xe_check_libs=" -lintl " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7637: \"$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 @@ -7669,19 +7666,19 @@ fi echo "checking for Mule input methods" 1>&6 -echo "configure:7673: checking for Mule input methods" >&5 +echo "configure:7670: checking for Mule input methods" >&5 case "$with_xim" in "" | "yes" ) echo "checking for XIM" 1>&6 -echo "configure:7676: checking for XIM" >&5 +echo "configure:7673: checking for XIM" >&5 if test "$have_lesstif" = "yes"; then with_xim=xlib else echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:7680: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:7677: checking for XmImMbLookupString in -lXm" >&5 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'` xe_check_libs=" -lXm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7693: \"$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 @@ -7758,15 +7755,15 @@ EOF if test "$with_xfs" = "yes" ; then echo "checking for XFontSet" 1>&6 -echo "configure:7762: checking for XFontSet" >&5 +echo "configure:7759: checking for XFontSet" >&5 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6 -echo "configure:7765: checking for XmbDrawString in -lX11" >&5 +echo "configure:7762: checking for XmbDrawString in -lX11" >&5 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'` xe_check_libs=" -lX11 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7778: \"$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 @@ -7817,15 +7814,15 @@ EOF test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6 -echo "configure:7821: checking for wnn/jllib.h" >&5 +echo "configure:7818: checking for wnn/jllib.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7850,10 +7847,10 @@ fi for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7854: checking for $ac_func" >&5 +echo "configure:7851: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7905,12 +7902,12 @@ done test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:7909: checking for crypt in -lcrypt" >&5 +echo "configure:7906: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` xe_check_libs=" -lcrypt " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7922: \"$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 @@ -7956,12 +7953,12 @@ fi if test -z "$with_wnn" -o "$with_wnn" = "yes"; then echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:7960: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:7957: checking for jl_dic_list_e in -lwnn" >&5 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7973: \"$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 @@ -7990,12 +7987,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6 -echo "configure:7994: checking for jl_dic_list_e in -lwnn4" >&5 +echo "configure:7991: checking for jl_dic_list_e in -lwnn4" >&5 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn4 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8007: \"$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 @@ -8024,12 +8021,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6 -echo "configure:8028: checking for jl_dic_list_e in -lwnn6" >&5 +echo "configure:8025: checking for jl_dic_list_e in -lwnn6" >&5 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6 " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8041: \"$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 @@ -8058,12 +8055,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6 -echo "configure:8062: checking for dic_list_e in -lwnn6_fromsrc" >&5 +echo "configure:8059: checking for dic_list_e in -lwnn6_fromsrc" >&5 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'` xe_check_libs=" -lwnn6_fromsrc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8075: \"$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 @@ -8122,12 +8119,12 @@ EOF if test "$with_wnn6" != "no"; then echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6 -echo "configure:8126: checking for jl_fi_dic_list in -l$libwnn" >&5 +echo "configure:8123: checking for jl_fi_dic_list in -l$libwnn" >&5 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'` xe_check_libs=" -l$libwnn " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8139: \"$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 @@ -8173,15 +8170,15 @@ EOF if test "$with_canna" != "no"; then ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:8177: checking for canna/jrkanji.h" >&5 +echo "configure:8174: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8208,15 +8205,15 @@ fi c_switch_site="$c_switch_site -I/usr/local/canna/include" ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6 -echo "configure:8212: checking for canna/jrkanji.h" >&5 +echo "configure:8209: checking for canna/jrkanji.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8217: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8244,15 +8241,15 @@ fi test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6 -echo "configure:8248: checking for canna/RK.h" >&5 +echo "configure:8245: checking for canna/RK.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8275,12 +8272,12 @@ fi } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:8279: checking for RkBgnBun in -lRKC" >&5 +echo "configure:8276: checking for RkBgnBun in -lRKC" >&5 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'` xe_check_libs=" -lRKC " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8292: \"$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 @@ -8314,12 +8311,12 @@ fi } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:8318: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:8315: checking for jrKanjiControl in -lcanna" >&5 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'` xe_check_libs=" -lcanna " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8331: \"$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 @@ -8379,12 +8376,12 @@ if test "$need_motif" = "yes" ; then libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6 -echo "configure:8383: checking for layout_object_getvalue in -li18n" >&5 +echo "configure:8380: checking for layout_object_getvalue in -li18n" >&5 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'` xe_check_libs=" -li18n " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8396: \"$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 @@ -8481,10 +8478,10 @@ fi for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8485: checking for $ac_func" >&5 +echo "configure:8482: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8548,10 +8545,10 @@ case "$opsys" in * ) for ac_func in realpath do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8552: checking for $ac_func" >&5 +echo "configure:8549: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8608,16 +8605,16 @@ done esac echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:8612: checking whether netdb declares h_errno" >&5 +echo "configure:8609: checking whether netdb declares h_errno" >&5 cat > conftest.$ac_ext < int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:8621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8618: \"$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 @@ -8637,16 +8634,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:8641: checking for sigsetjmp" >&5 +echo "configure:8638: checking for sigsetjmp" >&5 cat > conftest.$ac_ext < int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:8650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8647: \"$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 @@ -8666,11 +8663,11 @@ fi rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:8670: checking whether localtime caches TZ" >&5 +echo "configure:8667: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext < #if STDC_HEADERS @@ -8705,7 +8702,7 @@ main() exit (0); } EOF -if { (eval echo configure:8709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:8706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then emacs_cv_localtime_cache=no else @@ -8735,9 +8732,9 @@ fi if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6 -echo "configure:8739: checking whether gettimeofday accepts one or two arguments" >&5 +echo "configure:8736: checking whether gettimeofday accepts one or two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""two" 1>&6 else @@ -8781,19 +8778,19 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:8785: checking for inline" >&5 +echo "configure:8782: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -8843,17 +8840,17 @@ fi # 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:8847: checking for working alloca.h" >&5 +echo "configure:8844: checking for working alloca.h" >&5 cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:8857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -8877,10 +8874,10 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:8881: checking for alloca" >&5 +echo "configure:8878: checking for alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -8942,10 +8939,10 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:8946: checking whether alloca needs Cray hooks" >&5 +echo "configure:8943: checking whether alloca needs Cray hooks" >&5 cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8973: checking for $ac_func" >&5 +echo "configure:8970: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9025,10 +9022,10 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:9029: checking stack direction for C alloca" >&5 +echo "configure:9026: checking stack direction for C alloca" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_c_stack_direction=1 else @@ -9076,15 +9073,15 @@ test -n "$ALLOCA" && extra_objs="$extra_objs $ALLOCA" && if test "$extra_verbos ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:9080: checking for vfork.h" >&5 +echo "configure:9077: checking for vfork.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9112,10 +9109,10 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:9116: checking for working vfork" >&5 +echo "configure:9113: checking for working vfork" >&5 cat > conftest.$ac_ext < @@ -9210,7 +9207,7 @@ main() { } } EOF -if { (eval echo configure:9214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_vfork_works=yes else @@ -9236,10 +9233,10 @@ fi echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:9240: checking for working strcoll" >&5 +echo "configure:9237: checking for working strcoll" >&5 cat > conftest.$ac_ext < main () @@ -9249,7 +9246,7 @@ main () strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:9253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -9277,10 +9274,10 @@ fi for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9281: checking for $ac_func" >&5 +echo "configure:9278: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9331,10 +9328,10 @@ fi done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:9335: checking whether getpgrp takes no argument" >&5 +echo "configure:9332: checking whether getpgrp takes no argument" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -9416,10 +9413,10 @@ fi echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:9420: checking for working mmap" >&5 +echo "configure:9417: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext < #include @@ -9452,7 +9449,7 @@ int main (int argc, char *argv[]) return 1; } EOF -if { (eval echo configure:9456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then have_mmap=yes else @@ -9477,15 +9474,15 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9481: checking for $ac_hdr" >&5 +echo "configure:9478: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9517,10 +9514,10 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9521: checking for $ac_func" >&5 +echo "configure:9518: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9571,10 +9568,10 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:9575: checking for working mmap" >&5 +echo "configure:9572: checking for working mmap" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:9715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then ac_cv_func_mmap_fixed_mapped=yes else @@ -9752,15 +9749,15 @@ EOF ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:9756: checking for termios.h" >&5 +echo "configure:9753: checking for termios.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9803,15 +9800,15 @@ else echo "$ac_t""no" 1>&6 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termio.h""... $ac_c" 1>&6 -echo "configure:9807: checking for termio.h" >&5 +echo "configure:9804: checking for termio.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9843,10 +9840,10 @@ fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:9847: checking for socket" >&5 +echo "configure:9844: checking for socket" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -9884,15 +9881,15 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6 -echo "configure:9888: checking for netinet/in.h" >&5 +echo "configure:9885: checking for netinet/in.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9909,15 +9906,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6 -echo "configure:9913: checking for arpa/inet.h" >&5 +echo "configure:9910: checking for arpa/inet.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9942,9 +9939,9 @@ EOF } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:9946: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:9943: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext < @@ -9955,7 +9952,7 @@ int main() { static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:9959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9956: \"$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 @@ -9973,9 +9970,9 @@ else fi rm -f conftest* echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6 -echo "configure:9977: checking "for ip_mreq struct in netinet/in.h"" >&5 +echo "configure:9974: checking "for ip_mreq struct in netinet/in.h"" >&5 cat > conftest.$ac_ext < @@ -9985,7 +9982,7 @@ int main() { static struct ip_mreq x; ; return 0; } EOF -if { (eval echo configure:9989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_MULTICAST @@ -10016,10 +10013,10 @@ fi echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:10020: checking for msgget" >&5 +echo "configure:10017: checking for msgget" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -10057,15 +10054,15 @@ if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6 -echo "configure:10061: checking for sys/ipc.h" >&5 +echo "configure:10058: checking for sys/ipc.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10082,15 +10079,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -echo "configure:10086: checking for sys/msg.h" >&5 +echo "configure:10083: checking for sys/msg.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10128,15 +10125,15 @@ fi ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:10132: checking for dirent.h" >&5 +echo "configure:10129: checking for dirent.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10163,15 +10160,15 @@ else echo "$ac_t""no" 1>&6 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6 -echo "configure:10167: checking for sys/dir.h" >&5 +echo "configure:10164: checking for sys/dir.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10204,15 +10201,15 @@ fi ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:10208: checking for nlist.h" >&5 +echo "configure:10205: checking for nlist.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10242,7 +10239,7 @@ fi echo "checking "for sound support"" 1>&6 -echo "configure:10246: checking "for sound support"" >&5 +echo "configure:10243: checking "for sound support"" >&5 case "$with_sound" in native | both ) with_native_sound=yes;; nas | no ) with_native_sound=no;; @@ -10253,15 +10250,15 @@ if test "$with_native_sound" != "no"; then if test -n "$native_sound_lib"; then ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6 -echo "configure:10257: checking for multimedia/audio_device.h" >&5 +echo "configure:10254: checking for multimedia/audio_device.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10309,12 +10306,12 @@ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:10313: checking for ALopenport in -laudio" >&5 +echo "configure:10310: checking for ALopenport in -laudio" >&5 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'` xe_check_libs=" -laudio " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10326: \"$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 @@ -10356,12 +10353,12 @@ fi if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:10360: checking for AOpenAudio in -lAlib" >&5 +echo "configure:10357: checking for AOpenAudio in -lAlib" >&5 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'` xe_check_libs=" -lAlib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10373: \"$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 @@ -10410,15 +10407,15 @@ fi for dir in "machine" "sys" "linux"; do ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6 -echo "configure:10414: checking for ${dir}/soundcard.h" >&5 +echo "configure:10411: checking for ${dir}/soundcard.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10488,7 +10485,7 @@ EOF fi libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi cat > conftest.$ac_ext < EOF @@ -10515,7 +10512,7 @@ test -z "$with_tty" && with_tty=yes if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:10519: checking for TTY-related features" >&5 +echo "configure:10516: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -10531,12 +10528,12 @@ EOF if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:10535: checking for tgetent in -lncurses" >&5 +echo "configure:10532: checking for tgetent in -lncurses" >&5 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lncurses " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10548: \"$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 @@ -10580,15 +10577,15 @@ EOF ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:10584: checking for ncurses/curses.h" >&5 +echo "configure:10581: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10610,15 +10607,15 @@ fi ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:10614: checking for ncurses/term.h" >&5 +echo "configure:10611: checking for ncurses/term.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10648,15 +10645,15 @@ fi c_switch_site="$c_switch_site -I/usr/include/ncurses" ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:10652: checking for ncurses/curses.h" >&5 +echo "configure:10649: checking for ncurses/curses.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10691,12 +10688,12 @@ fi for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:10695: checking for tgetent in -l$lib" >&5 +echo "configure:10692: checking for tgetent in -l$lib" >&5 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -l$lib " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10708: \"$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 @@ -10738,12 +10735,12 @@ fi else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:10742: checking for tgetent in -lcurses" >&5 +echo "configure:10739: checking for tgetent in -lcurses" >&5 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -lcurses " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10755: \"$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 @@ -10772,12 +10769,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:10776: checking for tgetent in -ltermcap" >&5 +echo "configure:10773: checking for tgetent in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` xe_check_libs=" -ltermcap " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10789: \"$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 @@ -10836,15 +10833,15 @@ EOF test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gpm.h""... $ac_c" 1>&6 -echo "configure:10840: checking for gpm.h" >&5 +echo "configure:10837: checking for gpm.h" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10845: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10867,12 +10864,12 @@ fi } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:10871: checking for Gpm_Open in -lgpm" >&5 +echo "configure:10868: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgpm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10884: \"$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 @@ -10931,23 +10928,22 @@ test "$with_x11" = "yes" -o "$with_tty" = "yes" && extra_objs="$extra_objs event fi -echo "checking for database support" 1>&6 -echo "configure:10936: checking for database support" >&5 +test "$with_database_gnudbm $with_database_dbm $with_database_berkdb" \ + != "no no no" && echo "checking for database support" 1>&6 +echo "configure:10934: checking for database support" >&5 -if test "$with_database_gnudbm" != "no"; then - for ac_hdr in ndbm.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10943: checking for $ac_hdr" >&5 +if test "$with_database_gnudbm $with_database_dbm" != "no no"; then + ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6 +echo "configure:10939: checking for ndbm.h" >&5 cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -10962,29 +10958,27 @@ 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 <&6 + + test "$with_database_gnudbm" = "yes" -o \ + "$with_database_dbm" = "yes" && \ + { echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; } + with_database_gnudbm=no with_database_dbm=no fi -done - if test "$have_ndbm_h" = "yes"; then - +fi + +if test "$with_database_gnudbm" != "no"; then + echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:10983: checking for dbm_open in -lgdbm" >&5 +echo "configure:10977: checking for dbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -lgdbm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10993: \"$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 @@ -11009,81 +11003,24 @@ xe_check_libs="" if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 - with_database_gnudbm=yes have_libgdbm=yes + with_database_gnudbm=yes with_database_dbm=no libdbm=-lgdbm else echo "$ac_t""no" 1>&6 +if test "$with_database_gnudbm" = "yes"; then + { echo "Error:" "Required GNU DBM support cannot be provided." >&2; exit 1; } + fi + with_database_gnudbm=no fi - fi - if test "$with_database_gnudbm" != "yes"; then - echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:11022: checking for dbm_open" >&5 - -cat > conftest.$ac_ext < -/* 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 dbm_open(); - -int main() { - -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_dbm_open) || defined (__stub___dbm_open) -choke me -#else -dbm_open(); -#endif - -; return 0; } -EOF -if { (eval echo configure:11048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* - eval "ac_cv_func_dbm_open=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_dbm_open=no" -fi -rm -f conftest* - -if eval "test \"`echo '$ac_cv_func_'dbm_open`\" = yes"; then - echo "$ac_t""yes" 1>&6 - with_database_gnudbm=yes -else - echo "$ac_t""no" 1>&6 -fi - - fi - if test "$with_database_gnudbm" = "yes"; then - { test "$extra_verbose" = "yes" && cat << \EOF - Defining HAVE_DBM -EOF -cat >> confdefs.h <<\EOF -#define HAVE_DBM 1 -EOF -} - - test "$have_libgdbm" = "yes" && LIBS="-lgdbm $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lgdbm\" to \$LIBS"; fi - with_database_dbm=no - else with_database_gnudbm=no - fi fi if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:11084: checking for dbm_open" >&5 +echo "configure:11021: checking for dbm_open" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -11119,20 +11056,18 @@ rm -f conftest* if eval "test \"`echo '$ac_cv_func_'dbm_open`\" = yes"; then echo "$ac_t""yes" 1>&6 - with_database_dbm=yes need_libdbm=no + with_database_dbm=yes libdbm= else echo "$ac_t""no" 1>&6 -fi - if test "$need_libdbm" != "no"; then echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:11131: checking for dbm_open in -ldbm" >&5 +echo "configure:11066: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` xe_check_libs=" -ldbm " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11082: \"$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 @@ -11157,15 +11092,23 @@ xe_check_libs="" if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then echo "$ac_t""yes" 1>&6 - with_database_dbm=yes need_libdbm=yes + with_database_dbm=yes libdbm=-ldbm else echo "$ac_t""no" 1>&6 +test "$with_database_dbm" = "yes" && \ + { echo "Error:" "Required DBM support cannot be provided." >&2; exit 1; } + with_database_dbm=no fi - fi - if test "$with_database_dbm" = "yes"; then - { test "$extra_verbose" = "yes" && cat << \EOF +fi + +fi + +test -n "$libdbm" && LIBS=""$libdbm" $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libdbm"\" to \$LIBS"; fi +test "$with_database_gnudbm" = "yes" -o \ + "$with_database_dbm" = "yes" && \ + { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_DBM EOF cat >> confdefs.h <<\EOF @@ -11173,17 +11116,13 @@ cat >> confdefs.h <<\EOF EOF } - test "$need_libdbm" = "yes" && LIBS="-ldbm $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-ldbm\" to \$LIBS"; fi - else with_database_dbm=no - fi -fi if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6 -echo "configure:11184: checking for Berkeley db.h" >&5 +echo "configure:11123: checking for Berkeley db.h" >&5 for path in "db/db.h" "db.h"; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_path="$path"; break else @@ -11217,9 +11156,9 @@ rm -f conftest* if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6 -echo "configure:11221: checking for Berkeley DB version" >&5 +echo "configure:11160: checking for Berkeley DB version" >&5 cat > conftest.$ac_ext < #if DB_VERSION_MAJOR > 1 @@ -11238,10 +11177,10 @@ fi rm -f conftest* echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6 -echo "configure:11242: checking for $dbfunc" >&5 +echo "configure:11181: checking for $dbfunc" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$dbfunc=yes" else @@ -11283,12 +11222,12 @@ else echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6 -echo "configure:11287: checking for $dbfunc in -ldb" >&5 +echo "configure:11226: checking for $dbfunc in -ldb" >&5 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'` xe_check_libs=" -ldb " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11242: \"$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 @@ -11363,12 +11302,12 @@ fi if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:11367: checking for SOCKSinit in -lsocks" >&5 +echo "configure:11306: checking for SOCKSinit in -lsocks" >&5 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'` xe_check_libs=" -lsocks " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11322: \"$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 @@ -11438,15 +11377,15 @@ for ac_hdr in dlfcn.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11442: checking for $ac_hdr" >&5 +echo "configure:11381: checking for $ac_hdr" >&5 cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -11477,12 +11416,12 @@ done test -z "$with_shlib" && test ! -z "$have_dlfcn" && { echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:11481: checking for dlopen in -ldl" >&5 +echo "configure:11420: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` xe_check_libs=" -ldl " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11436: \"$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 @@ -11522,12 +11461,12 @@ fi } test -z "$with_shlib" && test ! -z "$have_dlfcn" && { echo $ac_n "checking for _dlopen in -lc""... $ac_c" 1>&6 -echo "configure:11526: checking for _dlopen in -lc" >&5 +echo "configure:11465: checking for _dlopen in -lc" >&5 ac_lib_var=`echo c'_'_dlopen | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11481: \"$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 @@ -11567,12 +11506,12 @@ fi } test -z "$with_shlib" && test ! -z "$have_dlfcn" && { echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6 -echo "configure:11571: checking for dlopen in -lc" >&5 +echo "configure:11510: checking for dlopen in -lc" >&5 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'` xe_check_libs=" -lc " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11526: \"$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 @@ -11612,12 +11551,12 @@ fi } test -z "$with_shlib" && { echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 -echo "configure:11616: checking for shl_load in -ldld" >&5 +echo "configure:11555: checking for shl_load in -ldld" >&5 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11571: \"$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 @@ -11657,12 +11596,12 @@ fi } test -z "$with_shlib" && { echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6 -echo "configure:11661: checking for dld_init in -ldld" >&5 +echo "configure:11600: checking for dld_init in -ldld" >&5 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'` xe_check_libs=" -ldld " cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11616: \"$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 @@ -11723,7 +11662,7 @@ dll_cflags="-r" dll_oflags="-o " echo $ac_n "checking how to build a shared library""... $ac_c" 1>&6 -echo "configure:11727: checking how to build a shared library" >&5 +echo "configure:11666: checking how to build a shared library" >&5 case `uname -rs` in UNIX_SV*|UNIX_System_V*) dll_lflags="-G" @@ -11814,10 +11753,10 @@ case `uname -rs` in for ac_func in dlerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11818: checking for $ac_func" >&5 +echo "configure:11757: checking for $ac_func" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11876,11 +11815,11 @@ done fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 +if { (eval echo configure:11823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5 then : else @@ -11990,7 +11929,7 @@ for dir in $MAKE_SUBDIR; do esac T="" -for W in $SUBDIR_MAKEFILES $dir/Makefile; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done +for W in $SUBDIR_MAKEFILES $dir/Makefile $dir/GNUmakefile; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done SUBDIR_MAKEFILES="$T" diff --git a/configure.in b/configure.in index 8802a9b..8c422dc 100644 --- a/configure.in +++ b/configure.in @@ -230,7 +230,7 @@ define([XE_PREPEND], if test "$extra_verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi]) dnl XE_DIE(message) -define([XE_DIE], [{ echo $1 >&2; exit 1; }]) +define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }]) dnl XE_STRIP_4TH_COMPONENT(var) dnl Changes i986-pc-linux-gnu to i986-pc-linux, as God (not RMS) intended. @@ -2483,7 +2483,7 @@ if test "$with_msw" != "no"; then with_file_coding=yes use_minimal_tagbits=yes use_indexed_lrecord_implementation=yes - XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o) + XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o) fi fi @@ -2922,7 +2922,6 @@ test "$with_menubars" != "no" && XE_ADD_OBJS(menubar.o) test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar.o) test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog.o) test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar.o) -test "$all_widgets" != "no no no no" && XE_ADD_OBJS(gui.o) if test "$with_x11" = "yes"; then test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o) @@ -3485,45 +3484,48 @@ dnl Do we need event-unixoid.o ? test "$with_x11" = "yes" -o "$with_tty" = "yes" && XE_ADD_OBJS(event-unixoid.o) dnl Database support -dnl dnl We do not necessarily have to have libdb/lib(g)dbm for DB/(G)DBM support. dnl On FreeBSD, both DB and DBM are part of libc. -dnl Note that unless support for DB/(G)DBM is explicitly disabled, we always -dnl want to check for libdb/lib(g)dbm. Also note that libc will not be -dnl checked if we have the libraries. -dnl If support for DB/(G)DBM is requested, but we neither have libdb/lib(g)dbm, -dnl nor does libc implement it, we are a bit lost :) - -AC_CHECKING(for database support) +dnl By default, we check for DBM support in libgdbm, then libc, then libdbm. + +test "$with_database_gnudbm $with_database_dbm $with_database_berkdb" \ + != "no no no" && AC_CHECKING(for database support) + +dnl Check for ndbm.h, required for either kind of DBM support. +if test "$with_database_gnudbm $with_database_dbm" != "no no"; then + AC_CHECK_HEADER(ndbm.h, [:], [ + test "$with_database_gnudbm" = "yes" -o \ + "$with_database_dbm" = "yes" && \ + XE_DIE("Required DBM support cannot be provided.") + with_database_gnudbm=no with_database_dbm=no]) +fi +dnl Check for DBM support in libgdbm. if test "$with_database_gnudbm" != "no"; then - AC_CHECK_HEADERS(ndbm.h, have_ndbm_h=yes) - if test "$have_ndbm_h" = "yes"; then - AC_CHECK_LIB(gdbm, dbm_open, with_database_gnudbm=yes have_libgdbm=yes) - fi - if test "$with_database_gnudbm" != "yes"; then - AC_CHECK_FUNC(dbm_open, with_database_gnudbm=yes) - fi - if test "$with_database_gnudbm" = "yes"; then - AC_DEFINE(HAVE_DBM) - test "$have_libgdbm" = "yes" && XE_PREPEND(-lgdbm, LIBS) - with_database_dbm=no - else with_database_gnudbm=no - fi + AC_CHECK_LIB(gdbm, dbm_open, [ + with_database_gnudbm=yes with_database_dbm=no libdbm=-lgdbm], [ + if test "$with_database_gnudbm" = "yes"; then + XE_DIE("Required GNU DBM support cannot be provided.") + fi + with_database_gnudbm=no]) fi +dnl Check for DBM support in libc and libdbm. if test "$with_database_dbm" != "no"; then - AC_CHECK_FUNC(dbm_open, with_database_dbm=yes need_libdbm=no) - if test "$need_libdbm" != "no"; then - AC_CHECK_LIB(dbm, dbm_open, with_database_dbm=yes need_libdbm=yes) - fi - if test "$with_database_dbm" = "yes"; then - AC_DEFINE(HAVE_DBM) - test "$need_libdbm" = "yes" && XE_PREPEND(-ldbm, LIBS) - else with_database_dbm=no - fi + AC_CHECK_FUNC(dbm_open, [with_database_dbm=yes libdbm=], [ + AC_CHECK_LIB(dbm, dbm_open, [with_database_dbm=yes libdbm=-ldbm], [ + test "$with_database_dbm" = "yes" && \ + XE_DIE("Required DBM support cannot be provided.") + with_database_dbm=no])]) fi +dnl Tell make about the DBM support we detected. +test -n "$libdbm" && XE_PREPEND("$libdbm", LIBS) +test "$with_database_gnudbm" = "yes" -o \ + "$with_database_dbm" = "yes" && \ + AC_DEFINE(HAVE_DBM) + +dnl Check for Berkeley DB. if test "$with_database_berkdb" != "no"; then AC_MSG_CHECKING(for Berkeley db.h) for path in "db/db.h" "db.h"; do diff --git a/etc/NEWS b/etc/NEWS index 30d5eb2..2e222f0 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -502,6 +502,8 @@ You will need to install a LDAP library first. The following have been tested: - LDAP 3.3 from the University of Michigan (get it from ) + - OpenLDAP 1.0.3 from the OpenLDAP Foundation + (get it from ) - LDAP SDK 1.0 from Netscape Corp. (get it from ) diff --git a/version.sh b/version.sh index 814c3b1..b313f11 100644 --- a/version.sh +++ b/version.sh @@ -1,8 +1,8 @@ #!/bin/sh emacs_major_version=21 emacs_minor_version=2 -emacs_beta_version=6 -xemacs_codename="Apollo" +emacs_beta_version=7 +xemacs_codename="Ares" infodock_major_version=4 infodock_minor_version=0 infodock_build_version=1 -- 1.7.10.4