diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-01 03:21:06 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-01 03:21:06 +0000 |
| commit | 4c34eeeee5886d14f3e60b77fb563cb549c8896f (patch) | |
| tree | af17010f0864173dd6416585f08d686377791412 | |
| parent | 76acf92ebe73e35528c5966a21328305ba7b5aef (diff) | |
| parent | db6292445840e2795f35ebad62a14314fc3c7c21 (diff) | |
| download | emacs-4c34eeeee5886d14f3e60b77fb563cb549c8896f.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 563-582)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 177-185)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158
161 files changed, 12550 insertions, 10024 deletions
@@ -3,8 +3,6 @@ Foundation's distribution of GNU Emacs. To show our appreciation for their public spirit, we list here in alphabetical order a condensed list of their contributions. -"$,1 a(Bukasz Demianiuk": changed erc.el - Aaron Larson: changed bibtex.el Aaron S. Hawley: changed files.texi files.el isearch.el misc.texi @@ -23,6 +21,8 @@ Adrian Lanz: changed mail-source.el spam.el Agustin Martin: changed flyspell.el ispell.el +Agust,Am(Bn Mart,Am(Bn: changed flyspell.el + Aidan Kehoe: changed lread.c mm-util.el erc.el objects.texi Ake Stenhoff: wrote imenu.el @@ -36,8 +36,8 @@ Alakazam Petrofsky: changed hanoi.el Alan Mackenzie: wrote cc-awk.el and changed cc-cmds.el cc-mode.el cc-defs.el cc-engine.el cc-vars.el cc-langs.el cc-styles.el cc-mode.texi lread.c cc-fonts.el cc-align.el - cc-subword.el isearch.el programs.texi search.texi subr.el text.texi - buffers.texi cc-fix.el cc-mode-19.el ebrowse.el and 15 other files + programs.texi cc-subword.el isearch.el lisp.el search.texi subr.el + text.texi buffers.texi cc-fix.el cc-mode-19.el and 16 other files Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el easy-mmode.el gnus-sum.el ibuf-ext.el ibuffer.el lunar.el macros.el @@ -81,10 +81,12 @@ Alexandre Veyrenc: changed fr-refcard.tex Alfred Correira: changed generic-x.el -Alfred M. Szmidt: changed compile.el html2text.el +Alfred M. Szmidt: changed compile.el html2text.el openbsd.h Alfredo Finelli: changed TUTORIAL.it +Alin C. Soare: changed hexl.el + Ami Fischman: changed calendar.el diary-lib.el Anders Holst: wrote hippie-exp.el @@ -100,7 +102,7 @@ Andre Spiegel: changed vc.el vc-hooks.el vc-cvs.el vc-rcs.el vc-sccs.el Andre Srinivasan: changed gnus-group.el gnus-sum.el gnus.texi mm-decode.el mml.el nnmail.el -Andrea Russo: changed info-look.el +Andrea Russo: changed erc-dcc.el info-look.el Andreas B,A|(Bsching: changed emacsclient.c @@ -119,14 +121,14 @@ Andreas Leue: changed artist.el Andreas Luik: changed xfns.c xterm.c -Andreas Schwab: changed Makefile.in files.el lisp.h xdisp.c alloc.c - configure.in fns.c print.c coding.c dired.el editfns.c info.el eval.c +Andreas Schwab: changed Makefile.in files.el lisp.h xdisp.c configure.in + alloc.c fns.c print.c coding.c dired.el editfns.c info.el eval.c fileio.c simple.el buffer.c minibuf.c xterm.c emacs.c keyboard.c - process.c and 446 other files + process.c and 448 other files -Andreas Seltenreich: changed nnweb.el gnus.texi battery.el gnus-art.el - gnus-ml.el gnus-srvr.el gnus-start.el gnus-util.el gnus.el mm-url.el - mm-uu.el nnslashdot.el url-cookie.el url-http.el +Andreas Seltenreich: changed nnweb.el gnus.texi mm-uu.el nnslashdot.el + battery.el easy-mmode.el gnus-art.el gnus-ml.el gnus-srvr.el + gnus-start.el gnus-util.el gnus.el mm-url.el url-cookie.el url-http.el Andrew Choi: wrote mac-win.el and changed macterm.c mac.c macfns.c INSTALL macmenu.c darwin.h macterm.h @@ -164,8 +166,8 @@ Arisawa Akihiro: changed mm-decode.el mm-view.el ps-print.el time.el Arne Georg Gleditsch: changed gnus-sum.el Arne J,Ax(Brgensen: wrote latexenc.el -and changed smime.el gnus-art.el gnus-sieve.el message.el mm-decode.el - mule-conf.el nnimap.el nnrss.el wid-edit.el +and changed smime.el gnus-art.el gnus-sieve.el ldap.el message.el + mm-decode.el mule-conf.el nnimap.el nnrss.el wid-edit.el Artem Chuprina: changed message.el @@ -192,7 +194,8 @@ Ben Harris: changed configure.in Ben Key: changed w32.c w32fns.c w32menu.c makefile.w32-in w32.h w32term.c emacs.c gmake.defs ms-w32.h nmake.defs sound.c -Ben North: changed fill.el isearch.el lisp-mode.el w32term.c xfaces.c +Ben North: changed fill.el isearch.el lisp-mode.el paren.el w32term.c + xfaces.c Benjamin Drieu: wrote pong.el @@ -250,7 +253,7 @@ and changed isearch.el sendmail.el Bob Halley: changed esh-io.el -Bob Rogers: changed ffap.el +Bob Rogers: changed ffap.el thingatpt.el Bob Weiner: changed info.el quail.el @@ -326,17 +329,17 @@ Cheng Gao: changed MORE.STUFF flymake.el tips.texi url-dired.el url-file.el url-handlers.el url-http.el url-nfs.el Chong Yidong: changed cus-edit.el simple.el custom.el display.texi - longlines.el files.el text.texi custom.texi files.texi keyboard.c - wid-edit.el compile.el cus-theme.el frames.texi info.el misc.texi - mouse.el xterm.c image-mode.el keymaps.texi sendmail.el - and 176 other files + longlines.el files.el text.texi custom.texi files.texi info.el + keyboard.c mouse.el wid-edit.el xterm.c compile.el cus-theme.el + frames.texi misc.texi startup.el image-mode.el keymaps.texi + and 182 other files Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el syntax.c texnfo-upd.el x11fns.c xfns.c dired.el fileio.c hp9000s800.h indent.c info.el man.el and 17 other files -Chris Moore: changed dired.el wdired.el +Chris Moore: changed dired.el Makefile.in gnus-sum.el wdired.el Chris Prince: changed w32term.c @@ -355,7 +358,8 @@ Christian Von Roques: changed gnus-start.el Christoph Bauer: changed configure.in -Christoph Conrad: changed gnus-agent.el gnus-score.el qp.el +Christoph Conrad: changed gnus-agent.el gnus-score.el makefile.w32-in + qp.el Christoph Wedler: wrote antlr-mode.el and changed format.el gnus-art.el gnus-picon.el message.el register.el @@ -566,11 +570,11 @@ Detlev Zundel: wrote re-builder.el Dhruva Krishnamurthy: changed makefile.w32-in -Diane Murray: changed erc.el erc-button.el erc-menu.el erc-match.el - erc-track.el erc-nets.el erc-backend.el erc-list.el erc-nickserv.el - erc-autoaway.el erc-stamp.el erc-compat.el erc-goodies.el erc-log.el - Makefile erc-fill.el erc-ibuffer.el erc-notify.el erc-ring.el - erc-speak.el erc-speedbar.el and 25 other files +Diane Murray: changed erc.el erc-menu.el erc-button.el erc-match.el + erc-track.el erc-backend.el erc-nets.el erc-list.el erc-autoaway.el + erc-nickserv.el erc-compat.el erc-stamp.el erc-goodies.el + erc-ibuffer.el erc-log.el Makefile erc-dcc.el erc-fill.el + erc-nicklist.el erc-notify.el erc-ring.el and 30 other files Dick King: wrote uniquify.el @@ -628,9 +632,9 @@ Eli Tziperman: wrote rmail-spam-filter.el Eli Zaretskii: wrote codepage.el rxvt.el tty-colors.el and changed msdos.c Makefile.in makefile.w32-in files.el info.el fileio.c - startup.el mainmake.v2 config.bat menu-bar.el pc-win.el rmail.el - simple.el internal.el msdos.h xfaces.c frame.c dosfns.c faces.el - frame.el emacs.c and 518 other files + startup.el mainmake.v2 config.bat menu-bar.el pc-win.el msdos.h + rmail.el simple.el internal.el xfaces.c frame.c dosfns.c emacs.c + faces.el frame.el and 521 other files Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el sh-script.el text.texi @@ -659,7 +663,7 @@ and changed mh-utils.el mh-e.el mh-comp.el mh-mime.el Eric Eide: changed gnus-xmas.el Eric Hanchrow: changed TUTORIAL.es abbrev.el autorevert.el delphi.el - dired.el emacsclient.c ispell.el make-dist + dired.el emacsclient.c erc.el ispell.el make-dist ,AI(Bric Jacoboni: changed fr-refcard.tex @@ -835,10 +839,10 @@ Giuseppe Scrivano: changed buffer.c configure configure.in sysdep.c xsmfns.c Glenn Morris: changed f90.el calendar.el diary-lib.el fortran.el - calendar.texi appt.el sh-script.el timeclock.el cal-menu.el + calendar.texi appt.el sh-script.el timeclock.el cal-menu.el Makefile.in cal-hebrew.el cal-islam.el files.el holidays.el programs.texi - scroll-all.el startup.el cal-coptic.el cal-julian.el cal-move.el - cal-tex.el cal-x.el and 41 other files + scroll-all.el startup.el abbrevs.texi cal-coptic.el cal-julian.el + cal-move.el and 59 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -978,8 +982,8 @@ Ivar Rummelhoff: wrote winner.el Iwamuro Motonori: changed gnus-kill.el -J.D. Smith: changed idlwave.el idlw-shell.el idlw-rinfo.el - idlw-toolbar.el idlw-help.el vc.el bibtex.el comint.el files.texi +J.D. Smith: changed idlwave.el idlw-shell.el idlw-help.el idlw-rinfo.el + idlw-toolbar.el vc.el bibtex.el comint.el files.texi hideshow.el idlw-complete-structtag.el idlwave.texi misc.texi mouse.el Jaap-Henk Hoepman: changed mm-decode.el @@ -1012,10 +1016,10 @@ Jamie Zawinski: wrote byte-opt.el byte-run.el bytecomp.el disass.el and changed bytecode.c mail-extr.el subr.el Jan Dj,Ad(Brv: wrote dnd.el x-dnd.el -and changed gtkutil.c xterm.c xfns.c xmenu.c xterm.h gtkutil.h - configure.in x-win.el Makefile.in frames.texi keyboard.c config.in +and changed gtkutil.c xterm.c xfns.c xmenu.c xterm.h configure.in + gtkutil.h x-win.el Makefile.in frames.texi keyboard.c config.in configure xselect.c emacs.c alloc.c xlwmenu.c xresources.texi frame.c - startup.el xdisp.c and 174 other files + startup.el xdisp.c and 175 other files Jan Nieuwenhuizen: changed info.el TUTORIAL.nl emacs.c emacsclient.c gnus-start.el gud.el nnmh.el server.el startup.el @@ -1182,6 +1186,8 @@ John Heidemann: wrote mouse-copy.el mouse-drag.el John Hughes: changed term.c +John J Foerch: changed erc-stamp.el + John Mongan: changed f90.el John Paul Wallington: changed ibuffer.el ibuf-ext.el subr.el files.el @@ -1258,13 +1264,15 @@ Joshua Varner: changed intro.texi Jouni K Seppanen: changed nnimap.el +Jouni K. Sepp,Ad(Bnen: changed mm-url.el + Juan Le,As(Bn Lahoz Garc,Am(Ba: wrote wdired.el and changed files.el perl-mode.el -Juanma Barranquero: changed makefile.w32-in help-fns.el subr.el faces.el - files.el w32fns.c bs.el cperl-mode.el eval.c org.el replace.el - simple.el sh-script.el vhdl-mode.el ada-mode.el allout.el comint.el - emacsclient.c idlwave.el process.c w32-win.el and 584 other files +Juanma Barranquero: changed makefile.w32-in subr.el help-fns.el faces.el + files.el w32fns.c emacsclient.c replace.el bs.el buffer.c cperl-mode.el + eval.c org.el simple.el xdisp.c idlwave.el sh-script.el vhdl-mode.el + ada-mode.el allout.el comint.el and 619 other files Juergen Hoetzel: changed url-handlers.el @@ -1343,9 +1351,9 @@ Katsuhiro Hermit Endo: changed gnus-group.el gnus-spec.el Katsumi Yamaoka: wrote canlock.el and changed gnus-art.el message.el gnus-sum.el gnus.texi mm-decode.el - mm-view.el gnus-util.el gnus-msg.el mm-util.el gnus.el lpath.el + mm-view.el gnus-util.el mm-util.el gnus-msg.el gnus.el lpath.el gnus-group.el gnus-start.el rfc2047.el dgnushack.el mm-uu.el - gnus-agent.el mml.el nntp.el nnrss.el rfc2231.el and 71 other files + gnus-agent.el mml.el nntp.el nnrss.el rfc2231.el and 72 other files Kaveh R. Ghazi: changed delta88k.h xterm.c @@ -1405,32 +1413,33 @@ and changed dispnew.c addpm.c config.nt dispextern.h emacs.c facemenu.el s/ms-w32.h scroll.c startup.el sysdep.c term.c unexw32.c w32.c and 16 other files -Kevin Greiner: changed gnus-agent.el gnus-start.el gnus-sum.el - gnus-int.el gnus.el nntp.el gnus-util.el gnus-group.el gnus-cus.el - gnus-range.el legacy-gnus-agent.el gnus-art.el gnus-cache.el - gnus-srvr.el nnagent.el nnheader.el dgnushack.el gnus-async.el - gnus-draft.el gnus-registry.el gnus-salt.el and 4 other files +Kevin Greiner: wrote legacy-gnus-agent.el +and changed gnus-agent.el gnus-start.el gnus-sum.el gnus-int.el gnus.el + nntp.el gnus-util.el gnus-group.el gnus-cus.el gnus-range.el + gnus-art.el gnus-cache.el gnus-srvr.el nnagent.el nnheader.el + dgnushack.el gnus-async.el gnus-draft.el gnus-registry.el gnus-salt.el + gnus-uu.el and 3 other files Kevin Layer: changed w32proc.c -Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el simple.el - ange-ftp.el byte-opt.el desktop.el dired-x.texi ffap.el files.el - flyspell.el isearch.el lisp.el loadhist.el mailalias.el menu-bar.el - print.c replace.el sendmail.el vc.el xfns.c +Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el files.el + simple.el ange-ftp.el byte-opt.el desktop.el dired-x.texi ffap.el + files.texi flyspell.el isearch.el lisp.el loadhist.el mailalias.el + menu-bar.el print.c replace.el sendmail.el vc.el xfns.c Kevin Ryde: wrote info-xref.el and changed info-look.el info.el gnus-art.el gnus-sum.el mailcap.el os.texi text.texi MORE.STUFF cc-align.el cmdargs.texi compile.texi display.texi em-alias.el em-dirs.el em-hist.el em-unix.el - emacs-lisp-intro.texi ffap.el frames.texi glossary.texi gnus.texi - and 14 other files + emacs-lisp-intro.texi etags.c ffap.el frames.texi glossary.texi + and 15 other files Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el keypad.el kmacro.el -and changed xdisp.c dispextern.h simple.el window.c xterm.c keyboard.c - process.c subr.el w32term.c dispnew.c lisp.h fringe.c macterm.c - display.texi fns.c alloc.c xfaces.c xfns.c xterm.h keymap.c .gdbinit - and 240 other files +and changed xdisp.c dispextern.h simple.el process.c window.c keyboard.c + xterm.c subr.el w32term.c dispnew.c lisp.h fringe.c macterm.c + display.texi fns.c alloc.c xfaces.c xfns.c xterm.h .gdbinit info.el + and 243 other files Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el gnus-win.el gnus-xmas.el gnus.texi message.el nndraft.el nnml.el @@ -1445,8 +1454,8 @@ Klaus Zeitler: changed configure.in files.el sh-script.el vcursor.el Koaunghi Un: wrote hanja3.el and changed hanja.el hangul.el hangul3.el hanja-jis.el symbol-ksc.el -Kobayashi Yasuhiro: changed w32fns.c configure.bat info.el w32term.c - w32term.h window.c xfns.c +Kobayashi Yasuhiro: changed w32fns.c configure.bat indent.c info.el + w32term.c w32term.h window.c xfns.c Kohtala Marko: changed info.el @@ -1477,7 +1486,7 @@ Lars Balker Rasmussen: changed gnus-art.el gnus-agent.el message.el Lars Brinkhoff: changed building.texi config.in configure configure.in editfns.c fns.c os.texi -Lars Hansen: changed desktop.el info.el mh-e.el tramp.el dired-x.el +Lars Hansen: changed desktop.el tramp.el info.el mh-e.el dired-x.el dired-x.texi dired.el ls-lisp.el rmail.el dired.c files.texi grp.h hilit-chg.el misc.texi url-auth.el url-cache.el url-dired.el url-ftp.el url-irc.el url-misc.el url-news.el and 39 other files @@ -1521,15 +1530,17 @@ and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el Leigh Stoller: changed emacsclient.c emacsserver.c server.el -Lennart Borgman: changed window.el ada-xref.el filesets.el flymake.el - help-fns.el mouse.el recentf.el shell.el texinfmt.el tutorial.el - w32term.c w32term.h +Lennart Borgman: changed tutorial.el window.el ada-xref.el emacsclient.c + filesets.el flymake.el help-fns.el mouse.el recentf.el shell.el + texinfmt.el w32term.c w32term.h Lennart Staflin: changed dired.el diary-ins.el diary-lib.el tq.el xdisp.c Leonard H. Tower Jr.: changed rnews.el rnewspost.el emacsbug.el rmailout.el +Liam Healy: changed outline.el + Lloyd Zusman: changed mml.el Luc Teirlinck: wrote help-at-pt.el @@ -1538,6 +1549,8 @@ and changed files.el autorevert.el cus-edit.el subr.el simple.el comint.el custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi modes.texi variables.texi buffers.texi and 215 other files +$,1 a(Bukasz Demianiuk: changed erc.el + Lucid, Inc.: changed byte-opt.el byte-run.el bytecode.c bytecomp.el delsel.el disass.el faces.el font-lock.el lmenu.el lselect.el mailabbrev.el select.el xfaces.c xselect.c @@ -1559,8 +1572,8 @@ and changed emacsclient.c emacsserver.c etags.c lisp.h movemail.c Maciek Pasternacki: changed nnrss.el -Magnus Henoch: changed url-http.el ispell.el url-gw.el url-parse.el - url.el autoinsert.el rcirc.el url-https.el +Magnus Henoch: changed url-http.el ispell.el url.el url-gw.el + url-parse.el autoinsert.el rcirc.el url-https.el url-proxy.el Manuel Serrano: wrote flyspell.el @@ -1590,14 +1603,14 @@ Marek Martin: changed nnfolder.el Marien Zwart: changed python.el -Mario Lang: wrote erc-button.el erc-ibuffer.el erc-imenu.el erc-list.el - erc-menu.el erc-netsplit.el erc-networks.el erc-notify.el - erc-speedbar.el erc-stamp.el erc-track.el erc-xdcc.el +Mario Lang: wrote erc-button.el erc-ibuffer.el erc-imenu.el erc-menu.el + erc-netsplit.el erc-networks.el erc-notify.el erc-speedbar.el + erc-stamp.el erc-track.el erc-xdcc.el and changed erc.el erc-dcc.el erc-speak.el Makefile erc-bbdb.el - erc-complete.el erc-pcomplete.el erc-chess.el erc-fill.el battery.el - erc-match.el erc-autojoin.el erc-nets.el erc-nickserv.el erc-ring.el - diff.el erc-ezbounce.el erc-identd.el erc-lang.el erc-log.el - erc-macs.el and 5 other files + erc-complete.el erc-pcomplete.el erc-chess.el erc-fill.el erc-list.el + battery.el erc-match.el erc-autojoin.el erc-nets.el erc-nickserv.el + erc-ring.el diff.el erc-ezbounce.el erc-identd.el erc-lang.el + erc-log.el and 6 other files Mark A. Hershberger: changed xml.el nnrss.el mm-url.el cperl-mode.el gnus-group.el @@ -1669,7 +1682,7 @@ Martin Neitzel: changed sc.el Martin Rudalics: changed cus-edit.el wid-edit.el flyspell.el cus-start.el files.el font-lock.el insdel.c macmenu.c syntax.c w32menu.c window.el xdisp.c xmenu.c buffer.c buffer.h casefiddle.c cperl-mode.el custom.el - dispextern.h dnd.el editfns.c and 25 other files + dispextern.h dnd.el editfns.c and 26 other files Martin Stjernholm: wrote cc-bytecomp.el and changed cc-engine.el cc-cmds.el cc-langs.el cc-defs.el cc-mode.el @@ -1687,12 +1700,13 @@ Masanobu Umeda: wrote gnus-kill.el gnus-mh.el gnus-msg.el gnus.el and changed gnuspost.el Masatake Yamato: wrote cc-subword.el ld-script.el -and changed etags.el asm-mode.el xdisp.c bindings.el hexl.el man.el +and changed etags.el asm-mode.el hexl.el xdisp.c bindings.el man.el simple.el wid-edit.el add-log.el compile.el faces.el pcvs.el register.el ruler-mode.el buffer.c cus-face.el dired-x.el display.texi - etags.c font-lock.el gdb-ui.el and 58 other files + etags.c font-lock.el gdb-ui.el and 59 other files -Masayuki Ataka: changed texinfmt.el texinfo.el characters.el make-mode.el +Masayuki Ataka: changed texinfmt.el texinfo.el characters.el cmuscheme.el + make-mode.el Masayuki Fujii: changed dnd.el w32-win.el @@ -1773,16 +1787,16 @@ and changed ediff-merge.el ediff*.el viper*.el ediff-hooks.el menu-bar.el Michael Olson: changed erc.el erc-backend.el Makefile erc.texi erc-stamp.el erc-log.el erc-autoaway.el erc-identd.el erc-track.el - erc-match.el erc-dcc.el erc-notify.el erc-goodies.el erc-ibuffer.el - erc-list.el erc-pcomplete.el erc-spelling.el erc-bbdb.el erc-compat.el - erc-nicklist.el erc-*.el and 42 other files + erc-match.el erc-dcc.el erc-list.el erc-notify.el erc-goodies.el + erc-ibuffer.el erc-nicklist.el erc-pcomplete.el erc-spelling.el + erc-bbdb.el erc-compat.el erc-fill.el and 42 other files Michael Piotrowski: changed gnus-sum.el ps-print.el Michael R. Cook: changed gnus-topic.el gnus-art.el gnus-sum.el -Michael R. Mauger: changed sql.el cua-base.el custom.el facemenu.el - recentf.el replace.el tramp.el w32fns.c +Michael R. Mauger: changed sql.el emacsclient.c cua-base.el custom.el + facemenu.el recentf.el replace.el tramp.el w32fns.c Michael R. Wolf: changed ange-ftp.el @@ -1805,9 +1819,10 @@ Michal Jankowski: changed insdel.c keyboard.c Michal Nazarewicz: changed ispell.el -Micha,Ak(Bl Cadilhac: changed ido.el ispell.el battery.el blackbox.el - cus-edit.el dispnew.c info.el life.el lpr.el make-mode.el pong.el - print.c process.c rect.el startup.el subr.el uni-input.el zone.el +Micha,Ak(Bl Cadilhac: changed ido.el ispell.el anti.texi battery.el + blackbox.el cmuscheme.el cus-edit.el dispnew.c faq.texi flyspell.el + glasses.el info.el life.el lpr.el make-mode.el misc.texi pong.el + print.c process.c rect.el shell.el and 5 other files Michelangelo Grigni: wrote ffap.el and changed gnus-score.el @@ -1874,7 +1889,7 @@ Nachum Dershowitz: wrote cal-hebrew.el Nagy Andras: wrote gnus-sieve.el and changed imap.el gnus.el -Nakaji Hiroyuki: changed mm-util.el +Nakaji Hiroyuki: changed amdx86-64.h configure configure.in mm-util.el Nakamura Toshikazu: changed w32fns.c @@ -1899,7 +1914,7 @@ Nick Roberts: wrote gdb-ui.el and changed gud.el building.texi tooltip.el speedbar.el bindings.el thumbs.el DEBUG cc-mode.el frames.texi subr.el xt-mouse.el .gdbinit comint.el display.texi help-mode.el descr-text.el gud-display.pbm - speedbar.texi tumme.el xdisp.c byte-run.el and 112 other files + speedbar.texi tumme.el xdisp.c byte-run.el and 113 other files Nico Francois: changed w32fns.c w32inevt.c w32menu.c @@ -2006,8 +2021,9 @@ Pavel Jan,Bm(Bk: changed COPYING keyboard.c xterm.c xdisp.c Makefile.in coding.c eval.c fileio.c flyspell.el fns.c indent.c callint.c cus-start.el and 703 other files -Pavel Kobiakov: wrote flymake.el -and changed flymake.texi +Pavel Kobiakov: changed flymake.el flymake.texi + +Pavel Kobyakov: wrote flymake.el Per Abrahamsen: wrote cpp.el cus-dep.el cus-edit.el cus-face.el cus-start.el custom.el double.el gnus-cite.el gnus-cus.el gnus-score.el @@ -2132,7 +2148,7 @@ and changed gnus-art.el message.el gnus.texi gnus-sum.el gnus.el gnus-group.el gnus-faq.texi gnus-util.el mml.el gnus-start.el mm-util.el gnus-agent.el gnus-msg.el gnus-score.el message.texi files.el spam-report.el mm-decode.el nnweb.el spam.el deuglify.el - and 162 other files + and 163 other files Remek Trzaska: changed gnus-ems.el @@ -2227,9 +2243,9 @@ Rolf Ebert: wrote ada-mode.el and changed files.el find-file.el Romain Francoise: changed faq.texi dired-x.el ibuf-ext.el Makefile.in - compile.el message.el puresize.h replace.el subr.el files.texi - gnus-fun.el gnus.texi help-fns.el make-dist rcirc.el antlr-mode.el - bookmark.el buffer.c comint.el diary-lib.el dired.el + compile.el message.el puresize.h replace.el subr.el comint.el + files.texi gnus-fun.el gnus.texi help-fns.el make-dist rcirc.el + antlr-mode.el bookmark.el buffer.c diary-lib.el dired.el and 126 other files Roman Belenov: changed which-func.el @@ -2350,7 +2366,7 @@ Simon Marshall: wrote fast-lock.el lazy-lock.el regexp-opt.el and changed comint.el font-lock.el shell.el rmail.el fortran.el sendmail.el subr.el dired.el sh-script.el texinfo.el add-log.el compile.el outline.el help.el menu-bar.el perl-mode.el ps-print.el - rmailsum.el bytecomp.el data.c faces.el and 57 other files + rmailsum.el bytecomp.el cc-fonts.el data.c and 57 other files Skip Collins: changed w32fns.c w32term.c w32term.h @@ -2370,7 +2386,7 @@ Stefan Monnier: wrote bibtex.el cvs-status.el diff-mode.el log-edit.el and changed vc.el font-lock.el pcvs.el newcomment.el subr.el lisp.h keyboard.c keymap.c tex-mode.el fill.el alloc.c compile.el files.el regex.c easy-mmode.el simple.el info.el syntax.c vc-hooks.el xdisp.c - sh-script.el and 512 other files + sh-script.el and 513 other files Steinar Bang: changed imap.el @@ -2610,7 +2626,7 @@ Vincent Del Vecchio: changed info.el mh-utils.el Vinicius Jose Latorre: wrote delim-col.el ebnf-abn.el ebnf-bnf.el ebnf-dtd.el ebnf-ebx.el ebnf-iso.el ebnf-otz.el ebnf-yac.el ebnf2ps.el printing.el ps-mule.el -and changed ps-print.el ps-prin1.ps ps-prin0.ps ps-prin3.ps ps-bdf.el +and changed ps-print.el ps-prin1.ps ps-bdf.el ps-prin0.ps ps-prin3.ps ps-prin2.ps lpr.el subr.el ps-print-def.el ps-print0.ps ps-vars.el Vivek Dasmohapatra: changed emacs.c sh-script.el xterm.c xterm.h @@ -2647,6 +2663,8 @@ and changed url-handlers.el url-file.el url-methods.el url-vars.el url-cid.el url-dired.el url-expand.el url-ftp.el url-history.el url-irc.el and 6 other files +William Smith: changed strftime.c + William Sommerfeld: wrote emacsclient.c emacsserver.c scribe.el server.el Wilson H. Tien: changed unexelf.c @@ -2677,9 +2695,9 @@ Xavier Maillard: changed gnus-faq.texi gnus-score.el spam.el Yagi Tatsuya: changed gnus-art.el gnus-start.el Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h - macgui.h macmenu.c image.c macselect.c keyboard.c xdisp.c makefile.MPW - emacs.c config.h macos.texi xfaces.c Makefile.in darwin.h INSTALL - dispextern.h dispnew.c and 71 other files + macgui.h macmenu.c image.c macselect.c keyboard.c xdisp.c emacs.c + makefile.MPW config.h macos.texi xfaces.c INSTALL Makefile.in darwin.h + configure configure.in and 71 other files Yann Dirson: changed imenu.el diff --git a/ChangeLog b/ChangeLog index 8c0bdce6c22..4a51c969309 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,40 @@ -2006-12-10 Andreas Schwab <schwab@suse.de> +2006-12-26 Andreas Schwab <schwab@suse.de> - * configure.in: Remove check for struct timezone, its result is - never used. + * Makefile.in (datarootdir): Define. + +2006-12-24 Richard Stallman <rms@gnu.org> + + * configure.in: Require Autoconf 2.61. + +2006-12-22 Mark Davies <mark@mcs.vuw.ac.nz> + + * configure.in: Add support for NetBSD on x86-64, hp800 and sh3el. + Remove redundant entry for powerpc-apple-netbsd. * configure: Regenerate. -2006-12-08 NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (tiny change) +2006-12-22 Chong Yidong <cyd@stupidchicken.com> - * configure.in: Add support for Solaris 10 on x86-64. + * configure: Regenerate with autoconf 2.61. + +2006-12-20 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + * configure.in: Detect alsa/asoundlib.h also. * configure: Regenerate. +2006-12-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * configure.in: Check if GTK+ compiles at all. + +2006-12-10 Andreas Schwab <schwab@suse.de> + + * configure.in: Remove check for struct timezone, its result is + never used. + +2006-12-08 NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (tiny change) + + * configure.in: Add support for Solaris 10 on x86-64. + 2006-12-08 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * INSTALL (DETAILED BUILDING AND INSTALLATION): Document usage @@ -20,8 +44,6 @@ * configure.in (HAVE_SYNC): New test. - * configure: Regenerate. - 2006-12-03 Glenn Morris <rgm@gnu.org> * Makefile.in: Fix Copyright format. @@ -39,21 +61,15 @@ * configure.in (HAVE_X86_64_LIB64_DIR): New test. - * configure: Regenerate. - 2006-11-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * configure.in (HAVE_CANCELMENUTRACKING): Remove test. - * configure: Regenerate. - 2006-11-08 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * configure.in: Prefer X11 to Carbon only when some X-specific option is specified (Thanks to Jan Dj,Ad(Brv and Andreas Schwab). - * configure: Regenerate. - 2006-11-04 Romain Francoise <romain@orebokech.com> * Makefile.in (bootstrap-clean-before): Fix typo. @@ -68,10 +84,6 @@ * make-dist: Add makefile.w32-in to the man, lispref and lispintro directories. -2006-10-29 Chong Yidong <cyd@stupidchicken.com> - - * configure: Regenerate using autoconf 2.59. - 2006-10-29 Jeramey Crawford <jeramey@jeramey.com> * configure.in: Enable x86-64 OpenBSD compilation. @@ -89,26 +101,12 @@ * README: Bump version number to 22.0.90. - * AUTHORS: Regenerate. - - * configure: Regenerate. - 2006-10-23 Andreas Schwab <schwab@suse.de> * configure.in: Make sure x_default_search_path is always set even when x_libraries is empty, and look in .../share as well for each library directory. - * configure: Regenerate. - -2006-10-03 Kim F. Storm <storm@cua.dk> - - * AUTHORS: Regenerate. - -2006-09-30 Eli Zaretskii <eliz@gnu.org> - - * configure: Regenerate. - 2006-09-28 Kenichi Handa <handa@m17n.org> * configure.in (locallisppath): Don't include leim dir. @@ -124,10 +122,6 @@ * make-dist (EMACS): Exit and fail if the EMACS environment variable is set to something other than an absolute file name. -2006-09-07 Kim F. Storm <storm@cua.dk> - - * AUTHORS: Regenerate. - 2006-08-16 Andreas Schwab <schwab@suse.de> * configure.in (PKG_CHECK_MODULES): Use AS_MESSAGE_LOG_FD instead @@ -143,10 +137,6 @@ $PKG_CONFIG --exists "$2" to config.log. * configure: Regenerate. -2006-07-14 Kim F. Storm <storm@cua.dk> - - * AUTHORS: Regenerate. - 2006-07-08 Richard Stallman <rms@gnu.org> * INSTALL (DETAILED BUILDING AND INSTALLATION): Minor corrections. @@ -158,8 +148,6 @@ 2006-07-08 Eli Zaretskii <eliz@gnu.org> - * configure: Regenerate. - * configure.in (PKG_CHECK_MODULES): Redirect stderr of pkg-config to /dev/null, since we don't need the error message, just the exit status. @@ -185,22 +173,13 @@ * CONTRIBUTE: New file. -2006-06-25 Kim F. Storm <storm@cua.dk> - - * AUTHORS: Regenerate. - 2006-06-24 Eli Zaretskii <eliz@gnu.org> * INSTALL: Mention www.nongnu.org pages that list free Unicode fonts. -2006-06-05 Kim F. Storm <storm@cua.dk> - - * AUTHORS: Regenerate. - 2006-05-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in: Add check for ALSA. - * configure: Regenerate. 2006-05-06 Eli Zaretskii <eliz@gnu.org> @@ -212,10 +191,6 @@ * Copyright (sources/emacs): Update copyright year(s). -2006-04-01 Eli Zaretskii <eliz@gnu.org> - - * configure: Regenerate. - 2006-04-01 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change) * configure.in (HAVE_XAW3D): Disable Xaw3d check if @@ -239,10 +214,6 @@ * Makefile.in (install, uninstall): Add DESTDIR variable to support staged installations. -2006-02-14 Eli Zaretskii <eliz@gnu.org> - - * configure: Regenerate. - 2006-02-14 Richard M. Stallman <rms@gnu.org> * configure.in (s390x-*-linux-gnu*): New configuration. @@ -250,7 +221,6 @@ 2006-01-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in: Require GTK 2.4 or newer. - * configure: Regenerate. 2006-01-29 Michael Olson <mwolson@gnu.org> @@ -274,12 +244,10 @@ * configure.in: Move AC_AIX and AC_GNU_SOURCE before first compile check. - * configure: Regenerate. 2006-01-02 Chong Yidong <cyd@stupidchicken.com> * configure.in: Use -Wno-pointer-sign if available. - * configure: Regenerate. 2005-12-29 Andreas Schwab <schwab@suse.de> @@ -308,14 +276,12 @@ 2005-11-01 Romain Francoise <romain@orebokech.com> * configure.in: Check for gzip. - * configure: Regenerate. * Makefile.in (install): Compress source files. 2005-10-24 Steven Tamm <steventamm@mac.com> * configure.in: Fix darwin386 configuration issue. - * configure: Regenerate. 2005-10-22 Eli Zaretskii <eliz@gnu.org> @@ -342,7 +308,6 @@ * configure.in: Prefer Carbon if --enable-carbon-app or --with-carbon is explicitly specified even when X11 is detected. - * configure: Regenerate. 2005-09-15 Ulf Jasper <ulf.jasper@web.de> @@ -350,16 +315,11 @@ Handle newsticker manual. (info): Add - to commands. -2005-09-11 Kim F. Storm <storm@cua.dk> - - * AUTHORS: Regenerate. - 2005-09-10 Giuseppe Scrivano <gscrivano@gmail.com> Remove the MAXPATHLEN limitations: * configure.in (AC_CHECK_FUNCS): Check for get_current_dir_name. - * configure: Regenerate. 2005-09-09 Eli Zaretskii <eliz@gnu.org> @@ -393,7 +353,6 @@ 2005-07-06 Lute Kamstra <lute@gnu.org> * configure.in: Fix capitalization. - * configure: Regenerate. 2005-07-04 Lute Kamstra <lute@gnu.org> @@ -407,24 +366,20 @@ 2005-06-08 Steven Tamm <steventamm@mac.com> * configure.in: Support Darwin/MacOSX on Intel - * configure: Regenerate. 2005-06-06 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in (HAVE_CANCELMENUTRACKING): New test. - * configure: Regenerate. 2005-05-11 J,Ai(Br,At(Bme Marant <jmarant@marant.org> * configure.in: Add --enable-locallisppath. - * configure: Regenerate. 2005-05-13 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * configure.in: Don't check HAVE_CARBON if HAVE_X11 is set to yes. Check HAVE_CARBON before USE_TOOLKIT_SCROLL_BARS. Define USE_TOOLKIT_SCROLL_BARS by default if HAVE_CARBON is set to yes. - * configure: Regenerate. 2005-05-07 J,Ai(Br,At(Bme Marant <jerome@marant.org> @@ -435,12 +390,10 @@ 2005-04-23 Andreas Schwab <schwab@suse.de> * configure.in: Remove duplicate match for powerpc configuration. - * configure: Regenerate. 2005-04-20 Thien-Thi Nguyen <ttn@gnu.org> * configure.in: Check for <pwd.h>. - * configure: Regenerate. 2005-04-14 Lute Kamstra <lute@gnu.org> @@ -461,12 +414,10 @@ 2005-03-10 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in: Only add XASSERTS to cppflags. - * configure: Regenerate. 2005-03-04 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in: Added --enable-asserts. - * configure: Regenerate. 2005-02-09 Kim F. Storm <storm@cua.dk> @@ -476,7 +427,6 @@ 2005-01-19 Steven Tamm <steventamm@mac.com> * configure.in: Check for <sys/utsname.h>. - * configure: Regenerate. 2004-12-11 Kim F. Storm <storm@cua.dk> @@ -497,7 +447,6 @@ * configure.in: If $HAVE_GTK_FILE_CHOOSER = yes, check for pthreads and define HAVE_GTK_AND_PTHREAD. - * configure: Regenerate. 2004-12-05 Richard M. Stallman <rms@gnu.org> @@ -531,7 +480,6 @@ 2004-11-06 Lars Brinkhoff <lars@nocrew.org> * configure.in: Add check for getrusage. - * configure: Regenerate. 2004-11-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> @@ -540,18 +488,14 @@ (HAVE_GTK): Only set with_toolkit_scroll_bars if not explicitly set to no. - * configure: Rebuild. - 2004-10-20 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in (HAVE_PERSONALITY_LINUX32): New test if PER_LINUX32 can be set. Remove SETARCH test. - * configure: Rebuild. 2004-10-08 Steven Tamm <steventamm@mac.com> * configure.in (HAVE_MALLOC_MALLOC_H): Test for malloc/malloc.h - * configure: Rebuild. 2004-10-06 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> @@ -571,12 +515,10 @@ 2004-09-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in (HAVE_EXECSHIELD): Only define on x86. - * configure: Rebuild. 2004-09-24 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * configure.in: Check for exec-shield. - * configure: Rebuild. 2004-08-06 Andreas Schwab <schwab@suse.de> @@ -715,7 +657,6 @@ * configure.in (powerpc-apple-darwin*): Use ${CC-cc} instead of hardcoding gcc. - * configure: Rebuild. 2003-11-16 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> @@ -792,10 +733,6 @@ * configure.in: Fix XRegisterIMInstantiateCallback check for gcc. -2003-06-26 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> - - * configure: Regenerate. - 2003-06-23 Dave Love <fx@gnu.org> * configure.in: Check for sys/_mbstate_t.h. @@ -896,13 +833,7 @@ * Makefile.in: Use @EXEEXT@ for Cygwin. Use USERNAME if LOGNAME is not set (for Cygwin). - * configure.in: - * configure: Add opsys=cygwin. - -2003-01-29 Kim F. Storm <storm@cua.dk> - - * AUTHORS: Regenerate using new format (after fixing numerous - formatting errors in the ChangeLog files). + * configure.in: Add opsys=cygwin. 2003-01-22 Andreas Schwab <schwab@suse.de> @@ -943,7 +874,7 @@ * Makefile.in (INSTALL_INFO): Get install-info command from configure. - * configure.in: Add tests for install-info + * configure.in: Add tests for install-info. 2002-12-09 Markus Rost <rost@math.ohio-state.edu> @@ -1393,7 +1324,7 @@ 2001-11-06 Sam Steingold <sds@gnu.org> - * configure.in: Added a check for <nlist.h> + * configure.in: Added a check for <nlist.h>. 2001-11-01 Pavel Jan,Am(Bk <Pavel@Janik.cz> @@ -1966,8 +1897,8 @@ 2000-05-05 Gerd Moellmann <gerd@gnu.org> - * make-dist: Make a link for lib-src/grep-changelog. Copy - install-sh. + * make-dist: Make a link for lib-src/grep-changelog. + Copy install-sh. 2000-05-01 Eli Zaretskii <eliz@is.elta.co.il> diff --git a/Makefile.in b/Makefile.in index 634a32efbe5..54c55ea9f62 100644 --- a/Makefile.in +++ b/Makefile.in @@ -110,6 +110,10 @@ exec_prefix=@exec_prefix@ # run directly (like etags). bindir=@bindir@ +# The root of the directory tree for read-only architecture-independent +# data files. ${datadir}, ${infodir} and ${mandir} are based on this. +datarootdir=@datarootdir@ + # Where to install architecture-independent data files. ${lispdir} # and ${etcdir} are subdirectories of this. datadir=@datadir@ @@ -1,4 +1,4 @@ -This directory tree holds version 22.0.91 of GNU Emacs, the extensible, +This directory tree holds version 22.0.92 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 55aa32bd0e9..3b7eb8c4560 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -41,28 +41,56 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem. ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin. (Did we decide that is unreproducible?) -* BUGS - ** make-network-process :nowait t doesn't work for non-local targets - on Windows. - If it cannot be fixed, (featurep 'make-network-process '(:nowait t)) - should return nil. + on Windows. This has been "fixed" for Emacs 22 by defining + BROKEN_NON_BLOCKING_CONNECT in ms-w32.h. -** Document use of gpg-agent -** monnier@iro.umontreal.ca, Nov 24: - gnus-summary-tick-article-forward doesn't work any more? +* BUGS -** Should CC mode set beginning-of-defun-function? +** document gpg-agent. ** Need papers from Rubini for his code in t-mouse.el Sent instructions. -** jpff@cs.bath.ac.uk, Dec 7: Failure to submit second netnews message. +** lennart.borgman.073@student.lu.se, Dec 21: + Saving when the coding system can't code all buffer characters + +** Bug in ESHELL that Wiegley is supposed to fix. + +** How should C-x C-v ask about saving? + +** lennart.borgman.073@student.lu.se, Dec 16: + compilation-previous-error fails if first error is at start of buffer + +** CC mode fixes to be installed. + +** W3 status with latest url package. + +** Fix up the notices in oldXMenu properly. + +** bruno@clisp.org's patches for location of Info file directory. + +** disumu@x3y2z1.net, Nov 22: + URL not following some 302 redirects after recent changes + +** Give recommendations for redefining window manager keys + to avoid interference with Emacs. + +** lennart.borgman.073@student.lu.se, Dec 29: + How global is a define-global-minor-mode mode +He says that customizing such a mode simply does not work. +RMS says that there is no code in the generated defcustom, +or elsewhere in the generated code, to implement setting that variable +through the custom mechanism. + +** b.riefenstahl@turtle-trading.net, Dec 29: + GTK build crashes under X -** kbd_buffer_store_event[_hold] called from outside signal handlers. +** dooglus@gmail.com, Dec 29: 4 week-old pretest bugs + Two GTK version bugs. -** org.el change papers +** pgg bugs reported by rms. * DOCUMENTATION diff --git a/configure b/configure index 645820a18b6..d4f82d57f7e 100755 --- a/configure +++ b/configure @@ -1,25 +1,54 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.61. # -# Copyright (C) 2003 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -29,8 +58,43 @@ else fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -44,18 +108,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -63,157 +128,388 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# CDPATH. +$as_unset CDPATH -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no fi + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in + case $as_dir in /*) - if ("$as_dir/$as_base" -c ' + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || + chmod +x "$as_me.lineno" || { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -222,7 +518,28 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH +exec 7<&0 </dev/null 6>&1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -exec 6>&1 - # # Initializations. # ac_default_prefix=/usr/local +ac_clean_files= ac_config_libobj_dir=. +LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - # Identity of this package. PACKAGE_NAME= PACKAGE_TARNAME= @@ -276,42 +581,52 @@ ac_config_libobj_dir=src # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> -#if HAVE_SYS_TYPES_H +#ifdef HAVE_SYS_TYPES_H # include <sys/types.h> #endif -#if HAVE_SYS_STAT_H +#ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#if STDC_HEADERS +#ifdef STDC_HEADERS # include <stdlib.h> # include <stddef.h> #else -# if HAVE_STDLIB_H +# ifdef HAVE_STDLIB_H # include <stdlib.h> # endif #endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H # include <memory.h> # endif # include <string.h> #endif -#if HAVE_STRINGS_H +#ifdef HAVE_STRINGS_H # include <strings.h> #endif -#if HAVE_INTTYPES_H +#ifdef HAVE_INTTYPES_H # include <inttypes.h> -#else -# if HAVE_STDINT_H -# include <stdint.h> -# endif #endif -#if HAVE_UNISTD_H +#ifdef HAVE_STDINT_H +# include <stdint.h> +#endif +#ifdef HAVE_UNISTD_H # include <unistd.h> #endif" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INSTALL_INFO GZIP_PROG LIBSOUND PKG_CONFIG ALSA_CFLAGS ALSA_LIBS CFLAGS_SOUND SET_MAKE GTK_CFLAGS GTK_LIBS XFT_CFLAGS XFT_LIBS FREETYPE_CFLAGS FREETYPE_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS HAVE_LIBOTF LIBOTF_CFLAGS LIBOTF_LIBS ALLOCA liblockfile LIBOBJS NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS GETOPT_H GETOPTOBJS version configuration canonical srcdir lispdir locallisppath lisppath x_default_search_path etcdir archlibdir docdir bitmapdir gamedir gameuser c_switch_system c_switch_machine LD_SWITCH_X_SITE LD_SWITCH_X_SITE_AUX C_SWITCH_X_SITE X_TOOLKIT_TYPE machfile opsysfile carbon_appdir LTLIBOBJS' ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +XMKMF' + # Initialize some variables set by options. ac_init_help= @@ -338,34 +653,48 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' ac_prev= +ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_option in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -387,33 +716,45 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) + -datadir=* | --datadir=* | --datadi=* | --datad=*) datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; -enable-* | --enable-*) ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid feature name: $ac_feature" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -440,6 +781,12 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -464,13 +811,16 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -535,6 +885,16 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -587,24 +947,20 @@ do -with-* | --with-*) ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid package name: $ac_package" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -635,8 +991,7 @@ Try \`$0 --help' for more information." >&2 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" + eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) @@ -656,27 +1011,19 @@ if test -n "$ac_prev"; then { (exit 1); exit 1; }; } fi -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir do - eval ac_val=$`echo $ac_var` + eval ac_val=\$$ac_var case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } done # There might be people who depend on the old broken behavior: `$host' @@ -703,74 +1050,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$0" : 'X\(//\)[^/]' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done # # Report the --help message. @@ -799,9 +1148,6 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] -_ACEOF - - cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] @@ -819,15 +1165,22 @@ Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sbindir=DIR system admin executables [EPREFIX/sbin] --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -896,126 +1249,96 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a nonstandard directory <lib dir> - CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have - headers in a nonstandard directory <include dir> + LIBS libraries to pass to the linker, e.g. -l<library> + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if + you have headers in a nonstandard directory <include dir> CPP C preprocessor + XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. _ACEOF +ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. - ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue + test -d "$ac_dir" || continue ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd $ac_popdir + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } done fi -test -n "$ac_init_help" && exit 0 +test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF +configure +generated by GNU Autoconf 2.61 -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit 0 + exit fi -exec 5>config.log -cat >&5 <<_ACEOF +cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ _ACEOF +exec 5>>config.log { cat <<_ASUNAME ## --------- ## @@ -1034,7 +1357,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown` /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` @@ -1048,6 +1371,7 @@ do test -z "$as_dir" && as_dir=. echo "PATH: $as_dir" done +IFS=$as_save_IFS } >&5 @@ -1069,7 +1393,6 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= -ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -1080,7 +1403,7 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in @@ -1102,9 +1425,7 @@ do -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " + ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac done @@ -1115,8 +1436,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_ # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -1129,20 +1450,34 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -{ +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} + esac | + sort +) echo cat <<\_ASBOX @@ -1153,22 +1488,28 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## +## ------------------- ## +## File substitutions. ## +## ------------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1180,26 +1521,24 @@ _ASBOX ## ----------- ## _ASBOX echo - sed "/^$/d" confdefs.h | sort + cat confdefs.h echo fi test "$ac_signal" != 0 && echo "$as_me: caught signal $ac_signal" echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status - ' 0 +' 0 for ac_signal in 1 2 13 15; do trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h +rm -f -r conftest* confdefs.h # Predefined preprocessor variables. @@ -1230,14 +1569,17 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} @@ -1253,8 +1595,8 @@ if test -r "$cache_file"; then { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; esac fi else @@ -1263,15 +1605,17 @@ echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +ac_header_list="$ac_header_list sys/time.h" +ac_header_list="$ac_header_list unistd.h" +ac_func_list="$ac_func_list alarm" # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do +for ac_var in $ac_precious_vars; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 @@ -1296,8 +1640,7 @@ echo "$as_me: current value: $ac_new_val" >&2;} # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1314,12 +1657,6 @@ echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start ov { (exit 1); exit 1; }; } fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - @@ -1336,23 +1673,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_config_headers="$ac_config_headers src/config.h:src/config.in" +ac_config_headers="$ac_config_headers src/config.h:src/config.in" test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" + program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" + program_transform_name="s&\$&$program_suffix&;$program_transform_name" # Double any \ or $. echo might interpret backslashes. # By default was `s,x,x', remove it if useless. cat <<\_ACEOF >conftest.sed s/[\\$]/&&/g;s/;s,x,x,$// _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed +rm -f conftest.sed lispdir='${datadir}/emacs/${version}/lisp' @@ -1367,16 +1709,15 @@ gamedir='${localstatedir}/games/emacs' gameuser=games -# Check whether --with-gcc or --without-gcc was given. +# Check whether --with-gcc was given. if test "${with_gcc+set}" = set; then - withval="$with_gcc" + withval=$with_gcc; +fi -fi; -# Check whether --with-pop or --without-pop was given. +# Check whether --with-pop was given. if test "${with_pop+set}" = set; then - withval="$with_pop" - if test "$withval" = yes; then + withval=$with_pop; if test "$withval" = yes; then cat >>confdefs.h <<\_ACEOF #define MAIL_USE_POP 1 _ACEOF @@ -1388,23 +1729,23 @@ else #define MAIL_USE_POP 1 _ACEOF -fi; +fi -# Check whether --with-kerberos or --without-kerberos was given. + +# Check whether --with-kerberos was given. if test "${with_kerberos+set}" = set; then - withval="$with_kerberos" - cat >>confdefs.h <<\_ACEOF + withval=$with_kerberos; cat >>confdefs.h <<\_ACEOF #define KERBEROS 1 _ACEOF -fi; +fi + -# Check whether --with-kerberos5 or --without-kerberos5 was given. +# Check whether --with-kerberos5 was given. if test "${with_kerberos5+set}" = set; then - withval="$with_kerberos5" - if test "${with_kerberos5+set}" = set; then + withval=$with_kerberos5; if test "${with_kerberos5+set}" = set; then if test "${with_kerberos+set}" != set; then with_kerberos=yes cat >>confdefs.h <<\_ACEOF @@ -1418,30 +1759,30 @@ cat >>confdefs.h <<\_ACEOF #define KERBEROS5 1 _ACEOF -fi; +fi -# Check whether --with-hesiod or --without-hesiod was given. -if test "${with_hesiod+set}" = set; then - withval="$with_hesiod" +# Check whether --with-hesiod was given. +if test "${with_hesiod+set}" = set; then + withval=$with_hesiod; cat >>confdefs.h <<\_ACEOF #define HESIOD 1 _ACEOF -fi; +fi -# Check whether --with-sound or --without-sound was given. + +# Check whether --with-sound was given. if test "${with_sound+set}" = set; then - withval="$with_sound" + withval=$with_sound; +fi -fi; -# Check whether --with-x-toolkit or --without-x-toolkit was given. +# Check whether --with-x-toolkit was given. if test "${with_x_toolkit+set}" = set; then - withval="$with_x_toolkit" - case "${withval}" in + withval=$with_x_toolkit; case "${withval}" in y | ye | yes ) val=athena ;; n | no ) val=no ;; l | lu | luc | luci | lucid ) val=lucid ;; @@ -1460,37 +1801,38 @@ Currently, \`yes', \`athena' and \`lucid' are synonyms." >&2;} esac with_x_toolkit=$val -fi; +fi + -# Check whether --with-xpm or --without-xpm was given. +# Check whether --with-xpm was given. if test "${with_xpm+set}" = set; then - withval="$with_xpm" + withval=$with_xpm; +fi -fi; -# Check whether --with-jpeg or --without-jpeg was given. +# Check whether --with-jpeg was given. if test "${with_jpeg+set}" = set; then - withval="$with_jpeg" + withval=$with_jpeg; +fi -fi; -# Check whether --with-tiff or --without-tiff was given. +# Check whether --with-tiff was given. if test "${with_tiff+set}" = set; then - withval="$with_tiff" + withval=$with_tiff; +fi -fi; -# Check whether --with-gif or --without-gif was given. +# Check whether --with-gif was given. if test "${with_gif+set}" = set; then - withval="$with_gif" + withval=$with_gif; +fi -fi; -# Check whether --with-png or --without-png was given. +# Check whether --with-png was given. if test "${with_png+set}" = set; then - withval="$with_png" + withval=$with_png; +fi -fi; # Check whether --with-freetype or --without-freetype was given. if test "${with_freetype+set}" = set; then @@ -1506,38 +1848,38 @@ fi; # Check whether --with-gtk or --without-gtk was given. if test "${with_gtk+set}" = set; then - withval="$with_gtk" + withval=$with_gtk; +fi -fi; -# Check whether --with-pkg-config-prog or --without-pkg-config-prog was given. +# Check whether --with-pkg-config-prog was given. if test "${with_pkg_config_prog+set}" = set; then - withval="$with_pkg_config_prog" + withval=$with_pkg_config_prog; +fi -fi; -# Check whether --with-toolkit-scroll-bars or --without-toolkit-scroll-bars was given. +# Check whether --with-toolkit-scroll-bars was given. if test "${with_toolkit_scroll_bars+set}" = set; then - withval="$with_toolkit_scroll_bars" + withval=$with_toolkit_scroll_bars; +fi -fi; -# Check whether --with-xim or --without-xim was given. +# Check whether --with-xim was given. if test "${with_xim+set}" = set; then - withval="$with_xim" + withval=$with_xim; +fi -fi; -# Check whether --with-carbon or --without-carbon was given. +# Check whether --with-carbon was given. if test "${with_carbon+set}" = set; then - withval="$with_carbon" + withval=$with_carbon; +fi -fi; -# Check whether --enable-carbon-app or --disable-carbon-app was given. +# Check whether --enable-carbon-app was given. if test "${enable_carbon_app+set}" = set; then - enableval="$enable_carbon_app" - carbon_appdir_x=${enableval} -fi; + enableval=$enable_carbon_app; carbon_appdir_x=${enableval} +fi + # Check whether --enable-font-backend or --disable-font-backend was given. if test "${enable_font_backend+set}" = set; then @@ -1549,19 +1891,19 @@ fi; # Check whether --enable-asserts or --disable-asserts was given. if test "${enable_asserts+set}" = set; then - enableval="$enable_asserts" - USE_XASSERTS=$enableval + enableval=$enable_asserts; USE_XASSERTS=$enableval else USE_XASSERTS=no -fi; +fi -# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. + +# Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then - enableval="$enable_maintainer_mode" - USE_MAINTAINER_MODE=$enableval + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no -fi; +fi + if test $USE_MAINTAINER_MODE = yes; then MAINT= else @@ -1569,15 +1911,15 @@ else fi -# Check whether --enable-locallisppath or --disable-locallisppath was given. +# Check whether --enable-locallisppath was given. if test "${enable_locallisppath+set}" = set; then - enableval="$enable_locallisppath" - if test "${enableval}" = "no"; then + enableval=$enable_locallisppath; if test "${enableval}" = "no"; then locallisppath= elif test "${enableval}" != "yes"; then locallisppath=${enableval} fi -fi; +fi + #### Make srcdir absolute, if it isn't already. It's important to #### avoid running the path through pwd unnecessarily, since pwd can @@ -1626,82 +1968,117 @@ fi ### Canonicalize the configuration name. ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break - elif test -f $ac_dir/shtool; then + elif test -f "$ac_dir/shtool"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/shtool install -c" break fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + + +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } +fi fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; +esac host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac canonical=$host @@ -1765,7 +2142,6 @@ _ACEOF m68k-*-netbsd*) # This is somewhat bogus. machine=hp9000s300 ;; - powerpc-apple-netbsd*) machine=macppc ;; mips-*-netbsd*) machine=pmax ;; mipsel-*-netbsd*) machine=pmax ;; mipseb-*-netbsd*) machine=pmax ;; @@ -1774,6 +2150,9 @@ _ACEOF sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; arm-*-netbsd*) machine=arm ;; + x86_64-*-netbsd*) machine=amdx86-64 ;; + hppa-*-netbsd*) machine=hp800 ;; + shle-*-netbsd*) machine=sh3el ;; esac ;; @@ -2751,8 +3130,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2765,32 +3144,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2803,36 +3184,51 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2845,74 +3241,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi + fi fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2926,7 +3282,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2937,6 +3293,7 @@ do fi done done +IFS=$as_save_IFS if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -2954,22 +3311,23 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -2982,36 +3340,38 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3024,29 +3384,45 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + test -n "$ac_ct_CC" && break done - CC=$ac_ct_CC + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi fi fi @@ -3059,21 +3435,35 @@ See \`config.log' for more details." >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 +echo "$as_me:$LINENO: checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 - (eval $ac_compiler --version </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 - (eval $ac_compiler -v </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 - (eval $ac_compiler -V </dev/null >&5) 2>&5 +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } @@ -3098,47 +3488,77 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. break;; * ) break;; esac done +test "$ac_cv_exeext" = no && ac_cv_exeext= + else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3150,19 +3570,21 @@ See \`config.log' for more details." >&2;} fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -3181,22 +3603,27 @@ See \`config.log' for more details." >&2;} fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either +# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -3207,9 +3634,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext break;; * ) break;; esac @@ -3223,14 +3649,14 @@ See \`config.log' for more details." >&2;} fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3250,14 +3676,20 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac @@ -3275,12 +3707,12 @@ fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -3303,50 +3735,49 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_compiler_gnu=no + ac_compiler_gnu=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat >conftest.$ac_ext <<_ACEOF + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -3362,38 +3793,118 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_prog_cc_g=no + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3409,12 +3920,12 @@ else CFLAGS= fi fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_stdc=no + ac_cv_prog_cc_c89=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3448,12 +3959,17 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get + as 'x'. The following induces an error, until -std is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ + that's true only with -std. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -3468,205 +3984,57 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; return 0; } _ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_prog_cc_stdc=$ac_arg -break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break done -rm -f conftest.$ac_ext conftest.$ac_objext +rm -f conftest.$ac_ext CC=$ac_save_CC fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; esac -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include <stdlib.h> -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3712,8 +4080,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3747,24 +4115,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3773,9 +4139,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3785,24 +4152,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3813,6 +4178,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3830,8 +4196,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -3854,24 +4220,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -3880,9 +4244,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3892,24 +4257,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -3920,6 +4283,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -3942,24 +4306,171 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep +else + ac_cv_path_EGREP=$EGREP +fi + + + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" -echo "$as_me:$LINENO: checking for AIX" >&5 -echo $ECHO_N "checking for AIX... $ECHO_C" >&6 + +{ echo "$as_me:$LINENO: checking for AIX" >&5 +echo $ECHO_N "checking for AIX... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -3973,15 +4484,15 @@ cat >>conftest.$ac_ext <<_ACEOF _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "yes" >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define _ALL_SOURCE 1 _ACEOF else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi rm -f conftest* @@ -3994,8 +4505,8 @@ _ACEOF ### Use -Wno-pointer-sign if the compiler supports it -echo "$as_me:$LINENO: checking whether gcc understands -Wno-pointer-sign" >&5 -echo $ECHO_N "checking whether gcc understands -Wno-pointer-sign... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether gcc understands -Wno-pointer-sign" >&5 +echo $ECHO_N "checking whether gcc understands -Wno-pointer-sign... $ECHO_C" >&6; } SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wno-pointer-sign" cat >conftest.$ac_ext <<_ACEOF @@ -4014,55 +4525,51 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then has_option=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -has_option=no + has_option=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $has_option = yes; then C_WARNINGS_SWITCH="-Wno-pointer-sign $C_WARNINGS_SWITCH" fi -echo "$as_me:$LINENO: result: $has_option" >&5 -echo "${ECHO_T}$has_option" >&6 +{ echo "$as_me:$LINENO: result: $has_option" >&5 +echo "${ECHO_T}$has_option" >&6; } CFLAGS="$SAVE_CFLAGS" unset has_option unset SAVE_CFLAGS #### Some other nice autoconf tests. -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 + { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +echo "${ECHO_T}no, using $LN_S" >&6; } fi ac_ext=c @@ -4070,8 +4577,8 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -4105,24 +4612,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4131,9 +4636,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4143,24 +4649,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -4171,6 +4675,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -4188,8 +4693,8 @@ fi else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -4212,24 +4717,22 @@ cat >>conftest.$ac_ext <<_ACEOF #endif Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : else echo "$as_me: failed program was:" >&5 @@ -4238,9 +4741,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi + rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether non-existent headers + # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -4250,24 +4754,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ac_nonexistent.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # Broken: success on invalid input. continue else @@ -4278,6 +4780,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_preproc_ok=: break fi + rm -f conftest.err conftest.$ac_ext done @@ -4312,8 +4815,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4335,7 +4838,7 @@ case $as_dir/ in # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4354,21 +4857,22 @@ case $as_dir/ in ;; esac done +IFS=$as_save_IFS fi if test "${ac_cv_path_install+set}" = set; then INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. + # removed, or if the value is a relative name. INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -4382,8 +4886,8 @@ if test "x$RANLIB" = x; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4396,32 +4900,34 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 + { echo "$as_me:$LINENO: result: $RANLIB" >&5 +echo "${ECHO_T}$RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4434,27 +4940,41 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 + { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +echo "${ECHO_T}$ac_ct_RANLIB" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - RANLIB=$ac_ct_RANLIB + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi else RANLIB="$ac_cv_prog_RANLIB" fi @@ -4462,8 +4982,8 @@ fi fi # Extract the first word of "install-info", so it can be a program name with args. set dummy install-info; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_INSTALL_INFO+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4478,31 +4998,32 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INSTALL_INFO="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi INSTALL_INFO=$ac_cv_path_INSTALL_INFO - if test -n "$INSTALL_INFO"; then - echo "$as_me:$LINENO: result: $INSTALL_INFO" >&5 -echo "${ECHO_T}$INSTALL_INFO" >&6 + { echo "$as_me:$LINENO: result: $INSTALL_INFO" >&5 +echo "${ECHO_T}$INSTALL_INFO" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "install-info", so it can be a program name with args. set dummy install-info; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_INSTALL_INFO+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4517,31 +5038,32 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INSTALL_INFO="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi INSTALL_INFO=$ac_cv_path_INSTALL_INFO - if test -n "$INSTALL_INFO"; then - echo "$as_me:$LINENO: result: $INSTALL_INFO" >&5 -echo "${ECHO_T}$INSTALL_INFO" >&6 + { echo "$as_me:$LINENO: result: $INSTALL_INFO" >&5 +echo "${ECHO_T}$INSTALL_INFO" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "install-info", so it can be a program name with args. set dummy install-info; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_INSTALL_INFO+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4556,32 +5078,33 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INSTALL_INFO="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_INSTALL_INFO" && ac_cv_path_INSTALL_INFO=":" ;; esac fi INSTALL_INFO=$ac_cv_path_INSTALL_INFO - if test -n "$INSTALL_INFO"; then - echo "$as_me:$LINENO: result: $INSTALL_INFO" >&5 -echo "${ECHO_T}$INSTALL_INFO" >&6 + { echo "$as_me:$LINENO: result: $INSTALL_INFO" >&5 +echo "${ECHO_T}$INSTALL_INFO" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + # Extract the first word of "gzip", so it can be a program name with args. set dummy gzip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_GZIP_PROG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4596,29 +5119,30 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GZIP_PROG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS ;; esac fi GZIP_PROG=$ac_cv_path_GZIP_PROG - if test -n "$GZIP_PROG"; then - echo "$as_me:$LINENO: result: $GZIP_PROG" >&5 -echo "${ECHO_T}$GZIP_PROG" >&6 + { echo "$as_me:$LINENO: result: $GZIP_PROG" >&5 +echo "${ECHO_T}$GZIP_PROG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x then ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" @@ -4637,44 +5161,41 @@ else LDFLAGS="$LDFLAGS -znocombreloc" fi -echo "$as_me:$LINENO: checking for -znocombreloc" >&5 -echo $ECHO_N "checking for -znocombreloc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for -znocombreloc" >&5 +echo $ECHO_N "checking for -znocombreloc... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF main(){return 0;} _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LDFLAGS=$late_LDFLAGS - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + LDFLAGS=$late_LDFLAGS + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext #### Extract some information from the operating system and machine files. @@ -4828,15 +5349,15 @@ fi -# Check whether --enable-largefile or --disable-largefile was given. +# Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then - enableval="$enable_largefile" + enableval=$enable_largefile; +fi -fi; if test "$enable_largefile" != no; then - echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 -echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4844,8 +5365,8 @@ else if test "$GCC" != yes; then ac_save_CC=$CC while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4869,84 +5390,77 @@ main () return 0; } _ACEOF - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext - CC="$CC -n32" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 + +rm -f core conftest.err conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sys_largefile_CC=' -n32'; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext + +rm -f core conftest.err conftest.$ac_objext break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do - ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4971,34 +5485,31 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_file_offset_bits=no; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5024,54 +5535,53 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sys_file_offset_bits=64; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_file_offset_bits=unknown break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 -echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 -if test "$ac_cv_sys_file_offset_bits" != no; then - +{ echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6; } +case $ac_cv_sys_file_offset_bits in #( + no | unknown) ;; + *) cat >>confdefs.h <<_ACEOF #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits _ACEOF - -fi +;; +esac rm -f conftest* - echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 -echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 + if test $ac_cv_sys_file_offset_bits = unknown; then + { echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do - ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5096,34 +5606,31 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_sys_large_files=no; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5149,47 +5656,47 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sys_large_files=1; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_cv_sys_large_files=unknown break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 -echo "${ECHO_T}$ac_cv_sys_large_files" >&6 -if test "$ac_cv_sys_large_files" != no; then - +{ echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6; } +case $ac_cv_sys_large_files in #( + no | unknown) ;; + *) cat >>confdefs.h <<_ACEOF #define _LARGE_FILES $ac_cv_sys_large_files _ACEOF - -fi +;; +esac rm -f conftest* + fi fi @@ -5212,8 +5719,8 @@ esac if test "${with_sound}" != "no"; then # Sound support for GNU/Linux and the free BSDs. - echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5237,35 +5744,31 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -5321,6 +5824,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ctype.h> +#include <stdlib.h> #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -5340,18 +5844,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -5364,12 +5877,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -5392,9 +5907,9 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -5408,38 +5923,35 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -5456,18 +5968,19 @@ done for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5478,41 +5991,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5521,24 +6030,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -5546,9 +6053,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -5572,25 +6080,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -5603,8 +6105,8 @@ fi done # Emulation library used on NetBSD. - echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5 -echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5 +echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6; } if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5617,56 +6119,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char _oss_ioctl (); int main () { -_oss_ioctl (); +return _oss_ioctl (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ossaudio__oss_ioctl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ossaudio__oss_ioctl=no + ac_cv_lib_ossaudio__oss_ioctl=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 -echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5 +echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6; } if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then LIBSOUND=-lossaudio else @@ -5686,8 +6185,8 @@ fi if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -5702,28 +6201,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -5731,28 +6231,28 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5 -echo $ECHO_N "checking for $ALSA_MODULES... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5 +echo $ECHO_N "checking for $ALSA_MODULES... $ECHO_C" >&6; } if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5 -echo $ECHO_N "checking ALSA_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5 +echo $ECHO_N "checking ALSA_CFLAGS... $ECHO_C" >&6; } ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"` - echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 -echo "${ECHO_T}$ALSA_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 +echo "${ECHO_T}$ALSA_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking ALSA_LIBS" >&5 -echo $ECHO_N "checking ALSA_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking ALSA_LIBS" >&5 +echo $ECHO_N "checking ALSA_LIBS... $ECHO_C" >&6; } ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"` - echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 -echo "${ECHO_T}$ALSA_LIBS" >&6 + { echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 +echo "${ECHO_T}$ALSA_LIBS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } ALSA_CFLAGS="" ALSA_LIBS="" ## If we have a custom action on failure, don't print errors, but @@ -5776,6 +6276,103 @@ echo "${ECHO_T}no" >&6 fi if test $HAVE_ALSA = yes; then + SAVE_CFLAGS="$CFLAGS" + SAVE_LDFLAGS="$LDFLAGS" + CFLAGS="$ALSA_CFLAGS $CFLAGS" + LDFLAGS="$ALSA_LIBS $LDFLAGS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <asoundlib.h> +int +main () +{ +snd_lib_error_set_handler (0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + emacs_alsa_normal=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + emacs_alsa_normal=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$emacs_alsa_normal" != yes; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <alsa/asoundlib.h> +int +main () +{ +snd_lib_error_set_handler (0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + emacs_alsa_subdir=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + emacs_alsa_subdir=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$emacs_alsa_subdir" != yes; then + { { echo "$as_me:$LINENO: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&5 +echo "$as_me: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&2;} + { (exit 1); exit 1; }; } + fi + ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" + fi + + CFLAGS="$SAVE_CFLAGS" + LDFLAGS="$SAVE_LDFLAGS" LIBSOUND="$LIBSOUND $ALSA_LIBS" CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" @@ -5783,6 +6380,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_ALSA 1 _ACEOF + fi fi @@ -5819,18 +6417,19 @@ for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \ sys/utsname.h pwd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5841,41 +6440,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5884,24 +6479,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -5909,9 +6502,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -5935,25 +6529,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -5966,8 +6554,8 @@ fi done -echo "$as_me:$LINENO: checking if personality LINUX32 can be set" >&5 -echo $ECHO_N "checking if personality LINUX32 can be set... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking if personality LINUX32 can be set" >&5 +echo $ECHO_N "checking if personality LINUX32 can be set... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5984,37 +6572,33 @@ personality (PER_LINUX32) } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_personality_linux32=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_personality_linux32=no + emacs_cv_personality_linux32=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $emacs_cv_personality_linux32" >&5 -echo "${ECHO_T}$emacs_cv_personality_linux32" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $emacs_cv_personality_linux32" >&5 +echo "${ECHO_T}$emacs_cv_personality_linux32" >&6; } if test $emacs_cv_personality_linux32 = yes; then @@ -6028,9 +6612,9 @@ fi for ac_header in term.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -6041,24 +6625,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 @@ -6066,10 +6648,12 @@ sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" fi + rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -6079,8 +6663,8 @@ fi done -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6104,35 +6688,31 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_stdc=no + ac_cv_header_stdc=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. @@ -6188,6 +6768,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <ctype.h> +#include <stdlib.h> #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -6207,18 +6788,27 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); + return 2; + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -6231,12 +6821,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -6245,8 +6837,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6270,38 +6862,34 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_time=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_time=no + ac_cv_header_time=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6; } if test $ac_cv_header_time = yes; then cat >>confdefs.h <<\_ACEOF @@ -6310,8 +6898,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5 -echo $ECHO_N "checking whether sys_siglist is declared... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5 +echo $ECHO_N "checking whether sys_siglist is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_sys_siglist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6326,7 +6914,7 @@ int main () { #ifndef sys_siglist - char *p = (char *) sys_siglist; + (void) sys_siglist; #endif ; @@ -6334,38 +6922,34 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_have_decl_sys_siglist=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_decl_sys_siglist=no + ac_cv_have_decl_sys_siglist=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5 -echo "${ECHO_T}$ac_cv_have_decl_sys_siglist" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5 +echo "${ECHO_T}$ac_cv_have_decl_sys_siglist" >&6; } if test $ac_cv_have_decl_sys_siglist = yes; then cat >>confdefs.h <<_ACEOF @@ -6384,8 +6968,8 @@ fi if test $ac_cv_have_decl_sys_siglist != yes; then # For Tru64, at least: - echo "$as_me:$LINENO: checking whether __sys_siglist is declared" >&5 -echo $ECHO_N "checking whether __sys_siglist is declared... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether __sys_siglist is declared" >&5 +echo $ECHO_N "checking whether __sys_siglist is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl___sys_siglist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6400,7 +6984,7 @@ int main () { #ifndef __sys_siglist - char *p = (char *) __sys_siglist; + (void) __sys_siglist; #endif ; @@ -6408,38 +6992,34 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_have_decl___sys_siglist=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_decl___sys_siglist=no + ac_cv_have_decl___sys_siglist=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_decl___sys_siglist" >&5 -echo "${ECHO_T}$ac_cv_have_decl___sys_siglist" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___sys_siglist" >&5 +echo "${ECHO_T}$ac_cv_have_decl___sys_siglist" >&6; } if test $ac_cv_have_decl___sys_siglist = yes; then cat >>confdefs.h <<_ACEOF @@ -6464,8 +7044,8 @@ _ACEOF fi fi -echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6478,7 +7058,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/types.h> #include <sys/wait.h> #ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) #endif #ifndef WIFEXITED # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) @@ -6495,38 +7075,34 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_sys_wait_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_header_sys_wait_h=no + ac_cv_header_sys_wait_h=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then cat >>confdefs.h <<\_ACEOF @@ -6536,8 +7112,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct utimbuf" >&5 -echo $ECHO_N "checking for struct utimbuf... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct utimbuf" >&5 +echo $ECHO_N "checking for struct utimbuf... $ECHO_C" >&6; } if test "${emacs_cv_struct_utimbuf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6569,38 +7145,34 @@ static struct utimbuf x; x.actime = x.modtime; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_struct_utimbuf=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_struct_utimbuf=no + emacs_cv_struct_utimbuf=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_struct_utimbuf" >&5 -echo "${ECHO_T}$emacs_cv_struct_utimbuf" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_struct_utimbuf" >&5 +echo "${ECHO_T}$emacs_cv_struct_utimbuf" >&6; } if test $emacs_cv_struct_utimbuf = yes; then cat >>confdefs.h <<\_ACEOF @@ -6609,8 +7181,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 +echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6622,56 +7194,44 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/types.h> #include <signal.h> -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif int main () { -int i; +return *(signal (0, 0)) (0) == 1; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_type_signal=void + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_signal=int else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_signal=int + ac_cv_type_signal=void fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 +echo "${ECHO_T}$ac_cv_type_signal" >&6; } cat >>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal @@ -6679,8 +7239,8 @@ _ACEOF -echo "$as_me:$LINENO: checking for speed_t" >&5 -echo $ECHO_N "checking for speed_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for speed_t" >&5 +echo $ECHO_N "checking for speed_t... $ECHO_C" >&6; } if test "${emacs_cv_speed_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6700,38 +7260,34 @@ speed_t x = 1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_speed_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_speed_t=no + emacs_cv_speed_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_speed_t" >&5 -echo "${ECHO_T}$emacs_cv_speed_t" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_speed_t" >&5 +echo "${ECHO_T}$emacs_cv_speed_t" >&6; } if test $emacs_cv_speed_t = yes; then cat >>confdefs.h <<\_ACEOF @@ -6740,8 +7296,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct timeval" >&5 -echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct timeval" >&5 +echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6; } if test "${emacs_cv_struct_timeval+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6770,38 +7326,34 @@ static struct timeval x; x.tv_sec = x.tv_usec; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_struct_timeval=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_struct_timeval=no + emacs_cv_struct_timeval=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_struct_timeval" >&5 -echo "${ECHO_T}$emacs_cv_struct_timeval" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_struct_timeval" >&5 +echo "${ECHO_T}$emacs_cv_struct_timeval" >&6; } HAVE_TIMEVAL=$emacs_cv_struct_timeval if test $emacs_cv_struct_timeval = yes; then @@ -6811,8 +7363,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct exception" >&5 -echo $ECHO_N "checking for struct exception... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct exception" >&5 +echo $ECHO_N "checking for struct exception... $ECHO_C" >&6; } if test "${emacs_cv_struct_exception+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -6832,38 +7384,34 @@ static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 1; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_struct_exception=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_struct_exception=no + emacs_cv_struct_exception=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_struct_exception" >&5 -echo "${ECHO_T}$emacs_cv_struct_exception" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_struct_exception" >&5 +echo "${ECHO_T}$emacs_cv_struct_exception" >&6; } HAVE_EXCEPTION=$emacs_cv_struct_exception if test $emacs_cv_struct_exception != yes; then @@ -6877,18 +7425,19 @@ fi for ac_header in sys/socket.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6899,41 +7448,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -6942,24 +7487,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -6967,9 +7510,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -6993,25 +7537,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -7027,9 +7565,9 @@ done for ac_header in net/if.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -7046,38 +7584,35 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_Header=no" + eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -7088,8 +7623,8 @@ fi done -echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 +echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } if test "${ac_cv_struct_tm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7105,44 +7640,42 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -struct tm *tp; tp->tm_sec; +struct tm tm; + int *p = &tm.tm_sec; + return !p; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_struct_tm=time.h else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_struct_tm=sys/time.h + ac_cv_struct_tm=sys/time.h fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 -echo "${ECHO_T}$ac_cv_struct_tm" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 +echo "${ECHO_T}$ac_cv_struct_tm" >&6; } if test $ac_cv_struct_tm = sys/time.h; then cat >>confdefs.h <<\_ACEOF @@ -7151,8 +7684,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5 -echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5 +echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; } if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7177,33 +7710,28 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_tm_tm_zone=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7224,40 +7752,37 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_tm_tm_zone=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_tm_tm_zone=no + ac_cv_member_struct_tm_tm_zone=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 -echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 +echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; } if test $ac_cv_member_struct_tm_tm_zone = yes; then cat >>confdefs.h <<_ACEOF @@ -7274,8 +7799,77 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - echo "$as_me:$LINENO: checking for tzname" >&5 -echo $ECHO_N "checking for tzname... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether tzname is declared" >&5 +echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; } +if test "${ac_cv_have_decl_tzname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <time.h> + +int +main () +{ +#ifndef tzname + (void) tzname; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl_tzname=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl_tzname=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5 +echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; } +if test $ac_cv_have_decl_tzname = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_TZNAME 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_TZNAME 0 +_ACEOF + + +fi + + + { echo "$as_me:$LINENO: checking for tzname" >&5 +echo $ECHO_N "checking for tzname... $ECHO_C" >&6; } if test "${ac_cv_var_tzname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7286,52 +7880,49 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <time.h> -#ifndef tzname /* For SGI. */ -extern char *tzname[]; /* RS6000 and others reject char **tzname. */ +#if !HAVE_DECL_TZNAME +extern char *tzname[]; #endif int main () { -atoi(*tzname); +return tzname[0][0]; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_var_tzname=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_var_tzname=no + ac_cv_var_tzname=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5 -echo "${ECHO_T}$ac_cv_var_tzname" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5 +echo "${ECHO_T}$ac_cv_var_tzname" >&6; } if test $ac_cv_var_tzname = yes; then cat >>confdefs.h <<\_ACEOF @@ -7341,8 +7932,8 @@ _ACEOF fi fi -echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5 -echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct tm.tm_gmtoff" >&5 +echo $ECHO_N "checking for struct tm.tm_gmtoff... $ECHO_C" >&6; } if test "${ac_cv_member_struct_tm_tm_gmtoff+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7365,33 +7956,28 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_tm_tm_gmtoff=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7410,40 +7996,37 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_tm_tm_gmtoff=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_tm_tm_gmtoff=no + ac_cv_member_struct_tm_tm_gmtoff=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5 -echo "${ECHO_T}$ac_cv_member_struct_tm_tm_gmtoff" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_gmtoff" >&5 +echo "${ECHO_T}$ac_cv_member_struct_tm_tm_gmtoff" >&6; } if test $ac_cv_member_struct_tm_tm_gmtoff = yes; then cat >>confdefs.h <<\_ACEOF @@ -7452,8 +8035,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct ifreq.ifr_flags" >&5 -echo $ECHO_N "checking for struct ifreq.ifr_flags... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct ifreq.ifr_flags" >&5 +echo $ECHO_N "checking for struct ifreq.ifr_flags... $ECHO_C" >&6; } if test "${ac_cv_member_struct_ifreq_ifr_flags+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7482,33 +8065,28 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_flags=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7533,40 +8111,37 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_flags=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_ifreq_ifr_flags=no + ac_cv_member_struct_ifreq_ifr_flags=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_flags" >&5 -echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_flags" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_flags" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_flags" >&6; } if test $ac_cv_member_struct_ifreq_ifr_flags = yes; then cat >>confdefs.h <<_ACEOF @@ -7575,8 +8150,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct ifreq.ifr_hwaddr" >&5 -echo $ECHO_N "checking for struct ifreq.ifr_hwaddr... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct ifreq.ifr_hwaddr" >&5 +echo $ECHO_N "checking for struct ifreq.ifr_hwaddr... $ECHO_C" >&6; } if test "${ac_cv_member_struct_ifreq_ifr_hwaddr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7605,33 +8180,28 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_hwaddr=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7656,40 +8226,37 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_hwaddr=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_ifreq_ifr_hwaddr=no + ac_cv_member_struct_ifreq_ifr_hwaddr=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_hwaddr" >&5 -echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_hwaddr" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_hwaddr" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_hwaddr" >&6; } if test $ac_cv_member_struct_ifreq_ifr_hwaddr = yes; then cat >>confdefs.h <<_ACEOF @@ -7698,8 +8265,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct ifreq.ifr_netmask" >&5 -echo $ECHO_N "checking for struct ifreq.ifr_netmask... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct ifreq.ifr_netmask" >&5 +echo $ECHO_N "checking for struct ifreq.ifr_netmask... $ECHO_C" >&6; } if test "${ac_cv_member_struct_ifreq_ifr_netmask+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7728,33 +8295,28 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_netmask=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7779,40 +8341,37 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_netmask=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_ifreq_ifr_netmask=no + ac_cv_member_struct_ifreq_ifr_netmask=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_netmask" >&5 -echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_netmask" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_netmask" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_netmask" >&6; } if test $ac_cv_member_struct_ifreq_ifr_netmask = yes; then cat >>confdefs.h <<_ACEOF @@ -7821,8 +8380,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct ifreq.ifr_broadaddr" >&5 -echo $ECHO_N "checking for struct ifreq.ifr_broadaddr... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct ifreq.ifr_broadaddr" >&5 +echo $ECHO_N "checking for struct ifreq.ifr_broadaddr... $ECHO_C" >&6; } if test "${ac_cv_member_struct_ifreq_ifr_broadaddr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7851,33 +8410,28 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_broadaddr=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -7902,40 +8456,37 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_broadaddr=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_ifreq_ifr_broadaddr=no + ac_cv_member_struct_ifreq_ifr_broadaddr=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_broadaddr" >&5 -echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_broadaddr" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_broadaddr" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_broadaddr" >&6; } if test $ac_cv_member_struct_ifreq_ifr_broadaddr = yes; then cat >>confdefs.h <<_ACEOF @@ -7944,8 +8495,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for struct ifreq.ifr_addr" >&5 -echo $ECHO_N "checking for struct ifreq.ifr_addr... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for struct ifreq.ifr_addr" >&5 +echo $ECHO_N "checking for struct ifreq.ifr_addr... $ECHO_C" >&6; } if test "${ac_cv_member_struct_ifreq_ifr_addr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -7974,33 +8525,28 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_addr=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -8025,40 +8571,37 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_ifreq_ifr_addr=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_ifreq_ifr_addr=no + ac_cv_member_struct_ifreq_ifr_addr=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_addr" >&5 -echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_addr" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_ifreq_ifr_addr" >&5 +echo "${ECHO_T}$ac_cv_member_struct_ifreq_ifr_addr" >&6; } if test $ac_cv_member_struct_ifreq_ifr_addr = yes; then cat >>confdefs.h <<_ACEOF @@ -8070,11 +8613,11 @@ fi -echo "$as_me:$LINENO: checking for function prototypes" >&5 -echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6 -if test "$ac_cv_prog_cc_stdc" != no; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +{ echo "$as_me:$LINENO: checking for function prototypes" >&5 +echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6; } +if test "$ac_cv_prog_cc_c89" != no; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define PROTOTYPES 1 @@ -8086,12 +8629,12 @@ cat >>confdefs.h <<\_ACEOF _ACEOF else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking for working volatile" >&5 -echo $ECHO_N "checking for working volatile... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for working volatile" >&5 +echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; } if test "${ac_cv_c_volatile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8107,44 +8650,41 @@ main () { volatile int x; -int * volatile y; +int * volatile y = (int *) 0; +return !x && !y; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_c_volatile=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_volatile=no + ac_cv_c_volatile=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5 -echo "${ECHO_T}$ac_cv_c_volatile" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5 +echo "${ECHO_T}$ac_cv_c_volatile" >&6; } if test $ac_cv_c_volatile = no; then cat >>confdefs.h <<\_ACEOF @@ -8153,8 +8693,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 +echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } if test "${ac_cv_c_const+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8172,10 +8712,10 @@ main () #ifndef __cplusplus /* Ultrix mips cc rejects this. */ typedef int charset[2]; - const charset x; + const charset cs; /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; + char const *const *pcpcc; + char **ppc; /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; @@ -8184,16 +8724,17 @@ main () an arm of an if-expression whose if-part is not a constant expression */ const char *g = "string"; - ccp = &g + (g ? g-g : 0); + pcpcc = &g + (g ? g-g : 0); /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; + ++pcpcc; + ppc = (char**) pcpcc; + pcpcc = (char const *const *) ppc; { /* SCO 3.2v4 cc rejects this. */ char *t; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; + if (s) return 0; } { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ int x[] = {25, 17}; @@ -8212,7 +8753,9 @@ main () } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; + if (!foo) return 0; } + return !cs[0] && !zero.x; #endif ; @@ -8220,38 +8763,34 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_c_const=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_c_const=no + ac_cv_c_const=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 +echo "${ECHO_T}$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then cat >>confdefs.h <<\_ACEOF @@ -8260,8 +8799,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for void * support" >&5 -echo $ECHO_N "checking for void * support... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for void * support" >&5 +echo $ECHO_N "checking for void * support... $ECHO_C" >&6; } if test "${emacs_cv_void_star+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8281,38 +8820,34 @@ void * foo; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_void_star=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_void_star=no + emacs_cv_void_star=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_void_star" >&5 -echo "${ECHO_T}$emacs_cv_void_star" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_void_star" >&5 +echo "${ECHO_T}$emacs_cv_void_star" >&6; } if test $emacs_cv_void_star = yes; then cat >>confdefs.h <<\_ACEOF #define POINTER_TYPE void @@ -8329,38 +8864,39 @@ fi -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="$(MAKE)"' + @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac rm -f conftest.make fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi -echo "$as_me:$LINENO: checking for long file names" >&5 -echo $ECHO_N "checking for long file names... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for long file names" >&5 +echo $ECHO_N "checking for long file names... $ECHO_C" >&6; } if test "${ac_cv_sys_long_file_names+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8369,37 +8905,30 @@ else # . the current directory, where building will happen # $prefix/lib where we will be installing things # $exec_prefix/lib likewise -# eval it to expand exec_prefix. # $TMPDIR if set, where it might want to write temporary files -# if $TMPDIR is not set: # /tmp where it might want to write temporary files # /var/tmp likewise # /usr/tmp likewise -if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then - ac_tmpdirs=$TMPDIR -else - ac_tmpdirs='/tmp /var/tmp /usr/tmp' -fi -for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do - test -d $ac_dir || continue - test -w $ac_dir || continue # It is less confusing to not echo anything here. +for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do + # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib + # in the usual case where exec_prefix is '${prefix}'. + case $ac_dir in #( + . | /* | ?:[\\/]*) ;; #( + *) continue;; + esac + test -w "$ac_dir/." || continue # It is less confusing to not echo anything here. ac_xdir=$ac_dir/cf$$ - (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue + (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue ac_tf1=$ac_xdir/conftest9012345 ac_tf2=$ac_xdir/conftest9012346 - (echo 1 >$ac_tf1) 2>/dev/null - (echo 2 >$ac_tf2) 2>/dev/null - ac_val=`cat $ac_tf1 2>/dev/null` - if test ! -f $ac_tf1 || test "$ac_val" != 1; then + touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" || ac_cv_sys_long_file_names=no - rm -rf $ac_xdir 2>/dev/null - break - fi - rm -rf $ac_xdir 2>/dev/null + rm -f -r "$ac_xdir" 2>/dev/null + test $ac_cv_sys_long_file_names = no && break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 -echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 +echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6; } if test $ac_cv_sys_long_file_names = yes; then cat >>confdefs.h <<\_ACEOF @@ -8411,44 +8940,49 @@ fi #### Choose a window system. -echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } -# Check whether --with-x or --without-x was given. +# Check whether --with-x was given. if test "${with_x+set}" = set; then - withval="$with_x" + withval=$with_x; +fi -fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. have_x=disabled else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then + case $x_includes,$x_libraries in #( + *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +echo "$as_me: error: Cannot use X directory names containing '" >&2;} + { (exit 1); exit 1; }; };; #( + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir +rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' +_ACEOF + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break fi done @@ -8456,7 +8990,7 @@ _ACEOF # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in - /usr/include) ;; + /usr/include) ac_x_includes= ;; *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in @@ -8465,7 +8999,7 @@ _ACEOF esac fi cd .. - rm -fr conftest.dir + rm -f -r conftest.dir fi # Standard set of common directories for X headers. @@ -8506,7 +9040,7 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Intrinsic.h. + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -8514,26 +9048,24 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Intrinsic.h> +#include <X11/Xlib.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # We can compile using X headers with no special include directory. ac_x_includes= else @@ -8541,12 +9073,13 @@ else sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi done fi + rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = no @@ -8555,44 +9088,40 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <X11/Intrinsic.h> +#include <X11/Xlib.h> int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= @@ -8600,49 +9129,54 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -LIBS=$ac_save_LIBS + LIBS=$ac_save_LIBS for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 fi done done fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi +case $ac_x_includes,$ac_x_libraries in #( + no,* | *,no | *\'*) + # Didn't find X, or a directory has "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" +esac fi - - fi +;; #( + *) have_x=yes;; + esac eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. test "x$x_includes" = xNONE && x_includes=$ac_x_includes test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" + { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then @@ -8702,17 +9236,17 @@ fi HAVE_CARBON=no if test "${with_carbon}" != no; then if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then - echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5 -echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5 +echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; } if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5 -echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5 +echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5 -echo $ECHO_N "checking Carbon/Carbon.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking Carbon/Carbon.h usability" >&5 +echo $ECHO_N "checking Carbon/Carbon.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8723,41 +9257,37 @@ $ac_includes_default #include <Carbon/Carbon.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5 -echo $ECHO_N "checking Carbon/Carbon.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking Carbon/Carbon.h presence" >&5 +echo $ECHO_N "checking Carbon/Carbon.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -8766,24 +9296,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <Carbon/Carbon.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -8791,9 +9319,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -8817,25 +9346,18 @@ echo "$as_me: WARNING: Carbon/Carbon.h: section \"Present But Cannot Be Comp echo "$as_me: WARNING: Carbon/Carbon.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: Carbon/Carbon.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5 -echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5 +echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; } if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_Carbon_Carbon_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5 -echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5 +echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; } fi if test $ac_cv_header_Carbon_Carbon_h = yes; then @@ -8909,8 +9431,8 @@ UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`" # Assume not, until told otherwise. GNU_MALLOC=yes doug_lea_malloc=yes -echo "$as_me:$LINENO: checking for malloc_get_state" >&5 -echo $ECHO_N "checking for malloc_get_state... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for malloc_get_state" >&5 +echo $ECHO_N "checking for malloc_get_state... $ECHO_C" >&6; } if test "${ac_cv_func_malloc_get_state+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8937,76 +9459,67 @@ cat >>conftest.$ac_ext <<_ACEOF #undef malloc_get_state -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char malloc_get_state (); /* 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_malloc_get_state) || defined (__stub___malloc_get_state) +#if defined __stub_malloc_get_state || defined __stub___malloc_get_state choke me -#else -char (*f) () = malloc_get_state; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != malloc_get_state; +return malloc_get_state (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_malloc_get_state=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_malloc_get_state=no + ac_cv_func_malloc_get_state=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_malloc_get_state" >&5 -echo "${ECHO_T}$ac_cv_func_malloc_get_state" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_get_state" >&5 +echo "${ECHO_T}$ac_cv_func_malloc_get_state" >&6; } if test $ac_cv_func_malloc_get_state = yes; then : else doug_lea_malloc=no fi -echo "$as_me:$LINENO: checking for malloc_set_state" >&5 -echo $ECHO_N "checking for malloc_set_state... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for malloc_set_state" >&5 +echo $ECHO_N "checking for malloc_set_state... $ECHO_C" >&6; } if test "${ac_cv_func_malloc_set_state+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9033,76 +9546,67 @@ cat >>conftest.$ac_ext <<_ACEOF #undef malloc_set_state -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char malloc_set_state (); /* 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_malloc_set_state) || defined (__stub___malloc_set_state) +#if defined __stub_malloc_set_state || defined __stub___malloc_set_state choke me -#else -char (*f) () = malloc_set_state; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != malloc_set_state; +return malloc_set_state (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_malloc_set_state=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_malloc_set_state=no + ac_cv_func_malloc_set_state=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_malloc_set_state" >&5 -echo "${ECHO_T}$ac_cv_func_malloc_set_state" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_malloc_set_state" >&5 +echo "${ECHO_T}$ac_cv_func_malloc_set_state" >&6; } if test $ac_cv_func_malloc_set_state = yes; then : else doug_lea_malloc=no fi -echo "$as_me:$LINENO: checking whether __after_morecore_hook exists" >&5 -echo $ECHO_N "checking whether __after_morecore_hook exists... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether __after_morecore_hook exists" >&5 +echo $ECHO_N "checking whether __after_morecore_hook exists... $ECHO_C" >&6; } if test "${emacs_cv_var___after_morecore_hook+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9122,39 +9626,36 @@ __after_morecore_hook = 0 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then emacs_cv_var___after_morecore_hook=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_var___after_morecore_hook=no + emacs_cv_var___after_morecore_hook=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_var___after_morecore_hook" >&5 -echo "${ECHO_T}$emacs_cv_var___after_morecore_hook" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_var___after_morecore_hook" >&5 +echo "${ECHO_T}$emacs_cv_var___after_morecore_hook" >&6; } if test $emacs_cv_var___after_morecore_hook = no; then doug_lea_malloc=no fi @@ -9185,18 +9686,19 @@ fi for ac_header in stdlib.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9207,41 +9709,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9250,24 +9748,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -9275,9 +9771,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -9301,25 +9798,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -9335,9 +9826,9 @@ done for ac_func in getpagesize do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -9363,68 +9854,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -9433,8 +9916,8 @@ _ACEOF fi done -echo "$as_me:$LINENO: checking for working mmap" >&5 -echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for working mmap" >&5 +echo $ECHO_N "checking for working mmap... $ECHO_C" >&6; } if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9476,21 +9959,21 @@ $ac_includes_default #include <fcntl.h> #include <sys/mman.h> -#if !STDC_HEADERS && !HAVE_STDLIB_H +#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H char *malloc (); #endif /* This mess was copied from the GNU getpagesize.h. */ -#if !HAVE_GETPAGESIZE +#ifndef HAVE_GETPAGESIZE /* Assume that all systems that can run configure have sys/param.h. */ -# if !HAVE_SYS_PARAM_H +# ifndef HAVE_SYS_PARAM_H # define HAVE_SYS_PARAM_H 1 # endif # ifdef _SC_PAGESIZE # define getpagesize() sysconf(_SC_PAGESIZE) # else /* no _SC_PAGESIZE */ -# if HAVE_SYS_PARAM_H +# ifdef HAVE_SYS_PARAM_H # include <sys/param.h> # ifdef EXEC_PAGESIZE # define getpagesize() EXEC_PAGESIZE @@ -9529,15 +10012,15 @@ main () /* First, make a file with some known garbage in it. */ data = (char *) malloc (pagesize); if (!data) - exit (1); + return 1; for (i = 0; i < pagesize; ++i) *(data + i) = rand (); umask (0); fd = creat ("conftest.mmap", 0600); if (fd < 0) - exit (1); + return 1; if (write (fd, data, pagesize) != pagesize) - exit (1); + return 1; close (fd); /* Next, try to mmap the file at a fixed address which already has @@ -9545,17 +10028,17 @@ main () we see the same garbage. */ fd = open ("conftest.mmap", O_RDWR); if (fd < 0) - exit (1); + return 1; data2 = (char *) malloc (2 * pagesize); if (!data2) - exit (1); - data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); + return 1; + data2 += (pagesize - ((long int) data2 & (pagesize - 1))) & (pagesize - 1); if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, fd, 0L)) - exit (1); + return 1; for (i = 0; i < pagesize; ++i) if (*(data + i) != *(data2 + i)) - exit (1); + return 1; /* Finally, make sure that changes to the mapped area do not percolate back to the file as seen by read(). (This is a bug on @@ -9564,24 +10047,33 @@ main () *(data2 + i) = *(data2 + i) + 1; data3 = (char *) malloc (pagesize); if (!data3) - exit (1); + return 1; if (read (fd, data3, pagesize) != pagesize) - exit (1); + return 1; for (i = 0; i < pagesize; ++i) if (*(data + i) != *(data3 + i)) - exit (1); + return 1; close (fd); - exit (0); + return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -9594,11 +10086,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_mmap_fixed_mapped=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 +echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6; } if test $ac_cv_func_mmap_fixed_mapped = yes; then cat >>confdefs.h <<\_ACEOF @@ -9615,8 +10109,8 @@ fi LIBS="$libsrc_libs $LIBS" -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9629,56 +10123,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -dnet_ntoa (); +return dnet_ntoa (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dnet_dnet_ntoa=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dnet_dnet_ntoa=no + ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } if test $ac_cv_lib_dnet_dnet_ntoa = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDNET 1 @@ -9689,8 +10180,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for main in -lXbsd" >&5 -echo $ECHO_N "checking for main in -lXbsd... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for main in -lXbsd" >&5 +echo $ECHO_N "checking for main in -lXbsd... $ECHO_C" >&6; } if test "${ac_cv_lib_Xbsd_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9707,54 +10198,51 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -main (); +return main (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xbsd_main=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xbsd_main=no + ac_cv_lib_Xbsd_main=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5 -echo "${ECHO_T}$ac_cv_lib_Xbsd_main" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5 +echo "${ECHO_T}$ac_cv_lib_Xbsd_main" >&6; } if test $ac_cv_lib_Xbsd_main = yes; then LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd" fi -echo "$as_me:$LINENO: checking for cma_open in -lpthreads" >&5 -echo $ECHO_N "checking for cma_open in -lpthreads... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for cma_open in -lpthreads" >&5 +echo $ECHO_N "checking for cma_open in -lpthreads... $ECHO_C" >&6; } if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9767,56 +10255,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char cma_open (); int main () { -cma_open (); +return cma_open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_pthreads_cma_open=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pthreads_cma_open=no + ac_cv_lib_pthreads_cma_open=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_cma_open" >&5 -echo "${ECHO_T}$ac_cv_lib_pthreads_cma_open" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_cma_open" >&5 +echo "${ECHO_T}$ac_cv_lib_pthreads_cma_open" >&6; } if test $ac_cv_lib_pthreads_cma_open = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBPTHREADS 1 @@ -9827,22 +10312,22 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for XFree86 in /usr/X386" >&5 -echo $ECHO_N "checking for XFree86 in /usr/X386... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for XFree86 in /usr/X386" >&5 +echo $ECHO_N "checking for XFree86 in /usr/X386... $ECHO_C" >&6; } if test -d /usr/X386/include; then HAVE_XFREE386=yes : ${C_SWITCH_X_SITE="-I/usr/X386/include"} else HAVE_XFREE386=no fi -echo "$as_me:$LINENO: result: $HAVE_XFREE386" >&5 -echo "${ECHO_T}$HAVE_XFREE386" >&6 +{ echo "$as_me:$LINENO: result: $HAVE_XFREE386" >&5 +echo "${ECHO_T}$HAVE_XFREE386" >&6; } case ${host_os} in aix*) - echo "$as_me:$LINENO: checking for -bbigtoc option" >&5 -echo $ECHO_N "checking for -bbigtoc option... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for -bbigtoc option" >&5 +echo $ECHO_N "checking for -bbigtoc option... $ECHO_C" >&6; } if test "${gdb_cv_bigtoc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -9869,40 +10354,37 @@ int i; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then : else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -gdb_cv_bigtoc= + gdb_cv_bigtoc= fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $gdb_cv_bigtoc" >&5 -echo "${ECHO_T}$gdb_cv_bigtoc" >&6 +{ echo "$as_me:$LINENO: result: $gdb_cv_bigtoc" >&5 +echo "${ECHO_T}$gdb_cv_bigtoc" >&6; } ;; esac @@ -9929,8 +10411,8 @@ if test "${HAVE_X11}" = "yes"; then fi if test "${opsys}" = "gnu-linux"; then - echo "$as_me:$LINENO: checking whether X on GNU/Linux needs -b to link" >&5 -echo $ECHO_N "checking whether X on GNU/Linux needs -b to link... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether X on GNU/Linux needs -b to link" >&5 +echo $ECHO_N "checking whether X on GNU/Linux needs -b to link... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -9947,35 +10429,32 @@ XOpenDisplay ("foo"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then xlinux_first_failure=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -xlinux_first_failure=yes + xlinux_first_failure=yes fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test "${xlinux_first_failure}" = "yes"; then OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE" @@ -10002,35 +10481,32 @@ XOpenDisplay ("foo"); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then xlinux_second_failure=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -xlinux_second_failure=yes + xlinux_second_failure=yes fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test "${xlinux_second_failure}" = "yes"; then # If we get the same failure with -b, there is no use adding -b. @@ -10039,22 +10515,22 @@ rm -f conftest.err conftest.$ac_objext \ C_SWITCH_X_SITE="$OLD_C_SWITCH_X_SITE" CPPFLAGS="$OLD_CPPFLAGS" LIBS="$OLD_LIBS" - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } fi else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi # Reportedly, some broken Solaris systems have XKBlib.h but are missing # header files included from there. - echo "$as_me:$LINENO: checking for Xkb" >&5 -echo $ECHO_N "checking for Xkb... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for Xkb" >&5 +echo $ECHO_N "checking for Xkb... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -10072,38 +10548,35 @@ XkbDescPtr kb = XkbGetKeyboard (0, XkbAllComponentsMask, XkbUseCoreKbd); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then emacs_xkb=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_xkb=no + emacs_xkb=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - echo "$as_me:$LINENO: result: $emacs_xkb" >&5 -echo "${ECHO_T}$emacs_xkb" >&6 + { echo "$as_me:$LINENO: result: $emacs_xkb" >&5 +echo "${ECHO_T}$emacs_xkb" >&6; } if test $emacs_xkb = yes; then cat >>confdefs.h <<\_ACEOF @@ -10120,9 +10593,9 @@ for ac_func in XrmSetDatabase XScreenResourceString \ XScreenNumberOfScreen XSetWMProtocols do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10148,68 +10621,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -10221,8 +10686,8 @@ done fi if test "${window_system}" = "x11"; then - echo "$as_me:$LINENO: checking X11 version 6" >&5 -echo $ECHO_N "checking X11 version 6... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking X11 version 6" >&5 +echo $ECHO_N "checking X11 version 6... $ECHO_C" >&6; } if test "${emacs_cv_x11_version_6+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10245,55 +10710,52 @@ fail; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then emacs_cv_x11_version_6=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_x11_version_6=no + emacs_cv_x11_version_6=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi if test $emacs_cv_x11_version_6 = yes; then - echo "$as_me:$LINENO: result: 6 or newer" >&5 -echo "${ECHO_T}6 or newer" >&6 + { echo "$as_me:$LINENO: result: 6 or newer" >&5 +echo "${ECHO_T}6 or newer" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_X11R6 1 _ACEOF else - echo "$as_me:$LINENO: result: before 6" >&5 -echo "${ECHO_T}before 6" >&6 + { echo "$as_me:$LINENO: result: before 6" >&5 +echo "${ECHO_T}before 6" >&6; } fi fi if test "${window_system}" = "x11"; then - echo "$as_me:$LINENO: checking X11 version 5" >&5 -echo $ECHO_N "checking X11 version 5... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking X11 version 5" >&5 +echo $ECHO_N "checking X11 version 5... $ECHO_C" >&6; } if test "${emacs_cv_x11_version_5+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10316,41 +10778,38 @@ fail; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then emacs_cv_x11_version_5=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_x11_version_5=no + emacs_cv_x11_version_5=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi if test $emacs_cv_x11_version_5 = yes; then - echo "$as_me:$LINENO: result: 5 or newer" >&5 -echo "${ECHO_T}5 or newer" >&6 + { echo "$as_me:$LINENO: result: 5 or newer" >&5 +echo "${ECHO_T}5 or newer" >&6; } HAVE_X11R5=yes cat >>confdefs.h <<\_ACEOF @@ -10359,12 +10818,15 @@ _ACEOF else HAVE_X11R5=no - echo "$as_me:$LINENO: result: before 5" >&5 -echo "${ECHO_T}before 5" >&6 + { echo "$as_me:$LINENO: result: before 5" >&5 +echo "${ECHO_T}before 5" >&6; } fi fi HAVE_GTK=no +if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then + USE_X_TOOLKIT=none +fi if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5 @@ -10384,8 +10846,8 @@ echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10400,28 +10862,29 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG - if test -n "$PKG_CONFIG"; then - echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -10433,28 +10896,28 @@ echo "$as_me: error: else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for $GTK_MODULES" >&5 -echo $ECHO_N "checking for $GTK_MODULES... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for $GTK_MODULES" >&5 +echo $ECHO_N "checking for $GTK_MODULES... $ECHO_C" >&6; } if $PKG_CONFIG --exists "$GTK_MODULES" 2>&5; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 -echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 +echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags "$GTK_MODULES"` - echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 -echo "${ECHO_T}$GTK_CFLAGS" >&6 + { echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 +echo "${ECHO_T}$GTK_CFLAGS" >&6; } - echo "$as_me:$LINENO: checking GTK_LIBS" >&5 -echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking GTK_LIBS" >&5 +echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6; } GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"` - echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 -echo "${ECHO_T}$GTK_LIBS" >&6 + { echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 +echo "${ECHO_T}$GTK_LIBS" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } GTK_CFLAGS="" GTK_LIBS="" ## If we have a custom action on failure, don't print errors, but @@ -10484,6 +10947,107 @@ echo "$as_me: error: Library requirements ($GTK_MODULES) not met; consider adjus C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$GTK_LIBS $LIBS" + GTK_COMPILES=no + +for ac_func in gtk_main +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* 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_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + GTK_COMPILES=yes +fi +done + + if test "${GTK_COMPILES}" != "yes"; then + { { echo "$as_me:$LINENO: error: Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" >&5 +echo "$as_me: error: Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" >&2;} + { (exit 1); exit 1; }; }; + fi + HAVE_GTK=yes cat >>confdefs.h <<\_ACEOF @@ -10501,9 +11065,9 @@ _ACEOF for ac_func in gdk_display_open do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10529,68 +11093,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -10611,9 +11167,9 @@ _ACEOF for ac_func in gtk_file_selection_new do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10639,68 +11195,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -10715,9 +11263,9 @@ done for ac_func in gtk_file_chooser_dialog_new do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -10743,68 +11291,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -10829,18 +11369,19 @@ _ACEOF for ac_header in pthread.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -10851,41 +11392,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -10894,24 +11431,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -10919,9 +11454,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -10945,25 +11481,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -10976,8 +11506,8 @@ fi done if test "$ac_cv_header_pthread_h"; then - echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5 -echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5 +echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6; } if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -10990,56 +11520,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char pthread_self (); int main () { -pthread_self (); +return pthread_self (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_pthread_pthread_self=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pthread_pthread_self=no + ac_cv_lib_pthread_pthread_self=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_self" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_pthread_self" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_self" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthread_self" >&6; } if test $ac_cv_lib_pthread_pthread_self = yes; then HAVE_GTK_AND_PTHREAD=yes fi @@ -11058,8 +11585,8 @@ fi if test x"${USE_X_TOOLKIT}" = xmaybe; then if test x"${HAVE_X11R5}" = xyes; then - echo "$as_me:$LINENO: checking X11 version 5 with Xaw" >&5 -echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking X11 version 5 with Xaw" >&5 +echo $ECHO_N "checking X11 version 5 with Xaw... $ECHO_C" >&6; } if test "${emacs_cv_x11_version_5_with_xaw+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11081,45 +11608,42 @@ main () } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then emacs_cv_x11_version_5_with_xaw=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_x11_version_5_with_xaw=no + emacs_cv_x11_version_5_with_xaw=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi if test $emacs_cv_x11_version_5_with_xaw = yes; then - echo "$as_me:$LINENO: result: 5 or newer, with Xaw; use toolkit by default" >&5 -echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6 + { echo "$as_me:$LINENO: result: 5 or newer, with Xaw; use toolkit by default" >&5 +echo "${ECHO_T}5 or newer, with Xaw; use toolkit by default" >&6; } USE_X_TOOLKIT=LUCID else - echo "$as_me:$LINENO: result: before 5 or no Xaw; do not use toolkit by default" >&5 -echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6 + { echo "$as_me:$LINENO: result: before 5 or no Xaw; do not use toolkit by default" >&5 +echo "${ECHO_T}before 5 or no Xaw; do not use toolkit by default" >&6; } USE_X_TOOLKIT=none fi else @@ -11130,8 +11654,8 @@ fi X_TOOLKIT_TYPE=$USE_X_TOOLKIT if test "${USE_X_TOOLKIT}" != "none"; then - echo "$as_me:$LINENO: checking X11 toolkit version" >&5 -echo $ECHO_N "checking X11 toolkit version... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking X11 toolkit version" >&5 +echo $ECHO_N "checking X11 toolkit version... $ECHO_C" >&6; } if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11154,50 +11678,47 @@ fail; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then emacs_cv_x11_toolkit_version_6=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_x11_toolkit_version_6=no + emacs_cv_x11_toolkit_version_6=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi HAVE_X11XTR6=$emacs_cv_x11_toolkit_version_6 if test $emacs_cv_x11_toolkit_version_6 = yes; then - echo "$as_me:$LINENO: result: 6 or newer" >&5 -echo "${ECHO_T}6 or newer" >&6 + { echo "$as_me:$LINENO: result: 6 or newer" >&5 +echo "${ECHO_T}6 or newer" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_X11XTR6 1 _ACEOF else - echo "$as_me:$LINENO: result: before 6" >&5 -echo "${ECHO_T}before 6" >&6 + { echo "$as_me:$LINENO: result: before 6" >&5 +echo "${ECHO_T}before 6" >&6; } fi OLDLIBS="$LIBS" @@ -11207,8 +11728,8 @@ echo "${ECHO_T}before 6" >&6 LIBS="-lXt $LIBS" fi -echo "$as_me:$LINENO: checking for XmuConvertStandardSelection in -lXmu" >&5 -echo $ECHO_N "checking for XmuConvertStandardSelection in -lXmu... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for XmuConvertStandardSelection in -lXmu" >&5 +echo $ECHO_N "checking for XmuConvertStandardSelection in -lXmu... $ECHO_C" >&6; } if test "${ac_cv_lib_Xmu_XmuConvertStandardSelection+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11221,56 +11742,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XmuConvertStandardSelection (); int main () { -XmuConvertStandardSelection (); +return XmuConvertStandardSelection (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xmu_XmuConvertStandardSelection=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xmu_XmuConvertStandardSelection=no + ac_cv_lib_Xmu_XmuConvertStandardSelection=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5 -echo "${ECHO_T}$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5 +echo "${ECHO_T}$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; } if test $ac_cv_lib_Xmu_XmuConvertStandardSelection = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXMU 1 @@ -11287,8 +11805,8 @@ fi if test "${HAVE_X11}" = "yes"; then if test "${USE_X_TOOLKIT}" != "none"; then -echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5 -echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for XShapeQueryExtension in -lXext" >&5 +echo $ECHO_N "checking for XShapeQueryExtension in -lXext... $ECHO_C" >&6; } if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11301,56 +11819,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XShapeQueryExtension (); int main () { -XShapeQueryExtension (); +return XShapeQueryExtension (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xext_XShapeQueryExtension=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xext_XShapeQueryExtension=no + ac_cv_lib_Xext_XShapeQueryExtension=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXEXT 1 @@ -11364,8 +11879,8 @@ fi fi if test "${USE_X_TOOLKIT}" = "MOTIF"; then - echo "$as_me:$LINENO: checking for Motif version 2.1" >&5 -echo $ECHO_N "checking for Motif version 2.1... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for Motif version 2.1" >&5 +echo $ECHO_N "checking for Motif version 2.1... $ECHO_C" >&6; } if test "${emacs_cv_motif_version_2_1+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11389,38 +11904,34 @@ Motif version prior to 2.1. } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_motif_version_2_1=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_motif_version_2_1=no + emacs_cv_motif_version_2_1=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_motif_version_2_1" >&5 -echo "${ECHO_T}$emacs_cv_motif_version_2_1" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_motif_version_2_1" >&5 +echo "${ECHO_T}$emacs_cv_motif_version_2_1" >&6; } HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1 if test $emacs_cv_motif_version_2_1 = yes; then HAVE_LIBXP=no @@ -11429,8 +11940,8 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_MOTIF_2_1 1 _ACEOF - echo "$as_me:$LINENO: checking for XpCreateContext in -lXp" >&5 -echo $ECHO_N "checking for XpCreateContext in -lXp... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XpCreateContext in -lXp" >&5 +echo $ECHO_N "checking for XpCreateContext in -lXp... $ECHO_C" >&6; } if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11443,56 +11954,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XpCreateContext (); int main () { -XpCreateContext (); +return XpCreateContext (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xp_XpCreateContext=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xp_XpCreateContext=no + ac_cv_lib_Xp_XpCreateContext=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpCreateContext" >&5 -echo "${ECHO_T}$ac_cv_lib_Xp_XpCreateContext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpCreateContext" >&5 +echo "${ECHO_T}$ac_cv_lib_Xp_XpCreateContext" >&6; } if test $ac_cv_lib_Xp_XpCreateContext = yes; then HAVE_LIBXP=yes fi @@ -11505,8 +12013,8 @@ _ACEOF fi else - echo "$as_me:$LINENO: checking for LessTif where some systems put it" >&5 -echo $ECHO_N "checking for LessTif where some systems put it... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for LessTif where some systems put it" >&5 +echo $ECHO_N "checking for LessTif where some systems put it... $ECHO_C" >&6; } if test "${emacs_cv_lesstif+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11533,38 +12041,34 @@ int x = 5; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_lesstif=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_lesstif=no + emacs_cv_lesstif=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_lesstif" >&5 -echo "${ECHO_T}$emacs_cv_lesstif" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_lesstif" >&5 +echo "${ECHO_T}$emacs_cv_lesstif" >&6; } if test $emacs_cv_lesstif = yes; then # Make sure this -I option remains in CPPFLAGS after it is set # back to REAL_CPPFLAGS. @@ -11584,8 +12088,8 @@ fi HAVE_XAW3D=no if test "${HAVE_X11}" = "yes"; then if test "${USE_X_TOOLKIT}" != "none" && test "${with_toolkit_scroll_bars}" != "no"; then - echo "$as_me:$LINENO: checking for X11/Xaw3d/Scrollbar.h" >&5 -echo $ECHO_N "checking for X11/Xaw3d/Scrollbar.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/Xaw3d/Scrollbar.h" >&5 +echo $ECHO_N "checking for X11/Xaw3d/Scrollbar.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_Xaw3d_Scrollbar_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11597,24 +12101,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <X11/Xaw3d/Scrollbar.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_cv_header_X11_Xaw3d_Scrollbar_h=yes else echo "$as_me: failed program was:" >&5 @@ -11622,13 +12124,14 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_X11_Xaw3d_Scrollbar_h=no fi + rm -f conftest.err conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_Scrollbar_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xaw3d_Scrollbar_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_Xaw3d_Scrollbar_h" >&6; } if test $ac_cv_header_X11_Xaw3d_Scrollbar_h = yes; then - echo "$as_me:$LINENO: checking for XawScrollbarSetThumb in -lXaw3d" >&5 -echo $ECHO_N "checking for XawScrollbarSetThumb in -lXaw3d... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XawScrollbarSetThumb in -lXaw3d" >&5 +echo $ECHO_N "checking for XawScrollbarSetThumb in -lXaw3d... $ECHO_C" >&6; } if test "${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -11641,56 +12144,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XawScrollbarSetThumb (); int main () { -XawScrollbarSetThumb (); +return XawScrollbarSetThumb (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xaw3d_XawScrollbarSetThumb=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xaw3d_XawScrollbarSetThumb=no + ac_cv_lib_Xaw3d_XawScrollbarSetThumb=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5 -echo "${ECHO_T}$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5 +echo "${ECHO_T}$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6; } if test $ac_cv_lib_Xaw3d_XawScrollbarSetThumb = yes; then HAVE_XAW3D=yes fi @@ -11760,27 +12260,22 @@ XIMProc callback; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then HAVE_XIM=yes cat >>confdefs.h <<\_ACEOF @@ -11791,9 +12286,10 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -HAVE_XIM=no + HAVE_XIM=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "${with_xim}" != "no"; then @@ -11841,34 +12337,31 @@ extern Bool XRegisterIMInstantiateCallback(Display*, XrmDatabase, char*, } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_arg6_star=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$emacs_cv_arg6_star" = yes; then cat >>confdefs.h <<\_ACEOF @@ -12508,17 +13001,17 @@ HAVE_XPM=no if test "${HAVE_X11}" = "yes"; then if test "${with_xpm}" != "no"; then if test "${ac_cv_header_X11_xpm_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 -echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 +echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_xpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5 -echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5 +echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12529,41 +13022,37 @@ $ac_includes_default #include <X11/xpm.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5 -echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5 +echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12572,24 +13061,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <X11/xpm.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -12597,9 +13084,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -12623,30 +13111,23 @@ echo "$as_me: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\" echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 -echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 +echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_xpm_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_xpm_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6; } fi if test $ac_cv_header_X11_xpm_h = yes; then - echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in -lXpm" >&5 -echo $ECHO_N "checking for XpmReadFileToPixmap in -lXpm... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XpmReadFileToPixmap in -lXpm" >&5 +echo $ECHO_N "checking for XpmReadFileToPixmap in -lXpm... $ECHO_C" >&6; } if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12659,56 +13140,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char XpmReadFileToPixmap (); int main () { -XpmReadFileToPixmap (); +return XpmReadFileToPixmap (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_Xpm_XpmReadFileToPixmap=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_Xpm_XpmReadFileToPixmap=no + ac_cv_lib_Xpm_XpmReadFileToPixmap=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5 -echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5 +echo "${ECHO_T}$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; } if test $ac_cv_lib_Xpm_XpmReadFileToPixmap = yes; then HAVE_XPM=yes fi @@ -12717,8 +13195,8 @@ fi if test "${HAVE_XPM}" = "yes"; then - echo "$as_me:$LINENO: checking for XpmReturnAllocPixels preprocessor define" >&5 -echo $ECHO_N "checking for XpmReturnAllocPixels preprocessor define... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for XpmReturnAllocPixels preprocessor define" >&5 +echo $ECHO_N "checking for XpmReturnAllocPixels preprocessor define... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12741,11 +13219,11 @@ rm -f conftest* if test "${HAVE_XPM}" = "yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi fi fi @@ -12764,17 +13242,17 @@ HAVE_JPEG=no if test "${HAVE_X11}" = "yes"; then if test "${with_jpeg}" != "no"; then if test "${ac_cv_header_jerror_h+set}" = set; then - echo "$as_me:$LINENO: checking for jerror.h" >&5 -echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for jerror.h" >&5 +echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6; } if test "${ac_cv_header_jerror_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_jerror_h" >&5 -echo "${ECHO_T}$ac_cv_header_jerror_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_jerror_h" >&5 +echo "${ECHO_T}$ac_cv_header_jerror_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking jerror.h usability" >&5 -echo $ECHO_N "checking jerror.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking jerror.h usability" >&5 +echo $ECHO_N "checking jerror.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12785,41 +13263,37 @@ $ac_includes_default #include <jerror.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking jerror.h presence" >&5 -echo $ECHO_N "checking jerror.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking jerror.h presence" >&5 +echo $ECHO_N "checking jerror.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -12828,24 +13302,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <jerror.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -12853,9 +13325,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -12879,30 +13352,23 @@ echo "$as_me: WARNING: jerror.h: section \"Present But Cannot Be Compiled\"" echo "$as_me: WARNING: jerror.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: jerror.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: jerror.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for jerror.h" >&5 -echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for jerror.h" >&5 +echo $ECHO_N "checking for jerror.h... $ECHO_C" >&6; } if test "${ac_cv_header_jerror_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_jerror_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_jerror_h" >&5 -echo "${ECHO_T}$ac_cv_header_jerror_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_jerror_h" >&5 +echo "${ECHO_T}$ac_cv_header_jerror_h" >&6; } fi if test $ac_cv_header_jerror_h = yes; then - echo "$as_me:$LINENO: checking for jpeg_destroy_compress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_destroy_compress in -ljpeg... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo $ECHO_N "checking for jpeg_destroy_compress in -ljpeg... $ECHO_C" >&6; } if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -12915,56 +13381,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char jpeg_destroy_compress (); int main () { -jpeg_destroy_compress (); +return jpeg_destroy_compress (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_jpeg_jpeg_destroy_compress=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_jpeg_jpeg_destroy_compress=no + ac_cv_lib_jpeg_jpeg_destroy_compress=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; } if test $ac_cv_lib_jpeg_jpeg_destroy_compress = yes; then HAVE_JPEG=yes fi @@ -13017,18 +13480,19 @@ if test "${HAVE_X11}" = "yes"; then for ac_header in png.h libpng/png.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13039,41 +13503,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13082,24 +13542,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -13107,9 +13565,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -13133,25 +13592,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -13164,8 +13617,8 @@ fi done if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then - echo "$as_me:$LINENO: checking for png_get_channels in -lpng" >&5 -echo $ECHO_N "checking for png_get_channels in -lpng... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for png_get_channels in -lpng" >&5 +echo $ECHO_N "checking for png_get_channels in -lpng... $ECHO_C" >&6; } if test "${ac_cv_lib_png_png_get_channels+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13178,56 +13631,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char png_get_channels (); int main () { -png_get_channels (); +return png_get_channels (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_png_png_get_channels=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_png_png_get_channels=no + ac_cv_lib_png_png_get_channels=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_get_channels" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_get_channels" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_get_channels" >&5 +echo "${ECHO_T}$ac_cv_lib_png_png_get_channels" >&6; } if test $ac_cv_lib_png_png_get_channels = yes; then HAVE_PNG=yes fi @@ -13249,17 +13699,17 @@ HAVE_TIFF=no if test "${HAVE_X11}" = "yes"; then if test "${with_tiff}" != "no"; then if test "${ac_cv_header_tiffio_h+set}" = set; then - echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tiffio.h usability" >&5 +echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13270,41 +13720,37 @@ $ac_includes_default #include <tiffio.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking tiffio.h presence" >&5 +echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13313,24 +13759,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <tiffio.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -13338,9 +13782,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -13364,33 +13809,26 @@ echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } if test "${ac_cv_header_tiffio_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_tiffio_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } fi if test $ac_cv_header_tiffio_h = yes; then tifflibs="-lz -lm" # At least one tiff package requires the jpeg library. if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi - echo "$as_me:$LINENO: checking for TIFFGetVersion in -ltiff" >&5 -echo $ECHO_N "checking for TIFFGetVersion in -ltiff... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for TIFFGetVersion in -ltiff" >&5 +echo $ECHO_N "checking for TIFFGetVersion in -ltiff... $ECHO_C" >&6; } if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13403,56 +13841,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char TIFFGetVersion (); int main () { -TIFFGetVersion (); +return TIFFGetVersion (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_tiff_TIFFGetVersion=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_tiff_TIFFGetVersion=no + ac_cv_lib_tiff_TIFFGetVersion=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFGetVersion" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff_TIFFGetVersion" >&6; } if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then HAVE_TIFF=yes fi @@ -13476,17 +13911,17 @@ HAVE_GIF=no if test "${HAVE_X11}" = "yes"; then if test "${with_gif}" != "no"; then if test "${ac_cv_header_gif_lib_h+set}" = set; then - echo "$as_me:$LINENO: checking for gif_lib.h" >&5 -echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for gif_lib.h" >&5 +echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6; } if test "${ac_cv_header_gif_lib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking gif_lib.h usability" >&5 -echo $ECHO_N "checking gif_lib.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking gif_lib.h usability" >&5 +echo $ECHO_N "checking gif_lib.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13497,41 +13932,37 @@ $ac_includes_default #include <gif_lib.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking gif_lib.h presence" >&5 -echo $ECHO_N "checking gif_lib.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking gif_lib.h presence" >&5 +echo $ECHO_N "checking gif_lib.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13540,24 +13971,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <gif_lib.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -13565,9 +13994,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -13591,32 +14021,25 @@ echo "$as_me: WARNING: gif_lib.h: section \"Present But Cannot Be Compiled\" echo "$as_me: WARNING: gif_lib.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for gif_lib.h" >&5 -echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for gif_lib.h" >&5 +echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6; } if test "${ac_cv_header_gif_lib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_gif_lib_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6; } fi if test $ac_cv_header_gif_lib_h = yes; then # EGifPutExtensionLast only exists from version libungif-4.1.0b1. # Earlier versions can crash Emacs. - echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5 -echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5 +echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; } if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -13629,56 +14052,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char EGifPutExtensionLast (); int main () { -EGifPutExtensionLast (); +return EGifPutExtensionLast (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ungif_EGifPutExtensionLast=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ungif_EGifPutExtensionLast=no + ac_cv_lib_ungif_EGifPutExtensionLast=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 -echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5 +echo "${ECHO_T}$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; } if test $ac_cv_lib_ungif_EGifPutExtensionLast = yes; then HAVE_GIF=yes fi @@ -13698,17 +14118,17 @@ _ACEOF fi if test "${ac_cv_header_malloc_malloc_h+set}" = set; then - echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5 -echo $ECHO_N "checking for malloc/malloc.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5 +echo $ECHO_N "checking for malloc/malloc.h... $ECHO_C" >&6; } if test "${ac_cv_header_malloc_malloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_malloc_malloc_h" >&5 -echo "${ECHO_T}$ac_cv_header_malloc_malloc_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_malloc_malloc_h" >&5 +echo "${ECHO_T}$ac_cv_header_malloc_malloc_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking malloc/malloc.h usability" >&5 -echo $ECHO_N "checking malloc/malloc.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking malloc/malloc.h usability" >&5 +echo $ECHO_N "checking malloc/malloc.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13719,8 +14139,13 @@ $ac_includes_default #include <malloc/malloc.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -13744,15 +14169,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking malloc/malloc.h presence" >&5 -echo $ECHO_N "checking malloc/malloc.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking malloc/malloc.h presence" >&5 +echo $ECHO_N "checking malloc/malloc.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13761,24 +14187,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <malloc/malloc.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -13786,9 +14210,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -13812,25 +14237,18 @@ echo "$as_me: WARNING: malloc/malloc.h: section \"Present But Cannot Be Comp echo "$as_me: WARNING: malloc/malloc.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: malloc/malloc.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: malloc/malloc.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5 -echo $ECHO_N "checking for malloc/malloc.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for malloc/malloc.h" >&5 +echo $ECHO_N "checking for malloc/malloc.h... $ECHO_C" >&6; } if test "${ac_cv_header_malloc_malloc_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_malloc_malloc_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_malloc_malloc_h" >&5 -echo "${ECHO_T}$ac_cv_header_malloc_malloc_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_malloc_malloc_h" >&5 +echo "${ECHO_T}$ac_cv_header_malloc_malloc_h" >&6; } fi if test $ac_cv_header_malloc_malloc_h = yes; then @@ -13866,17 +14284,17 @@ fi HAVE_X_SM=no if test "${HAVE_X11}" = "yes"; then if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/SM/SMlib.h" >&5 -echo $ECHO_N "checking for X11/SM/SMlib.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for X11/SM/SMlib.h" >&5 +echo $ECHO_N "checking for X11/SM/SMlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_SM_SMlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_SM_SMlib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_SM_SMlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_SM_SMlib_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking X11/SM/SMlib.h usability" >&5 -echo $ECHO_N "checking X11/SM/SMlib.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/SM/SMlib.h usability" >&5 +echo $ECHO_N "checking X11/SM/SMlib.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13887,41 +14305,37 @@ $ac_includes_default #include <X11/SM/SMlib.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking X11/SM/SMlib.h presence" >&5 -echo $ECHO_N "checking X11/SM/SMlib.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking X11/SM/SMlib.h presence" >&5 +echo $ECHO_N "checking X11/SM/SMlib.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13930,24 +14344,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <X11/SM/SMlib.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -13955,9 +14367,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -13981,30 +14394,23 @@ echo "$as_me: WARNING: X11/SM/SMlib.h: section \"Present But Cannot Be Compi echo "$as_me: WARNING: X11/SM/SMlib.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: X11/SM/SMlib.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: X11/SM/SMlib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for X11/SM/SMlib.h" >&5 -echo $ECHO_N "checking for X11/SM/SMlib.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for X11/SM/SMlib.h" >&5 +echo $ECHO_N "checking for X11/SM/SMlib.h... $ECHO_C" >&6; } if test "${ac_cv_header_X11_SM_SMlib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_X11_SM_SMlib_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_SM_SMlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_SM_SMlib_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_SM_SMlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_SM_SMlib_h" >&6; } fi if test $ac_cv_header_X11_SM_SMlib_h = yes; then - echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5 -echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for SmcOpenConnection in -lSM" >&5 +echo $ECHO_N "checking for SmcOpenConnection in -lSM... $ECHO_C" >&6; } if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14017,56 +14423,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char SmcOpenConnection (); int main () { -SmcOpenConnection (); +return SmcOpenConnection (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_SM_SmcOpenConnection=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_SM_SmcOpenConnection=no + ac_cv_lib_SM_SmcOpenConnection=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 -echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 +echo "${ECHO_T}$ac_cv_lib_SM_SmcOpenConnection" >&6; } if test $ac_cv_lib_SM_SmcOpenConnection = yes; then HAVE_X_SM=yes fi @@ -14089,8 +14492,8 @@ _ACEOF fi # If netdb.h doesn't declare h_errno, we must declare it by hand. -echo "$as_me:$LINENO: checking whether netdb declares h_errno" >&5 -echo $ECHO_N "checking whether netdb declares h_errno... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether netdb declares h_errno" >&5 +echo $ECHO_N "checking whether netdb declares h_errno... $ECHO_C" >&6; } if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14110,39 +14513,36 @@ return h_errno; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then emacs_cv_netdb_declares_h_errno=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_netdb_declares_h_errno=no + emacs_cv_netdb_declares_h_errno=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_netdb_declares_h_errno" >&5 -echo "${ECHO_T}$emacs_cv_netdb_declares_h_errno" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_netdb_declares_h_errno" >&5 +echo "${ECHO_T}$emacs_cv_netdb_declares_h_errno" >&6; } if test $emacs_cv_netdb_declares_h_errno = yes; then cat >>confdefs.h <<\_ACEOF @@ -14153,8 +14553,8 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo "$as_me:$LINENO: checking for working alloca.h" >&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; } if test "${ac_cv_working_alloca_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14169,44 +14569,42 @@ int main () { char *p = (char *) alloca (2 * sizeof (int)); + if (p) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_working_alloca_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_working_alloca_h=no + ac_cv_working_alloca_h=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; } if test $ac_cv_working_alloca_h = yes; then cat >>confdefs.h <<\_ACEOF @@ -14215,8 +14613,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6; } if test "${ac_cv_func_alloca_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14233,7 +14631,7 @@ cat >>conftest.$ac_ext <<_ACEOF # include <malloc.h> # define alloca _alloca # else -# if HAVE_ALLOCA_H +# ifdef HAVE_ALLOCA_H # include <alloca.h> # else # ifdef _AIX @@ -14251,44 +14649,42 @@ int main () { char *p = (char *) alloca (1); + if (p) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_alloca_works=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_alloca_works=no + ac_cv_func_alloca_works=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; } if test $ac_cv_func_alloca_works = yes; then @@ -14302,15 +14698,15 @@ else # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. -ALLOCA=alloca.$ac_objext +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext cat >>confdefs.h <<\_ACEOF #define C_ALLOCA 1 _ACEOF -echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; } if test "${ac_cv_os_cray+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14320,7 +14716,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#if defined(CRAY) && ! defined(CRAY2) +#if defined CRAY && ! defined CRAY2 webecray #else wenotbecray @@ -14336,14 +14732,14 @@ fi rm -f conftest* fi -echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14369,68 +14765,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF @@ -14443,8 +14831,8 @@ fi done fi -echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; } if test "${ac_cv_c_stack_direction+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14457,6 +14845,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +$ac_includes_default int find_stack_direction () { @@ -14474,17 +14863,26 @@ find_stack_direction () int main () { - exit (find_stack_direction () < 0); + return find_stack_direction () < 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -14497,11 +14895,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_c_stack_direction=-1 fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; } cat >>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction @@ -14514,8 +14914,8 @@ fi # fmod, logb, and frexp are found in -lm on most systems. # On HPUX 9.01, -lm does not contain logb, so check for sqrt. -echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 -echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 +echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6; } if test "${ac_cv_lib_m_sqrt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14528,56 +14928,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char sqrt (); int main () { -sqrt (); +return sqrt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_m_sqrt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_m_sqrt=no + ac_cv_lib_m_sqrt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 -echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 +echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6; } if test $ac_cv_lib_m_sqrt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 @@ -14591,8 +14988,8 @@ fi # Check for mail-locking functions in a "mail" library. Probably this should # have the same check as for liblockfile below. -echo "$as_me:$LINENO: checking for maillock in -lmail" >&5 -echo $ECHO_N "checking for maillock in -lmail... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for maillock in -lmail" >&5 +echo $ECHO_N "checking for maillock in -lmail... $ECHO_C" >&6; } if test "${ac_cv_lib_mail_maillock+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14605,56 +15002,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char maillock (); int main () { -maillock (); +return maillock (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_mail_maillock=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_mail_maillock=no + ac_cv_lib_mail_maillock=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_mail_maillock" >&5 -echo "${ECHO_T}$ac_cv_lib_mail_maillock" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mail_maillock" >&5 +echo "${ECHO_T}$ac_cv_lib_mail_maillock" >&6; } if test $ac_cv_lib_mail_maillock = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMAIL 1 @@ -14665,8 +15059,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for maillock in -llockfile" >&5 -echo $ECHO_N "checking for maillock in -llockfile... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for maillock in -llockfile" >&5 +echo $ECHO_N "checking for maillock in -llockfile... $ECHO_C" >&6; } if test "${ac_cv_lib_lockfile_maillock+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14679,56 +15073,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char maillock (); int main () { -maillock (); +return maillock (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_lockfile_maillock=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_lockfile_maillock=no + ac_cv_lib_lockfile_maillock=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_lockfile_maillock" >&5 -echo "${ECHO_T}$ac_cv_lib_lockfile_maillock" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_lockfile_maillock" >&5 +echo "${ECHO_T}$ac_cv_lib_lockfile_maillock" >&6; } if test $ac_cv_lib_lockfile_maillock = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLOCKFILE 1 @@ -14744,8 +15135,8 @@ fi if test "$ac_cv_lib_lockfile_maillock" = no; then # Extract the first word of "liblockfile.so", so it can be a program name with args. set dummy liblockfile.so; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } if test "${ac_cv_prog_liblockfile+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -14759,26 +15150,28 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_liblockfile="yes" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done +IFS=$as_save_IFS test -z "$ac_cv_prog_liblockfile" && ac_cv_prog_liblockfile="no" fi fi liblockfile=$ac_cv_prog_liblockfile if test -n "$liblockfile"; then - echo "$as_me:$LINENO: result: $liblockfile" >&5 -echo "${ECHO_T}$liblockfile" >&6 + { echo "$as_me:$LINENO: result: $liblockfile" >&5 +echo "${ECHO_T}$liblockfile" >&6; } else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + if test $ac_cv_prog_liblockfile = yes; then { { echo "$as_me:$LINENO: error: Shared liblockfile found but can't link against it. This probably means that movemail could lose mail. @@ -14794,9 +15187,9 @@ fi for ac_func in touchlock do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -14822,68 +15215,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -14896,18 +15281,19 @@ done for ac_header in maillock.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14918,41 +15304,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -14961,24 +15343,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -14986,9 +15366,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -15012,25 +15393,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -15123,9 +15498,9 @@ gai_strerror mkstemp getline getdelim mremap memmove fsync sync bzero \ memset memcmp difftime memcpy mempcpy mblen mbrlen posix_memalign do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15151,68 +15526,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -15226,18 +15593,19 @@ done for ac_header in sys/un.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15248,8 +15616,13 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -15273,15 +15646,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15290,24 +15664,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -15315,9 +15687,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -15341,25 +15714,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -15375,21 +15742,23 @@ done -for ac_header in stdlib.h sys/time.h unistd.h + +for ac_header in $ac_header_list do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15400,41 +15769,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -15443,24 +15808,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -15468,9 +15831,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -15494,25 +15858,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -15525,12 +15883,19 @@ fi done -for ac_func in alarm + + + + + + + +for ac_func in $ac_func_list do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15556,68 +15921,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -15626,8 +15983,24 @@ _ACEOF fi done -echo "$as_me:$LINENO: checking for working mktime" >&5 -echo $ECHO_N "checking for working mktime... $ECHO_C" >&6 + + + + + + + + + + + + + + + + +{ echo "$as_me:$LINENO: checking for working mktime" >&5 +echo $ECHO_N "checking for working mktime... $ECHO_C" >&6; } if test "${ac_cv_func_working_mktime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15641,26 +16014,24 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Test program from Paul Eggert and Tony Leneis. */ -#if TIME_WITH_SYS_TIME +#ifdef TIME_WITH_SYS_TIME # include <sys/time.h> # include <time.h> #else -# if HAVE_SYS_TIME_H +# ifdef HAVE_SYS_TIME_H # include <sys/time.h> # else # include <time.h> # endif #endif -#if HAVE_STDLIB_H -# include <stdlib.h> -#endif +#include <stdlib.h> -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#if !HAVE_ALARM +#ifndef HAVE_ALARM # define alarm(X) /* empty */ #endif @@ -15677,9 +16048,9 @@ static char *tz_strings[] = { }; #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) -/* Fail if mktime fails to convert a date in the spring-forward gap. +/* Return 0 if mktime fails to convert a date in the spring-forward gap. Based on a problem report from Andreas Jaeger. */ -static void +static int spring_forward_gap () { /* glibc (up to about 1998-10-07) failed this test. */ @@ -15698,29 +16069,27 @@ spring_forward_gap () tm.tm_min = 0; tm.tm_sec = 0; tm.tm_isdst = -1; - if (mktime (&tm) == (time_t)-1) - exit (1); + return mktime (&tm) != (time_t) -1; } -static void +static int mktime_test1 (now) time_t now; { struct tm *lt; - if ((lt = localtime (&now)) && mktime (lt) != now) - exit (1); + return ! (lt = localtime (&now)) || mktime (lt) == now; } -static void +static int mktime_test (now) time_t now; { - mktime_test1 (now); - mktime_test1 ((time_t) (time_t_max - now)); - mktime_test1 ((time_t) (time_t_min + now)); + return (mktime_test1 (now) + && mktime_test1 ((time_t) (time_t_max - now)) + && mktime_test1 ((time_t) (time_t_min + now))); } -static void +static int irix_6_4_bug () { /* Based on code from Ariel Faigon. */ @@ -15733,11 +16102,10 @@ irix_6_4_bug () tm.tm_sec = 0; tm.tm_isdst = -1; mktime (&tm); - if (tm.tm_mon != 2 || tm.tm_mday != 31) - exit (1); + return tm.tm_mon == 2 && tm.tm_mday == 31; } -static void +static int bigtime_test (j) int j; { @@ -15759,8 +16127,39 @@ bigtime_test (j) && lt->tm_wday == tm.tm_wday && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) - exit (1); + return 0; } + return 1; +} + +static int +year_2050_test () +{ + /* The correct answer for 2050-02-01 00:00:00 in Pacific time, + ignoring leap seconds. */ + unsigned long int answer = 2527315200UL; + + struct tm tm; + time_t t; + tm.tm_year = 2050 - 1900; + tm.tm_mon = 2 - 1; + tm.tm_mday = 1; + tm.tm_hour = tm.tm_min = tm.tm_sec = 0; + tm.tm_isdst = -1; + + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); + + t = mktime (&tm); + + /* Check that the result is either a failure, or close enough + to the correct answer that we can assume the discrepancy is + due to leap seconds. */ + return (t == (time_t) -1 + || (0 < t && answer - 120 <= t && t <= answer + 120)); } int @@ -15787,28 +16186,39 @@ main () putenv (tz_strings[i]); for (t = 0; t <= time_t_max - delta; t += delta) - mktime_test (t); - mktime_test ((time_t) 1); - mktime_test ((time_t) (60 * 60)); - mktime_test ((time_t) (60 * 60 * 24)); + if (! mktime_test (t)) + return 1; + if (! (mktime_test ((time_t) 1) + && mktime_test ((time_t) (60 * 60)) + && mktime_test ((time_t) (60 * 60 * 24)))) + return 1; for (j = 1; 0 < j; j *= 2) - bigtime_test (j); - bigtime_test (j - 1); + if (! bigtime_test (j)) + return 1; + if (! bigtime_test (j - 1)) + return 1; } - irix_6_4_bug (); - spring_forward_gap (); - exit (0); + return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -15821,18 +16231,18 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_working_mktime=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5 -echo "${ECHO_T}$ac_cv_func_working_mktime" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_working_mktime" >&5 +echo "${ECHO_T}$ac_cv_func_working_mktime" >&6; } if test $ac_cv_func_working_mktime = no; then - case $LIBOBJS in - "mktime.$ac_objext" | \ - *" mktime.$ac_objext" | \ - "mktime.$ac_objext "* | \ + case " $LIBOBJS " in *" mktime.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS mktime.$ac_objext" ;; + *) LIBOBJS="$LIBOBJS mktime.$ac_objext" + ;; esac fi @@ -15856,8 +16266,8 @@ echo "$as_me: error: $srcdir/$ac_config_libobj_dir/getloadavg.c is missing" >&2; ac_save_LIBS=$LIBS # Check for getloadavg, but be sure not to touch the cache variable. -(echo "$as_me:$LINENO: checking for getloadavg" >&5 -echo $ECHO_N "checking for getloadavg... $ECHO_C" >&6 +({ echo "$as_me:$LINENO: checking for getloadavg" >&5 +echo $ECHO_N "checking for getloadavg... $ECHO_C" >&6; } if test "${ac_cv_func_getloadavg+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -15884,68 +16294,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef getloadavg -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getloadavg (); /* 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_getloadavg) || defined (__stub___getloadavg) +#if defined __stub_getloadavg || defined __stub___getloadavg choke me -#else -char (*f) () = getloadavg; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != getloadavg; +return getloadavg (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_getloadavg=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_getloadavg=no + ac_cv_func_getloadavg=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg" >&5 -echo "${ECHO_T}$ac_cv_func_getloadavg" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg" >&5 +echo "${ECHO_T}$ac_cv_func_getloadavg" >&6; } if test $ac_cv_func_getloadavg = yes; then exit 0 else @@ -15958,9 +16359,9 @@ fi for ac_func in pstat_getdynamic do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -15986,37 +16387,36 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -16040,13 +16440,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -16058,8 +16460,8 @@ done # Solaris has libkstat which does not require root. -echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 -echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for kstat_open in -lkstat" >&5 +echo $ECHO_N "checking for kstat_open in -lkstat... $ECHO_C" >&6; } if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16072,56 +16474,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char kstat_open (); int main () { -kstat_open (); +return kstat_open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_kstat_kstat_open=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_kstat_kstat_open=no + ac_cv_lib_kstat_kstat_open=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 -echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_kstat_kstat_open" >&5 +echo "${ECHO_T}$ac_cv_lib_kstat_kstat_open" >&6; } if test $ac_cv_lib_kstat_kstat_open = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKSTAT 1 @@ -16138,8 +16537,8 @@ test $ac_cv_lib_kstat_kstat_open = yes && ac_have_func=yes # to get the right answer into the cache. # For kstat on solaris, we need libelf to force the definition of SVR4 below. if test $ac_have_func = no; then - echo "$as_me:$LINENO: checking for elf_begin in -lelf" >&5 -echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for elf_begin in -lelf" >&5 +echo $ECHO_N "checking for elf_begin in -lelf... $ECHO_C" >&6; } if test "${ac_cv_lib_elf_elf_begin+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16152,24 +16551,29 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char elf_begin (); int main () { -elf_begin (); +return elf_begin (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -16193,22 +16597,23 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_elf_elf_begin=no + ac_cv_lib_elf_elf_begin=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_elf_elf_begin" >&5 -echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_elf_elf_begin" >&5 +echo "${ECHO_T}$ac_cv_lib_elf_elf_begin" >&6; } if test $ac_cv_lib_elf_elf_begin = yes; then LIBS="-lelf $LIBS" fi fi if test $ac_have_func = no; then - echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 -echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5 +echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; } if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16221,24 +16626,29 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char kvm_open (); int main () { -kvm_open (); +return kvm_open (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -16262,21 +16672,22 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_kvm_kvm_open=no + ac_cv_lib_kvm_kvm_open=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 -echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5 +echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; } if test $ac_cv_lib_kvm_kvm_open = yes; then LIBS="-lkvm $LIBS" fi # Check for the 4.4BSD definition of getloadavg. - echo "$as_me:$LINENO: checking for getloadavg in -lutil" >&5 -echo $ECHO_N "checking for getloadavg in -lutil... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for getloadavg in -lutil" >&5 +echo $ECHO_N "checking for getloadavg in -lutil... $ECHO_C" >&6; } if test "${ac_cv_lib_util_getloadavg+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16289,24 +16700,29 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getloadavg (); int main () { -getloadavg (); +return getloadavg (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -16330,14 +16746,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_util_getloadavg=no + ac_cv_lib_util_getloadavg=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_util_getloadavg" >&5 -echo "${ECHO_T}$ac_cv_lib_util_getloadavg" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_getloadavg" >&5 +echo "${ECHO_T}$ac_cv_lib_util_getloadavg" >&6; } if test $ac_cv_lib_util_getloadavg = yes; then LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes fi @@ -16349,8 +16766,8 @@ if test $ac_have_func = no; then # Since it is not a standard part of AIX, it might be installed locally. ac_getloadavg_LIBS=$LIBS LIBS="-L/usr/local/lib $LIBS" - echo "$as_me:$LINENO: checking for getloadavg in -lgetloadavg" >&5 -echo $ECHO_N "checking for getloadavg in -lgetloadavg... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for getloadavg in -lgetloadavg" >&5 +echo $ECHO_N "checking for getloadavg in -lgetloadavg... $ECHO_C" >&6; } if test "${ac_cv_lib_getloadavg_getloadavg+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16363,56 +16780,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char getloadavg (); int main () { -getloadavg (); +return getloadavg (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_getloadavg_getloadavg=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_getloadavg_getloadavg=no + ac_cv_lib_getloadavg_getloadavg=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_getloadavg_getloadavg" >&5 -echo "${ECHO_T}$ac_cv_lib_getloadavg_getloadavg" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_getloadavg_getloadavg" >&5 +echo "${ECHO_T}$ac_cv_lib_getloadavg_getloadavg" >&6; } if test $ac_cv_lib_getloadavg_getloadavg = yes; then LIBS="-lgetloadavg $LIBS" else @@ -16427,9 +16841,9 @@ fi for ac_func in getloadavg do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -16455,80 +16869,70 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF else - case $LIBOBJS in - "getloadavg.$ac_objext" | \ - *" getloadavg.$ac_objext" | \ - "getloadavg.$ac_objext "* | \ + case " $LIBOBJS " in *" getloadavg.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS getloadavg.$ac_objext" ;; + *) LIBOBJS="$LIBOBJS getloadavg.$ac_objext" + ;; esac @@ -16539,17 +16943,17 @@ _ACEOF # Figure out what our getloadavg.c needs. ac_have_func=no if test "${ac_cv_header_sys_dg_sys_info_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/dg_sys_info.h" >&5 -echo $ECHO_N "checking for sys/dg_sys_info.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for sys/dg_sys_info.h" >&5 +echo $ECHO_N "checking for sys/dg_sys_info.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_dg_sys_info_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_dg_sys_info_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_dg_sys_info_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_dg_sys_info_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_dg_sys_info_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking sys/dg_sys_info.h usability" >&5 -echo $ECHO_N "checking sys/dg_sys_info.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/dg_sys_info.h usability" >&5 +echo $ECHO_N "checking sys/dg_sys_info.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16560,41 +16964,37 @@ $ac_includes_default #include <sys/dg_sys_info.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking sys/dg_sys_info.h presence" >&5 -echo $ECHO_N "checking sys/dg_sys_info.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/dg_sys_info.h presence" >&5 +echo $ECHO_N "checking sys/dg_sys_info.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16603,24 +17003,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/dg_sys_info.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -16628,9 +17026,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -16654,25 +17053,18 @@ echo "$as_me: WARNING: sys/dg_sys_info.h: section \"Present But Cannot Be Co echo "$as_me: WARNING: sys/dg_sys_info.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: sys/dg_sys_info.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: sys/dg_sys_info.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for sys/dg_sys_info.h" >&5 -echo $ECHO_N "checking for sys/dg_sys_info.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sys/dg_sys_info.h" >&5 +echo $ECHO_N "checking for sys/dg_sys_info.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_dg_sys_info_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_sys_dg_sys_info_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_dg_sys_info_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_dg_sys_info_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_dg_sys_info_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_dg_sys_info_h" >&6; } fi if test $ac_cv_header_sys_dg_sys_info_h = yes; then @@ -16683,8 +17075,8 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -echo "$as_me:$LINENO: checking for dg_sys_info in -ldgc" >&5 -echo $ECHO_N "checking for dg_sys_info in -ldgc... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for dg_sys_info in -ldgc" >&5 +echo $ECHO_N "checking for dg_sys_info in -ldgc... $ECHO_C" >&6; } if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -16697,56 +17089,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dg_sys_info (); int main () { -dg_sys_info (); +return dg_sys_info (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_dgc_dg_sys_info=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_dgc_dg_sys_info=no + ac_cv_lib_dgc_dg_sys_info=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_dgc_dg_sys_info" >&5 -echo "${ECHO_T}$ac_cv_lib_dgc_dg_sys_info" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dgc_dg_sys_info" >&5 +echo "${ECHO_T}$ac_cv_lib_dgc_dg_sys_info" >&6; } if test $ac_cv_lib_dgc_dg_sys_info = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDGC 1 @@ -16761,17 +17150,17 @@ fi if test "${ac_cv_header_locale_h+set}" = set; then - echo "$as_me:$LINENO: checking for locale.h" >&5 -echo $ECHO_N "checking for locale.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for locale.h" >&5 +echo $ECHO_N "checking for locale.h... $ECHO_C" >&6; } if test "${ac_cv_header_locale_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_locale_h" >&5 -echo "${ECHO_T}$ac_cv_header_locale_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_locale_h" >&5 +echo "${ECHO_T}$ac_cv_header_locale_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking locale.h usability" >&5 -echo $ECHO_N "checking locale.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking locale.h usability" >&5 +echo $ECHO_N "checking locale.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16782,41 +17171,37 @@ $ac_includes_default #include <locale.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking locale.h presence" >&5 -echo $ECHO_N "checking locale.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking locale.h presence" >&5 +echo $ECHO_N "checking locale.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -16825,24 +17210,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <locale.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -16850,9 +17233,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -16876,25 +17260,18 @@ echo "$as_me: WARNING: locale.h: section \"Present But Cannot Be Compiled\"" echo "$as_me: WARNING: locale.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: locale.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: locale.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for locale.h" >&5 -echo $ECHO_N "checking for locale.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for locale.h" >&5 +echo $ECHO_N "checking for locale.h... $ECHO_C" >&6; } if test "${ac_cv_header_locale_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_locale_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_locale_h" >&5 -echo "${ECHO_T}$ac_cv_header_locale_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_locale_h" >&5 +echo "${ECHO_T}$ac_cv_header_locale_h" >&6; } fi @@ -16903,9 +17280,9 @@ fi for ac_func in setlocale do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -16931,68 +17308,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -17016,17 +17385,17 @@ fi if test $ac_have_func = no; then if test "${ac_cv_header_inq_stats_cpustats_h+set}" = set; then - echo "$as_me:$LINENO: checking for inq_stats/cpustats.h" >&5 -echo $ECHO_N "checking for inq_stats/cpustats.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for inq_stats/cpustats.h" >&5 +echo $ECHO_N "checking for inq_stats/cpustats.h... $ECHO_C" >&6; } if test "${ac_cv_header_inq_stats_cpustats_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_inq_stats_cpustats_h" >&5 -echo "${ECHO_T}$ac_cv_header_inq_stats_cpustats_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_inq_stats_cpustats_h" >&5 +echo "${ECHO_T}$ac_cv_header_inq_stats_cpustats_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking inq_stats/cpustats.h usability" >&5 -echo $ECHO_N "checking inq_stats/cpustats.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking inq_stats/cpustats.h usability" >&5 +echo $ECHO_N "checking inq_stats/cpustats.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17037,41 +17406,37 @@ $ac_includes_default #include <inq_stats/cpustats.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking inq_stats/cpustats.h presence" >&5 -echo $ECHO_N "checking inq_stats/cpustats.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking inq_stats/cpustats.h presence" >&5 +echo $ECHO_N "checking inq_stats/cpustats.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17080,24 +17445,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <inq_stats/cpustats.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -17105,9 +17468,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -17131,25 +17495,18 @@ echo "$as_me: WARNING: inq_stats/cpustats.h: section \"Present But Cannot Be echo "$as_me: WARNING: inq_stats/cpustats.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: inq_stats/cpustats.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: inq_stats/cpustats.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for inq_stats/cpustats.h" >&5 -echo $ECHO_N "checking for inq_stats/cpustats.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for inq_stats/cpustats.h" >&5 +echo $ECHO_N "checking for inq_stats/cpustats.h... $ECHO_C" >&6; } if test "${ac_cv_header_inq_stats_cpustats_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_inq_stats_cpustats_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_inq_stats_cpustats_h" >&5 -echo "${ECHO_T}$ac_cv_header_inq_stats_cpustats_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_inq_stats_cpustats_h" >&5 +echo "${ECHO_T}$ac_cv_header_inq_stats_cpustats_h" >&6; } fi if test $ac_cv_header_inq_stats_cpustats_h = yes; then @@ -17171,17 +17528,17 @@ fi if test $ac_have_func = no; then if test "${ac_cv_header_sys_cpustats_h+set}" = set; then - echo "$as_me:$LINENO: checking for sys/cpustats.h" >&5 -echo $ECHO_N "checking for sys/cpustats.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for sys/cpustats.h" >&5 +echo $ECHO_N "checking for sys/cpustats.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_cpustats_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_cpustats_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_cpustats_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_cpustats_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_cpustats_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking sys/cpustats.h usability" >&5 -echo $ECHO_N "checking sys/cpustats.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/cpustats.h usability" >&5 +echo $ECHO_N "checking sys/cpustats.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17192,41 +17549,37 @@ $ac_includes_default #include <sys/cpustats.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking sys/cpustats.h presence" >&5 -echo $ECHO_N "checking sys/cpustats.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking sys/cpustats.h presence" >&5 +echo $ECHO_N "checking sys/cpustats.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17235,24 +17588,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <sys/cpustats.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -17260,9 +17611,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -17286,25 +17638,18 @@ echo "$as_me: WARNING: sys/cpustats.h: section \"Present But Cannot Be Compi echo "$as_me: WARNING: sys/cpustats.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: sys/cpustats.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: sys/cpustats.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for sys/cpustats.h" >&5 -echo $ECHO_N "checking for sys/cpustats.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for sys/cpustats.h" >&5 +echo $ECHO_N "checking for sys/cpustats.h... $ECHO_C" >&6; } if test "${ac_cv_header_sys_cpustats_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_sys_cpustats_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_cpustats_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_cpustats_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_cpustats_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_cpustats_h" >&6; } fi if test $ac_cv_header_sys_cpustats_h = yes; then @@ -17322,18 +17667,19 @@ if test $ac_have_func = no; then for ac_header in mach/mach.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17344,41 +17690,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17387,24 +17729,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -17412,9 +17752,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -17438,25 +17779,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -17474,18 +17809,19 @@ fi for ac_header in nlist.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17496,41 +17832,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17539,24 +17871,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -17564,9 +17894,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -17590,33 +17921,27 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - echo "$as_me:$LINENO: checking for struct nlist.n_un.n_name" >&5 -echo $ECHO_N "checking for struct nlist.n_un.n_name... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for struct nlist.n_un.n_name" >&5 +echo $ECHO_N "checking for struct nlist.n_un.n_name... $ECHO_C" >&6; } if test "${ac_cv_member_struct_nlist_n_un_n_name+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17639,33 +17964,28 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_member_struct_nlist_n_un_n_name=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -17684,8 +18004,13 @@ return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -17709,14 +18034,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_member_struct_nlist_n_un_n_name=no + ac_cv_member_struct_nlist_n_un_n_name=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5 -echo "${ECHO_T}$ac_cv_member_struct_nlist_n_un_n_name" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_nlist_n_un_n_name" >&5 +echo "${ECHO_T}$ac_cv_member_struct_nlist_n_un_n_name" >&6; } if test $ac_cv_member_struct_nlist_n_un_n_name = yes; then cat >>confdefs.h <<_ACEOF @@ -17740,8 +18067,8 @@ done # Some definitions of getloadavg require that the program be installed setgid. -echo "$as_me:$LINENO: checking whether getloadavg requires setgid" >&5 -echo $ECHO_N "checking whether getloadavg requires setgid... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether getloadavg requires setgid" >&5 +echo $ECHO_N "checking whether getloadavg requires setgid... $ECHO_C" >&6; } if test "${ac_cv_func_getloadavg_setgid+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17765,8 +18092,8 @@ fi rm -f conftest* fi -echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg_setgid" >&5 -echo "${ECHO_T}$ac_cv_func_getloadavg_setgid" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getloadavg_setgid" >&5 +echo "${ECHO_T}$ac_cv_func_getloadavg_setgid" >&6; } if test $ac_cv_func_getloadavg_setgid = yes; then NEED_SETGID=true @@ -17779,8 +18106,8 @@ else fi if test $ac_cv_func_getloadavg_setgid = yes; then - echo "$as_me:$LINENO: checking group of /dev/kmem" >&5 -echo $ECHO_N "checking group of /dev/kmem... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking group of /dev/kmem" >&5 +echo $ECHO_N "checking group of /dev/kmem... $ECHO_C" >&6; } if test "${ac_cv_group_kmem+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -17794,8 +18121,8 @@ else / /s/.* //;p;'` fi -echo "$as_me:$LINENO: result: $ac_cv_group_kmem" >&5 -echo "${ECHO_T}$ac_cv_group_kmem" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_group_kmem" >&5 +echo "${ECHO_T}$ac_cv_group_kmem" >&6; } KMEM_GROUP=$ac_cv_group_kmem fi if test "x$ac_save_LIBS" = x; then @@ -17807,13 +18134,12 @@ LIBS=$ac_save_LIBS -echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; } if test "${ac_cv_sys_largefile_source+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do - ac_cv_sys_largefile_source=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17824,40 +18150,39 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return !fseeko; +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - break + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_sys_largefile_source=no; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -17869,52 +18194,53 @@ cat >>conftest.$ac_ext <<_ACEOF int main () { -return !fseeko; +return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_sys_largefile_source=1; break else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_cv_sys_largefile_source=unknown break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 -echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 -if test "$ac_cv_sys_largefile_source" != no; then - +{ echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6; } +case $ac_cv_sys_largefile_source in #( + no | unknown) ;; + *) cat >>confdefs.h <<_ACEOF #define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source _ACEOF - -fi +;; +esac rm -f conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug @@ -18009,18 +18335,19 @@ fi for ac_header in getopt.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -18031,41 +18358,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -18074,24 +18397,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -18099,9 +18420,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -18125,25 +18447,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -18162,9 +18478,9 @@ done for ac_func in getopt_long_only do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -18190,68 +18506,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -18265,8 +18573,8 @@ done fi if test -z "$GETOPT_H"; then - echo "$as_me:$LINENO: checking whether optreset is declared" >&5 -echo $ECHO_N "checking whether optreset is declared... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether optreset is declared" >&5 +echo $ECHO_N "checking whether optreset is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_optreset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18282,7 +18590,7 @@ int main () { #ifndef optreset - char *p = (char *) optreset; + (void) optreset; #endif ; @@ -18290,8 +18598,13 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -18315,12 +18628,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_decl_optreset=no + ac_cv_have_decl_optreset=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5 -echo "${ECHO_T}$ac_cv_have_decl_optreset" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_optreset" >&5 +echo "${ECHO_T}$ac_cv_have_decl_optreset" >&6; } if test $ac_cv_have_decl_optreset = yes; then GETOPT_H=getopt.h fi @@ -18328,14 +18642,14 @@ fi fi if test -z "$GETOPT_H"; then - echo "$as_me:$LINENO: checking for working GNU getopt function" >&5 -echo $ECHO_N "checking for working GNU getopt function... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for working GNU getopt function" >&5 +echo $ECHO_N "checking for working GNU getopt function... $ECHO_C" >&6; } if test "${gl_cv_func_gnu_getopt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - echo "$as_me:$LINENO: checking whether getopt_clip is declared" >&5 -echo $ECHO_N "checking whether getopt_clip is declared... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether getopt_clip is declared" >&5 +echo $ECHO_N "checking whether getopt_clip is declared... $ECHO_C" >&6; } if test "${ac_cv_have_decl_getopt_clip+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18351,7 +18665,7 @@ int main () { #ifndef getopt_clip - char *p = (char *) getopt_clip; + (void) getopt_clip; #endif ; @@ -18359,38 +18673,34 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_have_decl_getopt_clip=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_have_decl_getopt_clip=no + ac_cv_have_decl_getopt_clip=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5 -echo "${ECHO_T}$ac_cv_have_decl_getopt_clip" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_getopt_clip" >&5 +echo "${ECHO_T}$ac_cv_have_decl_getopt_clip" >&6; } if test $ac_cv_have_decl_getopt_clip = yes; then gl_cv_func_gnu_getopt=no else @@ -18420,13 +18730,22 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -18439,11 +18758,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) gl_cv_func_gnu_getopt=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: result: $gl_cv_func_gnu_getopt" >&5 -echo "${ECHO_T}$gl_cv_func_gnu_getopt" >&6 +{ echo "$as_me:$LINENO: result: $gl_cv_func_gnu_getopt" >&5 +echo "${ECHO_T}$gl_cv_func_gnu_getopt" >&6; } if test "$gl_cv_func_gnu_getopt" = "no"; then GETOPT_H=getopt.h fi @@ -18470,8 +18791,8 @@ fi -echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5 -echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5 +echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6; } if test "${ac_cv_func_getpgrp_void+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18492,39 +18813,35 @@ getpgrp (0); } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_func_getpgrp_void=no else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_getpgrp_void=yes + ac_cv_func_getpgrp_void=yes fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5 -echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5 +echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6; } if test $ac_cv_func_getpgrp_void = yes; then cat >>confdefs.h <<\_ACEOF @@ -18538,9 +18855,9 @@ fi for ac_func in strftime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -18566,68 +18883,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -18635,8 +18944,8 @@ _ACEOF else # strftime is in -lintl on SCO UNIX. -echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 -echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for strftime in -lintl" >&5 +echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_strftime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18649,24 +18958,29 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char strftime (); int main () { -strftime (); +return strftime (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -18690,14 +19004,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_intl_strftime=no + ac_cv_lib_intl_strftime=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6; } if test $ac_cv_lib_intl_strftime = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_STRFTIME 1 @@ -18715,9 +19030,9 @@ done for ac_func in grantpt do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -18743,68 +19058,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -18819,9 +19126,9 @@ done for ac_func in getpt do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -18847,68 +19154,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -18923,8 +19222,8 @@ done # It's better to believe a function is not available # than to expect to find it in ncurses. -echo "$as_me:$LINENO: checking for tparm in -lncurses" >&5 -echo $ECHO_N "checking for tparm in -lncurses... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for tparm in -lncurses" >&5 +echo $ECHO_N "checking for tparm in -lncurses... $ECHO_C" >&6; } if test "${ac_cv_lib_ncurses_tparm+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -18937,56 +19236,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char tparm (); int main () { -tparm (); +return tparm (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_ncurses_tparm=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_ncurses_tparm=no + ac_cv_lib_ncurses_tparm=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tparm" >&5 -echo "${ECHO_T}$ac_cv_lib_ncurses_tparm" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tparm" >&5 +echo "${ECHO_T}$ac_cv_lib_ncurses_tparm" >&6; } if test $ac_cv_lib_ncurses_tparm = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNCURSES 1 @@ -19001,8 +19297,8 @@ fi if test "$with_hesiod" = yes ; then # Don't set $LIBS here -- see comments above. resolv=no - echo "$as_me:$LINENO: checking for res_send" >&5 -echo $ECHO_N "checking for res_send... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for res_send" >&5 +echo $ECHO_N "checking for res_send... $ECHO_C" >&6; } if test "${ac_cv_func_res_send+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19029,73 +19325,64 @@ cat >>conftest.$ac_ext <<_ACEOF #undef res_send -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char res_send (); /* 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_res_send) || defined (__stub___res_send) +#if defined __stub_res_send || defined __stub___res_send choke me -#else -char (*f) () = res_send; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != res_send; +return res_send (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_res_send=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_res_send=no + ac_cv_func_res_send=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5 -echo "${ECHO_T}$ac_cv_func_res_send" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_res_send" >&5 +echo "${ECHO_T}$ac_cv_func_res_send" >&6; } if test $ac_cv_func_res_send = yes; then : else - echo "$as_me:$LINENO: checking for __res_send" >&5 -echo $ECHO_N "checking for __res_send... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for __res_send" >&5 +echo $ECHO_N "checking for __res_send... $ECHO_C" >&6; } if test "${ac_cv_func___res_send+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19122,37 +19409,36 @@ cat >>conftest.$ac_ext <<_ACEOF #undef __res_send -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char __res_send (); /* 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___res_send) || defined (__stub_____res_send) +#if defined __stub___res_send || defined __stub_____res_send choke me -#else -char (*f) () = __res_send; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != __res_send; +return __res_send (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -19176,18 +19462,19 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func___res_send=no + ac_cv_func___res_send=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func___res_send" >&5 -echo "${ECHO_T}$ac_cv_func___res_send" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func___res_send" >&5 +echo "${ECHO_T}$ac_cv_func___res_send" >&6; } if test $ac_cv_func___res_send = yes; then : else - echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5 -echo $ECHO_N "checking for res_send in -lresolv... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for res_send in -lresolv" >&5 +echo $ECHO_N "checking for res_send in -lresolv... $ECHO_C" >&6; } if test "${ac_cv_lib_resolv_res_send+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19200,61 +19487,58 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char res_send (); int main () { -res_send (); +return res_send (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_resolv_res_send=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_resolv_res_send=no + ac_cv_lib_resolv_res_send=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_res_send" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_send" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_res_send" >&6; } if test $ac_cv_lib_resolv_res_send = yes; then resolv=yes else - echo "$as_me:$LINENO: checking for __res_send in -lresolv" >&5 -echo $ECHO_N "checking for __res_send in -lresolv... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for __res_send in -lresolv" >&5 +echo $ECHO_N "checking for __res_send in -lresolv... $ECHO_C" >&6; } if test "${ac_cv_lib_resolv___res_send+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19267,56 +19551,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char __res_send (); int main () { -__res_send (); +return __res_send (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_resolv___res_send=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_resolv___res_send=no + ac_cv_lib_resolv___res_send=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_send" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv___res_send" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___res_send" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv___res_send" >&6; } if test $ac_cv_lib_resolv___res_send = yes; then resolv=yes fi @@ -19337,8 +19618,8 @@ _ACEOF else RESOLVLIB= fi - echo "$as_me:$LINENO: checking for hes_getmailhost" >&5 -echo $ECHO_N "checking for hes_getmailhost... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for hes_getmailhost" >&5 +echo $ECHO_N "checking for hes_getmailhost... $ECHO_C" >&6; } if test "${ac_cv_func_hes_getmailhost+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19365,73 +19646,64 @@ cat >>conftest.$ac_ext <<_ACEOF #undef hes_getmailhost -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char hes_getmailhost (); /* 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_hes_getmailhost) || defined (__stub___hes_getmailhost) +#if defined __stub_hes_getmailhost || defined __stub___hes_getmailhost choke me -#else -char (*f) () = hes_getmailhost; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != hes_getmailhost; +return hes_getmailhost (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_hes_getmailhost=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_hes_getmailhost=no + ac_cv_func_hes_getmailhost=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_hes_getmailhost" >&5 -echo "${ECHO_T}$ac_cv_func_hes_getmailhost" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_hes_getmailhost" >&5 +echo "${ECHO_T}$ac_cv_func_hes_getmailhost" >&6; } if test $ac_cv_func_hes_getmailhost = yes; then : else - echo "$as_me:$LINENO: checking for hes_getmailhost in -lhesiod" >&5 -echo $ECHO_N "checking for hes_getmailhost in -lhesiod... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for hes_getmailhost in -lhesiod" >&5 +echo $ECHO_N "checking for hes_getmailhost in -lhesiod... $ECHO_C" >&6; } if test "${ac_cv_lib_hesiod_hes_getmailhost+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19444,24 +19716,29 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char hes_getmailhost (); int main () { -hes_getmailhost (); +return hes_getmailhost (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -19485,14 +19762,15 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_hesiod_hes_getmailhost=no + ac_cv_lib_hesiod_hes_getmailhost=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5 -echo "${ECHO_T}$ac_cv_lib_hesiod_hes_getmailhost" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5 +echo "${ECHO_T}$ac_cv_lib_hesiod_hes_getmailhost" >&6; } if test $ac_cv_lib_hesiod_hes_getmailhost = yes; then cat >>confdefs.h <<\_ACEOF @@ -19510,8 +19788,8 @@ fi # These tell us which Kerberos-related libraries to use. if test "${with_kerberos+set}" = set; then -echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5 -echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5 +echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6; } if test "${ac_cv_lib_com_err_com_err+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19524,56 +19802,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char com_err (); int main () { -com_err (); +return com_err (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_com_err_com_err=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_com_err_com_err=no + ac_cv_lib_com_err_com_err=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5 -echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5 +echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6; } if test $ac_cv_lib_com_err_com_err = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBCOM_ERR 1 @@ -19584,8 +19859,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 -echo $ECHO_N "checking for mit_des_cbc_encrypt in -lk5crypto... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 +echo $ECHO_N "checking for mit_des_cbc_encrypt in -lk5crypto... $ECHO_C" >&6; } if test "${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19598,56 +19873,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char mit_des_cbc_encrypt (); int main () { -mit_des_cbc_encrypt (); +return mit_des_cbc_encrypt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_k5crypto_mit_des_cbc_encrypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_k5crypto_mit_des_cbc_encrypt=no + ac_cv_lib_k5crypto_mit_des_cbc_encrypt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5 -echo "${ECHO_T}$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5 +echo "${ECHO_T}$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; } if test $ac_cv_lib_k5crypto_mit_des_cbc_encrypt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBK5CRYPTO 1 @@ -19658,8 +19930,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for mit_des_cbc_encrypt in -lcrypto" >&5 -echo $ECHO_N "checking for mit_des_cbc_encrypt in -lcrypto... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for mit_des_cbc_encrypt in -lcrypto" >&5 +echo $ECHO_N "checking for mit_des_cbc_encrypt in -lcrypto... $ECHO_C" >&6; } if test "${ac_cv_lib_crypto_mit_des_cbc_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19672,56 +19944,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char mit_des_cbc_encrypt (); int main () { -mit_des_cbc_encrypt (); +return mit_des_cbc_encrypt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_crypto_mit_des_cbc_encrypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_crypto_mit_des_cbc_encrypt=no + ac_cv_lib_crypto_mit_des_cbc_encrypt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5 -echo "${ECHO_T}$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5 +echo "${ECHO_T}$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; } if test $ac_cv_lib_crypto_mit_des_cbc_encrypt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPTO 1 @@ -19732,8 +20001,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for krb5_init_context in -lkrb5" >&5 -echo $ECHO_N "checking for krb5_init_context in -lkrb5... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for krb5_init_context in -lkrb5" >&5 +echo $ECHO_N "checking for krb5_init_context in -lkrb5... $ECHO_C" >&6; } if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19746,56 +20015,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char krb5_init_context (); int main () { -krb5_init_context (); +return krb5_init_context (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_krb5_krb5_init_context=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_krb5_krb5_init_context=no + ac_cv_lib_krb5_krb5_init_context=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5 -echo "${ECHO_T}$ac_cv_lib_krb5_krb5_init_context" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb5_krb5_init_context" >&5 +echo "${ECHO_T}$ac_cv_lib_krb5_krb5_init_context" >&6; } if test $ac_cv_lib_krb5_krb5_init_context = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKRB5 1 @@ -19807,8 +20073,8 @@ fi if test "${with_kerberos5+set}" != set; then -echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes425" >&5 -echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes425" >&5 +echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6; } if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19821,56 +20087,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char des_cbc_encrypt (); int main () { -des_cbc_encrypt (); +return des_cbc_encrypt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_des425_des_cbc_encrypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_des425_des_cbc_encrypt=no + ac_cv_lib_des425_des_cbc_encrypt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 -echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 +echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6; } if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDES425 1 @@ -19880,8 +20143,8 @@ _ACEOF else -echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes" >&5 -echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes" >&5 +echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6; } if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19894,56 +20157,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char des_cbc_encrypt (); int main () { -des_cbc_encrypt (); +return des_cbc_encrypt (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_des_des_cbc_encrypt=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_des_des_cbc_encrypt=no + ac_cv_lib_des_des_cbc_encrypt=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 -echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 +echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6; } if test $ac_cv_lib_des_des_cbc_encrypt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDES 1 @@ -19956,8 +20216,8 @@ fi fi -echo "$as_me:$LINENO: checking for krb_get_cred in -lkrb4" >&5 -echo $ECHO_N "checking for krb_get_cred in -lkrb4... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for krb_get_cred in -lkrb4" >&5 +echo $ECHO_N "checking for krb_get_cred in -lkrb4... $ECHO_C" >&6; } if test "${ac_cv_lib_krb4_krb_get_cred+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -19970,56 +20230,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char krb_get_cred (); int main () { -krb_get_cred (); +return krb_get_cred (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_krb4_krb_get_cred=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_krb4_krb_get_cred=no + ac_cv_lib_krb4_krb_get_cred=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_get_cred" >&5 -echo "${ECHO_T}$ac_cv_lib_krb4_krb_get_cred" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_krb_get_cred" >&5 +echo "${ECHO_T}$ac_cv_lib_krb4_krb_get_cred" >&6; } if test $ac_cv_lib_krb4_krb_get_cred = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKRB4 1 @@ -20029,8 +20286,8 @@ _ACEOF else -echo "$as_me:$LINENO: checking for krb_get_cred in -lkrb" >&5 -echo $ECHO_N "checking for krb_get_cred in -lkrb... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for krb_get_cred in -lkrb" >&5 +echo $ECHO_N "checking for krb_get_cred in -lkrb... $ECHO_C" >&6; } if test "${ac_cv_lib_krb_krb_get_cred+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -20043,56 +20300,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char krb_get_cred (); int main () { -krb_get_cred (); +return krb_get_cred (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_krb_krb_get_cred=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_krb_krb_get_cred=no + ac_cv_lib_krb_krb_get_cred=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_get_cred" >&5 -echo "${ECHO_T}$ac_cv_lib_krb_krb_get_cred" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb_krb_get_cred" >&5 +echo "${ECHO_T}$ac_cv_lib_krb_krb_get_cred" >&6; } if test $ac_cv_lib_krb_krb_get_cred = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKRB 1 @@ -20111,18 +20365,19 @@ fi for ac_header in krb5.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20133,41 +20388,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20176,24 +20427,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20201,9 +20450,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20227,25 +20477,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -20262,18 +20506,19 @@ done for ac_header in des.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20284,41 +20529,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20327,24 +20568,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20352,9 +20591,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20378,25 +20618,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -20409,18 +20643,19 @@ else for ac_header in kerberosIV/des.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20431,41 +20666,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20474,24 +20705,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20499,9 +20728,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20525,25 +20755,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -20556,18 +20780,19 @@ else for ac_header in kerberos/des.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20578,41 +20803,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20621,24 +20842,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20646,9 +20865,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20672,25 +20892,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -20714,18 +20928,19 @@ done for ac_header in krb.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20736,41 +20951,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20779,24 +20990,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20804,9 +21013,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20830,25 +21040,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -20861,18 +21065,19 @@ else for ac_header in kerberosIV/krb.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20883,41 +21088,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20926,24 +21127,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -20951,9 +21150,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -20977,25 +21177,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21008,18 +21202,19 @@ else for ac_header in kerberos/krb.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21030,41 +21225,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21073,24 +21264,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -21098,9 +21287,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21124,25 +21314,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21167,18 +21351,19 @@ done for ac_header in com_err.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21189,41 +21374,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21232,24 +21413,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -21257,9 +21436,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21283,25 +21463,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -21318,8 +21492,8 @@ fi # Solaris requires -lintl if you want strerror (which calls dgettext) # to return localized messages. -echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 -echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +echo $ECHO_N "checking for dgettext in -lintl... $ECHO_C" >&6; } if test "${ac_cv_lib_intl_dgettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21332,56 +21506,53 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char dgettext (); int main () { -dgettext (); +return dgettext (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_lib_intl_dgettext=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_intl_dgettext=no + ac_cv_lib_intl_dgettext=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +echo "${ECHO_T}$ac_cv_lib_intl_dgettext" >&6; } if test $ac_cv_lib_intl_dgettext = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBINTL 1 @@ -21392,8 +21563,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking whether localtime caches TZ" >&5 -echo $ECHO_N "checking whether localtime caches TZ... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether localtime caches TZ" >&5 +echo $ECHO_N "checking whether localtime caches TZ... $ECHO_C" >&6; } if test "${emacs_cv_localtime_cache+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21439,13 +21610,22 @@ main() } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -21458,16 +21638,18 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) emacs_cv_localtime_cache=yes fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + else # If we lack tzset, report that localtime does not cache TZ, # since we can't invalidate the cache if we don't have tzset. emacs_cv_localtime_cache=no fi fi -echo "$as_me:$LINENO: result: $emacs_cv_localtime_cache" >&5 -echo "${ECHO_T}$emacs_cv_localtime_cache" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_localtime_cache" >&5 +echo "${ECHO_T}$emacs_cv_localtime_cache" >&6; } if test $emacs_cv_localtime_cache = yes; then cat >>confdefs.h <<\_ACEOF @@ -21481,9 +21663,9 @@ if test "x$HAVE_TIMEVAL" = xyes; then for ac_func in gettimeofday do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -21509,68 +21691,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -21580,8 +21754,8 @@ fi done if test $ac_cv_func_gettimeofday = yes; then - echo "$as_me:$LINENO: checking whether gettimeofday can accept two arguments" >&5 -echo $ECHO_N "checking whether gettimeofday can accept two arguments... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking whether gettimeofday can accept two arguments" >&5 +echo $ECHO_N "checking whether gettimeofday can accept two arguments... $ECHO_C" >&6; } if test "${emacs_cv_gettimeofday_two_arguments+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21612,38 +21786,34 @@ struct timeval time; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_gettimeofday_two_arguments=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_gettimeofday_two_arguments=no + emacs_cv_gettimeofday_two_arguments=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_gettimeofday_two_arguments" >&5 -echo "${ECHO_T}$emacs_cv_gettimeofday_two_arguments" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_gettimeofday_two_arguments" >&5 +echo "${ECHO_T}$emacs_cv_gettimeofday_two_arguments" >&6; } if test $emacs_cv_gettimeofday_two_arguments = no; then cat >>confdefs.h <<\_ACEOF @@ -21655,8 +21825,8 @@ _ACEOF fi ok_so_far=yes -echo "$as_me:$LINENO: checking for socket" >&5 -echo $ECHO_N "checking for socket... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for socket" >&5 +echo $ECHO_N "checking for socket... $ECHO_C" >&6; } if test "${ac_cv_func_socket+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -21683,68 +21853,59 @@ cat >>conftest.$ac_ext <<_ACEOF #undef socket -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char socket (); /* 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_socket) || defined (__stub___socket) +#if defined __stub_socket || defined __stub___socket choke me -#else -char (*f) () = socket; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != socket; +return socket (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_socket=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_func_socket=no + ac_cv_func_socket=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 -echo "${ECHO_T}$ac_cv_func_socket" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_socket" >&5 +echo "${ECHO_T}$ac_cv_func_socket" >&6; } if test $ac_cv_func_socket = yes; then : else @@ -21753,17 +21914,17 @@ fi if test $ok_so_far = yes; then if test "${ac_cv_header_netinet_in_h+set}" = set; then - echo "$as_me:$LINENO: checking for netinet/in.h" >&5 -echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for netinet/in.h" >&5 +echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; } if test "${ac_cv_header_netinet_in_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 -echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 +echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking netinet/in.h usability" >&5 -echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking netinet/in.h usability" >&5 +echo $ECHO_N "checking netinet/in.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21774,8 +21935,13 @@ $ac_includes_default #include <netinet/in.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -21799,15 +21965,16 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking netinet/in.h presence" >&5 -echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking netinet/in.h presence" >&5 +echo $ECHO_N "checking netinet/in.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21816,24 +21983,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <netinet/in.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -21841,9 +22006,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -21867,25 +22033,18 @@ echo "$as_me: WARNING: netinet/in.h: section \"Present But Cannot Be Compile echo "$as_me: WARNING: netinet/in.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: netinet/in.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for netinet/in.h" >&5 -echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for netinet/in.h" >&5 +echo $ECHO_N "checking for netinet/in.h... $ECHO_C" >&6; } if test "${ac_cv_header_netinet_in_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_netinet_in_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 -echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_netinet_in_h" >&5 +echo "${ECHO_T}$ac_cv_header_netinet_in_h" >&6; } fi if test $ac_cv_header_netinet_in_h = yes; then @@ -21898,17 +22057,17 @@ fi fi if test $ok_so_far = yes; then if test "${ac_cv_header_arpa_inet_h+set}" = set; then - echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 -echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 +echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; } if test "${ac_cv_header_arpa_inet_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 -echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 +echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking arpa/inet.h usability" >&5 -echo $ECHO_N "checking arpa/inet.h usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking arpa/inet.h usability" >&5 +echo $ECHO_N "checking arpa/inet.h usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21919,41 +22078,37 @@ $ac_includes_default #include <arpa/inet.h> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking arpa/inet.h presence" >&5 -echo $ECHO_N "checking arpa/inet.h presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking arpa/inet.h presence" >&5 +echo $ECHO_N "checking arpa/inet.h presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21962,24 +22117,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <arpa/inet.h> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -21987,9 +22140,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22013,25 +22167,18 @@ echo "$as_me: WARNING: arpa/inet.h: section \"Present But Cannot Be Compiled echo "$as_me: WARNING: arpa/inet.h: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: arpa/inet.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 -echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for arpa/inet.h" >&5 +echo $ECHO_N "checking for arpa/inet.h... $ECHO_C" >&6; } if test "${ac_cv_header_arpa_inet_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_header_arpa_inet_h=$ac_header_preproc fi -echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 -echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_header_arpa_inet_h" >&5 +echo "${ECHO_T}$ac_cv_header_arpa_inet_h" >&6; } fi if test $ac_cv_header_arpa_inet_h = yes; then @@ -22054,18 +22201,19 @@ fi for ac_header in sys/ioctl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22076,41 +22224,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22119,24 +22263,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -22144,9 +22286,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22170,25 +22313,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22209,23 +22346,23 @@ _ACEOF fi -echo "$as_me:$LINENO: checking whether system supports dynamic ptys" >&5 -echo $ECHO_N "checking whether system supports dynamic ptys... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking whether system supports dynamic ptys" >&5 +echo $ECHO_N "checking whether system supports dynamic ptys... $ECHO_C" >&6; } if test -d /dev/pts && ls -d /dev/ptmx > /dev/null 2>&1 ; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } cat >>confdefs.h <<\_ACEOF #define HAVE_DEV_PTMX 1 _ACEOF else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22236,50 +22373,47 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef pid_t ac__type_new_; int main () { -if ((pid_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (pid_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_pid_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_pid_t=no + ac_cv_type_pid_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } if test $ac_cv_type_pid_t = yes; then : else @@ -22291,22 +22425,22 @@ _ACEOF fi - -for ac_header in unistd.h vfork.h +for ac_header in vfork.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22317,41 +22451,37 @@ $ac_includes_default #include <$ac_header> _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_header_compiler=no + ac_header_compiler=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } # Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -22360,24 +22490,22 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 @@ -22385,9 +22513,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi + rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -22411,25 +22540,19 @@ echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 + ;; esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } fi if test `eval echo '${'$as_ac_Header'}'` = yes; then @@ -22446,9 +22569,9 @@ done for ac_func in fork vfork do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -22474,68 +22597,60 @@ cat >>conftest.$ac_ext <<_ACEOF #undef $ac_func -/* Override any gcc2 internal prototype to avoid an error. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ #ifdef __cplusplus extern "C" -{ #endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} #endif int main () { -return f != $ac_func; +return $ac_func (); ; return 0; } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -eval "$as_ac_var=no" + eval "$as_ac_var=no" fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 @@ -22545,8 +22660,8 @@ fi done if test "x$ac_cv_func_fork" = xyes; then - echo "$as_me:$LINENO: checking for working fork" >&5 -echo $ECHO_N "checking for working fork... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for working fork" >&5 +echo $ECHO_N "checking for working fork... $ECHO_C" >&6; } if test "${ac_cv_func_fork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22554,27 +22669,40 @@ else ac_cv_func_fork_works=cross else cat >conftest.$ac_ext <<_ACEOF -/* By Ruediger Kuhlmann. */ - #include <sys/types.h> - #if HAVE_UNISTD_H - # include <unistd.h> - #endif - /* Some systems only have a dummy stub for fork() */ - int main () - { - if (fork() < 0) - exit (1); - exit (0); - } +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + + /* By Ruediger Kuhlmann. */ + return fork () < 0; + + ; + return 0; +} _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22587,11 +22715,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_fork_works=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 -echo "${ECHO_T}$ac_cv_func_fork_works" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 +echo "${ECHO_T}$ac_cv_func_fork_works" >&6; } else ac_cv_func_fork_works=$ac_cv_func_fork @@ -22611,8 +22741,8 @@ echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross co fi ac_cv_func_vfork_works=$ac_cv_func_vfork if test "x$ac_cv_func_vfork" = xyes; then - echo "$as_me:$LINENO: checking for working vfork" >&5 -echo $ECHO_N "checking for working vfork... $ECHO_C" >&6 + { echo "$as_me:$LINENO: checking for working vfork" >&5 +echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; } if test "${ac_cv_func_vfork_works+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22626,15 +22756,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ /* Thanks to Paul Eggert for this test. */ -#include <stdio.h> -#include <stdlib.h> -#include <sys/types.h> -#include <sys/stat.h> +$ac_includes_default #include <sys/wait.h> -#if HAVE_UNISTD_H -# include <unistd.h> -#endif -#if HAVE_VFORK_H +#ifdef HAVE_VFORK_H # include <vfork.h> #endif /* On some sparc systems, changes by the child to local and incoming @@ -22705,7 +22829,7 @@ main () while (wait(&status) != child) ; - exit( + return ( /* Was there some problem with vforking? */ child < 0 @@ -22722,13 +22846,22 @@ main () } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -22741,11 +22874,13 @@ sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_func_vfork_works=no fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + + fi -echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 -echo "${ECHO_T}$ac_cv_func_vfork_works" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 +echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; } fi; if test "x$ac_cv_func_fork_works" = xcross; then @@ -22776,8 +22911,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 -echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5 +echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; } if test "${emacs_cv_langinfo_codeset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22797,40 +22932,37 @@ char* cs = nl_langinfo(CODESET); } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then emacs_cv_langinfo_codeset=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_langinfo_codeset=no + emacs_cv_langinfo_codeset=no fi -rm -f conftest.err conftest.$ac_objext \ + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_langinfo_codeset" >&5 -echo "${ECHO_T}$emacs_cv_langinfo_codeset" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_langinfo_codeset" >&5 +echo "${ECHO_T}$emacs_cv_langinfo_codeset" >&6; } if test $emacs_cv_langinfo_codeset = yes; then cat >>confdefs.h <<\_ACEOF @@ -22839,8 +22971,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22851,20 +22983,26 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default +typedef size_t ac__type_new_; int main () { -if ((size_t *) 0) +if ((ac__type_new_ *) 0) return 0; -if (sizeof (size_t)) +if (sizeof (ac__type_new_)) return 0; ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22888,12 +23026,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_size_t=no + ac_cv_type_size_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; } if test $ac_cv_type_size_t = yes; then cat >>confdefs.h <<_ACEOF @@ -22904,8 +23043,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for mbstate_t" >&5 -echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for mbstate_t" >&5 +echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; } if test "${ac_cv_type_mbstate_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22926,8 +23065,13 @@ mbstate_t x; return sizeof x; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -22951,12 +23095,13 @@ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_type_mbstate_t=no + ac_cv_type_mbstate_t=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 -echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6 +{ echo "$as_me:$LINENO: result: $ac_cv_type_mbstate_t" >&5 +echo "${ECHO_T}$ac_cv_type_mbstate_t" >&6; } if test $ac_cv_type_mbstate_t = yes; then cat >>confdefs.h <<\_ACEOF @@ -22971,8 +23116,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for C restrict keyword" >&5 -echo $ECHO_N "checking for C restrict keyword... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C restrict keyword" >&5 +echo $ECHO_N "checking for C restrict keyword... $ECHO_C" >&6; } if test "${emacs_cv_c_restrict+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -22992,33 +23137,28 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_c_restrict=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@ -23034,40 +23174,37 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_c_restrict=__restrict else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_c_restrict=no + emacs_cv_c_restrict=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_c_restrict" >&5 -echo "${ECHO_T}$emacs_cv_c_restrict" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_c_restrict" >&5 +echo "${ECHO_T}$emacs_cv_c_restrict" >&6; } case "$emacs_cv_c_restrict" in yes) emacs_restrict=restrict;; no) emacs_restrict="";; @@ -23081,8 +23218,8 @@ _ACEOF fi -echo "$as_me:$LINENO: checking for C restricted array declarations" >&5 -echo $ECHO_N "checking for C restricted array declarations... $ECHO_C" >&6 +{ echo "$as_me:$LINENO: checking for C restricted array declarations" >&5 +echo $ECHO_N "checking for C restricted array declarations... $ECHO_C" >&6; } if test "${emacs_cv_c_restrict_arr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -23102,38 +23239,34 @@ main () } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then emacs_cv_c_restrict_arr=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -emacs_cv_c_restrict_arr=no + emacs_cv_c_restrict_arr=no fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $emacs_cv_c_restrict_arr" >&5 -echo "${ECHO_T}$emacs_cv_c_restrict_arr" >&6 +{ echo "$as_me:$LINENO: result: $emacs_cv_c_restrict_arr" >&5 +echo "${ECHO_T}$emacs_cv_c_restrict_arr" >&6; } if test "$emacs_cv_c_restrict_arr" = yes; then cat >>confdefs.h <<\_ACEOF @@ -23365,8 +23498,10 @@ fi rm -f conftest* - ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in lisp/Makefile lispref/Makefile lispintro/Makefile leim/Makefile" - ac_config_commands="$ac_config_commands default" +ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in lisp/Makefile lispref/Makefile lispintro/Makefile leim/Makefile" + +ac_config_commands="$ac_config_commands default" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -23385,39 +23520,58 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -{ +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; + ;; #( *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" ;; - esac; -} | + esac | + sort +) | sed ' + /^ac_cv_env_/b end t clear - : clear + :clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -23426,32 +23580,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -23482,17 +23622,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF ## M4sh Initialization. ## ## --------------------- ## -# Be Bourne compatible +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh fi -DUALCASE=1; export DUALCASE # for MKS sh # Support unset when possible. if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -23502,8 +23670,43 @@ else fi +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + # Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done PS1='$ ' PS2='> ' PS4='+ ' @@ -23517,18 +23720,19 @@ do if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then eval $as_var=C; export $as_var else - $as_unset $as_var + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done # Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then as_basename=basename else as_basename=false @@ -23536,159 +23740,120 @@ fi # Name of the executable. -as_me=`$as_basename "$0" || +as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || + X"$0" : 'X\(/\)' \| . 2>/dev/null || echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi +# CDPATH. +$as_unset CDPATH - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' as_lineno_1=$LINENO as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { # Create $as_me.lineno as a copy of $as_myself, but with $LINENO # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ t loop - s,-$,, - s,^['$as_cr_digits']*\n,, + s/-\n.*// ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" # Exit status is that of the last command. exit } -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1; then +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr else as_expr=false fi rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi echo >conf$$.file if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.file +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then as_mkdir_p=: @@ -23697,7 +23862,28 @@ else as_mkdir_p=false fi -as_executable_p="test -f" +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -23706,31 +23892,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to +# Save the log message, to keep $[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - +# values after options handling. +ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was +generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -23738,30 +23907,20 @@ generated by GNU Autoconf 2.59. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + _ACEOF +cat >>$CONFIG_STATUS <<_ACEOF # Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi +config_files="$ac_config_files" +config_headers="$ac_config_headers" +config_commands="$ac_config_commands" -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. @@ -23769,7 +23928,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions @@ -23788,19 +23947,21 @@ Configuration commands: $config_commands Report bugs to <bug-autoconf@gnu.org>." -_ACEOF +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2003 Free Software Foundation, Inc. +Copyright (C) 2006 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF @@ -23811,39 +23972,24 @@ while test $# != 0 do case $1 in --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - -*) + *) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; esac case $ac_option in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift @@ -23853,18 +23999,24 @@ Try \`$0 --help' for more information." >&2;} $ac_shift CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; - *) ac_config_targets="$ac_config_targets $1" ;; + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; esac shift @@ -23880,46 +24032,58 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 +_ACEOF cat >>$CONFIG_STATUS <<_ACEOF # -# INIT-COMMANDS section. +# INIT-COMMANDS # - GCC="$GCC" NON_GNU_CPP="$NON_GNU_CPP" CPP="$CPP" CPP_NEED_TRADITIONAL="$CPP_NEED_TRADITIONAL" CPPFLAGS="$CPPFLAGS" _ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. for ac_config_target in $ac_config_targets do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "lib-src/Makefile.c" ) CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;; - "oldXMenu/Makefile" ) CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;; - "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; - "lwlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;; - "src/Makefile.c" ) CONFIG_FILES="$CONFIG_FILES src/Makefile.c:src/Makefile.in" ;; - "lisp/Makefile" ) CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; - "lispref/Makefile" ) CONFIG_FILES="$CONFIG_FILES lispref/Makefile" ;; - "lispintro/Makefile" ) CONFIG_FILES="$CONFIG_FILES lispintro/Makefile" ;; - "leim/Makefile" ) CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; - "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;; + case $ac_config_target in + "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;; + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "lib-src/Makefile.c") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;; + "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;; + "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; + "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;; + "src/Makefile.c") CONFIG_FILES="$CONFIG_FILES src/Makefile.c:src/Makefile.in" ;; + "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; + "lispref/Makefile") CONFIG_FILES="$CONFIG_FILES lispref/Makefile" ;; + "lispintro/Makefile") CONFIG_FILES="$CONFIG_FILES lispintro/Makefile" ;; + "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; + "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done + # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -23931,37 +24095,194 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, +# simply because there is no reason against having it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. $debug || { - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 trap '{ (exit 1); exit 1; }' 1 2 13 15 } - # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") } || { echo "$me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -_ACEOF +# +# Set up the sed scripts for CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +MAINT!$MAINT$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +CPP!$CPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +LN_S!$LN_S$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +RANLIB!$RANLIB$ac_delim +INSTALL_INFO!$INSTALL_INFO$ac_delim +GZIP_PROG!$GZIP_PROG$ac_delim +LIBSOUND!$LIBSOUND$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim +ALSA_LIBS!$ALSA_LIBS$ac_delim +CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +XMKMF!$XMKMF$ac_delim +GTK_CFLAGS!$GTK_CFLAGS$ac_delim +GTK_LIBS!$GTK_LIBS$ac_delim +ALLOCA!$ALLOCA$ac_delim +liblockfile!$liblockfile$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +NEED_SETGID!$NEED_SETGID$ac_delim +KMEM_GROUP!$KMEM_GROUP$ac_delim +GETLOADAVG_LIBS!$GETLOADAVG_LIBS$ac_delim +GETOPT_H!$GETOPT_H$ac_delim +GETOPTOBJS!$GETOPTOBJS$ac_delim +version!$version$ac_delim +configuration!$configuration$ac_delim +canonical!$canonical$ac_delim +srcdir!$srcdir$ac_delim +lispdir!$lispdir$ac_delim +locallisppath!$locallisppath$ac_delim +lisppath!$lisppath$ac_delim +x_default_search_path!$x_default_search_path$ac_delim +etcdir!$etcdir$ac_delim +archlibdir!$archlibdir$ac_delim +bitmapdir!$bitmapdir$ac_delim +gamedir!$gamedir$ac_delim +gameuser!$gameuser$ac_delim +c_switch_system!$c_switch_system$ac_delim +c_switch_machine!$c_switch_machine$ac_delim +LD_SWITCH_X_SITE!$LD_SWITCH_X_SITE$ac_delim +LD_SWITCH_X_SITE_AUX!$LD_SWITCH_X_SITE_AUX$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS <conf$$subs.sed +rm -f conf$$subs.sed cat >>$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF -# -# CONFIG_FILES section. -# + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +C_SWITCH_X_SITE!$C_SWITCH_X_SITE$ac_delim +X_TOOLKIT_TYPE!$X_TOOLKIT_TYPE$ac_delim +machfile!$machfile$ac_delim +opsysfile!$opsysfile$ac_delim +carbon_appdir!$carbon_appdir$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF # No need to generate the scripts if there are no CONFIG_FILES. # This happens for instance when ./config.status config.h @@ -24115,175 +24436,260 @@ _ACEOF if test -z "$ac_sed_cmds"; then ac_sed_cmds=cat fi -fi # test -n "$CONFIG_FILES" +done +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS <conf$$subs.sed +rm -f conf$$subs.sed +cat >>$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof _ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } - ac_builddir=. -if test "$ac_dir" != .; then +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix case $srcdir in - .) # No --srcdir option. We are building in place. + .) # We are building in place. ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + case $ac_mode in + :F) + # + # CONFIG_FILE + # case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac +_ACEOF - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac _ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub @@ -24291,365 +24697,140 @@ _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for + ;; + :H) + # + # CONFIG_HEADER + # +_ACEOF + +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' +ac_dB='\\)[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' + +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines + +# Break up conftest.defines: +ac_max_sed_lines=50 + +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + +while : do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break rm -f conftest.defines mv conftest.tail conftest.defines done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs +rm -f conftest.defines conftest.tail +echo "ac_result=$ac_in" >>$CONFIG_STATUS cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - rm -f $ac_file - mv $tmp/config.h $ac_file + mv "$tmp/config.h" $ac_file fi else - cat $tmp/config.h - rm -f $tmp/config.h + echo "/* $configure_input */" + cat "$ac_result" fi -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac + rm -f "$tmp/out12" + ;; -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac + :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 +echo "$as_me: executing $ac_file commands" >&6;} + ;; + esac - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - default ) + case $ac_file$ac_mode in + "default":C) ### Make the necessary directories, if they don't exist. for dir in etc lisp ; do @@ -24725,11 +24906,10 @@ fi touch src/config.stamp ;; + esac -done -_ACEOF +done # for ac_tag -cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } _ACEOF diff --git a/configure.in b/configure.in index f1402409c0b..e4ebaf0ca77 100644 --- a/configure.in +++ b/configure.in @@ -23,7 +23,7 @@ dnl along with GNU Emacs; see the file COPYING. If not, write to the dnl Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, dnl Boston, MA 02110-1301, USA. -AC_PREREQ(2.54)dnl +AC_PREREQ(2.61)dnl AC_INIT(src/lisp.h) AC_CONFIG_HEADER(src/config.h:src/config.in) @@ -269,7 +269,6 @@ dnl see the `changequote' comment above. m68k-*-netbsd*) # This is somewhat bogus. machine=hp9000s300 ;; - powerpc-apple-netbsd*) machine=macppc ;; mips-*-netbsd*) machine=pmax ;; mipsel-*-netbsd*) machine=pmax ;; mipseb-*-netbsd*) machine=pmax ;; @@ -278,6 +277,9 @@ dnl see the `changequote' comment above. sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*) machine=vax ;; arm-*-netbsd*) machine=arm ;; + x86_64-*-netbsd*) machine=amdx86-64 ;; + hppa-*-netbsd*) machine=hp800 ;; + shle-*-netbsd*) machine=sh3el ;; esac ;; @@ -1576,9 +1578,30 @@ if test "${with_sound}" != "no"; then fi PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no) if test $HAVE_ALSA = yes; then + SAVE_CFLAGS="$CFLAGS" + SAVE_LDFLAGS="$LDFLAGS" + CFLAGS="$ALSA_CFLAGS $CFLAGS" + LDFLAGS="$ALSA_LIBS $LDFLAGS" + AC_TRY_COMPILE([#include <asoundlib.h>], [snd_lib_error_set_handler (0);], + emacs_alsa_normal=yes, + emacs_alsa_normal=no) + if test "$emacs_alsa_normal" != yes; then + AC_TRY_COMPILE([#include <alsa/asoundlib.h>], + [snd_lib_error_set_handler (0);], + emacs_alsa_subdir=yes, + emacs_alsa_subdir=no) + if test "$emacs_alsa_subdir" != yes; then + AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.]) + fi + ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" + fi + + CFLAGS="$SAVE_CFLAGS" + LDFLAGS="$SAVE_LDFLAGS" LIBSOUND="$LIBSOUND $ALSA_LIBS" CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.]) + AC_SUBST() fi AC_SUBST(CFLAGS_SOUND) fi @@ -2052,6 +2075,9 @@ fail; fi HAVE_GTK=no +if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then + USE_X_TOOLKIT=none +fi if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); @@ -2071,6 +2097,13 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS" CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$GTK_LIBS $LIBS" + dnl Try to compile a simple GTK program. + GTK_COMPILES=no + AC_CHECK_FUNCS(gtk_main, GTK_COMPILES=yes) + if test "${GTK_COMPILES}" != "yes"; then + AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?]); + fi + HAVE_GTK=yes AC_DEFINE(HAVE_GTK, 1, [Define to 1 if using GTK.]) USE_X_TOOLKIT=none diff --git a/etc/ChangeLog b/etc/ChangeLog index 13aa4c593c6..735198a497b 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,11 @@ +2006-12-17 Richard Stallman <rms@gnu.org> + + * TUTORIAL: Say that C-d and DEL with arg do killing. + +2006-12-16 Eli Zaretskii <eliz@gnu.org> + + * PROBLEMS: Document problems with rebasing Cygwin DLLs. + 2006-12-08 Michael Olson <mwolson@gnu.org> * ERC-NEWS: Note that the list module has been removed. @@ -122,8 +130,7 @@ 2006-09-03 Diane Murray <disumu@x3y2z1.net> - * erc.texi (Getting Started, Connecting): Changed erc-select to - erc. + * erc.texi (Getting Started, Connecting): Changed erc-select to erc. 2006-09-02 Juri Linkov <juri@jurta.org> @@ -1384,7 +1391,7 @@ 2004-09-16 Dan Nicolaescu <dann@ics.uci.edu> * e/eterm.ti: Change the strings for smso and rmso. - e/eterm: Regenerate. + * e/eterm: Regenerate. 2004-09-09 Thien-Thi Nguyen <ttn@gnu.org> @@ -2527,7 +2534,7 @@ * EUROPE: Renamed to ORDERS.EUROPE. DISTRIB now has a pointer to it at the beginning. - * OOOONEWS, OOOONEWS: Nuked. It's version 19 --- nobody needs the + * OOOONEWS, OOOONEWS: Nuked. It's version 19 --- nobody needs the version 15 and 17 files anymore. All files marked "Nuked" have actually been moved to =-prefixed @@ -6,10 +6,10 @@ See the end for copying conditions. Please send Emacs bug reports to bug-gnu-emacs@gnu.org. If possible, use M-x report-emacs-bug. -This file is about changes in emacs version 22. +This file is about changes in Emacs version 22. See files NEWS.21, NEWS.20, NEWS.19, NEWS.18, and NEWS.1-17 for changes -in older emacs versions. +in older Emacs versions. You can narrow news to a specific version by calling `view-emacs-news' with a prefix argument or by typing C-u C-h C-n. @@ -756,7 +756,8 @@ when the file name contains wildcard characters. +++ *** find-alternate-file replaces the current file with multiple files, -when the file name contains wildcard characters. +when the file name contains wildcard characters. It now asks if you +wish save your changes and not just offer to kill the buffer. +++ *** Auto Compression mode is now enabled by default. @@ -990,6 +991,11 @@ Due to technical limitations in how Emacs interacts with windowing systems, these constructs often failed to render properly, and could even cause Emacs to crash. ++++ +*** If value of `auto-resize-tool-bars' is `grow-only', the tool bar +will expand as needed, but not contract automatically. To contract +the tool bar, you must type C-l. + ** Cursor display changes: +++ @@ -2105,6 +2111,12 @@ for Emacs 22. In particular, the mode-line is now position sensitive. * Changes in Specialized Modes and Packages in Emacs 22.1: +** Changes in Shell Mode + +*** Shell output normally scrolls so that the input line is at the +bottom of the window -- thus showing the maximum possible text. (This +is similar to the way sequential output to a terminal works.) + ** Changes in Dired +++ @@ -3379,8 +3391,12 @@ version 5.0.2; see MH-E-NEWS for details. ** Calendar changes: +++ +*** The meanings of C-x < and C-x > have been interchanged. +< means to scroll backward in time, and > means to scroll forward. + ++++ *** You can now use < and >, instead of C-x < and C-x >, to scroll -the calendar left or right. (The old key bindings still work too.) +the calendar left or right. +++ *** There is a new calendar package, icalendar.el, that can be used to @@ -3852,6 +3868,11 @@ w32-use-full-screen-buffer to t. * Incompatible Lisp Changes in Emacs 22.1 ++++ +** The `read-file-name' function now returns a null string if the +user just types RET. + ++++ ** The function find-operation-coding-system may be called with a cons (FILENAME . BUFFER) in the second argument if the first argument OPERATION is `insert-file-contents', and thus a function registered in @@ -3890,7 +3911,13 @@ there is no longer a shortage of memory. +++ ** When Emacs receives a USR1 or USR2 signal, this generates -input event sequences: [signal usr1] or [signal usr2]. +input events: sigusr1 or sigusr2. Use special-event-map to +handle these events. + ++++ +** A hex or octal escape in a string constant forces the string to +be multibyte or unibyte, respectively. + * Lisp Changes in Emacs 22.1 @@ -4623,6 +4650,10 @@ autoloaded when not really necessary. *** The function `make-auto-save-file-name' is now handled by file name handlers. This will be exploited for remote files mainly. ++++ +*** The function `file-name-completion' accepts an optional argument +PREDICATE, and rejects completion candidates that don't satisfy PREDICATE. + ** Input changes: +++ @@ -4632,7 +4663,7 @@ maximum time to wait for input, in seconds. If no input arrives after this time elapses, the functions stop waiting and return nil. +++ -*** An interactive specification can now use the code letter 'U' to get +*** An interactive specification can now use the code letter `U' to get the up-event that was discarded in case the last key sequence read for a previous `k' or `K' argument was a down-event; otherwise nil is used. @@ -5588,10 +5619,25 @@ of multiline constructs so that such constructs get properly recognized. ** Major mode mechanism changes: +++ -*** `set-auto-mode' now gives the interpreter magic line (if present) -precedence over the file name. Likewise an `<?xml' or `<!DOCTYPE' -declaration will give the buffer XML or SGML mode, based on the new -variable `magic-mode-alist'. +*** If new variable `auto-mode-case-fold' is set to a non-nil value, +Emacs will perform a second case-insensitive search through +`auto-mode-alist' if the first case-sensitive search fails. +This means that a file FILE.TXT is opened in text-mode, and a file PROG.PY +is opened in python-mode. Note however, that independent of this +setting, *.C files are usually recognized as C++ files. +It also has no effect on systems with case-insensitive file names. + ++++ +*** New variable `magic-mode-alist' determines major mode for a file by +looking at the file contents. It takes precedence over `auto-mode-alist'. + ++++ +*** An interpreter magic line (if present) takes precedence over the +file name when setting the major mode. + ++++ +*** XML or SGML major mode is selected when file starts with an `<?xml' +or `<!DOCTYPE' declaration. +++ *** Use the new function `run-mode-hooks' to run the major mode's mode hook. diff --git a/etc/PROBLEMS b/etc/PROBLEMS index 70ee058b1a8..ffad920d7ec 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -2119,6 +2119,34 @@ and Shift, the Alt and Shift act as modifiers in the usual way. A more permanent work around is to change it to another key combination, or disable it in the keyboard control panel. +** Cygwin build of Emacs hangs after rebasing Cygwin DLLs + +Usually, on Cygwin, one needs to rebase the DLLs if an application +aborts with a message like this: + + C:\cygwin\bin\python.exe: *** unable to remap C:\cygwin\bin\cygssl.dll to + same address as parent(0xDF0000) != 0xE00000 + +However, since Cygwin DLL 1.5.17 was released, after such rebasing, +Emacs hangs. + +This was reported to happen for Emacs 21.2 and also for the pretest of +Emacs 22.1 on Cygwin. + +To work around this, build Emacs like this: + + LDFLAGS='-Wl,--enable-auto-import -Wl,--enable-auto-image-base' ./configure + make LD='$(CC)' + make LD='$(CC)' install + +This produces an Emacs binary that is independent of rebasing. + +Note that you _must_ use LD='$(CC)' in the last two commands above, to +prevent GCC from passing the "--image-base 0x20000000" option to the +linker, which is what it does by default. That option produces an +Emacs binary with the base address 0x20000000, which will cause Emacs +to hang after Cygwin DLLs are rebased. + ** Interrupting Cygwin port of Bash from Emacs doesn't work. Cygwin 1.x builds of the ported Bash cannot be interrupted from the @@ -87,6 +87,8 @@ current buffer. with evaluating definitions of the same function from different files, recording which file the latest definition came from. +** make back_comment use syntax-ppss or equivalent. + * Important features: ** Provide user-friendly ways to list all available font families, @@ -493,10 +495,24 @@ but which can also be used as a modifier). * Internal changes +** Merge ibuffer.el and buff-menu.el. + More specifically do what's needed to make ibuffer.el the default, + or just an extension of buff-menu.el. + +** Use pcomplete by default in shell-mode. + This means to make it behave (by default) more like the current code. + Use it also for read-shell-command, M-x compile, ... + +** Merge sendmail.el and messages.el. + Probably not a complete merge, but at least arrange for messages.el to be + a derived mode of sendmail.el. Or arrange for messages.el to be split + into a small core and "the rest" so that we use less resources as long as + we stick to the features provided in sendmail.el. + ** Replace gmalloc.c with the modified Doug Lea code from the current - GNU libc so that the special mmapping of buffers can be removed -- - that apparently loses under Solaris, at least. [fx has mostly done - this.] + GNU libc so that the special mmapping of buffers can be removed -- + that apparently loses under Solaris, at least. [fx has mostly done + this.] ** Rewrite make-docfile to be clean and maintainable. diff --git a/etc/TUTORIAL b/etc/TUTORIAL index 63e5d601fed..ff1075c17bb 100644 --- a/etc/TUTORIAL +++ b/etc/TUTORIAL @@ -384,7 +384,8 @@ Reinsertion of killed text is called "yanking". Generally, the commands that can remove a lot of text kill the text (they set up so that you can yank the text), while the commands that remove just one character, or only remove blank lines and spaces, do deletion (so you -cannot yank that text). +cannot yank that text). <Delback> and C-d do deletion in the simplest +case, with no argument. When given an argument, they kill instead. >> Move the cursor to the beginning of a line which is not empty. Then type C-k to kill the text on that line. diff --git a/leim/ChangeLog b/leim/ChangeLog index c7df3d6cbf9..57e8f626c61 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,12 @@ +2006-12-26 Andreas Schwab <schwab@suse.de> + + * Makefile.in (datarootdir): Define. + +2006-12-20 Eli Zaretskii <eliz@gnu.org> + + * Makefile.in (leim-list.el): Depend on ${TIT-MISC}, not + ${NON-TIT-MISC}. + 2006-12-09 Juanma Barranquero <lekktu@gmail.com> * quail/latin-alt.el ("scandinavian-alt-postfix"): Fix typo. diff --git a/leim/Makefile.in b/leim/Makefile.in index 1892ab8feca..9fdc0a30ad6 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -29,6 +29,7 @@ SHELL = /bin/sh # Here are the things that we expect ../configure to edit. version=@version@ prefix=@prefix@ +datarootdir=@datarootdir@ datadir=@datadir@ srcdir=@srcdir@ @@ -203,7 +204,7 @@ changed.misc: ${MISC-SOURCES} -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \ echo "changed" > $@ -leim-list.el: ${SUBDIRS} ${NON-TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el +leim-list.el: ${SUBDIRS} ${TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el ${RUN-EMACS} -l ${buildlisppath}/international/quail \ -f batch-byte-compile-if-not-done ${TIT-MISC:.elc=.el} if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \ diff --git a/lib-src/.gitignore b/lib-src/.gitignore index faf263e740d..157ce12c972 100644 --- a/lib-src/.gitignore +++ b/lib-src/.gitignore @@ -24,3 +24,4 @@ makefile blessmail *-spd *.pdb +stamp_BLD diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f15644050d9..76a0dcf1b9e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,36 @@ +2006-12-28 Francesco Potort,Al(B <pot@gnu.org> + + * etags.c (readline): When creating a relative file name from a + #line directive, leave the file name alone. The previous + behaviour was to make it relative to the tags file directory, + under the hypothesis that the #line directive file name was + relative to the directory of the tagged file. That hypothesis is + wrong with Cpp and Lex. + (Makefile_targets): Do not include spaces in tag names. + +2006-12-22 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (make-docfile, ctags, etags, ebrowse, hexl) + (movemail, fakemail, sorted-doc, digest-doc, emacsclient) + (test-distrib, $(DOC), all): depend on stamp_BLD instead of $(BLD). + ($(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O)) + ($(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O)) + ($(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS)) + ($(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O)) + ($(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O)): Depend on stamp_BLD. + (clean): Delete stamp_BLD. + +2006-12-20 Francesco Potort,Al(B <pot@gnu.org> + + * etags.c (C_entries): DEFUN names were longer by one: corrected. + +2006-12-18 Juanma Barranquero <lekktu@gmail.com> + + * emacsclient.c [WINDOWSNT] (set_fg, get_wc): New variables. + [WINDOWSNT] (w32_find_emacs_process, w32_give_focus): New functions. + (main) [WINDOWSNT]: Remove code to release the focus; call + w32_give_focus instead. + 2006-12-15 Juanma Barranquero <lekktu@gmail.com> * emacsclient.c (w32_execvp): New function; wrapper for `execvp'. @@ -26,7 +59,7 @@ (set_tcp_socket): Make the message for non-local connections informational rather than an error. -2006-11-28 Kevin Ryde <user42@zip.com.au> (tiny change) +2006-11-28 Kevin Ryde <user42@zip.com.au> * etags.c (readline): Check for double quote after #line. @@ -454,10 +487,9 @@ 2005-07-13 Ken Raeburn <raeburn@gnu.org> - * pop.c: Don't include des.h (or variants thereof); krb.h will do - it. - (sendline): Add the \r\n to the line in a temporary buffer, and - write it all at once. + * pop.c: Don't include des.h (or variants thereof); krb.h will do it. + (sendline): Add the \r\n to the line in a temporary buffer, and write + it all at once. 2005-07-04 Lute Kamstra <lute@gnu.org> @@ -497,10 +529,9 @@ 2005-02-04 Andreas Schwab <schwab@suse.de> - * movemail.c (fatal): Accept third parameter and pass down to - error. - (pfatal_with_name): Pass error string as format parameter instead - of as part of format string. + * movemail.c (fatal): Accept third parameter and pass down to error. + (pfatal_with_name): Pass error string as format parameter instead of + as part of format string. (pfatal_and_delete): Likewise. (main): Adjust call to fatal. (xmalloc): Likewise. @@ -511,8 +542,7 @@ 2004-12-26 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> - * make-docfile.c: Include stdlib.h even if WINDOWSNT is not - defined. + * make-docfile.c: Include stdlib.h even if WINDOWSNT is not defined. 2004-12-15 Andreas Schwab <schwab@suse.de> @@ -578,8 +608,7 @@ 2004-05-10 Thien-Thi Nguyen <ttn@gnu.org> - * test-distrib.c (main): For failing cases, exit with - `EXIT_FAILURE'. + * test-distrib.c (main): For failing cases, exit with `EXIT_FAILURE'. 2004-05-08 Jason Rumney <jasonr@gnu.org> @@ -752,8 +781,7 @@ 2003-04-27 Oliver Scholz <alkibiades@gmx.de> - * update-game-score.c (read_scores): Fix corruption of scores on - read. + * update-game-score.c (read_scores): Fix corruption of scores on read. 2003-04-12 Stefan Monnier <monnier@cs.yale.edu> diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index bbd6cbe239b..419cdd94b88 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -523,7 +523,7 @@ initialize_sockets () /* * Read the information needed to set up a TCP comm channel with * the Emacs server: host, port, pid and authentication string. -*/ + */ int get_server_config (server, authentication) struct sockaddr_in *server; @@ -845,6 +845,62 @@ set_socket () exit (EXIT_FAILURE); } +#ifdef WINDOWSNT +FARPROC set_fg; /* Pointer to AllowSetForegroundWindow. */ +FARPROC get_wc; /* Pointer to RealGetWindowClassA. */ + +BOOL CALLBACK +w32_find_emacs_process (hWnd, lParam) + HWND hWnd; + LPARAM lParam; +{ + DWORD pid; + char class[6]; + + /* Reject any window not of class "Emacs". */ + if (! get_wc (hWnd, class, sizeof (class)) + || strcmp (class, "Emacs")) + return TRUE; + + /* We only need the process id, not the thread id. */ + (void) GetWindowThreadProcessId (hWnd, &pid); + + /* Not the one we're looking for. */ + if (pid != (DWORD) emacs_pid) return TRUE; + + /* OK, let's raise it. */ + set_fg (emacs_pid); + + /* Stop enumeration. */ + return FALSE; +} + +/* + * Search for a window of class "Emacs" and owned by a process with + * process id = emacs_pid. If found, allow it to grab the focus. + */ +void +w32_give_focus () +{ + HMODULE hUser32; + + /* It should'nt happen when dealing with TCP sockets. */ + if (!emacs_pid) return; + + if (!(hUser32 = LoadLibrary ("user32.dll"))) return; + + /* Modern Windows restrict which processes can set the foreground window. + emacsclient can allow Emacs to grab the focus by calling the function + AllowSetForegroundWindow. Unfortunately, older Windows (W95, W98 and + NT) lack this function, so we have to check its availability. */ + if ((set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow")) + && (get_wc = GetProcAddress (hUser32, "RealGetWindowClassA"))) + EnumWindows (w32_find_emacs_process, (LPARAM) 0); + + FreeLibrary (hUser32); +} +#endif + int main (argc, argv) int argc; @@ -889,24 +945,7 @@ main (argc, argv) } #ifdef WINDOWSNT - /* - Modern Windows restrict which processes can set the foreground window. - emacsclient can allow Emacs to grab the focus by calling the function - AllowSetForegroundWindow. Unfortunately, older Windows (W95, W98 - and NT) lack this function, so we have to check its availability. - */ - if (emacs_pid) - { - HMODULE hUser32; - - if (hUser32 = LoadLibrary ("user32.dll")) - { - FARPROC set_fg; - if (set_fg = GetProcAddress (hUser32, "AllowSetForegroundWindow")) - set_fg (emacs_pid); - FreeLibrary (hUser32); - } - } + w32_give_focus (); #endif if (nowait) diff --git a/lib-src/etags.c b/lib-src/etags.c index 26dac368b4d..c4f7fdc4d69 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -41,7 +41,7 @@ * configuration file containing regexp definitions for etags. */ -char pot_etags_version[] = "@(#) pot revision number is $Revision: 3.61 $"; +char pot_etags_version[] = "@(#) pot revision number is 17.25"; #define TRUE 1 #define FALSE 0 @@ -3163,7 +3163,7 @@ static void make_C_tag (isfun) bool isfun; { - /* This function should never be called when token.valid is FALSE, but + /* This function is never called when token.valid is FALSE, but we must protect against invalid input or internal errors. */ if (!DEBUG && !token.valid) return; @@ -3493,7 +3493,6 @@ C_entries (c_ext, inf) off += 1; len -= 1; } - len = toklen; linebuffer_setlen (&token_name, len); strncpy (token_name.buffer, newlb.buffer + off, len); @@ -4687,8 +4686,16 @@ Makefile_targets (inf) while (*bp != '\0' && *bp != '=' && *bp != ':') bp++; if (*bp == ':' || (globals && *bp == '=')) - make_tag (lb.buffer, bp - lb.buffer, TRUE, - lb.buffer, bp - lb.buffer + 1, lineno, linecharno); + { + /* We should detect if there is more than one tag, but we do not. + We just skip initial and final spaces. */ + char * namestart = skip_spaces (lb.buffer); + while (--bp > namestart) + if (!notinname (*bp)) + break; + make_tag (namestart, bp - namestart + 1, TRUE, + lb.buffer, bp - lb.buffer + 2, lineno, linecharno); + } } } @@ -6278,7 +6285,7 @@ readline (lbp, stream) name = lbp->buffer + start; *endp = '\0'; canonicalize_filename (name); /* for DOS */ - taggedabsname = absolute_filename (name, curfdp->infabsdir); + taggedabsname = absolute_filename (name, tagfiledir); if (filename_is_absolute (name) || filename_is_absolute (curfdp->infname)) taggedfname = savestr (taggedabsname); diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 65d40255ae7..7b669c42bd4 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs .PHONY: $(ALL) -VERSION = 22.0.91 +VERSION = 22.0.92 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ @@ -45,18 +45,18 @@ $(BLD)/digest-doc.exe: $(BLD)/digest-doc.$(O) $(BLD)/test-distrib.exe: $(BLD)/test-distrib.$(O) $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(BLD)/test-distrib.$(O) $(LIBS) -make-docfile: $(BLD) $(BLD)/make-docfile.exe -ctags: $(BLD) $(BLD)/ctags.exe -etags: $(BLD) $(BLD)/etags.exe -ebrowse: $(BLD) $(BLD)/ebrowse.exe -hexl: $(BLD) $(BLD)/hexl.exe -movemail: $(BLD) $(BLD)/movemail.exe -fakemail: $(BLD) $(BLD)/fakemail.exe -sorted-doc: $(BLD) $(BLD)/sorted-doc.exe -digest-doc: $(BLD) $(BLD)/digest-doc.exe -emacsclient: $(BLD) $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe - -test-distrib: $(BLD) $(BLD)/test-distrib.exe +make-docfile: stamp_BLD $(BLD)/make-docfile.exe +ctags: stamp_BLD $(BLD)/ctags.exe +etags: stamp_BLD $(BLD)/etags.exe +ebrowse: stamp_BLD $(BLD)/ebrowse.exe +hexl: stamp_BLD $(BLD)/hexl.exe +movemail: stamp_BLD $(BLD)/movemail.exe +fakemail: stamp_BLD $(BLD)/fakemail.exe +sorted-doc: stamp_BLD $(BLD)/sorted-doc.exe +digest-doc: stamp_BLD $(BLD)/digest-doc.exe +emacsclient: stamp_BLD $(BLD)/emacsclient.exe $(BLD)/emacsclientw.exe + +test-distrib: stamp_BLD $(BLD)/test-distrib.exe "$(BLD)/test-distrib.exe" "$(SRC)/testfile" GETOPTOBJS = $(BLD)/getopt.$(O) $(BLD)/getopt1.$(O) @@ -275,7 +275,7 @@ lisp2 = \ - $(DEL) temacs.exe DOC = DOC -$(DOC): $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) +$(DOC): stamp_BLD $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp2) - $(DEL) $(DOC) "$(THISDIR)/$(BLD)/make-docfile" -o $(DOC) -d ../src $(obj) "$(THISDIR)/$(BLD)/make-docfile" -a $(DOC) -d ../src $(lisp1) @@ -291,7 +291,7 @@ $(DOC): $(BLD) $(BLD)/make-docfile.exe ../src/$(BLD)/temacs.exe $(lisp1) $(lisp # # Build the executables # -all: $(BLD) $(ALL) $(DOC) +all: stamp_BLD $(ALL) $(DOC) # # Assuming INSTALL_DIR is defined, build and install emacs in it. @@ -319,6 +319,7 @@ clean: - $(DEL) ctags.c - $(DEL) getopt.h - $(DEL_TREE) $(OBJDIR) + - $(DEL) stamp_BLD cleanall: clean - $(DEL_TREE) obj @@ -472,3 +473,16 @@ $(BLD)/timer.$(O) : \ $(EMACS_ROOT)/src/s/ms-w32.h \ $(EMACS_ROOT)/src/m/intel386.h \ $(EMACS_ROOT)/lib-src/../src/config.h + +# The following dependencies are for supporting parallel builds, where +# we must make sure $(BLD) exists before any compilation starts. +# +$(BLD)/make-docfile.$(O) $(BLD)/hexl.$(O) $(BLD)/fakemail.$(O): stamp_BLD + +$(BLD)/sorted-doc.$(O) $(BLD)/digest-doc.$(O): stamp_BLD + +$(BLD)/test-distrib.$(O) $(GETOPTOBJS) $(MOVEMAILOBJS): stamp_BLD + +$(BLD)/emacsclient.$(O) $(BLD)/etags.$(O) $(BLD)/regex.$(O): stamp_BLD + +$(BLD)/ebrowse.$(O) $(BLD)/ctags.$(O): stamp_BLD diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a57b4d5655d..51f8114feab 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,10 +1,404 @@ +2006-12-31 Romain Francoise <romain@orebokech.com> + + * net/tramp.el (tramp-default-method): Don't use `symbol-function'. + +2006-12-31 Kim F. Storm <storm@cua.dk> + + * files.el (auto-mode-case-fold): New defcustom. + (set-auto-mode): If non-nil, perform second case-sensitive pass + through auto-mode-alist if first pass failed. + +2006-12-30 Richard Stallman <rms@gnu.org> + + * emacs-lisp/easy-mmode.el (define-global-minor-mode): Doc fix. + +2006-12-30 Ken Manheimer <ken.manheimer@gmail.com> + + * allout.el (allout-encrypt-string): Handle symmetric-key + passphrase caching but leave keypair caching to pgg. + +2006-12-30 Michael Albinus <michael.albinus@gmx.de> + + Sync with Tramp 2.0.55. + + * net/tramp.el (tramp-completion-mode): Use `wholenump' instead of + `integerp'. `char-equal' could fail else in case of negative + numbers. Reported by Toby Speight <T.M.Speight.90@cantab.net>. + (top): Check for `font-lock-add-keywords' before calling; it + doesn't exist under XEmacs. + (tramp-yn-prompt-regexp): Fix regexp. Add question from plink. + (tramp-completion-mode): Remove clause (not + tramp-unified-filenames), because the function is called in other + context too, where this check results in wrong results in the + XEmacs case on Windows. + (tramp-touch): UTC handling is not possible for XEmacs. + +2006-12-30 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * scroll-bar.el (previous-scroll-bar-mode): New variable + (set-scroll-bar-mode): Set previous-scroll-bar-mode. + (scroll-bar-mode): Use previous-scroll-bar-mode if set. + + * term/x-win.el: Set scroll bar mode to right if set by X resources. + +2006-12-30 Richard Stallman <rms@gnu.org> + + * files.el (make-backup-file-name-1): Precompute abs name + but don't lose the relative name. + + * international/mule-cmds.el (select-safe-coding-system-interactively): + Fix message. + +2006-12-30 Kevin Rodgers <kevin.d.rodgers@gmail.com> + + * files.el (backup-buffer): Show entire backup file name in msg. + +2006-12-30 Juanma Barranquero <lekktu@gmail.com> + + * image.el (image-type-header-regexps, image-type-from-data) + (image-type-from-buffer, image-type-from-file-header): + Revert changes from 2006-12-26. + (image-type-auto-detectable): New variable. + (image-type-auto-detected-p): New function. + + * files.el (magic-mode-alist): Detect image files with + `image-type-auto-detected-p' instead of `image-type-from-buffer'. + +2006-12-29 Nick Roberts <nickrob@snap.net.nz> + + * dired.el (dired-sort-other): Move test for dired-mode... + (dired-sort-set-modeline): ...to here. + +2006-12-29 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * textmodes/fill.el (fill-comment-paragraph): Document 2006-12-24 + change. Suggested by Stefan Monnier. + +2006-12-29 Kim F. Storm <storm@cua.dk> + + * emacs-lisp/bindat.el (bindat--unpack-group, bindat--length-group) + (bindat--pack-group): Let-bind COUNT during repeat block evaluation. + +2006-12-27 Kim F. Storm <storm@cua.dk> + + * emacs-lisp/authors.el (authors-aliases): Anchor FSF alias regexp, + so it doesn't accidentally match an fsf.org mail address. + (authors-renamed-files-alist): Add tcover-*.el. + +2006-12-27 Stefan Monnier <monnier@iro.umontreal.ca> + + * vc-arch.el (vc-arch-find-version): New function. + + * vc-hooks.el (vc-version-backup-file-name): Revision names may be + composed of arbitrary characters (even /) in some systems. + +2006-12-27 Eli Zaretskii <eliz@gnu.org> + + * international/mule-cmds.el (select-safe-coding-system-interactively): + Improve the message in the *Warning* buffer. + +2006-12-27 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-set-matches-1): Fix last change. If default item is + current buffer, it is ok to be first. + +2006-12-27 Kenichi Handa <handa@m17n.org> + + * international/mule-cmds.el (select-safe-coding-system-interactively): + Improve the message in *Warning* buffer. + +2006-12-27 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-set-matches-1): Never put current buffer first if + there are other matches. + +2006-12-26 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gdb-ui.el (gud-watch): Allow duplicate names for watch + expressions. + (gdb-var-delete): Handle duplicate names. Print message for non + root expressions. + (gdb-partial-output-name): Start buffer name with a space. + (gdb-info-breakpoints-custom, gdb-reset): Handle space in above + buffer name. + +2006-12-26 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * mail/footnote.el (Footnote-insert-footnote): Fix the search of the + last footnote when `footnote-spaced-footnotes' is nil. + +2006-12-26 Richard Stallman <rms@gnu.org> + + * cus-edit.el (custom-browse-sort-alphabetically) + (custom-buffer-sort-alphabetically) + (custom-menu-sort-alphabetically): Doc fixes. Add autoloads. + + * image.el (image-type-header-regexps): Change element format + to include third item NOT-ALWAYS. + (image-type-from-data): Handle new format. + (image-type-from-buffer): Handle new format. New arg INCLUDE-MAYBES. + (image-type-from-file-header): Pass t for INCLUDE-MAYBES. + +2006-12-26 Guanpeng Xu <herberteuler@hotmail.com> (tiny change) + + * add-log.el (add-log-current-defun): Call `forward-sexp' + multiple times to pick a member function name defined as + part of nested classes/namespaces. + +2006-12-26 Vinicius Jose Latorre <viniciusjl@ig.com.br> + + * emacs-lisp/easymenu.el (easy-menu-change): New arg MAP to indicate + which keymap should be used to change menu. It does not affect any + existent code. + +2006-12-26 Richard Stallman <rms@gnu.org> + + * textmodes/fill.el (fill-paragraph): Check for a minibuffer + rather than for being in a minibuffer window. + +2006-12-25 Daiki Ueno <ueno@unixuser.org> + + * pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of + locale-coding-system. + * pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type + LF. + +2006-12-25 Michael R. Mauger <mmaug@yahoo.com> + + * progmodes/sql.el (sql-mode-abbrev-table): Corrected initialization. + (sql-mode-syntax-table): Disable double quoted strings. + (sql-mode-font-lock-object-name): Added TYPE and TYPE BODY. + +2006-12-25 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * startup.el (fancy-splash-last-input-event): New variable. + (fancy-splash-special-event-action): New function. + (fancy-splash-screens): Temporarily bind special events to it. + Execute command for saved special event before exiting from + recursive editing. + + * term/mac-win.el (mac-keyboard-translate-char, mac-unread-string): + New functions. + (mac-ts-update-active-input-area, mac-ts-unicode-for-key-event): + Use mac-unread-string. + +2006-12-24 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * textmodes/fill.el (fill-comment-paragraph): Prevent the use of + an optimized comment regexp if `comment-start-skip' uses a ^. + * bs.el (bs--up): Remove interactive spec. + +2006-12-24 Chong Yidong <cyd@stupidchicken.com> + + * woman.el (woman-decode-buffer): Signal error for alien macro sets. + Suggested by James Cloos. + +2006-12-24 Kevin Ryde <user42@zip.com.au> + + * calendar/cal-dst.el (calendar-dst-starts): Default to second Sunday + in March. + (calendar-dst-ends): Default to first Sunday in November. + +2006-12-24 Ken Manheimer <ken.manheimer@gmail.com> + + * allout.el (allout-encrypt-string): Inhibit use of agent within + body of let form where encryption happens. Acknowledge non-use of + gpg-agent in docstring. + (allout-toggle-subtree-encryption): Acknowledge non-use of + gpg-agent in docstring. + +2006-12-24 Chong Yidong <cyd@stupidchicken.com> + + * custom.el (custom-add-frequent-value): Alias for custom-add-option. + +2006-12-23 Michael Kifer <kifer@cs.stonybrook.edu> + + * ediff-diff.el (ediff-diff-options): Clarify docstring. + (ediff-setup-diff-regions): Disallow -u in ediff-diff-options. + + * viper-cmd.el (viper-post-command-sentinel): Protect against errors + in hooks. + (viper-add-newline-at-eob-if-necessary): Add newline only if we + actually modify buffer; ignore errors if occur. + +2006-12-23 Chong Yidong <cyd@stupidchicken.com> + + * calendar/calendar.el (calendar-mode-map): Switch < and >. + (calendar-mode-line-format): Use mouse-1 bindings, and tweak + formatting. + +2006-12-23 Richard Stallman <rms@gnu.org> + + * simple.el (delete-horizontal-space): Doc fix. + +2006-12-23 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (bootstrap-clean): Run bootstrap-clean-$(SHELLTYPE) + explicitly in a recursive Make, not implicitly through prerequisites, + since the latter is wrong under parallel builds. + +2006-12-22 Eli Zaretskii <eliz@gnu.org> + + * w32-fns.el (convert-standard-filename): Wrap in save-match-data. + +2006-12-22 Kevin Rodgers <kevin.d.rodgers@gmail.com> (tiny change) + + * progmodes/sh-script.el (sh-make-vars-local): Fix a typo in + message string. + +2006-12-22 Ben North <ben@redfrontdoor.org> (tiny change) + + * outline.el (outline-next-visible-heading): Fix the case with a + header at end-of-file with no final newline. + +2006-12-22 Robert Thorpe <rthorpe@realworldtech.com> (tiny change) + + * indent.el (tab-always-indent): Doc fix. + +2006-12-22 Chong Yidong <cyd@stupidchicken.com> + + * info.el (Info-fontify-maximum-menu-size): Bump to 1000000. + (Info-fontify-node): Do fontify indices. + + * tutorial.el (tutorial--detailed-help): Remove unnecessary link + to the Emacs Lisp reference manual. + (tutorial--tab-map): Remove. All callers changed. + (tutorial--find-changed-keys): New elt QUIET, used to... + (tutorial--display-changes): ...ensure that warning messages are + only issued once per changed key. + (tutorial--remove-remarks): Delete unused code-path. + (lang-strings): Remove extraneous formatting. + (tutorial--save-tutorial): Prompt before saving tutorial state. + +2006-12-21 Chong Yidong <cyd@stupidchicken.com> + + * tutorial.el: Remove `cl' requirement. Clean up whitespace. + Replace '?\ ' by '?\s' throughout. + (tutorial-warning-face): Inherit font-lock-warning-face. Move to + `help' custom group. + (tutorial--key-description): New function. + (tutorial--display-changes): Remove redundant arg. Scan for all + key sequences to avoid false matches. Cleanup. + (tutorial--saved-dir): Save to a subdirectory in .emacs.d to + reduce homedir pollution. + (help-with-tutorial): Call tutorial--display-changes with no arg. + +2006-12-21 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el (org-mode-map): Bind org-complete also to M-\t. + +2006-12-20 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-default-method): We still need to check for + `executable-find', because it is not bound under Emacs 20. + (tramp-handle-file-name-completion) + (tramp-completion-handle-file-name-completion): Handle optional + parameter PREDICATE. + (tramp-find-default-method): Add code for default values. + +2006-12-20 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gdb-ui.el (gdb-stopped): After attaching to a process + make gud-go send "continue". + +2006-12-19 Juanma Barranquero <lekktu@gmail.com> + + * image.el (image-type-header-regexps): Be more specific detecting `pbm' + and `png' files. Use non-capturing parenthesis for `tiff' regexp. + +2006-12-19 Kim F. Storm <storm@cua.dk> + + * bindings.el: Bind sigusr1 and sigusr2 in special-event-map + instead of global-map. + + * files.el (magic-mode-alist): Allow matching file type by + calling a function at bob. Check for image types by calling + image-type-from-buffer. Suggested by Juanma Barranquero. + (set-auto-mode): Do it. + +2006-12-19 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-methods): Introduce new method `scpc'. + Remove "ControlMaster" option from the other `scp*' methods. + (tramp-default-method): Check for ssh-agent before setting to `scp'. + +2006-12-18 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el (org-mode): Show context after isearch. + (org-show-siblings): New function. + (org-show-context): Use `org-show-siblings'. + +2006-12-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/syntax.el (syntax-ppss-flush-cache, syntax-ppss): + Use syntax-ppss-toplevel-pos. + +2006-12-18 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el (org-current-line): Make sure that lines are + counted from beginning of buffer. + (org-table-copy-region, org-table-paste-rectangle): Make sure that + lines are counted from beginning of buffer. + +2006-12-17 Chong Yidong <cyd@stupidchicken.com> + + * info.el (Info-build-node-completions): Signal error if tag-table + marker is not found. + + * pgg-gpg.el (pgg-gpg-use-agent): Default to t. + +2006-12-17 Alan Mackenzie <acm@muc.de> + + * emacs-lisp/lisp.el (beginning-of-defun-raw): Optimise (for + speed) the case when open-paren-in-column-0-is-defun-start is nil. + Based on code by Martin Rudalics. + + * progmodes/cc-mode.el (c-basic-common-init): Don't set + open-paren-in-column-0-is-defun-start to nil any more. + +2006-12-17 Richard Stallman <rms@gnu.org> + + * simple.el (delete-horizontal-space): Use prefix arg. + + * help-fns.el (describe-variable): Improve blank separator lines. + + * files.el (magic-mode-alist): Mark as risky. + + * files.el (make-backup-file-name-1): + Expand backup-directory explicitly. + +2006-12-17 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-default-method): Before setting to "pscp", + check whether package password.el is loaded, or Pageant is running. + +2006-12-17 Ulf Jasper <ulf.jasper@web.de> + + * calendar/icalendar.el (icalendar-version): Increase to "0.14". + (icalendar--rris): First try Emacs, then XEmacs. + (icalendar--convert-ical-to-diary): Doc fix. + Insert newline at end of target file. + +2006-12-17 Kim F. Storm <storm@cua.dk> + + * outline.el (outline-isearch-open-invisible-function): New defvar. + (outline-flag-region): Use it if non-nil for isearch-open-invisible + overlay property instead of outline-isearch-open-invisible. + +2006-12-16 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-completion-help): Build ido-cur-list and ido-matches + if ido-directory-too-big is set on entry. + (ido-toggle-ignore, ido-completion-help): Print message while + reading big directory. + 2006-12-15 Richard Stallman <rms@gnu.org> * shell.el (shell): Doc fix. 2006-12-15 Kevin Gallagher <Kevin.Gallagher@boeing.com> - * emulation/edt.el (edt-xserver): + * emulation/edt.el (edt-xserver): * emulation/edt-mapper.el (edt-xserver): Replace `/' with a `-', to fix a problem on Cygwin. @@ -2706,7 +3100,7 @@ * add-log.el (add-log-current-defun): Use `forward-sexp' instead of `forward-word' to pick c++::symbol. - Reported by Herbert Euler <herberteuler@hotmail.com>. + Reported by Guanpeng Xu <herberteuler@hotmail.com>. 2006-09-22 Kenichi Handa <handa@m17n.org> @@ -3335,7 +3729,7 @@ 2006-09-08 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> - * term/mac-win.el: (show-hide-font-panel): New HI command ID symbol. + * term/mac-win.el (show-hide-font-panel): New HI command ID symbol. (mac-apple-event-map): Define its handler. 2006-09-07 Toby Allsopp <Toby.Allsopp@navman.com> (tiny change) @@ -4547,7 +4941,7 @@ 2006-07-20 Jay Belanger <belanger@truman.edu> - * calc.el (calc-previous-alg-entry): Remove variable. + * calc.el (calc-previous-alg-entry): Remove variable. * calc-aent.el (calc-alg-entry-history, calc-quick-calc-history): New variables. @@ -6085,8 +6479,8 @@ load-path. Put a regexp matching the file name into after-load-alist, rather than the name itself. - * subr.el: New functions load-history-regexp, - load-history-filename-element, do-after-load-evaluation. + * subr.el (load-history-regexp, load-history-filename-element) + (do-after-load-evaluation): New functions. * international/mule.el (load-with-code-conversion): Do the eval-after-load stuff by calling do-after-load-evaluation. diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 2547ce63f5b..b626a61c8d3 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -68,9 +68,9 @@ superseding the old separate derived mode in awk-mode.el. * progmodes/cc-vars.el, cc-mode-19.el, progmodes/cc-langs.el, - progmodes/cc-mode.el, progmodes/cc-defs.el, - progmodes/cc-engine.el, progmodes/cc-fonts.el: Changes for the - new AWK support. + * progmodes/cc-mode.el, progmodes/cc-defs.el, + * progmodes/cc-engine.el, progmodes/cc-fonts.el: + Changes for the new AWK support. 2003-07-03 Martin Stjernholm <bug-cc-mode@gnu.org> @@ -101,7 +101,7 @@ emacsen that doesn't have it. * progmodes/cc-styles.el, progmodes/cc-vars.el, - progmodes/cc-cmds.el: Fixes for the syntactic symbols for + * progmodes/cc-cmds.el: Fixes for the syntactic symbols for module and composition blocks. * progmodes/cc-mode.el (c-basic-common-init): @@ -122,8 +122,8 @@ macros in C99. * progmodes/cc-menus.el, progmodes/cc-langs.el, - progmodes/cc-engine.el, progmodes/cc-fonts.el, - progmodes/cc-cmds.el: Fixed various regexps to use POSIX char + * progmodes/cc-engine.el, progmodes/cc-fonts.el, + * progmodes/cc-cmds.el: Fixed various regexps to use POSIX char classes when that is supported. * progmodes/cc-defs.el (c-alpha, c-alnum, c-digit, c-upper, c-lower): @@ -170,7 +170,6 @@ * progmodes/cc-engine.el: Fixes in face handling to cope with doc comments. - (c-find-decl-spots): More failsafe skipping of comments and strings that only have been partially fontified. @@ -494,7 +493,6 @@ * progmodes/cc-defs.el (c-(up|down)-list-(forward|backward)): Make the position optional and added docstrings. - (c-go-(up|down)-list-(forward|backward)): Add variants of the above that move point and return successfulness instead. @@ -668,10 +666,9 @@ each (X)Emacs flavor. * progmodes/cc-vars.el, progmodes/cc-defs.el, - progmodes/cc-engine.el, progmodes/cc-mode.el: + * progmodes/cc-engine.el, progmodes/cc-mode.el: Use `lookup-syntax-properties' in XEmacs to control whether the syntax-table property has any effect or not. - (c-parse-sexp-lookup-properties): New macro that expands to either `parse-sexp-lookup-properties' or `lookup-syntax-properties'. @@ -750,12 +747,12 @@ in progmodes/cc-engine.el. * progmodes/cc-engine.el, progmodes/cc-fonts.el, - progmodes/cc-langs.el: Fix the names on a number of regexp + * progmodes/cc-langs.el: Fix the names on a number of regexp language variables to conform to the nomenclature and shortened some names. * progmodes/cc-align.el, progmodes/cc-cmds.el, - progmodes/cc-fonts.el, progmodes/cc-engine.el + * progmodes/cc-fonts.el, progmodes/cc-engine.el (c-syntactic-re-search-forward): Remove the COUNT argument since it's never used. Add an argument to tell which subexpression whose end should be tested for syntactic @@ -803,7 +800,6 @@ This fixes a performance problem that could occur when `fill-paragraph' is used in font lock mode on a comment at the end of a large class or function. - (c-state-cache-start): Fix buffer localness. * progmodes/cc-langs.el: Updates from the C99 standard (or @@ -842,7 +838,6 @@ table for types: If a name is recognized as a type in a declaration it's added in an obarray to be able to recognize it in other ambiguous declarations. - (c-remove-ws): New helper function to canonicalize fully qualified identifiers for `c-found-types'. @@ -851,14 +846,12 @@ * progmodes/cc-align.el (c-lineup-arglist-close-under-paren): Work correctly with nested arglist-cont-nonempty symbols. - (c-lineup-arglist-operators): New lineup function to line up infix operators under the open paren of the surrounding sexp. * progmodes/cc-engine.el (c-forward-syntactic-ws): Fix a bug that could cause an infinite loop if something that looks like a macro begins in the middle of a line. - (c-parse-state): Fix a bug that could cause `c-state-cache' to contain two conses in sequence when there's an unbalanced open paren in a macro. @@ -874,13 +867,11 @@ string, or a macro. * progmodes/cc-align.el, progmodes/cc-cmds.el, - progmodes/cc-engine.el (c-forward-single-comment, - c-forward-comments, c-backward-single-comment, - c-backward-comments): New replacements for `c-forward-comment' - that wraps `forward-comment' more efficiently in each of the - four different cases it's actually used. These replacements - also treats line continuations as whitespace. - + * progmodes/cc-engine.el (c-forward-single-comment) + (c-forward-comments, c-backward-single-comment, c-backward-comments): + New replacements for `c-forward-comment' that wraps `forward-comment' + more efficiently in each of the four different cases it's actually + used. These replacements also treats line continuations as whitespace. (c-forward-comment): Remove. The four different cases above are basically different, so it's better to make them into separate functions than choose between them at runtime using @@ -936,7 +927,7 @@ matter. * progmodes/cc-align.el, progmodes/cc-defs.el, - progmodes/cc-engine.el, progmodes/cc-vars.el + * progmodes/cc-engine.el, progmodes/cc-vars.el (c-guess-basic-syntax, c-calc-offset) (c-get-syntactic-indentation, c-syntactic-context): Extend the representation of the syntactic context: Previously it was @@ -990,16 +981,13 @@ position for defun-open in K&R style functions. * progmodes/cc-engine.el (c-in-knr-argdecl): Don't trip up on macros. - (c-search-decl-header-end): Handle C++ template arguments more correctly. - (c-beginning-of-decl-1): Fix when the declaration is first in a macro. * progmodes/cc-engine.el (c-beginning-of-decl-1): Better way to handle protection labels, one which doesn't get confused by inherit colons. - (c-end-of-decl-1): Don't treat functions that have "class" or "struct" in the return type as classes or structs. @@ -1230,7 +1218,7 @@ (tramp-file-name-handler): Do not invoke the old remote-shell handler. (tramp-find-foreign-file-name-handler): Return after first match is found. From Francis Litterio <franl@world.std.com>. - (tramp-handle-file-newer-than-file-p): `tramp-time-diff' returns + (tramp-handle-file-newer-than-file-p): `tramp-time-diff' returns integer, not list. Do not apply `car' to the return value of `tramp-time-diff'. Reported by David D. Smith <ultrasoul@ultrasoul.com>. @@ -1460,7 +1448,7 @@ * info.el (Info-fontify-node): Don't refill over lines ending in a period; this should fix problems with lists like one in the - (emacs)Library Keywords section. + "(emacs)Library Keywords" section. 2003-06-05 Markus Rost <rost@math.ohio-state.edu> @@ -1652,7 +1640,7 @@ * textmodes/bibtex.el: Long overdue merge. Don't require `compile' since it seems unnecessary. For all internal variables and functions the docstring comments have - been converted into proper docstrings + been converted into proper docstrings. (bibtex-maintainer-address, bibtex-maintainer-salutation) (bibtex-version): Remove support for bug reporting. (bibtex-field-delimiters, bibtex-entry-delimiters) @@ -2012,7 +2000,7 @@ * international/mule.el (ctext-non-standard-encodings-alist): Rename from non-standard-icccm-encodings-alist. - (ctext-non-standard-encodings-regexp): New variable + (ctext-non-standard-encodings-regexp): New variable. (ctext-post-read-conversion): Full rewrite. (ctext-non-standard-designations-alist): Rename from non-standard-designations-alist. @@ -2182,7 +2170,7 @@ (gdb-display-source-buffer): Display assembler during execution, when requested. (gud-menu-map): Add a toggle button to menubar for gdb-many-windows. - (gdb-many-windows): Define explicitly as a function and a variable + (gdb-many-windows): Define explicitly as a function and a variable. (formerly as a minor mode). These need to be global so layout can be reset from any buffer. (gdb-assembler-mode): Keep fringe outside margin as the overlay @@ -2674,7 +2662,7 @@ (gdb-invalidate-breakpoints-and-assembler): Remove. (gdb-current-address): Remove. (gdb-previous-address): New variable. - (gud-until): Extend to work in Assembler buffer + (gud-until): Extend to work in Assembler buffer. (gdb-append-to-inferior-io): Select IO buffer when there is output. (gdb-assembler-custom): Try to get line marker (arrow) to display in window. Correct parsing for OS dependent output syntax of Gdb @@ -3343,7 +3331,7 @@ (ada-prj-find-prj-file): New parameter FILE. (ada-parse-prj-file): Take into account the ADA_INCLUDE_PATH and ADA_OBJECTS_PATH environment variables. Minor reorganization of the - code + code. (ada-get-all-references): Add support for GNAT 3.16 cross-references. * progmodes/ada-prj.el (ada-prj-add-keymap): Move to ada-mode.el @@ -3448,7 +3436,7 @@ (recentf-sort-directories-ascending) (recentf-sort-directories-descending) (recentf-show-basenames-ascending) - (recentf-show-basenames-descending: In-line. Better code. Doc fix. + (recentf-show-basenames-descending): In-line. Better code. Doc fix. (recentf-show-basenames) (recentf-relative-filter): Better code. Doc fix. (recentf-arrange-by-rule-subfilter): Doc fix. Improve :set code. @@ -3768,7 +3756,7 @@ * font-core.el (font-lock-maximum-size, font-lock-verbose): Remove. (font-lock-multiline, font-lock-fontified, font-lock-set-defaults): - Move back to font-lock.el + Move back to font-lock.el. (font-lock-default-function): Use font-lock-mode-internal. * files.el (auto-mode-alist): Add entries for *.ins and *.dtx. @@ -3935,7 +3923,7 @@ * progmodes/etags.el (select-tags-table-mode-map): Don't create new keymap. Instead copy from button-buffer-map. Bind push-button to `t' instead of binding - select-tags-table-select directly + select-tags-table-select directly. (tags-select-tags-table): New button. (select-tags-table): Put a button for each selections. @@ -4070,14 +4058,14 @@ * international/utf-16.el (utf-16-le-decode-loop) (utf-16-be-decode-loop): New temporary variables. (ccl-decode-mule-utf-16-le): Use utf-16-le-decode-loop. - (ccl-decode-mule-utf-16-be): Use utf-16-be-decode-loop + (ccl-decode-mule-utf-16-be): Use utf-16-be-decode-loop. (ccl-decode-mule-utf-16-le-with-signature) (ccl-decode-mule-utf-16-be-with-signature) (ccl-decode-mule-utf-16): New CCL programs. (utf-16-le-encode-loop, utf-16-be-encode-loop): New temporary variables. (ccl-encode-mule-utf-16-le): Use utf-16-le-encode-loop. - (ccl-encode-mule-utf-16-be): Use utf-16-be-encode-loop + (ccl-encode-mule-utf-16-be): Use utf-16-be-encode-loop. (ccl-encode-mule-utf-16-le-with-signature) (ccl-encode-mule-utf-16-be-with-signature): New CCL programs. (mule-utf-16-post-read-conversion): New function. @@ -4141,7 +4129,7 @@ pt -> desktop-buffer-point mk -> desktop-buffer-mark ro -> desktop-buffer-read-only - locals -> desktop-buffer-locals + locals -> desktop-buffer-locals. (desktop-buffer-major-mode, desktop-buffer-file-name) (desktop-buffer-name): Delete unused customizable variables. (desktop-buffer-misc): Delete unused variable. @@ -5354,8 +5342,8 @@ of buffer. This enables recognition of end of HERE-doc "as one types". Require "\n" after trailing tag of HERE-doc. \( made non-quoting outside of string/comment (gdj-contributed). - Likewise for \$. Remove `here-doc-group' text property at start - (makes this property reliable). + Likewise for \$. Remove `here-doc-group' text property at + start (makes this property reliable). Text property `first-format-line' ==> t. Do not recognize $opt_s and $opt::s as s///. (cperl-after-block-p): Optional arg pre-block to check for a pre-block @@ -5919,7 +5907,7 @@ I did it accidently. Infinite loop ... (tramp-get-device): `tramp-make-tramp-file-name' must not be called with NIL path. It fails in case of multi-method. - (tramp-file-name-for-operation): Apply `expand-file-name' for + (tramp-file-name-for-operation): Apply `expand-file-name' for relative file names only. Otherwise there might be problems if the default directory is another Tramp directory as the directory the file is based on. @@ -5968,7 +5956,7 @@ * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Apply `tramp-handle-directory-file-name'. - (tramp-smb-handle-file-attributes): Apply `tramp-get-device'. + (tramp-smb-handle-file-attributes): Apply `tramp-get-device'. ATIME and CTIME are (0 0) now (= "don't know"), which is more honest. (tramp-smb-handle-make-directory): Use Emacs file name primitives instead of calling tramp-smb-handle-* equivalents directly. @@ -6072,7 +6060,7 @@ regexp subpattern 5) (time-stamp-pattern): Initialize to nil to avoid regexp work in default case. - (time-stamp-string): Call set-time-zone-rule instead of setenv + (time-stamp-string): Call set-time-zone-rule instead of setenv. (time-stamp-hhmmss): Remove (not needed after all). (time-stamp-month-dd-yyyy, time-stamp-dd/mm/yyyy) (time-stamp-mon-dd-yyyy, time-stamp-dd-mon-yy, time-stamp-yy/mm/dd) @@ -6735,10 +6723,10 @@ 2003-01-13 Markus Rost <rost@math.ohio-state.edu> - * cus-dep.el (custom-make-dependencies): Don't set standard-value + * cus-dep.el (custom-make-dependencies): Don't set standard-value and version numbers for variables. Handle faces. - * cus-edit.el (customize-changed-options): Doc addition. Load the + * cus-edit.el (customize-changed-options): Doc addition. Load the version deps earlier. Use other tests for groups and variables. Handle faces. @@ -6960,7 +6948,7 @@ * cus-edit.el (custom-variable-prompt): Doc change. Use custom-variable-p. (customize-option): Remove search in loaddefs.el. - (customize-apropos): Use custom-variable-p. + (customize-apropos): Use custom-variable-p. (custom-save-variables): Use custom-variable-p to detect non-rogue variables. @@ -7972,7 +7960,7 @@ 2002-12-02 Fran,Ag(Bois Pinard <pinard@iro.umontreal.ca> * progmodes/make-mode.el (makefile-font-lock-keywords): Highlight - more make keywords: defined, endef, override, export, unexport + more make keywords: defined, endef, override, export, unexport and vpath. 2002-12-02 Dave Love <fx@gnu.org> @@ -8028,7 +8016,7 @@ Make search for message delimiter case-sensitive. * simple.el (yank-window-start): New variable. - (yank): Record yank-window-start + (yank): Record yank-window-start. (yank-pop): Use yank-window-start. * info.el (Info-additional-directory-list): Doc fix. @@ -9441,8 +9429,8 @@ menu pseudo-keys generated by easymenu which are lowercase in Emacs 22.1. - * progmodes/ada-xref.el - (ada-xref-update-project-menu,ada-add-ada-menu): Ditto. + * progmodes/ada-xref.el (ada-xref-update-project-menu) + (ada-add-ada-menu): Ditto. 2002-10-03 John Paul Wallington <jpw@shootybangbang.com> @@ -12757,8 +12745,8 @@ * textmodes/reftex-vars.el (reftex-index-verify-function): New option. (reftex-bibliography-commands): New option. - (reftex-toc-split-windows-horizontally): New option - (reftex-toc-split-windows-horizontally-fraction): New option + (reftex-toc-split-windows-horizontally): New option. + (reftex-toc-split-windows-horizontally-fraction): New option. (reftex-include-file-commands): New option. (reftex-cite-format-builtin): Added ?n for nocite. @@ -12767,7 +12755,7 @@ * textmodes/reftex-toc.el (reftex-re-enlarge): Handle horizontal splitting. - (reftex-toc): Handle horizontal splitting + (reftex-toc): Handle horizontal splitting. (reftex-last-window-width): New variable. * textmodes/reftex-parse.el (reftex-locate-bibliography-files): @@ -14168,7 +14156,7 @@ (comint-send-input, comint-output-filter): Use text properties instead of overlays. (comint-insert-clicked-input): Rewrite to work with text - properties as well as overlays + properties as well as overlays. (comint-snapshot-last-prompt): Snapshot using text properties. (comint-get-old-input-default, comint-extract-string): Don't copy text properties. @@ -15672,9 +15660,9 @@ (sendmail-send-it): Use it. * mail/smtpmail.el (smtpmail-queue-counter): New variable. - (smtpmail-send-it): Use it to construct new queue filenames - (needed if you send more than one message per second, which is - possible if you use Gnus Agent). + (smtpmail-send-it): Use it to construct new queue filenames (needed + if you send more than one message per second, which is possible if + you use Gnus Agent). * mail/smtpmail.el (smtpmail-auth-credentials): Support netrc files as well. @@ -15949,8 +15937,8 @@ 2002-04-22 Pavel Jan,Am(Bk <Pavel@Janik.cz> - * international/mule-diag.el (list-input-methods-1): Doc fix - (LEIM is now part of the standard distribution). + * international/mule-diag.el (list-input-methods-1): Doc fix (LEIM is + now part of the standard distribution). * tmm.el (tmm-completion-prompt): Doc fix. @@ -15970,7 +15958,7 @@ 2002-04-22 Martin Stjernholm <bug-cc-mode@gnu.org> * progmodes/cc-align.el, progmodes/cc-engine.el, - progmodes/cc-styles.el, progmodes/cc-vars.el + * progmodes/cc-styles.el, progmodes/cc-vars.el (c-guess-basic-syntax, c-lineup-topmost-intro-cont): Find correct anchor for statement-cont in top level constructs. Analyze variable initializations in top level constructs as @@ -16667,9 +16655,9 @@ (c-least-enclosing-brace): Added optional second arg to limit the search to before a certain point. - * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug - which could cause incorrect analysis if a cached state is used - (usually only happens when an electric key reindents a line). + * progmodes/cc-engine.el (c-guess-basic-syntax): Fixed bug which + could cause incorrect analysis if a cached state is used (usually + only happens when an electric key reindents a line). 2002-04-22 Martin Stjernholm <bug-cc-mode@gnu.org> @@ -18376,7 +18364,7 @@ (ediff-draw-dir-diffs): Now supports the "C" command in directory difference buffer. (ediff-dir-diff-copy-file): New function that implements copying - of files from one Ediff dir to another + of files from one Ediff dir to another. (ediff-bury-dir-diffs-buffer): Kills the buffer instead. (ediff-append-custom-diff): Better error msgs. @@ -18734,7 +18722,7 @@ 2002-02-22 Eli Zaretskii <eliz@is.elta.co.il> - Support for ICCCM Extended Segments in X selections: + Support for ICCCM Extended Segments in X selections: * international/mule-conf.el (ctext-no-compositions): New coding system. @@ -19059,8 +19047,7 @@ `current-language-environment' and `default-input-method' when marked as customized. - * international/mule-cmds.el - (setup-specified-language-environment): + * international/mule-cmds.el (setup-specified-language-environment): Mark `current-language-environment' as customized. (set-input-method): Mark `default-input-method' as customized when called interactively. @@ -19139,7 +19126,7 @@ 2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu> * viper-util.el (viper-read-key-sequence): Fix so it'll read - fast key sequences in Emacs native mode + fast key sequences in Emacs native mode. (viper-events-to-keys): Delete. * viper.el (describe-key, describe-key-briefly): Get rid of @@ -19149,7 +19136,7 @@ Use ediff-has-gutter-support. * ediff-util.el (ediff-dispose-of-variant-according-to-user): - check if buff is alive. + Check if buff is alive. * ediff.el: Typo in comment. @@ -19397,7 +19384,7 @@ * textmodes/flyspell.el (flyspell-issue-message-flag): New user option. (flyspell-mode-on, flyspell-notify-misspell) (flyspell-small-region, flyspell-external-point-words) - (flyspell-large-region): Use it + (flyspell-large-region): Use it. (flyspell-before-incorrect-word-string) (flyspell-after-incorrect-word-string): New user options. (make-flyspell-overlay): Use them. @@ -19883,7 +19870,7 @@ Move view-emacs-FAQ from F to C-f. Move view-emacs-problems from P to C-e. Bindings moved here from mule-cmds.el. - C-l binding for describe-language-environment deleted + C-l binding for describe-language-environment deleted. (help-for-help): Update for all these changes. * emacs-lisp/copyright.el (copyright-regexp): Make (C) optional. @@ -20048,12 +20035,12 @@ 2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu> * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): - new macro that replaces viper-emacs-p and viper-xemacs-p in many + New macro that replaces viper-emacs-p and viper-xemacs-p in many cases. Used to reduce the number of warnings. * viper-cmd.el: Use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): Move here from viper.el. - (viper-set-unread-command-events): Move to viper-util.el + (viper-set-unread-command-events): Move to viper-util.el. (viper-check-minibuffer-overlay): Make sure viper-minibuffer-overlay is moved to cover the entire input field. @@ -20264,8 +20251,8 @@ 2002-01-03 Pavel Jan,Am(Bk <Pavel@Janik.cz> - * time.el (display-time-load-average-threshold): Fix defcustom - (add type and group). + * time.el (display-time-load-average-threshold): + Fix defcustom (add type and group). * net/ange-ftp.el (ange-ftp-shell-command): Remove port specification from the hostname. @@ -21002,7 +20989,7 @@ * language/ind-util.el: Don't require cl. (indian-glyph-char, indian-glyph-max-char) - (indian-char-glyph): Moved from indian.el + (indian-char-glyph): Moved from indian.el. (indian--puthash-char, mapthread): Don't quote lambda. (indian--map): New function. (indian--puthash-v, indian--puthash-c, indian--puthash-m) @@ -21887,8 +21874,8 @@ 2001-11-22 Colin Walters <walters@debian.org> - * calc/calc-misc.el (calc-info): Don't perform voodoo, just - (info "Calc"). + * calc/calc-misc.el (calc-info): Don't perform voodoo, + just (info "Calc"). (report-calc-bug): Use reporter.el. * mail/reporter.el (reporter-submit-bug-report): Doc fixes. @@ -23266,7 +23253,7 @@ (ps-mode-menu-main): Submenu with options on/off was replaced with a toggle button. (ps-mode, ps-run-mode): Define with `define-derived-mode' - (ps-mode): Autoload cookie added on same line as comment + (ps-mode): Autoload cookie added on same line as comment. (ps-mode-tabkey, ps-mode-backward-delete-char): (ps-mode-r-balance): Replace `delete-horizontal-space' and `indent-to' with `indent-line-to' diff --git a/lisp/add-log.el b/lisp/add-log.el index 70345a122e1..2ecb274b4de 100644 --- a/lisp/add-log.el +++ b/lisp/add-log.el @@ -916,7 +916,19 @@ Has a preference of looking backwards." ;; Include certain keywords if they ;; precede the name. (setq middle (point)) - (forward-sexp -1) + ;; Single (forward-sexp -1) invocation is + ;; not enough for C++ member function defined + ;; as part of nested class and/or namespace + ;; like: + ;; + ;; void + ;; foo::bar::baz::bazz () + ;; { ... + ;; + ;; Here we have to move the point to + ;; the beginning of foo, not bazz. + (while (not (looking-back "\\(^\\|[ \t]\\)")) + (forward-sexp -1)) ;; Is this C++ method? (when (and (< 2 middle) (string= (buffer-substring (- middle 2) diff --git a/lisp/allout.el b/lisp/allout.el index 954faa40232..02d67671008 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -45,7 +45,9 @@ ;; - Symmetric-key and key-pair topic encryption, plus symmetric passphrase ;; mnemonic support, with verification against an established passphrase ;; (using a stashed encrypted dummy string) and user-supplied hint -;; maintenance. (See allout-toggle-current-subtree-encryption docstring.) +;; maintenance. (See allout-toggle-current-subtree-encryption docstring. +;; Currently only GnuPG encryption is supported, and integration +;; with gpg-agent is not yet implemented.) ;; - Automatic topic-number maintenance ;; - "Hot-spot" operation, for single-keystroke maneuvering and ;; exposure control (see the allout-mode docstring) @@ -5748,9 +5750,9 @@ it forces prompting for the passphrase regardless of availability from the passphrase cache. With no universal argument, the appropriate passphrase is obtained from the cache, if available, else from the user. -Currently only GnuPG encryption is supported. +Only GnuPG encryption is supported. -\**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg +\*NOTE WELL* that the encrypted text must be ascii-armored. For gnupg encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. Both symmetric-key and key-pair encryption is implemented. Symmetric is @@ -5764,8 +5766,8 @@ not. When a file with topics pending encryption is saved, topics pending encryption are encrypted. See allout-encrypt-unencrypted-on-saves for auto-encryption specifics. -\**NOTE WELL** that automatic encryption that happens during saves will -default to symmetric encryption - you must manually (re)encrypt key-pair +\*NOTE WELL* that automatic encryption that happens during saves will +default to symmetric encryption - you must deliberately (re)encrypt key-pair encrypted topics if you want them to continue to use the key-pair cipher. Level-one topics, with prefix consisting solely of an `*' asterisk, cannot be @@ -5777,10 +5779,8 @@ encrypted. If you want to encrypt the contents of a top-level topic, use The encryption passphrase is solicited if not currently available in the passphrase cache from a recent encryption action. -The solicited passphrase is retained for reuse in a buffer-specific cache -for some set period of time (default, 60 seconds), after which the string -is nulled. The passphrase cache timeout is customized by setting -`pgg-passphrase-cache-expiry'. +The solicited passphrase is retained for reuse in a cache, if enabled. See +`pgg-cache-passphrase' and `pgg-passphrase-cache-expiry' for details. Symmetric Passphrase Hinting and Verification @@ -5820,7 +5820,8 @@ it forces prompting for the passphrase regardless of availability from the passphrase cache. With no universal argument, the appropriate passphrase is obtained from the cache, if available, else from the user. -Currently only GnuPG encryption is supported. +Currently only GnuPG encryption is supported, and integration +with gpg-agent is not yet implemented. \**NOTE WELL** that the encrypted text must be ascii-armored. For gnupg encryption, include the option ``armor'' in your ~/.gnupg/gpg.conf file. @@ -5996,7 +5997,11 @@ Returns the resulting string, or nil if the transformation fails." (rejected (or rejected 0)) (rejections-left (- allout-encryption-ciphertext-rejection-ceiling rejected)) - result-text status) + result-text status + ;; Inhibit gpg-agent use for symmetric keys in the scope of this let: + (pgg-gpg-use-agent (if (equal key-type 'keypair) + pgg-gpg-use-agent + nil))) (if (and fetch-pass (not passphrase)) ;; Force later fetch by evicting passphrase from the cache. @@ -6004,12 +6009,9 @@ Returns the resulting string, or nil if the transformation fails." (catch 'encryption-failed - ;; Obtain the passphrase if we don't already have one and we're not - ;; doing a keypair encryption: - (if (not (or passphrase - (and (equal key-type 'keypair) - (not decrypt)))) - + ;; We handle only symmetric-key passphrase caching. + (if (and (not passphrase) + (not (equal key-type 'keypair))) (setq passphrase (allout-obtain-passphrase for-key target-cache-id target-prompt-id diff --git a/lisp/bindings.el b/lisp/bindings.el index f6e593bfa74..591e8aad122 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el @@ -1059,8 +1059,8 @@ language you are using." (define-key ctl-x-4-map "c" 'clone-indirect-buffer-other-window) ;; Signal handlers -(define-key global-map [signal] (make-sparse-keymap)) -(define-key global-map [signal t] 'ignore) +(define-key special-event-map [sigusr1] 'ignore) +(define-key special-event-map [sigusr2] 'ignore) ;; Don't look for autoload cookies in this file. ;; Local Variables: diff --git a/lisp/bs.el b/lisp/bs.el index d0b929b2d85..a42b22e8436 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -999,7 +999,6 @@ Uses function `vc-toggle-read-only'." (defun bs--up () "Move cursor vertically up one line. If on top of buffer list go to last line." - (interactive "p") (if (> (count-lines 1 (point)) bs-header-lines-length) (forward-line -1) (goto-char (point-max)) diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el index aed4c32e3db..ddd317de106 100644 --- a/lisp/calendar/cal-dst.el +++ b/lisp/calendar/cal-dst.el @@ -53,7 +53,8 @@ change." :group 'calendar) (defvar calendar-current-time-zone-cache nil - "Cache for result of calendar-current-time-zone.") + "Cache for result of `calendar-current-time-zone'.") +(put 'calendar-current-time-zone-cache 'risky-local-variable t) (defvar calendar-system-time-basis (calendar-absolute-from-gregorian '(1 1 1970)) @@ -345,8 +346,9 @@ This function respects the value of `calendar-dst-check-each-year-flag'." (cadr (calendar-dst-find-startend year)) (nth 4 calendar-current-time-zone-cache)))) (if expr (eval expr))) + ;; New US rules commencing 2007. ftp://elsie.nci.nih.gov/pub/. (and (not (zerop calendar-daylight-time-offset)) - (calendar-nth-named-day 1 0 4 year)))) + (calendar-nth-named-day 2 0 3 year)))) (defun calendar-dst-ends (year) "Return the date of YEAR on which Daylight Saving Time ends. @@ -355,8 +357,9 @@ This function respects the value of `calendar-dst-check-each-year-flag'." (nth 2 (calendar-dst-find-startend year)) (nth 5 calendar-current-time-zone-cache)))) (if expr (eval expr))) + ;; New US rules commencing 2007. ftp://elsie.nci.nih.gov/pub/. (and (not (zerop calendar-daylight-time-offset)) - (calendar-nth-named-day -1 0 10 year)))) + (calendar-nth-named-day 1 0 11 year)))) ;;;###autoload diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el index c5e7f85f51b..c0249223a06 100644 --- a/lisp/calendar/calendar.el +++ b/lisp/calendar/calendar.el @@ -2199,12 +2199,12 @@ movement commands will not work correctly." downcase-region upcase-region kill-region copy-region-as-kill capitalize-region write-region)) (define-key map (vector 'remap c) 'calendar-not-implemented)) - (define-key map ">" 'scroll-calendar-right) - (define-key map "\C-x>" 'scroll-calendar-right) + (define-key map "<" 'scroll-calendar-right) + (define-key map "\C-x<" 'scroll-calendar-right) (define-key map [prior] 'scroll-calendar-right-three-months) (define-key map "\ev" 'scroll-calendar-right-three-months) - (define-key map "<" 'scroll-calendar-left) - (define-key map "\C-x<" 'scroll-calendar-left) + (define-key map ">" 'scroll-calendar-left) + (define-key map "\C-x>" 'scroll-calendar-left) (define-key map [next] 'scroll-calendar-left-three-months) (define-key map "\C-v" 'scroll-calendar-left-three-months) (define-key map "\C-b" 'calendar-backward-day) @@ -2337,42 +2337,40 @@ movement commands will not work correctly." (defvar calendar-mode-line-format (list - (propertize (substitute-command-keys - "\\<calendar-mode-map>\\[scroll-calendar-left]") - 'help-echo "mouse-2: scroll left" + (propertize "<" + 'help-echo "mouse-1: previous month" 'mouse-face 'mode-line-highlight - 'keymap (make-mode-line-mouse-map 'mouse-2 - 'mouse-scroll-calendar-left)) + 'keymap (make-mode-line-mouse-map 'mouse-1 + 'mouse-scroll-calendar-right)) "Calendar" (concat (propertize (substitute-command-keys "\\<calendar-mode-map>\\[calendar-goto-info-node] info") - 'help-echo "mouse-2: read Info on Calendar" + 'help-echo "mouse-1: read Info on Calendar" 'mouse-face 'mode-line-highlight - 'keymap (make-mode-line-mouse-map 'mouse-2 'calendar-goto-info-node)) - "/" + 'keymap (make-mode-line-mouse-map 'mouse-1 'calendar-goto-info-node)) + " / " (propertize (substitute-command-keys - "\\<calendar-mode-map>\\[calendar-other-month] other") - 'help-echo "mouse-2: choose another month" + " \\<calendar-mode-map>\\[calendar-other-month] other") + 'help-echo "mouse-1: choose another month" 'mouse-face 'mode-line-highlight 'keymap (make-mode-line-mouse-map - 'mouse-2 'mouse-calendar-other-month)) - "/" + 'mouse-1 'mouse-calendar-other-month)) + " / " (propertize (substitute-command-keys "\\<calendar-mode-map>\\[calendar-goto-today] today") - 'help-echo "mouse-2: go to today's date" + 'help-echo "mouse-1: go to today's date" 'mouse-face 'mode-line-highlight - 'keymap (make-mode-line-mouse-map 'mouse-2 #'calendar-goto-today))) + 'keymap (make-mode-line-mouse-map 'mouse-1 #'calendar-goto-today))) '(calendar-date-string (calendar-current-date) t) - (propertize (substitute-command-keys - "\\<calendar-mode-map>\\[scroll-calendar-right]") - 'help-echo "mouse-2: scroll right" + (propertize ">" + 'help-echo "mouse-1: next month" 'mouse-face 'mode-line-highlight 'keymap (make-mode-line-mouse-map - 'mouse-2 'mouse-scroll-calendar-right))) + 'mouse-1 'mouse-scroll-calendar-left))) "The mode line of the calendar buffer. This must be a list of items that evaluate to strings--those strings are diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 570fb626747..6fecc86bf34 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -73,6 +73,10 @@ ;; * Import from ical to diary: ;; + Need more properties for icalendar-import-format +;; (added all that Mozilla Calendar uses) +;; From iCal specifications (RFC2445: 4.8.1), icalendar.el lacks +;; ATTACH, CATEGORIES, COMMENT, GEO, PERCENT-COMPLETE (VTODO), +;; PRIORITY, RESOURCES) not considering date/time and time-zone ;; + check vcalendar version ;; + check (unknown) elements ;; + recurring events! @@ -97,7 +101,7 @@ ;;; Code: -(defconst icalendar-version "0.13" +(defconst icalendar-version "0.14" "Version number of icalendar.el.") ;; ====================================================================== @@ -226,12 +230,12 @@ buffer." "Replace regular expression in string. Pass ARGS to `replace-regexp-in-string' (Emacs) or to `replace-in-string' (XEmacs)." + (if (fboundp 'replace-regexp-in-string) + ;; Emacs: + (apply 'replace-regexp-in-string args) ;; XEmacs: - (if (fboundp 'replace-in-string) - (save-match-data ;; apparently XEmacs needs save-match-data - (apply 'replace-in-string args)) - ;; Emacs: - (apply 'replace-regexp-in-string args))) + (save-match-data ;; apparently XEmacs needs save-match-data + (apply 'replace-in-string args)))) (defun icalendar--read-element (invalue inparams) "Recursively read the next iCalendar element in the current buffer. @@ -1549,7 +1553,7 @@ buffer `*icalendar-errors*'." (defun icalendar--convert-ical-to-diary (ical-list diary-file &optional do-not-ask non-marking) - "Convert Calendar data to an Emacs diary file. + "Convert iCalendar data to an Emacs diary file. Import VEVENTS from the iCalendar object ICAL-LIST and saves them to a DIARY-FILE. If DO-NOT-ASK is nil the user is asked for each event whether to actually import it. NON-MARKING determines whether diary @@ -1680,6 +1684,13 @@ written into the buffer `*icalendar-errors*'." (setq error-string (format "%s\n%s\nCannot handle this event: %s" error-val error-string e)) (message "%s" error-string)))) + ;; insert final newline + (let ((b (find-buffer-visiting diary-file))) + (when b + (save-current-buffer + (set-buffer b) + (goto-char (point-max)) + (insert "\n")))) (if found-error (save-current-buffer (set-buffer (get-buffer-create "*icalendar-errors*")) diff --git a/lisp/comint.el b/lisp/comint.el index b32f129c679..1ab285c9af4 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -132,7 +132,7 @@ ;; comint-eol-on-send boolean ... ;; comint-process-echoes boolean ... ;; comint-scroll-to-bottom-on-input symbol For scroll behavior -;; comint-scroll-to-bottom-on-output symbol ... +;; comint-move-point-for-output symbol ... ;; comint-scroll-show-maximum-output boolean ... ;; comint-accum-marker maker For comint-accumulate ;; diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index d698aaeecc3..59026942281 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -679,8 +679,9 @@ if that fails, the doc string with `custom-guess-doc-alist'." ;;; Sorting. +;;;###autoload (defcustom custom-browse-sort-alphabetically nil - "If non-nil, sort members of each customization group alphabetically." + "If non-nil, sort customization group alphabetically in `custom-browse'." :type 'boolean :group 'custom-browse) @@ -698,8 +699,9 @@ If `last', order groups after non-groups." :type 'boolean :group 'custom-browse) +;;;###autoload (defcustom custom-buffer-sort-alphabetically nil - "If non-nil, sort members of each customization group alphabetically." + "If non-nil, sort each customization group alphabetically in Custom buffer." :type 'boolean :group 'custom-buffer) @@ -712,8 +714,9 @@ If `last', order groups after non-groups." (const :tag "none" nil)) :group 'custom-buffer) +;;;###autoload (defcustom custom-menu-sort-alphabetically nil - "If non-nil, sort members of each customization group alphabetically." + "If non-nil, sort each customization group alphabetically in menus." :type 'boolean :group 'custom-menu) diff --git a/lisp/custom.el b/lisp/custom.el index e69e233614a..699d432fb70 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -536,6 +536,7 @@ For other custom types, this has no effect." (let ((options (get symbol 'custom-options))) (unless (member option options) (put symbol 'custom-options (cons option options))))) +(defalias 'custom-add-frequent-value 'custom-add-option) (defun custom-add-link (symbol widget) "To the custom option SYMBOL add the link WIDGET." diff --git a/lisp/dired.el b/lisp/dired.el index 09f4dc8425a..4f2e1b74b10 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -3098,15 +3098,18 @@ The idea is to set this buffer-locally in special dired buffers.") ;; Modeline display of "by name" or "by date" guarantees the user a ;; match with the corresponding regexps. Non-matching switches are ;; shown literally. - (setq mode-name - (let (case-fold-search) - (cond ((string-match dired-sort-by-name-regexp dired-actual-switches) - "Dired by name") - ((string-match dired-sort-by-date-regexp dired-actual-switches) - "Dired by date") - (t - (concat "Dired " dired-actual-switches))))) - (force-mode-line-update)) + (when (eq major-mode 'dired-mode) + (setq mode-name + (let (case-fold-search) + (cond ((string-match + dired-sort-by-name-regexp dired-actual-switches) + "Dired by name") + ((string-match + dired-sort-by-date-regexp dired-actual-switches) + "Dired by date") + (t + (concat "Dired " dired-actual-switches))))) + (force-mode-line-update))) (defun dired-sort-toggle-or-edit (&optional arg) "Toggle between sort by date/name and refresh the dired buffer. @@ -3162,7 +3165,7 @@ set the minor mode accordingly, others appear literally in the mode line. With optional second arg NO-REVERT, don't refresh the listing afterwards." (dired-sort-R-check switches) (setq dired-actual-switches switches) - (if (eq major-mode 'dired-mode) (dired-sort-set-modeline)) + (dired-sort-set-modeline) (or no-revert (revert-buffer))) (defvar dired-subdir-alist-pre-R nil diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index 7786326bea9..34a1ceda254 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -133,9 +133,13 @@ are `-I REGEXP', to ignore changes whose lines match the REGEXP." (defcustom ediff-diff-options "" "*Options to pass to `ediff-diff-program'. If Unix diff is used as `ediff-diff-program', - then a useful option is `-w', to ignore space. -Options `-c' and `-i' are not allowed. Case sensitivity can be - toggled interactively using \\[ediff-toggle-ignore-case]." +then a useful option is `-w', to ignore space. +Options `-c', `-u', and `-i' are not allowed. Case sensitivity can be +toggled interactively using \\[ediff-toggle-ignore-case]. + +This variable is not for customizing the look of the differences produced by +the command \\[ediff-show-diff-output]. Use the variable +`ediff-custom-diff-options' for that." :set 'ediff-reset-diff-options :type 'string :group 'ediff-diff) @@ -254,10 +258,10 @@ one optional arguments, diff-number to refine.") ;; ediff-setup-diff-regions-function, which can also have the value ;; ediff-setup-diff-regions3, which takes 4 arguments. (defun ediff-setup-diff-regions (file-A file-B file-C) - ;; looking for '-c', '-i', or a 'c', 'i' among clustered non-long options - (if (string-match "^-[ci]\\| -[ci]\\|\\(^\\| \\)-[^- ]+[ci]" + ;; looking for '-c', '-i', '-u', or 'c', 'i', 'u' among clustered non-long options + (if (string-match "^-[ciu]\\| -[ciu]\\|\\(^\\| \\)-[^- ]+[ciu]" ediff-diff-options) - (error "Options `-c' and `-i' are not allowed in `ediff-diff-options'")) + (error "Options `-c', `-u', and `-i' are not allowed in `ediff-diff-options'")) ;; create, if it doesn't exist (or (ediff-buffer-live-p ediff-diff-buffer) diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index b9afebcb3ef..a19f054a468 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -75,7 +75,7 @@ files.") (nil "(afs@hplb.hpl.hp.com)") (nil "<Use-Author-Address-Header@\\[127.1\\]>") (nil "Code Extracted") - (nil "Fsf") + (nil "\\`FSF") (nil "ISO-2022-JP") ("Jaeyoun Chung" "Jae-youn Chung" "Jae-you Chung" "Chung Jae-youn") ("Jan Dj,Ad(Brv" "Jan D." "Jan Djarv") @@ -300,6 +300,8 @@ found) in the repository.") ("GETTING.GNU.SOFTWARE" . "FTP") ("leim-Makefile" . "leim/Makefile") ("leim-Makefile.in" . "leim/Makefile.in") + ("emacs-lisp/testcover-ses.el" . "tcover-ses.el") + ("emacs-lisp/testcover-unsafep.el" . "tcover-unsafep.el") ("INSTALL-CVS" . "INSTALL.CVS") ) "Alist of files which have been renamed during their lifetime. diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el index 792272ef88a..6053fb3cf09 100644 --- a/lisp/emacs-lisp/bindat.el +++ b/lisp/emacs-lisp/bindat.el @@ -319,8 +319,8 @@ ((eq type 'struct) (setq data (bindat--unpack-group (eval len)))) ((eq type 'repeat) - (let ((index 0)) - (while (< index len) + (let ((index 0) (count len)) + (while (< index count) (setq data (cons (bindat--unpack-group (nthcdr tail item)) data)) (setq index (1+ index))) (setq data (nreverse data)))) @@ -415,8 +415,8 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (bindat--length-group (if field (bindat-get-field struct field) struct) (eval len))) ((eq type 'repeat) - (let ((index 0)) - (while (< index len) + (let ((index 0) (count len)) + (while (< index count) (bindat--length-group (nth index (bindat-get-field struct field)) (nthcdr tail item)) @@ -559,8 +559,8 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..." (bindat--pack-group (if field (bindat-get-field struct field) struct) (eval len))) ((eq type 'repeat) - (let ((index 0)) - (while (< index len) + (let ((index 0) (count len)) + (while (< index count) (bindat--pack-group (nth index (bindat-get-field struct field)) (nthcdr tail item)) diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index de8f0a91af4..213854edb54 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -274,7 +274,7 @@ With zero or negative ARG turn mode off. (defalias 'easy-mmode-define-global-mode 'define-global-minor-mode) ;;;###autoload (defmacro define-global-minor-mode (global-mode mode turn-on &rest keys) - "Make GLOBAL-MODE out of the buffer-local minor MODE. + "Make a global mode GLOBAL-MODE corresponding to buffer-local minor MODE. TURN-ON is a function that will be called with no args in every buffer and that should try to turn MODE on if applicable for that buffer. KEYS is a list of CL-style keyword arguments. As the minor mode diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index a2153beebd9..06cafb17e61 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el @@ -443,20 +443,24 @@ When non-nil, NOEXP indicates that CALLBACK cannot be an expression command)) ;;;###autoload -(defun easy-menu-change (path name items &optional before) +(defun easy-menu-change (path name items &optional before map) "Change menu found at PATH as item NAME to contain ITEMS. PATH is a list of strings for locating the menu that should contain a submenu named NAME. ITEMS is a list of menu items, as in `easy-menu-define'. These items entirely replace the previous items in that submenu. +If MAP is specified, it should normally be a keymap; nil stands for the local +menu-bar keymap. It can also be a symbol, which has earlier been used as the +first argument in a call to `easy-menu-define', or the value of such a symbol. + If the menu located by PATH has no submenu named NAME, add one. If the optional argument BEFORE is present, add it just before the submenu named BEFORE, otherwise add it at the end of the menu. To implement dynamic menus, either call this from `menu-bar-update-hook' or use a menu filter." - (easy-menu-add-item nil path (easy-menu-create-menu name items) before)) + (easy-menu-add-item map path (easy-menu-create-menu name items) before)) ;; XEmacs needs the following two functions to add and remove menus. ;; In Emacs this is done automatically when switching keymaps, so diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 6e06e4a067b..895bec256d4 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -185,13 +185,18 @@ With ARG, do it that many times. Negative arg -N means move forward to Nth following beginning of defun. Returns t unless search stops due to beginning or end of buffer. -Normally a defun starts when there is a char with open-parenthesis -syntax at the beginning of a line. If `defun-prompt-regexp' is -non-nil, then a string which matches that regexp may precede the -open-parenthesis, and point ends up at the beginning of the line. - If variable `beginning-of-defun-function' is non-nil, its value -is called as a function to find the defun's beginning." +is called as a function to find the defun's beginning. + +Normally a defun is assumed to start where there is a char with +open-parenthesis syntax at the beginning of a line. If +`defun-prompt-regexp' is non-nil, then a string which matches +that regexp may precede the open-parenthesis, and point ends up +at the beginning of the line. + +If `defun-prompt-regexp' and `open-paren-in-column-0-is-defun-start' +are both nil, the function instead finds an open-paren at the +outermost level." (interactive "p") (or (not (eq this-command 'beginning-of-defun)) (eq last-command 'beginning-of-defun) @@ -208,9 +213,9 @@ is non-nil. If variable `beginning-of-defun-function' is non-nil, its value is called as a function to find the defun's beginning." - (interactive "p") ; change this to "P", maybe, if we ever come to pass ARG - ; to beginning-of-defun-function. - (unless arg (setq arg 1)) ; The call might not be interactive. + (interactive "p") ; change this to "P", maybe, if we ever come to pass ARG + ; to beginning-of-defun-function. + (unless arg (setq arg 1)) (cond (beginning-of-defun-function (if (> arg 0) @@ -230,42 +235,56 @@ is called as a function to find the defun's beginning." nil 'move arg) (progn (goto-char (1- (match-end 0)))) t)) + ;; If open-paren-in-column-0-is-defun-start and defun-prompt-regexp + ;; are both nil, column 0 has no significance - so scan forward + ;; from BOB to see how nested point is, then carry on from there. + ;; + ;; It is generally not a good idea to land up here, because the + ;; call to scan-lists below can be extremely slow. This is because + ;; back_comment in syntax.c may have to scan from bob to find the + ;; beginning of each comment. Fixing this is not trivial -- cyd. + + ((eq arg 0)) (t - ;; Column 0 has no significance - so scan forward from BOB to see how - ;; nested point is, then carry on from there. - (let* ((floor (point-min)) - (ceiling (point-max)) - (pps-state (let (syntax-begin-function - font-lock-beginning-of-syntax-function) - (syntax-ppss))) - (nesting-depth (nth 0 pps-state))) + (let ((floor (point-min)) + (ceiling (point-max)) + (arg-+ve (> arg 0))) (save-restriction (widen) - ;; Get outside of any string or comment. - (if (nth 8 pps-state) - (goto-char (nth 8 pps-state))) - - (cond - ((> arg 0) - (when (> nesting-depth 0) - (up-list (- nesting-depth)) - (setq arg (1- arg))) - ;; We're now outside of any defun. - (backward-list arg) - (if (< (point) floor) (goto-char floor))) - - ((< arg 0) - (cond - ((> nesting-depth 0) - (up-list nesting-depth) - (setq arg (1+ arg))) - ((not (looking-at "\\s(")) - ;; We're between defuns, and not at the start of one. - (setq arg (1+ arg)))) - (forward-list (- arg)) - (down-list) - (backward-char) - (if (> (point) ceiling) (goto-char ceiling))))))))) + (let ((ppss (let (syntax-begin-function + font-lock-beginning-of-syntax-function) + (syntax-ppss))) + ;; position of least enclosing paren, or nil. + encl-pos) + ;; Back out of any comment/string, so that encl-pos will always + ;; become nil if we're at top-level. + (when (nth 8 ppss) + (goto-char (nth 8 ppss)) + (setq ppss (syntax-ppss))) ; should be fast, due to cache. + (setq encl-pos (syntax-ppss-toplevel-pos ppss)) + (if encl-pos (goto-char encl-pos)) + + (and encl-pos arg-+ve (setq arg (1- arg))) + (and (not encl-pos) (not arg-+ve) (not (looking-at "\\s(")) + (setq arg (1+ arg))) + + (condition-case nil ; to catch crazy parens. + (progn + (goto-char (scan-lists (point) (- arg) 0)) + (if arg-+ve + (if (>= (point) floor) + t + (goto-char floor) + nil) + ;; forward to next (, or trigger the c-c + (goto-char (1- (scan-lists (point) 1 -1))) + (if (<= (point) ceiling) + t + (goto-char ceiling) + nil))) + (error + (goto-char (if arg-+ve floor ceiling)) + nil)))))))) (defvar end-of-defun-function nil "If non-nil, function for function `end-of-defun' to call. diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el index f290db42c04..0937076a7f4 100644 --- a/lisp/emacs-lisp/syntax.el +++ b/lisp/emacs-lisp/syntax.el @@ -53,12 +53,20 @@ (nth 0 ppss)) (defun syntax-ppss-toplevel-pos (ppss) - "Return the last preceding position at toplevel. -\"At toplevel\" means that it is outside of any syntactic entity: -outside of any parentheses, or comments, or strings. -Returns nil iff PPSS itself corresponds to a toplevel position." + "Get the latest syntactically outermost position found in a syntactic scan. +PPSS is a scan state, as returned by `partial-parse-sexp' or `syntax-ppss'. +An \"outermost position\" means one that it is outside of any syntactic entity: +outside of any parentheses, comments, or strings encountered in the scan. +If no such position is recorded in PPSS (because the end of the scan was +itself at the outermost level), return nil." + ;; BEWARE! We rely on the undocumented 9th field. The 9th field currently + ;; contains the list of positions of the enclosing open-parens. + ;; I.e. those positions are outside of any string/comment and the first of + ;; those is outside of any paren (i.e. corresponds to a nil ppss). + ;; If this list is empty but we are in a string or comment, then the 8th + ;; field contains a similar "toplevel" position. (or (car (nth 9 ppss)) - (nth 8 ppss))) + (nth 8 ppss))) (defsubst syntax-ppss-context (ppss) (cond @@ -95,8 +103,7 @@ point (where the PPSS is equivalent to nil).") ;; depend on the text after BEG (which is presumably changed). So if ;; BEG=(car (nth 10 syntax-ppss-last)) don't reuse that data because the ;; assumed nil state at BEG may not be valid any more. - (if (<= beg (or (car (nth 10 syntax-ppss-last)) - (nth 9 syntax-ppss-last) + (if (<= beg (or (syntax-ppss-toplevel-pos (cdr syntax-ppss-last)) (nth 3 syntax-ppss-last) 0)) (setq syntax-ppss-last nil) @@ -144,22 +151,14 @@ Point is at POS when this function returns." (cond ;; Use OLD-PPSS if possible and close enough. ((and (not old-pos) old-ppss - ;; BEWARE! We rely on the undocumented 9th field. The 9th - ;; field currently contains the list of positions of - ;; open-parens of the enclosing parens. I.e. those - ;; positions are outside of any string/comment - ;; and the first of those is outside of any paren - ;; (i.e. corresponds to a nil ppss). If this list is empty - ;; but we are in a string or comment, then the 8th field - ;; contains a similar "toplevel" position. If `pt-min' is - ;; too far from `pos', we could try to use other positions - ;; in (nth 9 old-ppss), but that doesn't seem to happen in - ;; practice and it would complicate this code (and the - ;; before-change-function code even more). But maybe it - ;; would be useful in "degenerate" cases such as when the - ;; whole file is wrapped in a set of parenthesis. - (setq pt-min (or (car (nth 9 old-ppss)) - (nth 8 old-ppss) + ;; If `pt-min' is too far from `pos', we could try to use + ;; other positions in (nth 9 old-ppss), but that doesn't + ;; seem to happen in practice and it would complicate this + ;; code (and the before-change-function code even more). + ;; But maybe it would be useful in "degenerate" cases such + ;; as when the whole file is wrapped in a set + ;; of parentheses. + (setq pt-min (or (syntax-ppss-toplevel-pos old-ppss) (nth 2 old-ppss))) (<= pt-min pos) (< (- pos pt-min) syntax-ppss-max-span)) (incf (car (aref syntax-ppss-stats 1))) diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index ac3ef55d6e4..d3dae72d13e 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -171,7 +171,9 @@ (run-hook-with-args 'viper-before-change-functions beg end)) (defsubst viper-post-command-sentinel () - (run-hooks 'viper-post-command-hooks) + (condition-case conds + (run-hooks 'viper-post-command-hooks) + (error (viper-message-conditions conds))) (if (eq viper-current-state 'vi-state) (viper-restore-cursor-color 'after-insert-mode))) @@ -926,8 +928,7 @@ Vi's prefix argument will be used. Otherwise, the prefix argument passed to (condition-case nil (let (viper-vi-kbd-minor-mode) ; execute without kbd macros - (setq result (eval form)) - ) + (setq result (eval form))) (error (signal 'quit nil))) @@ -1971,9 +1972,16 @@ Undo previous insertion and inserts new." (if (and (eobp) (not (bolp)) require-final-newline + ;; add newline only if we actually edited buffer. otherwise it + ;; might unintentionally modify binary buffers + (buffer-modified-p) (not (viper-is-in-minibuffer)) (not buffer-read-only)) - (insert "\n"))) + ;; text property may be read-only + (condition-case nil + (insert "\n") + (error nil)) + )) )) (defun viper-yank-defun () diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index c8c1cb56b54..b356f83b0b2 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,4 +1,4 @@ -2006-12-13 Leo <sdl.web@gmail.com> +2006-12-13 Leo <sdl.web@gmail.com> (tiny change) * erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it isn't active already, instead of leaving it on. diff --git a/lisp/files.el b/lisp/files.el index 141fe9f26c9..c462e5cce9d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1876,6 +1876,16 @@ in that case, this function acts as if `enable-local-variables' were t." (if (fboundp 'ucs-set-table-for-input) ; don't lose when building (ucs-set-table-for-input))) +(defcustom auto-mode-case-fold nil + "Non-nil means to try second pass through `auto-mode-alist'. +This means that if the first case-sensitive search through the alist fails +to find a matching major mode, a second case-insensitive search is made. +On systems with case-insensitive file names, this variable is ignored, +since only a single case-insensitive search through the alist is made." + :group 'files + :version "22.1" + :type 'boolean) + (defvar auto-mode-alist ;; Note: The entries for the modes defined in cc-mode.el (c-mode, ;; c++-mode, java-mode and more) are added through autoload @@ -2115,7 +2125,8 @@ of the regular expression. The mode is then determined as the mode associated with that interpreter in `interpreter-mode-alist'.") (defvar magic-mode-alist - `(;; The < comes before the groups (but the first) to reduce backtracking. + `((image-type-auto-detected-p . image-mode) + ;; The < comes before the groups (but the first) to reduce backtracking. ;; TODO: UTF-16 <?xml may be preceded by a BOM 0xff 0xfe or 0xfe 0xff. ;; We use [ \t\n] instead of `\\s ' to make regex overflow less likely. (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") @@ -2134,13 +2145,15 @@ associated with that interpreter in `interpreter-mode-alist'.") ("%![^V]" . ps-mode) ("# xmcd " . conf-unix-mode)) "Alist of buffer beginnings vs. corresponding major mode functions. -Each element looks like (REGEXP . FUNCTION). After visiting a file, -if REGEXP matches the text at the beginning of the buffer, -`normal-mode' will call FUNCTION rather than allowing `auto-mode-alist' -to decide the buffer's major mode. +Each element looks like (REGEXP . FUNCTION) or (MATCH-FUNCTION . FUNCTION). +After visiting a file, if REGEXP matches the text at the beginning of the +buffer, or calling MATCH-FUNCTION returns non-nil, `normal-mode' will +call FUNCTION rather than allowing `auto-mode-alist' to decide the buffer's +major mode. If FUNCTION is nil, then it is not called. (That is a way of saying \"allow `auto-mode-alist' to decide for these files.\")") +(put 'magic-mode-alist 'risky-local-variable t) (defvar magic-mode-regexp-match-limit 4000 "Upper limit on `magic-mode-alist' regexp matches.") @@ -2224,7 +2237,9 @@ only set the major mode, if that would change it." (+ (point-min) magic-mode-regexp-match-limit))) (assoc-default nil magic-mode-alist (lambda (re dummy) - (looking-at re)))))) + (if (functionp re) + (funcall re) + (looking-at re))))))) (set-auto-mode-0 done keep-mode-if-same) ;; Compare the filename against the entries in auto-mode-alist. (if buffer-file-name @@ -2233,15 +2248,29 @@ only set the major mode, if that would change it." (setq name (file-name-sans-versions name)) (while name ;; Find first matching alist entry. - (let ((case-fold-search - (memq system-type '(vax-vms windows-nt cygwin)))) - (if (and (setq mode (assoc-default name auto-mode-alist - 'string-match)) - (consp mode) - (cadr mode)) - (setq mode (car mode) - name (substring name 0 (match-beginning 0))) - (setq name))) + (setq mode + (if (memq system-type '(vax-vms windows-nt cygwin)) + ;; System is case-insensitive. + (let ((case-fold-search t)) + (assoc-default name auto-mode-alist + 'string-match)) + ;; System is case-sensitive. + (or + ;; First match case-sensitively. + (let ((case-fold-search nil)) + (assoc-default name auto-mode-alist + 'string-match)) + ;; Fallback to case-insensitive match. + (and auto-mode-case-fold + (let ((case-fold-search t)) + (assoc-default name auto-mode-alist + 'string-match)))))) + (if (and mode + (consp mode) + (cadr mode)) + (setq mode (car mode) + name (substring name 0 (match-beginning 0))) + (setq name)) (when mode (set-auto-mode-0 mode keep-mode-if-same))))))))) @@ -3026,7 +3055,7 @@ BACKUPNAME is the backup file name, which is the old file renamed." (convert-standard-filename "~/%backup%~"))) (message "Cannot write backup file; backing up in %s" - (file-name-nondirectory backupname)) + backupname) (sleep-for 1) (backup-buffer-copy real-file-name backupname modes))) (setq buffer-backed-up t) @@ -3222,16 +3251,24 @@ doesn't exist, it is created." (defun make-backup-file-name-1 (file) "Subroutine of `make-backup-file-name' and `find-backup-file-name'." (let ((alist backup-directory-alist) - elt backup-directory) + elt backup-directory abs-backup-directory) (while alist (setq elt (pop alist)) (if (string-match (car elt) file) (setq backup-directory (cdr elt) alist nil))) - (if (and backup-directory (not (file-exists-p backup-directory))) + ;; If backup-directory is relative, it should be relative to the + ;; file's directory. By expanding explicitly here, we avoid + ;; depending on default-directory. + (if backup-directory + (setq abs-backup-directory + (expand-file-name backup-directory + (file-name-directory file)))) + (if (and abs-backup-directory (not (file-exists-p abs-backup-directory))) (condition-case nil - (make-directory backup-directory 'parents) - (file-error (setq backup-directory nil)))) + (make-directory abs-backup-directory 'parents) + (file-error (setq backup-directory nil + abs-backup-directory nil)))) (if (null backup-directory) file (if (file-name-absolute-p backup-directory) @@ -3262,9 +3299,7 @@ doesn't exist, it is created." (replace-regexp-in-string "!" "!!" file)) backup-directory)) (expand-file-name (file-name-nondirectory file) - (file-name-as-directory - (expand-file-name backup-directory - (file-name-directory file)))))))) + (file-name-as-directory abs-backup-directory)))))) (defun backup-file-name-p (file) "Return non-nil if FILE is a backup file name (numeric or not). diff --git a/lisp/forms-d2.el b/lisp/forms-d2.el index 63b47fc028d..883cfe14d7c 100644 --- a/lisp/forms-d2.el +++ b/lisp/forms-d2.el @@ -1,5 +1,8 @@ ;;; forms-d2.el --- demo forms-mode -*- no-byte-compile: t -*- +;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. + ;; Author: Johan Vromans <jvromans@squirrel.nl> ;; Created: 1989 diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 047bac04076..b6b8b1b9bac 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,63 @@ +2006-12-30 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> + + * gnus-sum.el (gnus-summary-insert-dormant-articles): Fix typo in + message. + +2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> + + * nnimap.el (nnimap-expunge-search-string): Mention + nnimap-search-uids-not-since-is-evil in docstring. + +2006-12-28 Reiner Steib <Reiner.Steib@gmx.de> + + * spam.el: Revert to make-obsolete-variable because + define-obsolete-variable-alias is not supported in Emacs 21. + +2006-12-28 Daiki Ueno <ueno@unixuser.org> + + * gnus-sum.el (gnus-summary-next-article): Make sure we are in the + summary buffer. + +2006-12-27 Reiner Steib <Reiner.Steib@gmx.de> + + * spam.el (spam-ifile-path, spam-ifile-database-path) + (spam-bogofilter-path): Use define-obsolete-variable-alias instead of + make-obsolete-variable. + +2006-12-26 Reiner Steib <Reiner.Steib@gmx.de> + + * message.el (message-make-fqdn): Fix comment. + (message-bogus-system-names): Add ".local". + + * spam.el (spam-ifile-path, spam-ifile-program) + (spam-ifile-database-path, spam-ifile-database) + (spam-bogofilter-path, spam-bogofilter-program): Rename variables. + Don't use "path" inappropriately. + (spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc + strings. + (spam-check-ifile, spam-ifile-register-with-ifile) + (spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use + new variable names. + + * gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face) + (gnus-treat-display-smileys): Simplify using + gnus-image-type-available-p. + + * gnus-ems.el (gnus-image-type-available-p): Use display-images-p if + available. + +2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org> + + * nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded + one after turning on the buffer's multibyteness instead of decoding + them directly in the unibyte buffer that causes unexpected conversion + in Emacs 23 (unicode). + +2006-12-20 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus-group.el (gnus-group-tool-bar-gnome): Exchange connect and + disconnect icons. Add help text. + 2006-12-13 Reiner Steib <Reiner.Steib@gmx.de> * legacy-gnus-agent.el: Add Copyright notice. @@ -20,7 +80,7 @@ * gnus-sum.el (gnus-sort-threads, gnus-summary-limit-children): Use `max' to avoid the value of `max-lisp-eval-depth' decreasing. -2006-12-04 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> (tiny change) +2006-12-04 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> * mm-url.el (mm-url-predefined-programs): Call curl with correct options. @@ -1649,7 +1709,7 @@ whitespace removed in revision 7.8. Use concatenated string to protect trailing whitespace. -2005-10-27 Jouni K Seppanen <jks@iki.fi> (tiny change) +2005-10-27 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> * nnimap.el (nnimap-search-uids-not-since-is-evil): Add variable. (nnimap-request-expire-articles): Use it to avoid sending 'UID diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el index 404aebbd921..53439d17091 100644 --- a/lisp/gnus/deuglify.el +++ b/lisp/gnus/deuglify.el @@ -1,7 +1,7 @@ ;;; deuglify.el --- deuglify broken Outlook (Express) articles -;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -;; Copyright (C) 2001, 2002 Raymond Scholz +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Raymond Scholz <rscholz@zonix.de> ;; Thomas Steffen (unwrapping algorithm, diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index cdb3c8950cc..9160f6f5002 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -1325,12 +1325,11 @@ See Info node `(gnus)Customizing Articles' for details." (defcustom gnus-treat-display-x-face (and (not noninteractive) - (or (and (fboundp 'image-type-available-p) - (image-type-available-p 'xbm) - (string-match "^0x" (shell-command-to-string "uncompface")) - (executable-find "icontopbm")) - (and (featurep 'xemacs) - (featurep 'xface))) + (gnus-image-type-available-p 'xbm) + (if (featurep 'xemacs) + (featurep 'xface) + (and (string-match "^0x" (shell-command-to-string "uncompface")) + (executable-find "icontopbm"))) 'head) "Display X-Face headers. Valid values are nil, t, `head', `last', an integer or a predicate. @@ -1362,10 +1361,7 @@ See Info node `(gnus)Customizing Articles' and Info node (defcustom gnus-treat-display-face (and (not noninteractive) - (or (and (fboundp 'image-type-available-p) - (image-type-available-p 'png)) - (and (featurep 'xemacs) - (featurep 'png))) + (gnus-image-type-available-p 'png) 'head) "Display Face headers. Valid values are nil, t, `head', `last', an integer or a predicate. @@ -1378,12 +1374,7 @@ See Info node `(gnus)Customizing Articles' and Info node :type gnus-article-treat-head-custom) (put 'gnus-treat-display-face 'highlight t) -(defcustom gnus-treat-display-smileys - (if (or (and (featurep 'xemacs) - (featurep 'xpm)) - (and (fboundp 'image-type-available-p) - (image-type-available-p 'pbm))) - t nil) +(defcustom gnus-treat-display-smileys (gnus-image-type-available-p 'xpm) "Display smileys. Valid values are nil, t, `head', `last', an integer or a predicate. See Info node `(gnus)Customizing Articles' and Info node diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index bc2f096fd70..06d3d530df7 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el @@ -1,7 +1,7 @@ ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus backend -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1999, 2000, 2001 Didier Verna. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Author: Didier Verna <didier@xemacs.org> ;; Maintainer: Didier Verna <didier@xemacs.org> diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el index 44f84237a4b..73bcf09f360 100644 --- a/lisp/gnus/gnus-ems.el +++ b/lisp/gnus/gnus-ems.el @@ -211,7 +211,10 @@ (defun gnus-image-type-available-p (type) (and (fboundp 'image-type-available-p) - (image-type-available-p type))) + (image-type-available-p type) + (if (fboundp 'display-images-p) + (display-images-p) + t))) (defun gnus-create-image (file &optional type data-p &rest props) (let ((face (plist-get props :face))) diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index f004a043834..3fe8d71f512 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -1018,9 +1018,11 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and '((gnus-group-post-news "mail/compose") ;; Some useful agent icons? I don't use the agent so agent users should ;; suggest useful commands: - (gnus-agent-toggle-plugged "connect" t - :visible (and gnus-agent (not gnus-plugged))) (gnus-agent-toggle-plugged "disconnect" t + :help "Gnus is currently unplugged. Click to work online." + :visible (and gnus-agent (not gnus-plugged))) + (gnus-agent-toggle-plugged "connect" t + :help "Gnus is currently plugged. Click to work offline." :visible (and gnus-agent gnus-plugged)) ;; FIXME: gnus-agent-toggle-plugged (in gnus-agent-group-make-menu-bar) ;; should have a better help text. diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 29e0067bf9b..54745511129 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -7333,6 +7333,9 @@ If UNREAD, only unread articles are selected. If SUBJECT, only articles with SUBJECT are selected. If BACKWARD, the previous article is selected instead of the next." (interactive "P") + ;; Make sure we are in the summary buffer. + (unless (eq major-mode 'gnus-summary-mode) + (set-buffer gnus-summary-buffer)) (cond ;; Is there such an article? ((and (gnus-summary-search-forward unread subject backward) @@ -7987,7 +7990,7 @@ article." (interactive) (let ((gnus-verbose (max 6 gnus-verbose))) (if (not gnus-newsgroup-dormant) - (gnus-message 3 "No cached articles for this group") + (gnus-message 3 "No dormant articles for this group") (gnus-summary-goto-subjects gnus-newsgroup-dormant)))) (defun gnus-summary-limit-include-dormant () diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index a3d0298ce0e..f7d876c120f 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -1579,7 +1579,7 @@ functionality to work." (defvar message-send-mail-real-function nil "Internal send mail function.") -(defvar message-bogus-system-names "^localhost\\." +(defvar message-bogus-system-names "^localhost\\.\\|\\.local$" "The regexp of bogus system names.") (defcustom message-valid-fqdn-regexp @@ -5000,8 +5000,8 @@ give as trustworthy answer as possible." (stringp message-user-fqdn) (string-match message-valid-fqdn-regexp message-user-fqdn) (not (string-match message-bogus-system-names message-user-fqdn))) + ;; `message-user-fqdn' seems to be valid message-user-fqdn) - ;; `message-user-fqdn' seems to be valid ((and (string-match message-valid-fqdn-regexp system-name) (not (string-match message-bogus-system-names system-name))) ;; `system-name' returned the right result. diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index bada9da6891..5c0777531c5 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -375,7 +375,10 @@ and the second %s is replaced by a date criterium. One useful (and perhaps the only useful) value to change this to would be `UID %s NOT SENTSINCE %s' to make nnimap use the Date: header instead of the internal date of messages. See section 6.4.4 of RFC -2060 for more information on valid strings.") +2060 for more information on valid strings. + +However, if `nnimap-search-uids-not-since-is-evil' is true, this +variable has no effect since the search logic is reversed.") (defvoo nnimap-importantize-dormant t "If non-nil, mark \"dormant\" articles as \"ticked\" for other IMAP clients. diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 318560179f5..f21fd74d138 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -418,8 +418,10 @@ otherwise return nil." (nnheader-remove-cr-followed-by-lf) ;; Decode text according to the encoding attribute. (when (setq cs (nnrss-get-encoding)) - (mm-decode-coding-region (point-min) (point-max) cs) - (mm-enable-multibyte)) + (insert (prog1 + (mm-decode-coding-string (buffer-string) cs) + (erase-buffer) + (mm-enable-multibyte)))) (goto-char (point-min)) ;; Because xml-parse-region can't deal with anything that isn't diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el index 047035536f2..589b2b0a619 100644 --- a/lisp/gnus/spam.el +++ b/lisp/gnus/spam.el @@ -351,14 +351,18 @@ All unmarked article in such group receive the spam mark on group entry." "Spam ifile configuration." :group 'spam) -(defcustom spam-ifile-path (executable-find "ifile") - "File path of the ifile executable program." +(make-obsolete-variable 'spam-ifile-path 'spam-ifile-program) +;; "22.1" ;; Gnus 5.10.9 +(defcustom spam-ifile-program (executable-find "ifile") + "Name of the ifile program." :type '(choice (file :tag "Location of ifile") (const :tag "ifile is not installed")) :group 'spam-ifile) -(defcustom spam-ifile-database-path nil - "File path of the ifile database." +(make-obsolete-variable 'spam-ifile-database-path 'spam-ifile-database) +;; "22.1" ;; Gnus 5.10.9 +(defcustom spam-ifile-database nil + "File name of the ifile database." :type '(choice (file :tag "Location of the ifile database") (const :tag "Use the default")) :group 'spam-ifile) @@ -386,8 +390,10 @@ your main source of newsgroup names." "Spam bogofilter configuration." :group 'spam) -(defcustom spam-bogofilter-path (executable-find "bogofilter") - "File path of the Bogofilter executable program." +(make-obsolete-variable 'spam-bogofilter-path 'spam-bogofilter-program) +;; "22.1" ;; Gnus 5.10.9 +(defcustom spam-bogofilter-program (executable-find "bogofilter") + "Name of the Bogofilter program." :type '(choice (file :tag "Location of bogofilter") (const :tag "Bogofilter is not installed")) :group 'spam-bogofilter) @@ -423,7 +429,8 @@ your main source of newsgroup names." :group 'spam-bogofilter) (defcustom spam-bogofilter-database-directory nil - "Directory path of the Bogofilter databases." + "Location of the Bogofilter database. +When nil, use the default location." :type '(choice (directory :tag "Location of the Bogofilter database directory") (const :tag "Use the default")) @@ -434,8 +441,8 @@ your main source of newsgroup names." :group 'spam) (defcustom spam-spamoracle-database nil - "Location of spamoracle database file. When nil, use the default -spamoracle database." + "Location of spamoracle database file. +When nil, use the default spamoracle database." :type '(choice (directory :tag "Location of spamoracle database file.") (const :tag "Use the default")) :group 'spam-spamoracle) @@ -1370,11 +1377,12 @@ functions") ;;; check the ifile backend; return nil if the mail was NOT classified ;;; as spam + (defun spam-get-ifile-database-parameter () - "Get the command-line parameter for ifile's database from - spam-ifile-database-path." - (if spam-ifile-database-path - (format "--db-file=%s" spam-ifile-database-path) + "Return the command-line parameter for ifile's database. +See `spam-ifile-database'." + (if spam-ifile-database + (format "--db-file=%s" spam-ifile-database) nil)) (defun spam-check-ifile () @@ -1390,7 +1398,7 @@ functions") (save-excursion (set-buffer article-buffer-name) (apply 'call-process-region - (point-min) (point-max) spam-ifile-path + (point-min) (point-max) spam-ifile-program nil temp-buffer-name nil "-c" (if db-param `(,db-param "-q") `("-q")))) ;; check the return now (we're back in the temp buffer) @@ -1418,7 +1426,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)." (when (stringp article-string) (insert article-string)))) (apply 'call-process-region - (point-min) (point-max) spam-ifile-path + (point-min) (point-max) spam-ifile-program nil nil nil add-or-delete-option category (if db `(,db "-h") `("-h")))))) @@ -1702,7 +1710,7 @@ REMOVE not nil, remove the ADDRESSES." (set-buffer article-buffer-name) (apply 'call-process-region (point-min) (point-max) - spam-bogofilter-path + spam-bogofilter-program nil temp-buffer-name nil (if db `("-d" ,db "-v") `("-v")))) (setq return (spam-check-bogofilter-headers score)))) @@ -1728,7 +1736,7 @@ REMOVE not nil, remove the ADDRESSES." (apply 'call-process-region (point-min) (point-max) - spam-bogofilter-path + spam-bogofilter-program nil nil nil switch (if db `("-d" ,db "-v") `("-v")))))))) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index e4d77e3447c..740504c95a6 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -575,8 +575,11 @@ it is displayed along with the global value." (documentation-property alias 'variable-documentation)))) (unless (eq alias variable) (princ (format "\nThis variable is an alias for `%s'.\n" alias))) + (if (or obsolete safe-var) + (terpri)) + (when obsolete - (princ "\nThis variable is obsolete") + (princ "This variable is obsolete") (if (cdr obsolete) (princ (format " since %s" (cdr obsolete)))) (princ ";") (terpri) (princ (if (stringp (car obsolete)) (car obsolete) @@ -587,9 +590,8 @@ it is displayed along with the global value." (princ "if its value\nsatisfies the predicate ") (princ (if (byte-code-function-p safe-var) "which is byte-compiled expression.\n" - (format "`%s'.\n" safe-var))) - (terpri)) - (princ "Documentation:\n") + (format "`%s'.\n" safe-var)))) + (princ "\nDocumentation:\n") (princ (or doc "Not documented as a variable."))) ;; Make a link to customize if this variable can be customized. (if (custom-variable-p variable) diff --git a/lisp/ido.el b/lisp/ido.el index 796c377571c..e02028e526c 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -1046,6 +1046,9 @@ so that it doesn't interfere with other minibuffer usage.") ;; Stores the current ido item type ('file, 'dir, 'buffer, or 'list). (defvar ido-cur-item) +;;; Stores the current default item +(defvar ido-default-item) + ;; Stores the current list of items that will be searched through. ;; The list is ordered, so that the most interesting item comes first, ;; although by default, the files visible in the current frame are put @@ -2589,7 +2592,9 @@ C-x C-f ... C-d enter dired on current directory." "Toggle ignoring files specified with `ido-ignore-files'." (interactive) (if ido-directory-too-big - (setq ido-directory-too-big nil) + (progn + (message "Reading directory...") + (setq ido-directory-too-big nil)) (setq ido-process-ignore-lists (not ido-process-ignore-lists))) (setq ido-text-init ido-text) (setq ido-exit 'refresh) @@ -3577,6 +3582,11 @@ for first matching file." (/= (aref name 0) ?.))) (string-match re name)) (cond + ((and (eq ido-cur-item 'buffer) + (or (not (stringp ido-default-item)) + (not (string= name ido-default-item))) + (string= name (buffer-name ido-entry-buffer))) + (setq matches (cons item matches))) ((and full-re (string-match full-re name)) (setq full-matches (cons item full-matches))) ((and suffix-re (string-match suffix-re name)) @@ -3729,7 +3739,8 @@ for first matching file." (set-buffer temp-buf) (setq win (get-buffer-window temp-buf)) (if (pos-visible-in-window-p (point-max) win) - (if (or ido-completion-buffer-all-completions (boundp 'ido-completion-buffer-full)) + (if (or ido-completion-buffer-all-completions + (boundp 'ido-completion-buffer-full)) (set-window-start win (point-min)) (with-no-warnings (set (make-local-variable 'ido-completion-buffer-full) t)) @@ -3742,6 +3753,14 @@ for first matching file." (with-output-to-temp-buffer ido-completion-buffer (let ((completion-list (sort (cond + (ido-directory-too-big + (message "Reading directory...") + (setq ido-directory-too-big nil + ido-ignored-list nil + ido-cur-list (ido-all-completions) + ido-rescan t) + (ido-set-matches) + (or ido-matches ido-cur-list)) (ido-use-merged-list (ido-flatten-merged-list (or ido-matches ido-cur-list))) ((or full-list ido-completion-buffer-all-completions) diff --git a/lisp/image.el b/lisp/image.el index b388396ded7..e70b9ec539e 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -35,11 +35,11 @@ (defconst image-type-header-regexps '(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm) - ("\\`P[1-6]" . pbm) + ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm) ("\\`GIF8" . gif) - ("\\`\211PNG\r\n" . png) + ("\\`\x89PNG\r\n\x1a\n" . png) ("\\`[\t\n\r ]*#define" . xbm) - ("\\`\\(MM\0\\*\\|II\\*\0\\)" . tiff) + ("\\`\\(?:MM\0\\*\\|II\\*\0\\)" . tiff) ("\\`[\t\n\r ]*%!PS" . postscript) ("\\`\xff\xd8" . (image-jpeg-p . jpeg))) "Alist of (REGEXP . IMAGE-TYPE) pairs used to auto-detect image types. @@ -63,6 +63,24 @@ a non-nil value, TYPE is the image's type.") When the name of an image file match REGEXP, it is assumed to be of image type IMAGE-TYPE.") +(defvar image-type-auto-detectable + '((pbm . t) + (xbm . t) + (bmp . maybe) + (gif . maybe) + (png . maybe) + (xpm . maybe) + (jpeg . maybe) + (tiff . maybe) + (postscript . nil)) + "Alist of (IMAGE-TYPE . AUTODETECT) pairs used to auto-detect image files. +\(See `image-type-auto-detected-p'). + +AUTODETECT can be + - t always auto-detect. + - nil never auto-detect. + - maybe auto-detect only if the image type is available + (see `image-type-available-p').") (defvar image-load-path nil "List of locations in which to search for image files. @@ -308,6 +326,7 @@ Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data." (error "Invalid image type `%s'" type)) type) + ;;;###autoload (defun image-type-available-p (type) "Return non-nil if image type TYPE is available. @@ -317,6 +336,20 @@ Image types are symbols like `xbm' or `jpeg'." ;;;###autoload +(defun image-type-auto-detected-p () + "Return t iff the current buffer contains an auto-detectable image. +Whether image types are auto-detectable or not depends on the setting +of the variable `image-type-auto-detectable'. + +This function is intended to be used from `magic-mode-alist' (which see)." + (let* ((type (image-type-from-buffer)) + (auto (and type (cdr (assq type image-type-auto-detectable))))) + (and auto + (or (eq auto t) + (image-type-available-p type))))) + + +;;;###autoload (defun create-image (file-or-data &optional type data-p &rest props) "Create an image. FILE-OR-DATA is an image file name or image data. diff --git a/lisp/indent.el b/lisp/indent.el index 38b509b849c..6f715fdba64 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -50,7 +50,9 @@ Don't rebind TAB unless you really need to.") "*Controls the operation of the TAB key. If t, hitting TAB always just indents the current line. If nil, hitting TAB indents the current line if point is at the left margin - or in the line's indentation, otherwise it insert a \"real\" tab character." +or in the line's indentation, otherwise it insert a \"real\" TAB character. +Most programming language modes have their own variable to control this, +e.g., `c-tab-always-indent', and do not respect this variable." :group 'indent :type '(choice (const nil) (const t) (const always))) diff --git a/lisp/info.el b/lisp/info.el index 8b0558d898e..237ca7a968e 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -145,7 +145,7 @@ The Lisp code is executed when the node is selected.") :type 'boolean :group 'info) -(defcustom Info-fontify-maximum-menu-size 100000 +(defcustom Info-fontify-maximum-menu-size 1000000 "*Maximum size of menu to fontify if `font-lock-mode' is non-nil." :type 'integer :group 'info) @@ -1551,6 +1551,8 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES . SUFFIXES)." (node-regexp "Node: *\\([^,\n]*\\) *[,\n\t]")) (save-excursion (save-restriction + (or Info-tag-table-marker + (error "No Info tags found")) (if (marker-buffer Info-tag-table-marker) (let ((marker Info-tag-table-marker)) (set-buffer (marker-buffer marker)) @@ -3938,7 +3940,6 @@ the variable `Info-file-list-for-emacs'." (goto-char (point-min)) (when (and (or not-fontified-p fontify-visited-p) (search-forward "\n* Menu:" nil t) - (not (Info-index-node)) ;; Don't take time to annotate huge menus (< (- (point-max) (point)) Info-fontify-maximum-menu-size)) (let ((n 0) diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index fbdc0467f00..6c7500ce950 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -719,18 +719,18 @@ DEFAULT is the coding system to use by default in the query." (insert "\n") (fill-region-as-paragraph pos (point))) (when rejected - (insert "These safely encodes the target text, -but it is not recommended for encoding text in this context, + (insert "These safely encode the text in the buffer, +but are not recommended for encoding text in this context, e.g., for sending an email message.\n ") (dolist (x rejected) (princ " ") (princ x)) (insert "\n")) (when unsafe - (insert (if rejected "And the others" + (insert (if rejected "The other coding systems" "However, each of them") - " encountered these problematic characters:\n") + " encountered characters it couldn't encode:\n") (dolist (coding unsafe) - (insert (format " %s:" (car coding))) + (insert (format " %s cannot encode these:" (car coding))) (let ((i 0) (func1 #'(lambda (bufname pos) @@ -754,6 +754,7 @@ e.g., for sending an email message.\n ") (insert-text-button (cdr elt) :type 'help-xref + 'face 'link 'help-echo "mouse-2, RET: jump to this character" 'help-function func1 @@ -761,6 +762,7 @@ e.g., for sending an email message.\n ") (insert-text-button "..." :type 'help-xref + 'face 'link 'help-echo "mouse-2, RET: next unencodable character" 'help-function func2 @@ -769,19 +771,22 @@ e.g., for sending an email message.\n ") (setq i (1+ i)))) (insert "\n")) (insert "\ -The first problematic character is at point in the displayed buffer,\n" + +Click on a character to jump to the place it appears,\n" (substitute-command-keys "\ -and \\[universal-argument] \\[what-cursor-position] will give information about it.\n")))) - (insert "\nSelect \ -one of the following safe coding systems, or edit the buffer:\n") +where `\\[universal-argument] \\[what-cursor-position]' will give information about it.\n")))) + (insert (substitute-command-keys "\nSelect \ +one of the safe coding systems listed below,\n\ +or cancel the writing with \\[keyboard-quit] and edit the buffer\n\ + to remove or modify the problematic characters,\n\ +or specify any other coding system (and risk losing\n\ + the problematic characters).\n\n")) (let ((pos (point)) (fill-prefix " ")) (dolist (x codings) (princ " ") (princ x)) (insert "\n") - (fill-region-as-paragraph pos (point))) - (insert "Or specify any other coding system -at the risk of losing the problematic characters.\n"))) + (fill-region-as-paragraph pos (point))))) ;; Read a coding system. (setq coding-system diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 6f09c649d25..277e647d16f 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -4,7 +4,7 @@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" -;;;;;; "play/5x5.el" (17504 41540)) +;;;;;; "play/5x5.el" (17786 56015)) ;;; Generated autoloads from play/5x5.el (autoload (quote 5x5) "5x5" "\ @@ -63,14 +63,14 @@ should return a grid vector array that is the new solution. ;;;*** -;;;### (autoloads nil "abbrev" "abbrev.el" (17504 41540)) +;;;### (autoloads nil "abbrev" "abbrev.el" (17781 39501)) ;;; Generated autoloads from abbrev.el (put 'abbrev-mode 'safe-local-variable 'booleanp) ;;;*** ;;;### (autoloads (list-one-abbrev-table) "abbrevlist" "abbrevlist.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39501)) ;;; Generated autoloads from abbrevlist.el (autoload (quote list-one-abbrev-table) "abbrevlist" "\ @@ -81,7 +81,7 @@ Display alphabetical listing of ABBREV-TABLE in buffer OUTPUT-BUFFER. ;;;*** ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el" -;;;;;; (17759 28871)) +;;;;;; (17770 2412)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload (quote ada-add-extensions) "ada-mode" "\ @@ -142,7 +142,7 @@ If you use ada-xref.el: ;;;*** ;;;### (autoloads (ada-header) "ada-stmt" "progmodes/ada-stmt.el" -;;;;;; (17759 28871)) +;;;;;; (17751 22876)) ;;; Generated autoloads from progmodes/ada-stmt.el (autoload (quote ada-header) "ada-stmt" "\ @@ -153,7 +153,7 @@ Insert a descriptive header at the top of the file. ;;;*** ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el" -;;;;;; (17759 28871)) +;;;;;; (17780 18172)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload (quote ada-find-file) "ada-xref" "\ @@ -168,7 +168,7 @@ Completion is available. ;;;;;; change-log-mode add-change-log-entry-other-window add-change-log-entry ;;;;;; find-change-log prompt-for-change-log-name add-log-mailing-address ;;;;;; add-log-full-name add-log-current-defun-function) "add-log" -;;;;;; "add-log.el" (17746 34860)) +;;;;;; "add-log.el" (17781 39501)) ;;; Generated autoloads from add-log.el (defvar add-log-current-defun-function nil "\ @@ -306,7 +306,7 @@ Fix any old-style date entries in the current log file to default format. ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice ;;;;;; ad-enable-advice ad-default-compilation-action ad-redefinition-action) -;;;;;; "advice" "emacs-lisp/advice.el" (17701 49518)) +;;;;;; "advice" "emacs-lisp/advice.el" (17785 34467)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action (quote warn) "\ @@ -434,7 +434,7 @@ See Info node `(elisp)Advising Functions' for comprehensive documentation. ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule ;;;;;; align-highlight-rule align-current align-entire align-regexp -;;;;;; align) "align" "align.el" (17504 41540)) +;;;;;; align) "align" "align.el" (17794 48602)) ;;; Generated autoloads from align.el (autoload (quote align) "align" "\ @@ -524,7 +524,7 @@ A replacement function for `newline-and-indent', aligning as it goes. ;;;*** ;;;### (autoloads (outlineify-sticky allout-mode) "allout" "allout.el" -;;;;;; (17759 28868)) +;;;;;; (17780 18171)) ;;; Generated autoloads from allout.el (put (quote allout-show-bodies) (quote safe-local-variable) (if (fboundp (quote booleanp)) (quote booleanp) (quote (lambda (x) (member x (quote (t nil))))))) @@ -573,88 +573,107 @@ accommodating syntax-sensitive text like programming languages. (For an example, see the allout code itself, which is organized as an allout outline.) -In addition to outline navigation and exposure, allout includes: +In addition to typical outline navigation and exposure, allout includes: - - topic-oriented repositioning, promotion/demotion, cut, and paste - - integral outline exposure-layout + - topic-oriented authoring, including keystroke-based topic creation, + repositioning, promotion/demotion, cut, and paste - incremental search with dynamic exposure and reconcealment of hidden text - - automatic topic-number maintenance + - adjustable format, so programming code can be developed in outline-structure - easy topic encryption and decryption - - \"Hot-spot\" operation, for single-keystroke maneuvering and - exposure control. (See the allout-mode docstring.) + - \"Hot-spot\" operation, for single-keystroke maneuvering and exposure control + - integral outline layout, for automatic initial exposure when visiting a file + - independent extensibility, using comprehensive exposure and authoring hooks and many other features. -Below is a description of the bindings, and then explanation of +Below is a description of the key bindings, and then explanation of special `allout-mode' features and terminology. See also the outline menubar additions for quick reference to many of the features, and see the docstring of the function `allout-init' for instructions on priming your emacs session for automatic activation of `allout-mode'. - -The bindings are dictated by the `allout-keybindings-list' and -`allout-command-prefix' variables. - - Navigation: Exposure Control: - ---------- ---------------- -\\[allout-next-visible-heading] allout-next-visible-heading | \\[allout-hide-current-subtree] allout-hide-current-subtree -\\[allout-previous-visible-heading] allout-previous-visible-heading | \\[allout-show-children] allout-show-children -\\[allout-up-current-level] allout-up-current-level | \\[allout-show-current-subtree] allout-show-current-subtree -\\[allout-forward-current-level] allout-forward-current-level | \\[allout-show-current-entry] allout-show-current-entry -\\[allout-backward-current-level] allout-backward-current-level | \\[allout-show-all] allout-show-all -\\[allout-end-of-entry] allout-end-of-entry -\\[allout-beginning-of-current-entry] allout-beginning-of-current-entry, alternately, goes to hot-spot - - Topic Header Production: - ----------------------- -\\[allout-open-sibtopic] allout-open-sibtopic Create a new sibling after current topic. -\\[allout-open-subtopic] allout-open-subtopic ... an offspring of current topic. -\\[allout-open-supertopic] allout-open-supertopic ... a sibling of the current topic's parent. - - Topic Level and Prefix Adjustment: - --------------------------------- -\\[allout-shift-in] allout-shift-in Shift current topic and all offspring deeper. -\\[allout-shift-out] allout-shift-out ... less deep. -\\[allout-rebullet-current-heading] allout-rebullet-current-heading Prompt for alternate bullet for - current topic. -\\[allout-rebullet-topic] allout-rebullet-topic Reconcile bullets of topic and its offspring - - distinctive bullets are not changed, others - alternated according to nesting depth. -\\[allout-number-siblings] allout-number-siblings Number bullets of topic and siblings - the - offspring are not affected. With repeat - count, revoke numbering. - - Topic-oriented Killing and Yanking: - ---------------------------------- -\\[allout-kill-topic] allout-kill-topic Kill current topic, including offspring. -\\[allout-copy-topic-as-kill] allout-copy-topic-as-kill Copy current topic, including offspring. -\\[allout-kill-line] allout-kill-line kill-line, attending to outline structure. -\\[allout-copy-line-as-kill] allout-copy-line-as-kill Copy line but don't delete it. -\\[allout-yank] allout-yank Yank, adjusting depth of yanked topic to - depth of heading if yanking into bare topic - heading (ie, prefix sans text). -\\[allout-yank-pop] allout-yank-pop Is to allout-yank as yank-pop is to yank - - Topic-oriented Encryption: - ------------------------- -\\[allout-toggle-current-subtree-encryption] allout-toggle-current-subtree-encryption Encrypt/Decrypt topic content - - Misc commands: - ------------- -M-x outlineify-sticky Activate outline mode for current buffer, - and establish a default file-var setting - for `allout-layout'. -\\[allout-mark-topic] allout-mark-topic -\\[allout-copy-exposed-to-buffer] allout-copy-exposed-to-buffer - Duplicate outline, sans concealed text, to - buffer with name derived from derived from that - of current buffer - \"*BUFFERNAME exposed*\". -\\[allout-flatten-exposed-to-buffer] allout-flatten-exposed-to-buffer - Like above 'copy-exposed', but convert topic - prefixes to section.subsection... numeric - format. -\\[eval-expression] (allout-init t) Setup Emacs session for outline mode - auto-activation. +The bindings are dictated by the customizable `allout-keybindings-list' +variable. We recommend customizing `allout-command-prefix' to use just +`\\C-c' as the command prefix, if the allout bindings don't conflict with +any personal bindings you have on \\C-c. In any case, outline structure +navigation and authoring is simplified by positioning the cursor on an +item's bullet character, the \"hot-spot\" - then you can invoke allout +commands with just the un-prefixed, un-control-shifted command letters. +This is described further in the HOT-SPOT Operation section. + + Exposure Control: + ---------------- +\\[allout-hide-current-subtree] `allout-hide-current-subtree' +\\[allout-show-children] `allout-show-children' +\\[allout-show-current-subtree] `allout-show-current-subtree' +\\[allout-show-current-entry] `allout-show-current-entry' +\\[allout-show-all] `allout-show-all' + + Navigation: + ---------- +\\[allout-next-visible-heading] `allout-next-visible-heading' +\\[allout-previous-visible-heading] `allout-previous-visible-heading' +\\[allout-up-current-level] `allout-up-current-level' +\\[allout-forward-current-level] `allout-forward-current-level' +\\[allout-backward-current-level] `allout-backward-current-level' +\\[allout-end-of-entry] `allout-end-of-entry' +\\[allout-beginning-of-current-entry] `allout-beginning-of-current-entry' (alternately, goes to hot-spot) +\\[allout-beginning-of-line] `allout-beginning-of-line' - like regular beginning-of-line, but + if immediately repeated cycles to the beginning of the current item + and then to the hot-spot (if `allout-beginning-of-line-cycles' is set). + + + Topic Header Production: + ----------------------- +\\[allout-open-sibtopic] `allout-open-sibtopic' Create a new sibling after current topic. +\\[allout-open-subtopic] `allout-open-subtopic' ... an offspring of current topic. +\\[allout-open-supertopic] `allout-open-supertopic' ... a sibling of the current topic's parent. + + Topic Level and Prefix Adjustment: + --------------------------------- +\\[allout-shift-in] `allout-shift-in' Shift current topic and all offspring deeper +\\[allout-shift-out] `allout-shift-out' ... less deep +\\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for + current topic +\\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and + its' offspring - distinctive bullets are not changed, others + are alternated according to nesting depth. +\\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings - + the offspring are not affected. + With repeat count, revoke numbering. + + Topic-oriented Killing and Yanking: + ---------------------------------- +\\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring. +\\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring. +\\[allout-kill-line] `allout-kill-line' kill-line, attending to outline structure. +\\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it. +\\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to + depth of heading if yanking into bare topic + heading (ie, prefix sans text). +\\[allout-yank-pop] `allout-yank-pop' Is to allout-yank as yank-pop is to yank + + Topic-oriented Encryption: + ------------------------- +\\[allout-toggle-current-subtree-encryption] `allout-toggle-current-subtree-encryption' + Encrypt/Decrypt topic content + + Misc commands: + ------------- +M-x outlineify-sticky Activate outline mode for current buffer, + and establish a default file-var setting + for `allout-layout'. +\\[allout-mark-topic] `allout-mark-topic' +\\[allout-copy-exposed-to-buffer] `allout-copy-exposed-to-buffer' + Duplicate outline, sans concealed text, to + buffer with name derived from derived from that + of current buffer - \"*BUFFERNAME exposed*\". +\\[allout-flatten-exposed-to-buffer] `allout-flatten-exposed-to-buffer' + Like above 'copy-exposed', but convert topic + prefixes to section.subsection... numeric + format. +\\[eval-expression] (allout-init t) Setup Emacs session for outline mode + auto-activation. Topic Encryption @@ -662,17 +681,22 @@ Outline mode supports gpg encryption of topics, with support for symmetric and key-pair modes, passphrase timeout, passphrase consistency checking, user-provided hinting for symmetric key mode, and auto-encryption of topics pending encryption on save. -\(Topics pending encryption are, by default, automatically -encrypted during file saves; if you're editing the contents of -such a topic, it is automatically decrypted for continued -editing.) The aim is reliable topic privacy while preventing -accidents like neglected encryption before saves, forgetting -which passphrase was used, and other practical pitfalls. -See `allout-toggle-current-subtree-encryption' function docstring and -`allout-encrypt-unencrypted-on-saves' customization variable for details. +Topics pending encryption are, by default, automatically +encrypted during file saves. If the contents of the topic +containing the cursor was encrypted for a save, it is +automatically decrypted for continued editing. + +The aim of these measures is reliable topic privacy while +preventing accidents like neglected encryption before saves, +forgetting which passphrase was used, and other practical +pitfalls. + +See `allout-toggle-current-subtree-encryption' function docstring +and `allout-encrypt-unencrypted-on-saves' customization variable +for details. - HOT-SPOT Operation + HOT-SPOT Operation Hot-spot operation provides a means for easy, single-keystroke outline navigation and exposure control. @@ -685,85 +709,108 @@ would invoke the command typically bound to \"C-c<space>C-f\" Thus, by positioning the cursor on a topic bullet, you can execute the outline navigation and manipulation commands with a -single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) never get +single keystroke. Regular navigation keys (eg, \\[forward-char], \\[next-line]) don't get this special translation, so you can use them to get out of the -hot-spot and back to normal operation. +hot-spot and back to normal editing operation. + +In allout-mode, the normal beginning-of-line command (\\[allout-beginning-of-line]]) is +replaced with one that makes it easy to get to the hot-spot. If you +repeat it immediately it cycles (if `allout-beginning-of-line-cycles' +is set) to the beginning of the item and then, if you hit it again +immediately, to the hot-spot. Similarly, `allout-beginning-of-current-entry' +\(\\[allout-beginning-of-current-entry]) moves to the hot-spot when the cursor is already located +at the beginning of the current entry. + + Extending Allout -Note that the command `allout-beginning-of-current-entry' (\\[allout-beginning-of-current-entry]) -will move to the hot-spot when the cursor is already located at the -beginning of the current entry, so you usually can hit \\[allout-beginning-of-current-entry] -twice in a row to get to the hot-spot. +Allout exposure and authoring activites all have associated +hooks, by which independent code can cooperate with allout +without changes to the allout core. Here are key ones: - Terminology +`allout-mode-hook' +`allout-mode-deactivate-hook' +`allout-exposure-change-hook' +`allout-structure-added-hook' +`allout-structure-deleted-hook' +`allout-structure-shifted-hook' + + Terminology Topic hierarchy constituents - TOPICS and SUBTOPICS: -TOPIC: A basic, coherent component of an Emacs outline. It can - contain and be contained by other topics. -CURRENT topic: - The visible topic most immediately containing the cursor. -DEPTH: The degree of nesting of a topic; it increases with - containment. Also called the: -LEVEL: The same as DEPTH. +ITEM: A unitary outline element, including the HEADER and ENTRY text. +TOPIC: An ITEM and any ITEMs contained within it, ie having greater DEPTH + and with no intervening items of lower DEPTH than the container. +CURRENT ITEM: + The visible ITEM most immediately containing the cursor. +DEPTH: The degree of nesting of an ITEM; it increases with containment. + The DEPTH is determined by the HEADER PREFIX. The DEPTH is also + called the: +LEVEL: The same as DEPTH. ANCESTORS: - The topics that contain a topic. -PARENT: A topic's immediate ancestor. It has a depth one less than - the topic. + Those ITEMs whose TOPICs contain an ITEM. +PARENT: An ITEM's immediate ANCESTOR. It has a DEPTH one less than that + of the ITEM. OFFSPRING: - The topics contained by a topic; + The ITEMs contained within an ITEM's TOPIC. SUBTOPIC: - An immediate offspring of a topic; -CHILDREN: - The immediate offspring of a topic. + An OFFSPRING of its ANCESTOR TOPICs. +CHILD: + An immediate SUBTOPIC of its PARENT. SIBLINGS: - Topics having the same parent and depth. + TOPICs having the same PARENT and DEPTH. Topic text constituents: -HEADER: The first line of a topic, include the topic PREFIX and header - text. -PREFIX: The leading text of a topic which distinguishes it from normal - text. It has a strict form, which consists of a prefix-lead - string, padding, and a bullet. The bullet may be followed by a +HEADER: The first line of an ITEM, include the ITEM PREFIX and HEADER + text. +ENTRY: The text content of an ITEM, before any OFFSPRING, but including + the HEADER text and distinct from the ITEM PREFIX. +BODY: Same as ENTRY. +PREFIX: The leading text of an ITEM which distinguishes it from normal + ENTRY text. Allout recognizes the outline structure according + to the strict PREFIX format. It consists of a PREFIX-LEAD string, + PREFIX-PADDING, and a BULLET. The BULLET might be followed by a number, indicating the ordinal number of the topic among its - siblings, a space, and then the header text. + siblings, or an asterisk indicating encryption, plus an optional + space. After that is the ITEM HEADER text, which is not part of + the PREFIX. - The relative length of the PREFIX determines the nesting depth - of the topic. + The relative length of the PREFIX determines the nesting DEPTH + of the ITEM. PREFIX-LEAD: - The string at the beginning of a topic prefix, normally a `.'. - It can be customized by changing the setting of - `allout-header-prefix' and then reinitializing `allout-mode'. - - By setting the prefix-lead to the comment-string of a - programming language, you can embed outline structuring in - program code without interfering with the language processing - of that code. See `allout-use-mode-specific-leader' - docstring for more detail. + The string at the beginning of a HEADER PREFIX, by default a `.'. + It can be customized by changing the setting of + `allout-header-prefix' and then reinitializing `allout-mode'. + + When the PREFIX-LEAD is set to the comment-string of a + programming language, outline structuring can be embedded in + program code without interfering with processing of the text + (by emacs or the language processor) as program code. This + setting happens automatically when allout mode is used in + programming-mode buffers. See `allout-use-mode-specific-leader' + docstring for more detail. PREFIX-PADDING: - Spaces or asterisks which separate the prefix-lead and the - bullet, determining the depth of the topic. -BULLET: A character at the end of the topic prefix, it must be one of - the characters listed on `allout-plain-bullets-string' or + Spaces or asterisks which separate the PREFIX-LEAD and the + bullet, determining the ITEM's DEPTH. +BULLET: A character at the end of the ITEM PREFIX, it must be one of + the characters listed on `allout-plain-bullets-string' or `allout-distinctive-bullets-string'. (See the documentation for these variables for more details.) The default choice of - bullet when generating topics varies in a cycle with the depth of - the topic. -ENTRY: The text contained in a topic before any offspring. -BODY: Same as ENTRY. - + BULLET when generating ITEMs varies in a cycle with the DEPTH of + the ITEM. EXPOSURE: - The state of a topic which determines the on-screen visibility - of its offspring and contained text. + The state of a TOPIC which determines the on-screen visibility + of its OFFSPRING and contained ENTRY text. CONCEALED: - Topics and entry text whose display is inhibited. Contiguous - units of concealed text is represented by `...' ellipses. + TOPICs and ENTRY text whose EXPOSURE is inhibited. Concealed + text is represented by \"...\" ellipses. - Concealed topics are effectively collapsed within an ancestor. -CLOSED: A topic whose immediate offspring and body-text is concealed. -OPEN: A topic that is not closed, though its offspring or body may be. + CONCEALED TOPICs are effectively collapsed within an ANCESTOR. +CLOSED: A TOPIC whose immediate OFFSPRING and body-text is CONCEALED. +OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be. \(fn &optional TOGGLE)" t nil) @@ -780,7 +827,7 @@ setup for auto-startup. ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (17504 41540)) +;;;;;; "net/ange-ftp.el" (17385 8494)) ;;; Generated autoloads from net/ange-ftp.el (defalias (quote ange-ftp-re-read-dir) (quote ange-ftp-reread-dir)) @@ -802,7 +849,7 @@ Not documented ;;;*** ;;;### (autoloads (animate-birthday-present animate-sequence animate-string) -;;;;;; "animate" "play/animate.el" (17504 41540)) +;;;;;; "animate" "play/animate.el" (17385 8495)) ;;; Generated autoloads from play/animate.el (autoload (quote animate-string) "animate" "\ @@ -830,7 +877,7 @@ You can specify the one's name by NAME; the default value is \"Sarah\". ;;;*** ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on) -;;;;;; "ansi-color" "ansi-color.el" (17504 41540)) +;;;;;; "ansi-color" "ansi-color.el" (17385 8481)) ;;; Generated autoloads from ansi-color.el (autoload (quote ansi-color-for-comint-mode-on) "ansi-color" "\ @@ -856,7 +903,7 @@ This is a good function to put in `comint-output-filter-functions'. ;;;*** ;;;### (autoloads (antlr-set-tabs antlr-mode antlr-show-makefile-rules) -;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (17504 41540)) +;;;;;; "antlr-mode" "progmodes/antlr-mode.el" (17485 5461)) ;;; Generated autoloads from progmodes/antlr-mode.el (autoload (quote antlr-show-makefile-rules) "antlr-mode" "\ @@ -895,7 +942,7 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'. ;;;### (autoloads (appt-activate appt-make-list appt-delete appt-add ;;;;;; appt-display-diary appt-display-duration appt-display-mode-line ;;;;;; appt-msg-window appt-visible appt-audible appt-message-warning-time -;;;;;; appt-issue-message) "appt" "calendar/appt.el" (17686 53337)) +;;;;;; appt-issue-message) "appt" "calendar/appt.el" (17686 46252)) ;;; Generated autoloads from calendar/appt.el (defvar appt-issue-message t "\ @@ -983,7 +1030,7 @@ ARG is positive, otherwise off. ;;;### (autoloads (apropos-documentation apropos-value apropos apropos-documentation-property ;;;;;; apropos-command apropos-variable apropos-read-pattern) "apropos" -;;;;;; "apropos.el" (17746 34860)) +;;;;;; "apropos.el" (17743 18143)) ;;; Generated autoloads from apropos.el (autoload (quote apropos-read-pattern) "apropos" "\ @@ -1079,8 +1126,8 @@ Returns list of symbols and documentation found. ;;;*** -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17604 -;;;;;; 18983)) +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17781 +;;;;;; 39501)) ;;; Generated autoloads from arc-mode.el (autoload (quote archive-mode) "arc-mode" "\ @@ -1100,7 +1147,7 @@ archive. ;;;*** -;;;### (autoloads (array-mode) "array" "array.el" (17504 41540)) +;;;### (autoloads (array-mode) "array" "array.el" (17781 39501)) ;;; Generated autoloads from array.el (autoload (quote array-mode) "array" "\ @@ -1171,8 +1218,8 @@ Entering array mode calls the function `array-mode-hook'. ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17522 -;;;;;; 22309)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (17520 +;;;;;; 49737)) ;;; Generated autoloads from textmodes/artist.el (autoload (quote artist-mode) "artist" "\ @@ -1377,8 +1424,8 @@ Keymap summary ;;;*** -;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (asm-mode) "asm-mode" "progmodes/asm-mode.el" (17495 +;;;;;; 43955)) ;;; Generated autoloads from progmodes/asm-mode.el (autoload (quote asm-mode) "asm-mode" "\ @@ -1405,8 +1452,24 @@ Special commands: ;;;*** +;;;### (autoloads (auto-show-mode auto-show-mode) "auto-show" "obsolete/auto-show.el" +;;;;;; (17075 55468)) +;;; Generated autoloads from obsolete/auto-show.el + +(defvar auto-show-mode nil "\ +Obsolete.") + +(custom-autoload (quote auto-show-mode) "auto-show") + +(autoload (quote auto-show-mode) "auto-show" "\ +This command is obsolete. + +\(fn ARG)" t nil) + +;;;*** + ;;;### (autoloads (autoarg-kp-mode autoarg-mode) "autoarg" "autoarg.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39501)) ;;; Generated autoloads from autoarg.el (defvar autoarg-mode nil "\ @@ -1451,7 +1514,7 @@ Toggle Autoarg-KP minor mode globally. With ARG, turn Autoarg mode on if ARG is positive, off otherwise. \\<autoarg-kp-mode-map> This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1' -&c to supply digit arguments. +etc. to supply digit arguments. \\{autoarg-kp-mode-map} @@ -1460,7 +1523,7 @@ This is similar to \\[autoarg-mode] but rebinds the keypad keys `kp-1' ;;;*** ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el" -;;;;;; (17504 41540)) +;;;;;; (17788 21816)) ;;; Generated autoloads from progmodes/autoconf.el (autoload (quote autoconf-mode) "autoconf" "\ @@ -1471,7 +1534,7 @@ Major mode for editing Autoconf configure.in files. ;;;*** ;;;### (autoloads (auto-insert-mode define-auto-insert auto-insert) -;;;;;; "autoinsert" "autoinsert.el" (17704 3960)) +;;;;;; "autoinsert" "autoinsert.el" (17781 39501)) ;;; Generated autoloads from autoinsert.el (autoload (quote auto-insert) "autoinsert" "\ @@ -1510,7 +1573,7 @@ insert a template for the file depending on the mode of the buffer. ;;;### (autoloads (batch-update-autoloads update-directory-autoloads ;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el" -;;;;;; (17596 14703)) +;;;;;; (17601 9092)) ;;; Generated autoloads from emacs-lisp/autoload.el (autoload (quote update-file-autoloads) "autoload" "\ @@ -1545,7 +1608,7 @@ Calls `update-directory-autoloads' on the command line arguments. ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) -;;;;;; "autorevert" "autorevert.el" (17504 41540)) +;;;;;; "autorevert" "autorevert.el" (17515 24179)) ;;; Generated autoloads from autorevert.el (autoload (quote auto-revert-mode) "autorevert" "\ @@ -1597,10 +1660,11 @@ This function is designed to be added to hooks, for example: Non-nil if Global-Auto-Revert mode is enabled. See the command `global-auto-revert-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `global-auto-revert-mode'.") +use either \\[customize] or the function `global-auto-revert-mode'.") + +(custom-autoload (quote global-auto-revert-mode) "autorevert") -(custom-autoload (quote global-auto-revert-mode) "autorevert" nil) +(put (quote global-auto-revert-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote global-auto-revert-mode) "autorevert" "\ Revert any buffer when file on disk changes. @@ -1614,7 +1678,7 @@ Use `auto-revert-mode' to revert a particular buffer. ;;;*** ;;;### (autoloads (mouse-avoidance-mode mouse-avoidance-mode) "avoid" -;;;;;; "avoid.el" (17628 62475)) +;;;;;; "avoid.el" (17781 39501)) ;;; Generated autoloads from avoid.el (defvar mouse-avoidance-mode nil "\ @@ -1655,7 +1719,7 @@ definition of \"random distance\".) ;;;*** ;;;### (autoloads (backquote) "backquote" "emacs-lisp/backquote.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8489)) ;;; Generated autoloads from emacs-lisp/backquote.el (autoload (quote backquote) "backquote" "\ @@ -1680,7 +1744,7 @@ Vectors work just like lists. Nested backquotes are permitted. ;;;*** ;;;### (autoloads (display-battery-mode battery) "battery" "battery.el" -;;;;;; (17746 34860)) +;;;;;; (17742 7456)) ;;; Generated autoloads from battery.el (put 'battery-mode-line-string 'risky-local-variable t) @@ -1712,7 +1776,7 @@ seconds. ;;;*** ;;;### (autoloads (benchmark benchmark-run-compiled benchmark-run) -;;;;;; "benchmark" "emacs-lisp/benchmark.el" (17504 41540)) +;;;;;; "benchmark" "emacs-lisp/benchmark.el" (17385 8489)) ;;; Generated autoloads from emacs-lisp/benchmark.el (autoload (quote benchmark-run) "benchmark" "\ @@ -1744,8 +1808,8 @@ non-interactive use see also `benchmark-run' and ;;;*** -;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17746 -;;;;;; 34862)) +;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from textmodes/bibtex.el (autoload (quote bibtex-mode) "bibtex" "\ @@ -1807,7 +1871,7 @@ if that value is non-nil. ;;;### (autoloads (binhex-decode-region binhex-decode-region-external ;;;;;; binhex-decode-region-internal) "binhex" "gnus/binhex.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8492)) ;;; Generated autoloads from gnus/binhex.el (defconst binhex-begin-line "^:...............................................................$") @@ -1830,8 +1894,8 @@ Binhex decode region between START and END. ;;;*** -;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (blackbox) "blackbox" "play/blackbox.el" (17385 +;;;;;; 8495)) ;;; Generated autoloads from play/blackbox.el (autoload (quote blackbox) "blackbox" "\ @@ -1953,7 +2017,7 @@ a reflection. ;;;### (autoloads (bookmark-bmenu-list bookmark-load bookmark-save ;;;;;; bookmark-write bookmark-delete bookmark-insert bookmark-rename ;;;;;; bookmark-insert-location bookmark-relocate bookmark-jump -;;;;;; bookmark-set) "bookmark" "bookmark.el" (17504 41540)) +;;;;;; bookmark-set) "bookmark" "bookmark.el" (17385 8482)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-map "rb" 'bookmark-jump) (define-key ctl-x-map "rm" 'bookmark-set) @@ -2143,7 +2207,7 @@ deletion, or > if it is flagged for displaying. ;;;;;; browse-url browse-url-of-region browse-url-of-dired-file ;;;;;; browse-url-of-buffer browse-url-of-file browse-url-url-at-point ;;;;;; browse-url-galeon-program browse-url-firefox-program browse-url-browser-function) -;;;;;; "browse-url" "net/browse-url.el" (17522 22309)) +;;;;;; "browse-url" "net/browse-url.el" (17785 34467)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function (cond ((memq system-type (quote (windows-nt ms-dos cygwin))) (quote browse-url-default-windows-browser)) ((memq system-type (quote (darwin))) (quote browse-url-default-macosx-browser)) (t (quote browse-url-default-browser))) "\ @@ -2474,8 +2538,8 @@ Default to the URL around or before point. ;;;*** -;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from play/bruce.el (autoload (quote bruce) "bruce" "\ @@ -2491,7 +2555,7 @@ Return a vector containing the lines from `bruce-phrases-file'. ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (17759 28868)) +;;;;;; "bs" "bs.el" (17748 43063)) ;;; Generated autoloads from bs.el (autoload (quote bs-cycle-next) "bs" "\ @@ -2532,8 +2596,8 @@ name of buffer configuration. ;;;*** ;;;### (autoloads (insert-text-button make-text-button insert-button -;;;;;; make-button define-button-type) "button" "button.el" (17504 -;;;;;; 41540)) +;;;;;; make-button define-button-type) "button" "button.el" (17786 +;;;;;; 60297)) ;;; Generated autoloads from button.el (defvar button-map (let ((map (make-sparse-keymap))) (define-key map "
" (quote push-button)) (define-key map [mouse-2] (quote push-button)) map) "\ @@ -2621,7 +2685,7 @@ Also see `make-text-button'. ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-warnings-safe-p) "bytecomp" -;;;;;; "emacs-lisp/bytecomp.el" (17759 30016)) +;;;;;; "emacs-lisp/bytecomp.el" (17775 9245)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-dynamic-docstrings 'safe-local-variable 'booleanp) @@ -2725,7 +2789,7 @@ and corresponding effects. ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17759 28868)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17748 43063)) ;;; Generated autoloads from calendar/cal-dst.el (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t) @@ -2735,7 +2799,7 @@ and corresponding effects. ;;;*** ;;;### (autoloads (list-yahrzeit-dates) "cal-hebrew" "calendar/cal-hebrew.el" -;;;;;; (17504 41540)) +;;;;;; (17386 33146)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload (quote list-yahrzeit-dates) "cal-hebrew" "\ @@ -2750,7 +2814,7 @@ from the cursor position. ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle ;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc ;;;;;; full-calc calc calc-dispatch calc-settings-file) "calc" "calc/calc.el" -;;;;;; (17672 28071)) +;;;;;; (17671 12179)) ;;; Generated autoloads from calc/calc.el (defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\ @@ -2828,8 +2892,8 @@ Not documented ;;;*** -;;;### (autoloads (calculator) "calculator" "calculator.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (calculator) "calculator" "calculator.el" (17385 +;;;;;; 8482)) ;;; Generated autoloads from calculator.el (autoload (quote calculator) "calculator" "\ @@ -2857,7 +2921,7 @@ See the documentation for `calculator-mode' for more information. ;;;;;; mark-holidays-in-calendar view-calendar-holidays-initially ;;;;;; calendar-remove-frame-by-deleting mark-diary-entries-in-calendar ;;;;;; view-diary-entries-initially calendar-offset) "calendar" -;;;;;; "calendar/calendar.el" (17732 62701)) +;;;;;; "calendar/calendar.el" (17734 1777)) ;;; Generated autoloads from calendar/calendar.el (defvar calendar-offset 0 "\ @@ -3430,7 +3494,7 @@ movement commands will not work correctly.") ;;;*** ;;;### (autoloads (canlock-verify canlock-insert-header) "canlock" -;;;;;; "gnus/canlock.el" (17504 41540)) +;;;;;; "gnus/canlock.el" (17385 8492)) ;;; Generated autoloads from gnus/canlock.el (autoload (quote canlock-insert-header) "canlock" "\ @@ -3447,15 +3511,15 @@ it fails. ;;;*** -;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (17508 -;;;;;; 50987)) +;;;### (autoloads nil "cc-compat" "progmodes/cc-compat.el" (17794 +;;;;;; 54379)) ;;; Generated autoloads from progmodes/cc-compat.el (put 'c-indent-level 'safe-local-variable 'integerp) ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (17504 41540)) +;;;;;; (17796 15986)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload (quote c-guess-basic-syntax) "cc-engine" "\ @@ -3467,7 +3531,7 @@ Return the syntactic context of the current line. ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode ;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (17599 63482)) +;;;;;; (17797 52285)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload (quote c-initialize-cc-mode) "cc-mode" "\ @@ -3625,7 +3689,7 @@ Key bindings: ;;;*** ;;;### (autoloads (c-set-offset c-add-style c-set-style) "cc-styles" -;;;;;; "progmodes/cc-styles.el" (17522 22309)) +;;;;;; "progmodes/cc-styles.el" (17794 54380)) ;;; Generated autoloads from progmodes/cc-styles.el (autoload (quote c-set-style) "cc-styles" "\ @@ -3676,14 +3740,14 @@ and exists only for compatibility reasons. ;;;*** -;;;### (autoloads nil "cc-subword" "progmodes/cc-subword.el" (17522 -;;;;;; 22309)) +;;;### (autoloads nil "cc-subword" "progmodes/cc-subword.el" (17794 +;;;;;; 54380)) ;;; Generated autoloads from progmodes/cc-subword.el (autoload 'c-subword-mode "cc-subword" "Mode enabling subword movement and editing keys." t) ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17522 22309)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (17794 54380)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3693,7 +3757,7 @@ and exists only for compatibility reasons. ;;;### (autoloads (ccl-execute-with-args check-ccl-program define-ccl-program ;;;;;; declare-ccl-program ccl-dump ccl-compile) "ccl" "international/ccl.el" -;;;;;; (17504 41540)) +;;;;;; (17792 9561)) ;;; Generated autoloads from international/ccl.el (autoload (quote ccl-compile) "ccl" "\ @@ -3952,7 +4016,7 @@ See the documentation of `define-ccl-program' for the detail of CCL program. ;;;*** ;;;### (autoloads (cfengine-mode) "cfengine" "progmodes/cfengine.el" -;;;;;; (17671 29986)) +;;;;;; (17669 23128)) ;;; Generated autoloads from progmodes/cfengine.el (autoload (quote cfengine-mode) "cfengine" "\ @@ -3974,7 +4038,7 @@ to the action header. ;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer ;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive ;;;;;; checkdoc-interactive checkdoc) "checkdoc" "emacs-lisp/checkdoc.el" -;;;;;; (17746 34861)) +;;;;;; (17740 981)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (autoload (quote checkdoc) "checkdoc" "\ @@ -4157,8 +4221,8 @@ checking of documentation strings. ;;;*** ;;;### (autoloads (encode-hz-buffer encode-hz-region decode-hz-buffer -;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17504 -;;;;;; 41540)) +;;;;;; decode-hz-region) "china-util" "language/china-util.el" (17792 +;;;;;; 9562)) ;;; Generated autoloads from language/china-util.el (autoload (quote decode-hz-region) "china-util" "\ @@ -4186,7 +4250,7 @@ Encode the text in the current buffer to HZ. ;;;*** ;;;### (autoloads (command-history list-command-history repeat-matching-complex-command) -;;;;;; "chistory" "chistory.el" (17504 41540)) +;;;;;; "chistory" "chistory.el" (17781 39501)) ;;; Generated autoloads from chistory.el (autoload (quote repeat-matching-complex-command) "chistory" "\ @@ -4225,7 +4289,7 @@ and runs the normal hook `command-history-hook'. ;;;*** -;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17701 49518)) +;;;### (autoloads nil "cl" "emacs-lisp/cl.el" (17785 34467)) ;;; Generated autoloads from emacs-lisp/cl.el (defvar custom-print-functions nil "\ @@ -4241,7 +4305,7 @@ a future Emacs interpreter will be able to use it.") ;;;*** ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el" -;;;;;; (17731 48935)) +;;;;;; (17729 22475)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload (quote common-lisp-indent-function) "cl-indent" "\ @@ -4252,7 +4316,7 @@ Not documented ;;;*** ;;;### (autoloads (c-macro-expand) "cmacexp" "progmodes/cmacexp.el" -;;;;;; (17504 41540)) +;;;;;; (17394 12937)) ;;; Generated autoloads from progmodes/cmacexp.el (autoload (quote c-macro-expand) "cmacexp" "\ @@ -4272,8 +4336,8 @@ For use inside Lisp programs, see also `c-macro-expansion'. ;;;*** -;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (run-scheme) "cmuscheme" "cmuscheme.el" (17786 +;;;;;; 56014)) ;;; Generated autoloads from cmuscheme.el (autoload (quote run-scheme) "cmuscheme" "\ @@ -4281,7 +4345,8 @@ Run an inferior Scheme process, input and output via buffer `*scheme*'. If there is a process already running in `*scheme*', switch to that buffer. With argument, allows you to edit the command line (default is value of `scheme-program-name'). -If a file `~/.emacs_SCHEMENAME' exists, it is given as initial input. +If the file `~/.emacs_SCHEMENAME' or `~/.emacs.d/init_SCHEMENAME.scm' exists, +it is given as initial input. Note that this may lose due to a timing error if the Scheme processor discards input when it starts up. Runs the hook `inferior-scheme-mode-hook' (after the `comint-mode-hook' @@ -4295,7 +4360,7 @@ is run). ;;;### (autoloads (codepage-setup cp-supported-codepages cp-offset-for-codepage ;;;;;; cp-language-for-codepage cp-charset-for-codepage cp-make-coding-systems-for-codepage) -;;;;;; "codepage" "international/codepage.el" (17668 1411)) +;;;;;; "codepage" "international/codepage.el" (17792 9561)) ;;; Generated autoloads from international/codepage.el (autoload (quote cp-make-coding-systems-for-codepage) "codepage" "\ @@ -4354,7 +4419,7 @@ read/written by MS-DOS software, or for display on the MS-DOS terminal. ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (17759 29233)) +;;;;;; (17800 14415)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions (quote (comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt)) "\ @@ -4444,8 +4509,8 @@ REGEXP-GROUP is the regular expression group in REGEXP to use. ;;;*** -;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17636 -;;;;;; 48139)) +;;;### (autoloads (compare-windows) "compare-w" "compare-w.el" (17781 +;;;;;; 39501)) ;;; Generated autoloads from compare-w.el (autoload (quote compare-windows) "compare-w" "\ @@ -4482,7 +4547,7 @@ on third call it again advances points to the next difference and so on. ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-mode-hook) -;;;;;; "compile" "progmodes/compile.el" (17759 29277)) +;;;;;; "compile" "progmodes/compile.el" (17767 19634)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4644,7 +4709,7 @@ This is the value of `next-error-function' in Compilation buffers. ;;;*** ;;;### (autoloads (partial-completion-mode) "complete" "complete.el" -;;;;;; (17625 60530)) +;;;;;; (17781 39501)) ;;; Generated autoloads from complete.el (defvar partial-completion-mode nil "\ @@ -4686,7 +4751,7 @@ second TAB brings up the `*Completions*' buffer. ;;;*** ;;;### (autoloads (dynamic-completion-mode) "completion" "completion.el" -;;;;;; (17704 3960)) +;;;;;; (17781 39501)) ;;; Generated autoloads from completion.el (defvar dynamic-completion-mode nil "\ @@ -4708,7 +4773,7 @@ Enable dynamic word-completion. ;;;### (autoloads (decompose-composite-char compose-last-chars compose-chars-after ;;;;;; find-composition compose-chars decompose-string compose-string ;;;;;; decompose-region compose-region encode-composition-rule) -;;;;;; "composite" "composite.el" (17504 41540)) +;;;;;; "composite" "composite.el" (17792 9561)) ;;; Generated autoloads from composite.el (defconst reference-point-alist (quote ((tl . 0) (tc . 1) (tr . 2) (Bl . 3) (Bc . 4) (Br . 5) (bl . 6) (bc . 7) (br . 8) (cl . 9) (cc . 10) (cr . 11) (top-left . 0) (top-center . 1) (top-right . 2) (base-left . 3) (base-center . 4) (base-right . 5) (bottom-left . 6) (bottom-center . 7) (bottom-right . 8) (center-left . 9) (center-center . 10) (center-right . 11) (ml . 3) (mc . 10) (mr . 5) (mid-left . 3) (mid-center . 10) (mid-right . 5))) "\ @@ -4930,7 +4995,7 @@ Optional 3rd arg WITH-COMPOSITION-RULE is ignored. ;;;### (autoloads (conf-xdefaults-mode conf-ppd-mode conf-colon-mode ;;;;;; conf-space-keywords conf-space-mode conf-javaprop-mode conf-windows-mode ;;;;;; conf-unix-mode conf-mode) "conf-mode" "textmodes/conf-mode.el" -;;;;;; (17680 45980)) +;;;;;; (17679 3707)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload (quote conf-mode) "conf-mode" "\ @@ -5086,7 +5151,7 @@ For details see `conf-mode'. Example: ;;;*** ;;;### (autoloads (shuffle-vector cookie-snarf cookie-insert cookie) -;;;;;; "cookie1" "play/cookie1.el" (17566 60307)) +;;;;;; "cookie1" "play/cookie1.el" (17786 56015)) ;;; Generated autoloads from play/cookie1.el (autoload (quote cookie) "cookie1" "\ @@ -5118,7 +5183,7 @@ Randomly permute the elements of VECTOR (all permutations equally likely). ;;;*** ;;;### (autoloads (copyright copyright-fix-years copyright-update) -;;;;;; "copyright" "emacs-lisp/copyright.el" (17504 41540)) +;;;;;; "copyright" "emacs-lisp/copyright.el" (17385 8489)) ;;; Generated autoloads from emacs-lisp/copyright.el (autoload (quote copyright-update) "copyright" "\ @@ -5146,7 +5211,7 @@ Insert a copyright by $ORGANIZATION notice at cursor. ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (17759 28873)) +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (17781 39502)) ;;; Generated autoloads from progmodes/cperl-mode.el (autoload (quote cperl-mode) "cperl-mode" "\ @@ -5337,7 +5402,7 @@ Run a `perldoc' on the word around point. ;;;*** ;;;### (autoloads (cpp-parse-edit cpp-highlight-buffer) "cpp" "progmodes/cpp.el" -;;;;;; (17504 41540)) +;;;;;; (17394 12937)) ;;; Generated autoloads from progmodes/cpp.el (autoload (quote cpp-highlight-buffer) "cpp" "\ @@ -5356,7 +5421,7 @@ Edit display information for cpp conditionals. ;;;*** ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el" -;;;;;; (17504 41540)) +;;;;;; (17785 34467)) ;;; Generated autoloads from emulation/crisp.el (defvar crisp-mode nil "\ @@ -5380,7 +5445,7 @@ With ARG, turn CRiSP mode on if ARG is positive, off otherwise. ;;;*** ;;;### (autoloads (completing-read-multiple) "crm" "emacs-lisp/crm.el" -;;;;;; (17506 11763)) +;;;;;; (17785 34467)) ;;; Generated autoloads from emacs-lisp/crm.el (autoload (quote completing-read-multiple) "crm" "\ @@ -5416,7 +5481,7 @@ INHERIT-INPUT-METHOD. ;;;*** ;;;### (autoloads (cua-selection-mode cua-mode) "cua-base" "emulation/cua-base.el" -;;;;;; (17664 10809)) +;;;;;; (17782 59544)) ;;; Generated autoloads from emulation/cua-base.el (defvar cua-mode nil "\ @@ -5482,7 +5547,7 @@ Enable CUA selection mode without the C-z/C-x/C-c/C-v bindings. ;;;;;; customize-face customize-changed-options customize-option-other-window ;;;;;; customize-option customize-group-other-window customize-group ;;;;;; customize-mode customize customize-save-variable customize-set-variable -;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (17759 28868)) +;;;;;; customize-set-value) "cus-edit" "cus-edit.el" (17752 39351)) ;;; Generated autoloads from cus-edit.el (add-hook 'same-window-regexps "\\`\\*Customiz.*\\*\\'") @@ -5771,7 +5836,7 @@ The format is suitable for use with `easy-menu-define'. ;;;*** ;;;### (autoloads (custom-reset-faces custom-theme-reset-faces custom-set-faces -;;;;;; custom-declare-face) "cus-face" "cus-face.el" (17504 41540)) +;;;;;; custom-declare-face) "cus-face" "cus-face.el" (17385 8483)) ;;; Generated autoloads from cus-face.el (autoload (quote custom-declare-face) "cus-face" "\ @@ -5841,7 +5906,7 @@ This means reset FACE to its value in FROM-THEME. ;;;*** ;;;### (autoloads (customize-create-theme) "cus-theme" "cus-theme.el" -;;;;;; (17632 36218)) +;;;;;; (17632 41885)) ;;; Generated autoloads from cus-theme.el (autoload (quote customize-create-theme) "cus-theme" "\ @@ -5852,7 +5917,7 @@ Create a custom theme. ;;;*** ;;;### (autoloads (cvs-status-mode) "cvs-status" "cvs-status.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39501)) ;;; Generated autoloads from cvs-status.el (autoload (quote cvs-status-mode) "cvs-status" "\ @@ -5863,7 +5928,7 @@ Mode used for cvs status output. ;;;*** ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode) -;;;;;; "cwarn" "progmodes/cwarn.el" (17504 41540)) +;;;;;; "cwarn" "progmodes/cwarn.el" (17394 12937)) ;;; Generated autoloads from progmodes/cwarn.el (autoload (quote cwarn-mode) "cwarn" "\ @@ -5889,10 +5954,11 @@ This function is designed to be added to hooks, for example: Non-nil if Global-Cwarn mode is enabled. See the command `global-cwarn-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `global-cwarn-mode'.") +use either \\[customize] or the function `global-cwarn-mode'.") + +(custom-autoload (quote global-cwarn-mode) "cwarn") -(custom-autoload (quote global-cwarn-mode) "cwarn" nil) +(put (quote global-cwarn-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote global-cwarn-mode) "cwarn" "\ Toggle Cwarn mode in every buffer. @@ -5906,7 +5972,7 @@ in which `turn-on-cwarn-mode-if-enabled' turns it on. ;;;### (autoloads (standard-display-cyrillic-translit cyrillic-encode-alternativnyj-char ;;;;;; cyrillic-encode-koi8-r-char) "cyril-util" "language/cyril-util.el" -;;;;;; (17504 41540)) +;;;;;; (17788 21816)) ;;; Generated autoloads from language/cyril-util.el (autoload (quote cyrillic-encode-koi8-r-char) "cyril-util" "\ @@ -5935,7 +6001,7 @@ If the argument is nil, we return the display table to its standard state. ;;;*** ;;;### (autoloads (dabbrev-expand dabbrev-completion) "dabbrev" "dabbrev.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8483)) ;;; Generated autoloads from dabbrev.el (define-key esc-map "/" 'dabbrev-expand) (define-key esc-map [?\C-/] 'dabbrev-completion) @@ -5979,8 +6045,8 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]. ;;;*** -;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (17394 +;;;;;; 12937)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload (quote dcl-mode) "dcl-mode" "\ @@ -6107,7 +6173,7 @@ There is some minimal font-lock support (see vars ;;;*** ;;;### (autoloads (cancel-debug-on-entry debug-on-entry debug) "debug" -;;;;;; "emacs-lisp/debug.el" (17504 41540)) +;;;;;; "emacs-lisp/debug.el" (17440 13082)) ;;; Generated autoloads from emacs-lisp/debug.el (setq debugger (quote debug)) @@ -6151,7 +6217,7 @@ To specify a nil argument interactively, exit with an empty minibuffer. ;;;*** ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from play/decipher.el (autoload (quote decipher) "decipher" "\ @@ -6180,8 +6246,8 @@ The most useful commands are: ;;;*** ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region -;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (17686 -;;;;;; 35928)) +;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (17781 +;;;;;; 39501)) ;;; Generated autoloads from delim-col.el (autoload (quote delimit-columns-customize) "delim-col" "\ @@ -6206,7 +6272,7 @@ START and END delimits the corners of text rectangle. ;;;*** ;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (17604 -;;;;;; 18983)) +;;;;;; 60390)) ;;; Generated autoloads from progmodes/delphi.el (autoload (quote delphi-mode) "delphi" "\ @@ -6256,8 +6322,8 @@ no args, if that value is non-nil. ;;;*** -;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (delete-selection-mode) "delsel" "delsel.el" (17385 +;;;;;; 8483)) ;;; Generated autoloads from delsel.el (defalias (quote pending-delete-mode) (quote delete-selection-mode)) @@ -6266,10 +6332,11 @@ no args, if that value is non-nil. Non-nil if Delete-Selection mode is enabled. See the command `delete-selection-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `delete-selection-mode'.") +use either \\[customize] or the function `delete-selection-mode'.") + +(custom-autoload (quote delete-selection-mode) "delsel") -(custom-autoload (quote delete-selection-mode) "delsel" nil) +(put (quote delete-selection-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote delete-selection-mode) "delsel" "\ Toggle Delete Selection mode. @@ -6286,7 +6353,7 @@ any selection. ;;;*** ;;;### (autoloads (derived-mode-init-mode-variables define-derived-mode) -;;;;;; "derived" "emacs-lisp/derived.el" (17504 41540)) +;;;;;; "derived" "emacs-lisp/derived.el" (17785 34467)) ;;; Generated autoloads from emacs-lisp/derived.el (autoload (quote define-derived-mode) "derived" "\ @@ -6351,7 +6418,7 @@ the first time the mode is used. ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (17504 41540)) +;;;;;; "descr-text.el" (17780 18171)) ;;; Generated autoloads from descr-text.el (autoload (quote describe-text-properties) "descr-text" "\ @@ -6377,7 +6444,7 @@ as well as widgets, buttons, overlays, and text properties. ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-remove desktop-save ;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop" -;;;;;; "desktop.el" (17672 28070)) +;;;;;; "desktop.el" (17670 57734)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6560,7 +6627,7 @@ Revert to the last loaded desktop. ;;;### (autoloads (gnus-article-outlook-deuglify-article gnus-outlook-deuglify-article ;;;;;; gnus-article-outlook-repair-attribution gnus-article-outlook-unwrap-lines) -;;;;;; "deuglify" "gnus/deuglify.el" (17504 41540)) +;;;;;; "deuglify" "gnus/deuglify.el" (17797 50970)) ;;; Generated autoloads from gnus/deuglify.el (autoload (quote gnus-article-outlook-unwrap-lines) "deuglify" "\ @@ -6593,7 +6660,7 @@ Deuglify broken Outlook (Express) articles and redisplay. ;;;*** ;;;### (autoloads (devanagari-post-read-conversion devanagari-compose-region) -;;;;;; "devan-util" "language/devan-util.el" (17504 41540)) +;;;;;; "devan-util" "language/devan-util.el" (17792 9562)) ;;; Generated autoloads from language/devan-util.el (defconst devanagari-consonant "[\x51ad5-\x51af9\x51b38-\x51b3f]") @@ -6611,7 +6678,7 @@ Not documented ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (17522 22309)) +;;;;;; "calendar/diary-lib.el" (17520 49736)) ;;; Generated autoloads from calendar/diary-lib.el (autoload (quote diary) "diary-lib" "\ @@ -6657,7 +6724,7 @@ Major mode for editing the diary file. ;;;*** ;;;### (autoloads (diff-backup diff diff-command diff-switches) "diff" -;;;;;; "diff.el" (17544 39648)) +;;;;;; "diff.el" (17683 64071)) ;;; Generated autoloads from diff.el (defvar diff-switches "-c" "\ @@ -6691,7 +6758,7 @@ With prefix arg, prompt for diff switches. ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "diff-mode.el" -;;;;;; (17672 28070)) +;;;;;; (17771 26718)) ;;; Generated autoloads from diff-mode.el (autoload (quote diff-mode) "diff-mode" "\ @@ -6721,7 +6788,7 @@ Minor mode for viewing/editing context diffs. ;;;;;; dired dired-copy-preserve-time dired-dwim-target dired-keep-marker-symlink ;;;;;; dired-keep-marker-hardlink dired-keep-marker-copy dired-keep-marker-rename ;;;;;; dired-trivial-filenames dired-ls-F-marks-symlinks dired-listing-switches) -;;;;;; "dired" "dired.el" (17746 34860)) +;;;;;; "dired" "dired.el" (17780 18171)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches "-al" "\ @@ -6926,7 +6993,7 @@ Keybindings: ;;;;;; dired-run-shell-command dired-do-shell-command dired-clean-directory ;;;;;; dired-do-print dired-do-touch dired-do-chown dired-do-chgrp ;;;;;; dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" (17746 34860)) +;;;;;; dired-diff) "dired-aux" "dired-aux.el" (17742 7456)) ;;; Generated autoloads from dired-aux.el (autoload (quote dired-diff) "dired-aux" "\ @@ -7338,7 +7405,7 @@ true then the type of the file linked to by FILE is printed instead. ;;;*** -;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17656 34193)) +;;;### (autoloads (dired-jump) "dired-x" "dired-x.el" (17656 37701)) ;;; Generated autoloads from dired-x.el (autoload (quote dired-jump) "dired-x" "\ @@ -7352,7 +7419,7 @@ buffer and try again. ;;;*** -;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17586 63360)) +;;;### (autoloads (dirtrack) "dirtrack" "dirtrack.el" (17781 39501)) ;;; Generated autoloads from dirtrack.el (autoload (quote dirtrack) "dirtrack" "\ @@ -7371,8 +7438,8 @@ You can enable directory tracking by adding this function to ;;;*** -;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (disassemble) "disass" "emacs-lisp/disass.el" (17385 +;;;;;; 8489)) ;;; Generated autoloads from emacs-lisp/disass.el (autoload (quote disassemble) "disass" "\ @@ -7390,7 +7457,7 @@ redefine OBJECT if it is a symbol. ;;;;;; standard-display-graphic standard-display-g1 standard-display-ascii ;;;;;; standard-display-default standard-display-8bit describe-current-display-table ;;;;;; describe-display-table set-display-table-slot display-table-slot -;;;;;; make-display-table) "disp-table" "disp-table.el" (17504 41540)) +;;;;;; make-display-table) "disp-table" "disp-table.el" (17781 39501)) ;;; Generated autoloads from disp-table.el (autoload (quote make-display-table) "disp-table" "\ @@ -7491,7 +7558,7 @@ for users who call this function in `.emacs'. ;;;*** ;;;### (autoloads (dissociated-press) "dissociate" "play/dissociate.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from play/dissociate.el (autoload (quote dissociated-press) "dissociate" "\ @@ -7507,7 +7574,7 @@ Default is 2. ;;;*** -;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17710 3074)) +;;;### (autoloads (dnd-protocol-alist) "dnd" "dnd.el" (17709 24917)) ;;; Generated autoloads from dnd.el (defvar dnd-protocol-alist (quote (("^file:///" . dnd-open-local-file) ("^file://" . dnd-open-file) ("^file:" . dnd-open-local-file) ("^\\(https?\\|ftp\\|file\\|nfs\\)://" . dnd-open-file))) "\ @@ -7528,7 +7595,7 @@ if some action was made, or nil if the URL is ignored.") ;;;*** ;;;### (autoloads (dns-mode-soa-increment-serial dns-mode) "dns-mode" -;;;;;; "textmodes/dns-mode.el" (17630 16368)) +;;;;;; "textmodes/dns-mode.el" (17632 41886)) ;;; Generated autoloads from textmodes/dns-mode.el (autoload (quote dns-mode) "dns-mode" "\ @@ -7552,7 +7619,7 @@ Locate SOA record and increment the serial field. ;;;*** -;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17504 41540)) +;;;### (autoloads (doctor) "doctor" "play/doctor.el" (17786 56015)) ;;; Generated autoloads from play/doctor.el (autoload (quote doctor) "doctor" "\ @@ -7563,7 +7630,7 @@ Switch to *doctor* buffer and start giving psychotherapy. ;;;*** ;;;### (autoloads (double-mode double-mode) "double" "double.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39501)) ;;; Generated autoloads from double.el (defvar double-mode nil "\ @@ -7584,7 +7651,7 @@ when pressed twice. See variable `double-map' for details. ;;;*** -;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17746 34862)) +;;;### (autoloads (dunnet) "dunnet" "play/dunnet.el" (17743 18144)) ;;; Generated autoloads from play/dunnet.el (autoload (quote dunnet) "dunnet" "\ @@ -7595,7 +7662,7 @@ Switch to *dungeon* buffer and start game. ;;;*** ;;;### (autoloads (gnus-earcon-display) "earcon" "gnus/earcon.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8492)) ;;; Generated autoloads from gnus/earcon.el (autoload (quote gnus-earcon-display) "earcon" "\ @@ -7607,7 +7674,7 @@ Play sounds in message buffers. ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap ;;;;;; define-global-minor-mode define-minor-mode) "easy-mmode" -;;;;;; "emacs-lisp/easy-mmode.el" (17656 34193)) +;;;;;; "emacs-lisp/easy-mmode.el" (17772 35829)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode)) @@ -7699,8 +7766,8 @@ CSS contains a list of syntax specifications of the form (CHAR . SYNTAX). ;;;*** ;;;### (autoloads (easy-menu-change easy-menu-create-menu easy-menu-do-define -;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17658 -;;;;;; 58024)) +;;;;;; easy-menu-define) "easymenu" "emacs-lisp/easymenu.el" (17785 +;;;;;; 34467)) ;;; Generated autoloads from emacs-lisp/easymenu.el (put (quote easy-menu-define) (quote lisp-indent-function) (quote defun)) @@ -7845,7 +7912,7 @@ To implement dynamic menus, either call this from ;;;;;; ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ebnf-spool-file ;;;;;; ebnf-spool-directory ebnf-print-region ebnf-print-buffer ;;;;;; ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps" -;;;;;; "progmodes/ebnf2ps.el" (17759 28873)) +;;;;;; "progmodes/ebnf2ps.el" (17780 18172)) ;;; Generated autoloads from progmodes/ebnf2ps.el (autoload (quote ebnf-customize) "ebnf2ps" "\ @@ -8104,8 +8171,8 @@ See `ebnf-style-database' documentation. ;;;;;; ebrowse-tags-find-declaration-other-window ebrowse-tags-find-definition ;;;;;; ebrowse-tags-view-definition ebrowse-tags-find-declaration ;;;;;; ebrowse-tags-view-declaration ebrowse-member-mode ebrowse-electric-choose-tree -;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17588 -;;;;;; 11509)) +;;;;;; ebrowse-tree-mode) "ebrowse" "progmodes/ebrowse.el" (17601 +;;;;;; 9092)) ;;; Generated autoloads from progmodes/ebrowse.el (autoload (quote ebrowse-tree-mode) "ebrowse" "\ @@ -8256,7 +8323,7 @@ Display statistics for a class tree. ;;;*** ;;;### (autoloads (electric-buffer-list) "ebuff-menu" "ebuff-menu.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39501)) ;;; Generated autoloads from ebuff-menu.el (autoload (quote electric-buffer-list) "ebuff-menu" "\ @@ -8281,7 +8348,7 @@ Run hooks in `electric-buffer-menu-mode-hook' on entry. ;;;*** ;;;### (autoloads (Electric-command-history-redo-expression) "echistory" -;;;;;; "echistory.el" (17504 41540)) +;;;;;; "echistory.el" (17781 39501)) ;;; Generated autoloads from echistory.el (autoload (quote Electric-command-history-redo-expression) "echistory" "\ @@ -8294,7 +8361,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing. ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form ;;;;;; edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug" -;;;;;; "emacs-lisp/edebug.el" (17628 62479)) +;;;;;; "emacs-lisp/edebug.el" (17632 41885)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -8367,7 +8434,7 @@ Toggle edebugging of all forms. ;;;;;; ediff-merge-directory-revisions ediff-merge-directories-with-ancestor ;;;;;; ediff-merge-directories ediff-directories3 ediff-directory-revisions ;;;;;; ediff-directories ediff-buffers3 ediff-buffers ediff-backup -;;;;;; ediff-files3 ediff-files) "ediff" "ediff.el" (17759 28868)) +;;;;;; ediff-files3 ediff-files) "ediff" "ediff.el" (17752 39351)) ;;; Generated autoloads from ediff.el (autoload (quote ediff-files) "ediff" "\ @@ -8605,7 +8672,7 @@ With optional NODE, goes to that node. ;;;*** ;;;### (autoloads (ediff-customize) "ediff-help" "ediff-help.el" -;;;;;; (17504 41540)) +;;;;;; (17403 27596)) ;;; Generated autoloads from ediff-help.el (autoload (quote ediff-customize) "ediff-help" "\ @@ -8615,7 +8682,7 @@ Not documented ;;;*** -;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17504 41540)) +;;;### (autoloads nil "ediff-hook" "ediff-hook.el" (17403 27596)) ;;; Generated autoloads from ediff-hook.el (defvar ediff-window-setup-function) @@ -8628,7 +8695,7 @@ Not documented ;;;*** ;;;### (autoloads (ediff-show-registry) "ediff-mult" "ediff-mult.el" -;;;;;; (17731 48935)) +;;;;;; (17726 28398)) ;;; Generated autoloads from ediff-mult.el (autoload (quote ediff-show-registry) "ediff-mult" "\ @@ -8641,7 +8708,7 @@ Display Ediff's registry. ;;;*** ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe) -;;;;;; "ediff-util" "ediff-util.el" (17680 45980)) +;;;;;; "ediff-util" "ediff-util.el" (17679 3707)) ;;; Generated autoloads from ediff-util.el (autoload (quote ediff-toggle-multiframe) "ediff-util" "\ @@ -8662,7 +8729,7 @@ To change the default, set the variable `ediff-use-toolbar-p', which see. ;;;### (autoloads (format-kbd-macro read-kbd-macro edit-named-kbd-macro ;;;;;; edit-last-kbd-macro edit-kbd-macro) "edmacro" "edmacro.el" -;;;;;; (17618 27597)) +;;;;;; (17781 39501)) ;;; Generated autoloads from edmacro.el (defvar edmacro-eight-bits nil "\ @@ -8715,7 +8782,7 @@ or nil, use a compact 80-column format. ;;;*** ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt" -;;;;;; "emulation/edt.el" (17504 41540)) +;;;;;; "emulation/edt.el" (17794 54379)) ;;; Generated autoloads from emulation/edt.el (autoload (quote edt-set-scroll-margins) "edt" "\ @@ -8733,7 +8800,7 @@ Turn on EDT Emulation. ;;;*** ;;;### (autoloads (electric-helpify with-electric-help) "ehelp" "ehelp.el" -;;;;;; (17504 41540)) +;;;;;; (17771 1419)) ;;; Generated autoloads from ehelp.el (autoload (quote with-electric-help) "ehelp" "\ @@ -8771,7 +8838,7 @@ Not documented ;;;*** ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string) -;;;;;; "eldoc" "emacs-lisp/eldoc.el" (17721 38189)) +;;;;;; "eldoc" "emacs-lisp/eldoc.el" (17785 34467)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string " ElDoc" "\ @@ -8809,8 +8876,8 @@ Emacs Lisp mode) that support Eldoc.") ;;;*** -;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (elide-head) "elide-head" "elide-head.el" (17781 +;;;;;; 39501)) ;;; Generated autoloads from elide-head.el (autoload (quote elide-head) "elide-head" "\ @@ -8826,7 +8893,7 @@ This is suitable as an entry on `find-file-hook' or appropriate mode hooks. ;;;*** ;;;### (autoloads (elint-initialize) "elint" "emacs-lisp/elint.el" -;;;;;; (17504 41540)) +;;;;;; (17785 34467)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload (quote elint-initialize) "elint" "\ @@ -8837,8 +8904,8 @@ Initialize elint. ;;;*** ;;;### (autoloads (elp-results elp-instrument-package elp-instrument-list -;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (17504 -;;;;;; 41540)) +;;;;;; elp-instrument-function) "elp" "emacs-lisp/elp.el" (17385 +;;;;;; 8490)) ;;; Generated autoloads from emacs-lisp/elp.el (autoload (quote elp-instrument-function) "elp" "\ @@ -8872,7 +8939,7 @@ displayed. ;;;*** ;;;### (autoloads (report-emacs-bug) "emacsbug" "mail/emacsbug.el" -;;;;;; (17746 34862)) +;;;;;; (17743 18143)) ;;; Generated autoloads from mail/emacsbug.el (autoload (quote report-emacs-bug) "emacsbug" "\ @@ -8887,7 +8954,7 @@ Prompts for bug subject. Leaves you in a mail buffer. ;;;;;; emerge-revisions emerge-files-with-ancestor-remote emerge-files-remote ;;;;;; emerge-files-with-ancestor-command emerge-files-command emerge-buffers-with-ancestor ;;;;;; emerge-buffers emerge-files-with-ancestor emerge-files) "emerge" -;;;;;; "emerge.el" (17504 41540)) +;;;;;; "emerge.el" (17167 2962)) ;;; Generated autoloads from emerge.el (defvar menu-bar-emerge-menu (make-sparse-keymap "Emerge")) @@ -8965,7 +9032,7 @@ Not documented ;;;*** ;;;### (autoloads (encoded-kbd-mode) "encoded-kb" "international/encoded-kb.el" -;;;;;; (17504 41540)) +;;;;;; (17792 9561)) ;;; Generated autoloads from international/encoded-kb.el (defvar encoded-kbd-mode nil "\ @@ -8994,7 +9061,7 @@ as a multilingual text encoded in a coding system set by ;;;*** ;;;### (autoloads (enriched-decode enriched-encode enriched-mode) -;;;;;; "enriched" "textmodes/enriched.el" (17746 34862)) +;;;;;; "enriched" "textmodes/enriched.el" (17786 56015)) ;;; Generated autoloads from textmodes/enriched.el (autoload (quote enriched-mode) "enriched" "\ @@ -9024,8 +9091,8 @@ Not documented ;;;*** -;;;### (autoloads (erc-handle-irc-url erc-select erc-select-read-args) -;;;;;; "erc" "erc/erc.el" (17746 35371)) +;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc" +;;;;;; "erc/erc.el" (17792 9561)) ;;; Generated autoloads from erc/erc.el (autoload (quote erc-select-read-args) "erc" "\ @@ -9033,7 +9100,7 @@ Prompt the user for values of nick, server, port, and password. \(fn)" nil nil) -(autoload (quote erc-select) "erc" "\ +(autoload (quote erc) "erc" "\ Select connection parameters and run ERC. Non-interactively, it takes keyword arguments (server (erc-compute-server)) @@ -9044,7 +9111,7 @@ Non-interactively, it takes keyword arguments That is, if called with - (erc-select :server \"irc.freenode.net\" :full-name \"Harry S Truman\") + (erc :server \"irc.freenode.net\" :full-name \"Harry S Truman\") server and full-name will be set to those values, whereas `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will @@ -9061,27 +9128,27 @@ Otherwise, connect to HOST:PORT as USER and /join CHANNEL. ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17746 -;;;;;; 34861)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (17761 +;;;;;; 54014)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") ;;;*** -;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17504 41540)) +;;;### (autoloads nil "erc-button" "erc/erc-button.el" (17447 52274)) ;;; Generated autoloads from erc/erc-button.el (autoload 'erc-button-mode "erc-button" nil t) ;;;*** -;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (17504 41540)) +;;;### (autoloads nil "erc-compat" "erc/erc-compat.el" (17761 54014)) ;;; Generated autoloads from erc/erc-compat.el (autoload 'erc-define-minor-mode "erc-compat") ;;;*** ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) -;;;;;; "erc-dcc" "erc/erc-dcc.el" (17746 34861)) +;;;;;; "erc-dcc" "erc/erc-dcc.el" (17785 34467)) ;;; Generated autoloads from erc/erc-dcc.el (autoload (quote erc-cmd-DCC) "erc-dcc" "\ @@ -9113,7 +9180,7 @@ that subcommand. ;;;;;; erc-ezb-add-session erc-ezb-end-of-session-list erc-ezb-init-session-list ;;;;;; erc-ezb-identify erc-ezb-notice-autodetect erc-ezb-lookup-action ;;;;;; erc-ezb-get-login erc-cmd-ezb) "erc-ezbounce" "erc/erc-ezbounce.el" -;;;;;; (17504 41540)) +;;;;;; (17789 35159)) ;;; Generated autoloads from erc/erc-ezbounce.el (autoload (quote erc-cmd-ezb) "erc-ezbounce" "\ @@ -9144,7 +9211,7 @@ Identify to the EZBouncer server. \(fn MESSAGE)" nil nil) (autoload (quote erc-ezb-init-session-list) "erc-ezbounce" "\ -Reset the EZBounce session list to NIL. +Reset the EZBounce session list to nil. \(fn MESSAGE)" nil nil) @@ -9175,8 +9242,8 @@ Add EZBouncer convenience functions to ERC. ;;;*** -;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (erc-fill) "erc-fill" "erc/erc-fill.el" (17761 +;;;;;; 54014)) ;;; Generated autoloads from erc/erc-fill.el (autoload 'erc-fill-mode "erc-fill" nil t) @@ -9188,15 +9255,15 @@ You can put this on `erc-insert-modify-hook' and/or `erc-send-modify-hook'. ;;;*** -;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (17504 -;;;;;; 41540)) +;;;### (autoloads nil "erc-hecomplete" "erc/erc-hecomplete.el" (17391 +;;;;;; 39324)) ;;; Generated autoloads from erc/erc-hecomplete.el (autoload 'erc-hecomplete-mode "erc-hecomplete" nil t) ;;;*** ;;;### (autoloads (erc-identd-stop erc-identd-start) "erc-identd" -;;;;;; "erc/erc-identd.el" (17592 59702)) +;;;;;; "erc/erc-identd.el" (17601 9092)) ;;; Generated autoloads from erc/erc-identd.el (autoload 'erc-identd-mode "erc-identd") @@ -9218,7 +9285,7 @@ Not documented ;;;*** ;;;### (autoloads (erc-create-imenu-index) "erc-imenu" "erc/erc-imenu.el" -;;;;;; (17592 59702)) +;;;;;; (17601 9092)) ;;; Generated autoloads from erc/erc-imenu.el (autoload (quote erc-create-imenu-index) "erc-imenu" "\ @@ -9228,35 +9295,14 @@ Not documented ;;;*** -;;;### (autoloads nil "erc-join" "erc/erc-join.el" (17504 41540)) +;;;### (autoloads nil "erc-join" "erc/erc-join.el" (17468 10541)) ;;; Generated autoloads from erc/erc-join.el (autoload 'erc-autojoin-mode "erc-join" nil t) ;;;*** -;;;### (autoloads (erc-chanlist erc-list-channels) "erc-list" "erc/erc-list.el" -;;;;;; (17504 41540)) -;;; Generated autoloads from erc/erc-list.el - (autoload 'erc-list-mode "erc-list") - -(autoload (quote erc-list-channels) "erc-list" "\ -Display a buffer containing a list of channels on the current server. -Optional argument CHANNEL specifies a single channel to list (instead of every -available channel). - -\(fn &rest CHANNEL)" t nil) - -(autoload (quote erc-chanlist) "erc-list" "\ -Show a channel listing of the current server in a special mode. -Please note that this function only works with IRC servers which conform -to RFC and send the LIST header (#321) at start of list transmission. - -\(fn &optional CHANNELS)" t nil) - -;;;*** - ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log" -;;;;;; "erc/erc-log.el" (17623 45181)) +;;;;;; "erc/erc-log.el" (17761 54014)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -9288,7 +9334,7 @@ You can save every individual message by putting this function on ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host ;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool ;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el" -;;;;;; (17632 36219)) +;;;;;; (17632 41885)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -9335,7 +9381,7 @@ Delete dangerous-host interactively to `erc-dangerous-hosts'. ;;;*** ;;;### (autoloads (erc-cmd-WHOLEFT) "erc-netsplit" "erc/erc-netsplit.el" -;;;;;; (17504 41540)) +;;;;;; (17468 10541)) ;;; Generated autoloads from erc/erc-netsplit.el (autoload 'erc-netsplit-mode "erc-netsplit") @@ -9347,7 +9393,7 @@ Show who's gone. ;;;*** ;;;### (autoloads (erc-server-select erc-determine-network) "erc-networks" -;;;;;; "erc/erc-networks.el" (17504 41540)) +;;;;;; "erc/erc-networks.el" (17761 54014)) ;;; Generated autoloads from erc/erc-networks.el (autoload (quote erc-determine-network) "erc-networks" "\ @@ -9365,7 +9411,7 @@ Interactively select a server to connect to using `erc-server-alist'. ;;;*** ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify" -;;;;;; "erc/erc-notify.el" (17504 41540)) +;;;;;; "erc/erc-notify.el" (17391 39324)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) @@ -9383,33 +9429,33 @@ Not documented ;;;*** -;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17504 41540)) +;;;### (autoloads nil "erc-page" "erc/erc-page.el" (17391 39324)) ;;; Generated autoloads from erc/erc-page.el (autoload 'erc-page-mode "erc-page") ;;;*** -;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17592 -;;;;;; 59702)) +;;;### (autoloads nil "erc-pcomplete" "erc/erc-pcomplete.el" (17601 +;;;;;; 9092)) ;;; Generated autoloads from erc/erc-pcomplete.el (autoload 'erc-completion-mode "erc-pcomplete" nil t) ;;;*** -;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17504 41540)) +;;;### (autoloads nil "erc-replace" "erc/erc-replace.el" (17761 54014)) ;;; Generated autoloads from erc/erc-replace.el (autoload 'erc-replace-mode "erc-replace") ;;;*** -;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17504 41540)) +;;;### (autoloads nil "erc-ring" "erc/erc-ring.el" (17391 39324)) ;;; Generated autoloads from erc/erc-ring.el (autoload 'erc-ring-mode "erc-ring" nil t) ;;;*** ;;;### (autoloads (erc-nickserv-identify erc-nickserv-identify-mode) -;;;;;; "erc-services" "erc/erc-services.el" (17504 41540)) +;;;;;; "erc-services" "erc/erc-services.el" (17391 39324)) ;;; Generated autoloads from erc/erc-services.el (autoload 'erc-services-mode "erc-services" nil t) @@ -9426,14 +9472,14 @@ When called interactively, read the password using `read-passwd'. ;;;*** -;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17504 41540)) +;;;### (autoloads nil "erc-sound" "erc/erc-sound.el" (17761 54014)) ;;; Generated autoloads from erc/erc-sound.el (autoload 'erc-sound-mode "erc-sound") ;;;*** ;;;### (autoloads (erc-speedbar-browser) "erc-speedbar" "erc/erc-speedbar.el" -;;;;;; (17504 41540)) +;;;;;; (17391 39324)) ;;; Generated autoloads from erc/erc-speedbar.el (autoload (quote erc-speedbar-browser) "erc-speedbar" "\ @@ -9445,19 +9491,19 @@ This will add a speedbar major display mode. ;;;*** ;;;### (autoloads nil "erc-spelling" "erc/erc-spelling.el" (17618 -;;;;;; 27598)) +;;;;;; 8193)) ;;; Generated autoloads from erc/erc-spelling.el (autoload 'erc-spelling-mode "erc-spelling" nil t) ;;;*** -;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17504 41540)) +;;;### (autoloads nil "erc-stamp" "erc/erc-stamp.el" (17785 34467)) ;;; Generated autoloads from erc/erc-stamp.el (autoload 'erc-timestamp-mode "erc-stamp" nil t) ;;;*** -;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17592 59703)) +;;;### (autoloads nil "erc-track" "erc/erc-track.el" (17761 54014)) ;;; Generated autoloads from erc/erc-track.el (autoload 'erc-track-mode "erc-track" nil t) (autoload 'erc-track-when-inactive-mode "erc-track" nil t) @@ -9465,7 +9511,7 @@ This will add a speedbar major display mode. ;;;*** ;;;### (autoloads (erc-truncate-buffer erc-truncate-buffer-to-size) -;;;;;; "erc-truncate" "erc/erc-truncate.el" (17746 34861)) +;;;;;; "erc-truncate" "erc/erc-truncate.el" (17743 18143)) ;;; Generated autoloads from erc/erc-truncate.el (autoload 'erc-truncate-mode "erc-truncate" nil t) @@ -9485,7 +9531,7 @@ Meant to be used in hooks, like `erc-insert-post-hook'. ;;;*** ;;;### (autoloads (erc-xdcc-add-file) "erc-xdcc" "erc/erc-xdcc.el" -;;;;;; (17504 41540)) +;;;;;; (17391 39324)) ;;; Generated autoloads from erc/erc-xdcc.el (autoload (quote erc-xdcc-add-file) "erc-xdcc" "\ @@ -9495,8 +9541,8 @@ Add a file to `erc-xdcc-files'. ;;;*** -;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (17385 +;;;;;; 8492)) ;;; Generated autoloads from eshell/esh-mode.el (autoload (quote eshell-mode) "esh-mode" "\ @@ -9508,8 +9554,8 @@ Emacs shell interactive mode. ;;;*** -;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (eshell-test) "esh-test" "eshell/esh-test.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from eshell/esh-test.el (autoload (quote eshell-test) "esh-test" "\ @@ -9520,7 +9566,7 @@ Test Eshell to verify that it works as expected. ;;;*** ;;;### (autoloads (eshell-report-bug eshell-command-result eshell-command -;;;;;; eshell) "eshell" "eshell/eshell.el" (17504 41540)) +;;;;;; eshell) "eshell" "eshell/eshell.el" (17786 56015)) ;;; Generated autoloads from eshell/eshell.el (autoload (quote eshell) "eshell" "\ @@ -9566,7 +9612,7 @@ Please include any configuration details that might be involved. ;;;;;; visit-tags-table tags-table-mode find-tag-default-function ;;;;;; find-tag-hook tags-add-tables tags-compression-info-list ;;;;;; tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el" -;;;;;; (17504 41540)) +;;;;;; (17408 40149)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9581,7 +9627,7 @@ Use the `etags' program to make a tags table file.") A value of t means case-insensitive, a value of nil means case-sensitive. Any other value means use the setting of `case-fold-search'.") -(custom-autoload (quote tags-case-fold-search) "etags" t) +(custom-autoload (quote tags-case-fold-search) "etags") (defvar tags-table-list nil "\ *List of file names of tags tables to search. @@ -9590,7 +9636,7 @@ To switch to a new list of tags tables, setting this variable is sufficient. If you set this variable, do not also set `tags-file-name'. Use the `etags' program to make a tags table file.") -(custom-autoload (quote tags-table-list) "etags" t) +(custom-autoload (quote tags-table-list) "etags") (defvar tags-compression-info-list (quote ("" ".Z" ".bz2" ".gz" ".tgz")) "\ *List of extensions tried by etags when jka-compr is used. @@ -9599,7 +9645,7 @@ These extensions will be tried only if jka-compr was activated \(i.e. via customize of `auto-compression-mode' or by calling the function `auto-compression-mode').") -(custom-autoload (quote tags-compression-info-list) "etags" t) +(custom-autoload (quote tags-compression-info-list) "etags") (defvar tags-add-tables (quote ask-user) "\ *Control whether to add a new tags table to the current list. @@ -9607,14 +9653,14 @@ t means do; nil means don't (always start a new list). Any other value means ask the user whether to add a new tags table to the current list (as opposed to starting a new list).") -(custom-autoload (quote tags-add-tables) "etags" t) +(custom-autoload (quote tags-add-tables) "etags") (defvar find-tag-hook nil "\ *Hook to be run by \\[find-tag] after finding a tag. See `run-hooks'. The value in the buffer in which \\[find-tag] is done is used, not the value in the buffer \\[find-tag] goes to.") -(custom-autoload (quote find-tag-hook) "etags" t) +(custom-autoload (quote find-tag-hook) "etags") (defvar find-tag-default-function nil "\ *A function of no arguments used by \\[find-tag] to pick a default tag. @@ -9622,7 +9668,7 @@ If nil, and the symbol that is the value of `major-mode' has a `find-tag-default-function' property (see `put'), that is used. Otherwise, `find-tag-default' is used.") -(custom-autoload (quote find-tag-default-function) "etags" t) +(custom-autoload (quote find-tag-default-function) "etags") (autoload (quote tags-table-mode) "etags" "\ Major mode for tags table file buffers. @@ -9868,7 +9914,7 @@ for \\[find-tag] (which see). ;;;;;; ethio-fidel-to-sera-buffer ethio-fidel-to-sera-region ethio-sera-to-fidel-marker ;;;;;; ethio-sera-to-fidel-mail ethio-sera-to-fidel-mail-or-marker ;;;;;; ethio-sera-to-fidel-buffer ethio-sera-to-fidel-region setup-ethiopic-environment-internal) -;;;;;; "ethio-util" "language/ethio-util.el" (17557 12727)) +;;;;;; "ethio-util" "language/ethio-util.el" (17792 9562)) ;;; Generated autoloads from language/ethio-util.el (autoload (quote setup-ethiopic-environment-internal) "ethio-util" "\ @@ -10063,7 +10109,7 @@ Transcribe Ethiopic characters in ASCII depending on the file extension. ;;;### (autoloads (eudc-load-eudc eudc-query-form eudc-expand-inline ;;;;;; eudc-get-phone eudc-get-email eudc-set-server) "eudc" "net/eudc.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from net/eudc.el (autoload (quote eudc-set-server) "eudc" "\ @@ -10119,7 +10165,7 @@ This does nothing except loading eudc by autoload side-effect. ;;;### (autoloads (eudc-display-jpeg-as-button eudc-display-jpeg-inline ;;;;;; eudc-display-sound eudc-display-mail eudc-display-url eudc-display-generic-binary) -;;;;;; "eudc-bob" "net/eudc-bob.el" (17504 41540)) +;;;;;; "eudc-bob" "net/eudc-bob.el" (17786 56015)) ;;; Generated autoloads from net/eudc-bob.el (autoload (quote eudc-display-generic-binary) "eudc-bob" "\ @@ -10155,7 +10201,7 @@ Display a button for the JPEG DATA. ;;;*** ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb) -;;;;;; "eudc-export" "net/eudc-export.el" (17504 41540)) +;;;;;; "eudc-export" "net/eudc-export.el" (17786 56015)) ;;; Generated autoloads from net/eudc-export.el (autoload (quote eudc-insert-record-at-point-into-bbdb) "eudc-export" "\ @@ -10172,7 +10218,7 @@ Call `eudc-insert-record-at-point-into-bbdb' if on a record. ;;;*** ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload (quote eudc-edit-hotlist) "eudc-hotlist" "\ @@ -10182,8 +10228,8 @@ Edit the hotlist of directory servers in a specialized buffer. ;;;*** -;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17541 -;;;;;; 35103)) +;;;### (autoloads (ewoc-create) "ewoc" "emacs-lisp/ewoc.el" (17785 +;;;;;; 34467)) ;;; Generated autoloads from emacs-lisp/ewoc.el (autoload (quote ewoc-create) "ewoc" "\ @@ -10212,7 +10258,7 @@ fourth arg NOSEP non-nil inhibits this. ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p ;;;;;; executable-self-display executable-set-magic executable-interpret ;;;;;; executable-command-find-posix-p) "executable" "progmodes/executable.el" -;;;;;; (17504 41540)) +;;;;;; (17394 12937)) ;;; Generated autoloads from progmodes/executable.el (autoload (quote executable-command-find-posix-p) "executable" "\ @@ -10254,7 +10300,7 @@ file modes. ;;;*** ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot -;;;;;; expand-add-abbrevs) "expand" "expand.el" (17746 34860)) +;;;;;; expand-add-abbrevs) "expand" "expand.el" (17781 39501)) ;;; Generated autoloads from expand.el (autoload (quote expand-add-abbrevs) "expand" "\ @@ -10297,7 +10343,7 @@ This is used only in conjunction with `expand-add-abbrevs'. ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17759 28873)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (17781 39502)) ;;; Generated autoloads from progmodes/f90.el (autoload (quote f90-mode) "f90" "\ @@ -10364,7 +10410,7 @@ with no args, if that value is non-nil. ;;;;;; facemenu-remove-all facemenu-remove-face-props facemenu-set-read-only ;;;;;; facemenu-set-intangible facemenu-set-invisible facemenu-set-face-from-menu ;;;;;; facemenu-set-background facemenu-set-foreground facemenu-set-face) -;;;;;; "facemenu" "facemenu.el" (17718 30634)) +;;;;;; "facemenu" "facemenu.el" (17780 31980)) ;;; Generated autoloads from facemenu.el (define-key global-map "\M-o" 'facemenu-keymap) (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap) @@ -10531,9 +10577,49 @@ argument BUFFER-NAME is nil, it defaults to *Colors*. ;;;*** +;;;### (autoloads (turn-on-fast-lock fast-lock-mode) "fast-lock" +;;;;;; "obsolete/fast-lock.el" (17786 56015)) +;;; Generated autoloads from obsolete/fast-lock.el + +(autoload (quote fast-lock-mode) "fast-lock" "\ +Toggle Fast Lock mode. +With arg, turn Fast Lock mode on if and only if arg is positive and the buffer +is associated with a file. Enable it automatically in your `~/.emacs' by: + + (setq font-lock-support-mode 'fast-lock-mode) + +If Fast Lock mode is enabled, and the current buffer does not contain any text +properties, any associated Font Lock cache is used if its timestamp matches the +buffer's file, and its `font-lock-keywords' match those that you are using. + +Font Lock caches may be saved: +- When you save the file's buffer. +- When you kill an unmodified file's buffer. +- When you exit Emacs, for all unmodified or saved buffers. +Depending on the value of `fast-lock-save-events'. +See also the commands `fast-lock-read-cache' and `fast-lock-save-cache'. + +Use \\[font-lock-fontify-buffer] to fontify the buffer if the cache is bad. + +Various methods of control are provided for the Font Lock cache. In general, +see variable `fast-lock-cache-directories' and function `fast-lock-cache-name'. +For saving, see variables `fast-lock-minimum-size', `fast-lock-save-events', +`fast-lock-save-others' and `fast-lock-save-faces'. + +\(fn &optional ARG)" t nil) + +(autoload (quote turn-on-fast-lock) "fast-lock" "\ +Unconditionally turn on Fast Lock mode. + +\(fn)" nil nil) + +(when (fboundp (quote add-minor-mode)) (defvar fast-lock-mode nil) (add-minor-mode (quote fast-lock-mode) nil)) + +;;;*** + ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue ;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts -;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17746 34862)) +;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (17743 18143)) ;;; Generated autoloads from mail/feedmail.el (autoload (quote feedmail-send-it) "feedmail" "\ @@ -10587,7 +10673,7 @@ you can set `feedmail-queue-reminder-alist' to nil. ;;;*** ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu -;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17746 34860)) +;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (17781 39501)) ;;; Generated autoloads from ffap.el (autoload (quote ffap-next) "ffap" "\ @@ -10646,7 +10732,7 @@ Evaluate the forms in variable `ffap-bindings'. ;;;### (autoloads (file-cache-minibuffer-complete file-cache-add-directory-recursively ;;;;;; file-cache-add-directory-using-locate file-cache-add-directory-using-find ;;;;;; file-cache-add-file file-cache-add-directory-list file-cache-add-directory) -;;;;;; "filecache" "filecache.el" (17669 35274)) +;;;;;; "filecache" "filecache.el" (17781 39501)) ;;; Generated autoloads from filecache.el (autoload (quote file-cache-add-directory) "filecache" "\ @@ -10705,8 +10791,8 @@ the name is considered already unique; only the second substitution ;;;*** -;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17715 -;;;;;; 55644)) +;;;### (autoloads (filesets-init) "filesets" "filesets.el" (17714 +;;;;;; 34817)) ;;; Generated autoloads from filesets.el (autoload (quote filesets-init) "filesets" "\ @@ -10717,7 +10803,7 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;*** -;;;### (autoloads nil "fill" "textmodes/fill.el" (17746 34862)) +;;;### (autoloads nil "fill" "textmodes/fill.el" (17743 45092)) ;;; Generated autoloads from textmodes/fill.el (put 'colon-double-space 'safe-local-variable 'booleanp) @@ -10725,7 +10811,7 @@ Set up hooks, load the cache file -- if existing -- and build the menu. ;;;### (autoloads (find-grep-dired find-name-dired find-dired find-grep-options ;;;;;; find-ls-subdir-switches find-ls-option) "find-dired" "find-dired.el" -;;;;;; (17652 14941)) +;;;;;; (17781 39501)) ;;; Generated autoloads from find-dired.el (defvar find-ls-option (if (eq system-type (quote berkeley-unix)) (quote ("-ls" . "-gilsb")) (quote ("-exec ls -ld {} \\;" . "-ld"))) "\ @@ -10786,7 +10872,7 @@ Thus ARG can also contain additional grep options. ;;;### (autoloads (ff-mouse-find-other-file-other-window ff-mouse-find-other-file ;;;;;; ff-find-other-file ff-get-other-file) "find-file" "find-file.el" -;;;;;; (17595 2870)) +;;;;;; (17781 39501)) ;;; Generated autoloads from find-file.el (defvar ff-special-constructs (quote (("^#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]" lambda nil (buffer-substring (match-beginning 2) (match-end 2))))) "\ @@ -10880,7 +10966,7 @@ Visit the file you click on in another window. ;;;;;; find-variable find-variable-noselect find-function-other-frame ;;;;;; find-function-other-window find-function find-function-noselect ;;;;;; find-function-search-for-symbol find-library) "find-func" -;;;;;; "emacs-lisp/find-func.el" (17746 34861)) +;;;;;; "emacs-lisp/find-func.el" (17786 56015)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload (quote find-library) "find-func" "\ @@ -10955,7 +11041,7 @@ The library where VARIABLE is defined is searched for in FILE or \(fn VARIABLE &optional FILE)" nil nil) (autoload (quote find-variable) "find-func" "\ -Find the definition of the VARIABLE near point. +Find the definition of the VARIABLE at or before point. Finds the library containing the definition of the variable near point (selected by `variable-at-point') in a buffer and @@ -11034,7 +11120,7 @@ Define some key bindings for the find-function family of functions. ;;;*** ;;;### (autoloads (find-lisp-find-dired-filter find-lisp-find-dired-subdirectories -;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17504 41540)) +;;;;;; find-lisp-find-dired) "find-lisp" "find-lisp.el" (17781 39501)) ;;; Generated autoloads from find-lisp.el (autoload (quote find-lisp-find-dired) "find-lisp" "\ @@ -11055,7 +11141,7 @@ Change the filter on a find-lisp-find-dired buffer to REGEXP. ;;;*** ;;;### (autoloads (finder-by-keyword finder-commentary finder-list-keywords) -;;;;;; "finder" "finder.el" (17504 41540)) +;;;;;; "finder" "finder.el" (17476 4797)) ;;; Generated autoloads from finder.el (autoload (quote finder-list-keywords) "finder" "\ @@ -11077,7 +11163,7 @@ Find packages matching a given keyword. ;;;*** ;;;### (autoloads (enable-flow-control-on enable-flow-control) "flow-ctrl" -;;;;;; "flow-ctrl.el" (17504 41540)) +;;;;;; "flow-ctrl.el" (17781 39501)) ;;; Generated autoloads from flow-ctrl.el (autoload (quote enable-flow-control) "flow-ctrl" "\ @@ -11099,7 +11185,7 @@ to get the effect of a C-q. ;;;*** ;;;### (autoloads (fill-flowed fill-flowed-encode) "flow-fill" "gnus/flow-fill.el" -;;;;;; (17504 41540)) +;;;;;; (17476 4798)) ;;; Generated autoloads from gnus/flow-fill.el (autoload (quote fill-flowed-encode) "flow-fill" "\ @@ -11115,7 +11201,7 @@ Not documented ;;;*** ;;;### (autoloads (flymake-mode-off flymake-mode-on flymake-mode) -;;;;;; "flymake" "progmodes/flymake.el" (17715 55646)) +;;;;;; "flymake" "progmodes/flymake.el" (17770 2412)) ;;; Generated autoloads from progmodes/flymake.el (autoload (quote flymake-mode) "flymake" "\ @@ -11139,7 +11225,7 @@ Turn flymake mode off. ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) -;;;;;; "flyspell" "textmodes/flyspell.el" (17759 28874)) +;;;;;; "flyspell" "textmodes/flyspell.el" (17786 56015)) ;;; Generated autoloads from textmodes/flyspell.el (autoload (quote flyspell-prog-mode) "flyspell" "\ @@ -11208,7 +11294,7 @@ Flyspell whole buffer. ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode ;;;;;; turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el" -;;;;;; (17746 34860)) +;;;;;; (17743 18143)) ;;; Generated autoloads from follow.el (autoload (quote turn-on-follow-mode) "follow" "\ @@ -11282,8 +11368,8 @@ in your `~/.emacs' file, replacing [f7] by your favourite key: ;;;*** -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from mail/footnote.el (autoload (quote footnote-mode) "footnote" "\ @@ -11304,7 +11390,7 @@ key binding ;;;*** ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode) -;;;;;; "forms" "forms.el" (17504 41540)) +;;;;;; "forms" "forms.el" (17781 39501)) ;;; Generated autoloads from forms.el (autoload (quote forms-mode) "forms" "\ @@ -11341,7 +11427,7 @@ Visit a file in Forms mode in other window. ;;;*** ;;;### (autoloads (fortran-mode fortran-tab-mode-default) "fortran" -;;;;;; "progmodes/fortran.el" (17658 57872)) +;;;;;; "progmodes/fortran.el" (17781 39502)) ;;; Generated autoloads from progmodes/fortran.el (defvar fortran-tab-mode-default nil "\ @@ -11427,7 +11513,7 @@ with no args, if that value is non-nil. ;;;*** ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region -;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (17504 41540)) +;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (17385 8495)) ;;; Generated autoloads from play/fortune.el (autoload (quote fortune-add-fortune) "fortune" "\ @@ -11477,7 +11563,7 @@ and choose the directory as the fortune-file. ;;;*** ;;;### (autoloads (gdb-enable-debug gdba) "gdb-ui" "progmodes/gdb-ui.el" -;;;;;; (17759 28873)) +;;;;;; (17780 18172)) ;;; Generated autoloads from progmodes/gdb-ui.el (autoload (quote gdba) "gdb-ui" "\ @@ -11540,8 +11626,8 @@ Non-nil means record the process input and output in `gdb-debug-ring'.") ;;;*** ;;;### (autoloads (generic-make-keywords-list generic-mode generic-mode-internal -;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (17504 -;;;;;; 41540)) +;;;;;; define-generic-mode) "generic" "emacs-lisp/generic.el" (17785 +;;;;;; 34467)) ;;; Generated autoloads from emacs-lisp/generic.el (defvar generic-mode-list nil "\ @@ -11616,7 +11702,7 @@ regular expression that can be used as an element of ;;;*** ;;;### (autoloads (glasses-mode) "glasses" "progmodes/glasses.el" -;;;;;; (17504 41540)) +;;;;;; (17788 21816)) ;;; Generated autoloads from progmodes/glasses.el (autoload (quote glasses-mode) "glasses" "\ @@ -11629,7 +11715,7 @@ at places they belong to. ;;;*** ;;;### (autoloads (gmm-tool-bar-from-list gmm-widget-p gmm-error -;;;;;; gmm-message) "gmm-utils" "gnus/gmm-utils.el" (17715 55645)) +;;;;;; gmm-message) "gmm-utils" "gnus/gmm-utils.el" (17714 34817)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload (quote gmm-message) "gmm-utils" "\ @@ -11676,7 +11762,7 @@ DEFAULT-MAP specifies the default key map for ICON-LIST. ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (17759 28869)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (17767 19634)) ;;; Generated autoloads from gnus/gnus.el (when (fboundp 'custom-autoload) (custom-autoload 'gnus-select-method "gnus")) @@ -11729,7 +11815,7 @@ prompt the user for the name of an NNTP server to use. ;;;;;; gnus-agent-get-undownloaded-list gnus-agent-delete-group ;;;;;; gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize ;;;;;; gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent" -;;;;;; "gnus/gnus-agent.el" (17732 62702)) +;;;;;; "gnus/gnus-agent.el" (17767 19633)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload (quote gnus-unplugged) "gnus-agent" "\ @@ -11820,7 +11906,7 @@ If CLEAN, obsolete (ignore). ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (17746 34861)) +;;;;;; (17767 19634)) ;;; Generated autoloads from gnus/gnus-art.el (autoload (quote gnus-article-prepare-display) "gnus-art" "\ @@ -11831,7 +11917,7 @@ Make the current buffer look like a nice article. ;;;*** ;;;### (autoloads (gnus-audio-play) "gnus-audio" "gnus/gnus-audio.el" -;;;;;; (17686 35982)) +;;;;;; (17788 21815)) ;;; Generated autoloads from gnus/gnus-audio.el (autoload (quote gnus-audio-play) "gnus-audio" "\ @@ -11843,8 +11929,8 @@ Play a sound FILE through the speaker. ;;;### (autoloads (gnus-cache-delete-group gnus-cache-rename-group ;;;;;; gnus-cache-generate-nov-databases gnus-cache-generate-active -;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17686 -;;;;;; 35982)) +;;;;;; gnus-jog-cache) "gnus-cache" "gnus/gnus-cache.el" (17385 +;;;;;; 8493)) ;;; Generated autoloads from gnus/gnus-cache.el (autoload (quote gnus-jog-cache) "gnus-cache" "\ @@ -11886,7 +11972,7 @@ supported. ;;;*** ;;;### (autoloads (gnus-delay-initialize gnus-delay-send-queue gnus-delay-article) -;;;;;; "gnus-delay" "gnus/gnus-delay.el" (17686 35982)) +;;;;;; "gnus-delay" "gnus/gnus-delay.el" (17385 8493)) ;;; Generated autoloads from gnus/gnus-delay.el (autoload (quote gnus-delay-article) "gnus-delay" "\ @@ -11922,7 +12008,7 @@ Checking delayed messages is skipped if optional arg NO-CHECK is non-nil. ;;;*** ;;;### (autoloads (gnus-user-format-function-D gnus-user-format-function-d) -;;;;;; "gnus-diary" "gnus/gnus-diary.el" (17746 34861)) +;;;;;; "gnus-diary" "gnus/gnus-diary.el" (17797 50970)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload (quote gnus-user-format-function-d) "gnus-diary" "\ @@ -11938,7 +12024,7 @@ Not documented ;;;*** ;;;### (autoloads (turn-on-gnus-dired-mode) "gnus-dired" "gnus/gnus-dired.el" -;;;;;; (17686 35982)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload (quote turn-on-gnus-dired-mode) "gnus-dired" "\ @@ -11949,7 +12035,7 @@ Convenience method to turn on gnus-dired-mode. ;;;*** ;;;### (autoloads (gnus-draft-reminder) "gnus-draft" "gnus/gnus-draft.el" -;;;;;; (17701 49519)) +;;;;;; (17698 30385)) ;;; Generated autoloads from gnus/gnus-draft.el (autoload (quote gnus-draft-reminder) "gnus-draft" "\ @@ -11961,8 +12047,8 @@ Reminder user if there are unsent drafts. ;;;### (autoloads (gnus-convert-png-to-face gnus-convert-face-to-png ;;;;;; gnus-face-from-file gnus-x-face-from-file gnus-insert-random-x-face-header -;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17686 -;;;;;; 35982)) +;;;;;; gnus-random-x-face) "gnus-fun" "gnus/gnus-fun.el" (17476 +;;;;;; 4800)) ;;; Generated autoloads from gnus/gnus-fun.el (autoload (quote gnus-random-x-face) "gnus-fun" "\ @@ -12001,7 +12087,7 @@ FILE should be a PNG file that's 48x48 and smaller than or equal to ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (17731 48936)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (17767 19634)) ;;; Generated autoloads from gnus/gnus-group.el (autoload (quote gnus-fetch-group) "gnus-group" "\ @@ -12018,7 +12104,7 @@ Pop up a frame and enter GROUP. ;;;*** ;;;### (autoloads (gnus-batch-score) "gnus-kill" "gnus/gnus-kill.el" -;;;;;; (17686 35982)) +;;;;;; (17788 21815)) ;;; Generated autoloads from gnus/gnus-kill.el (defalias (quote gnus-batch-kill) (quote gnus-batch-score)) @@ -12033,7 +12119,7 @@ Usage: emacs -batch -l ~/.emacs -l gnus -f gnus-batch-score ;;;### (autoloads (gnus-mailing-list-mode gnus-mailing-list-insinuate ;;;;;; turn-on-gnus-mailing-list-mode) "gnus-ml" "gnus/gnus-ml.el" -;;;;;; (17686 35982)) +;;;;;; (17551 7908)) ;;; Generated autoloads from gnus/gnus-ml.el (autoload (quote turn-on-gnus-mailing-list-mode) "gnus-ml" "\ @@ -12058,7 +12144,7 @@ Minor mode for providing mailing-list commands. ;;;### (autoloads (gnus-group-split-fancy gnus-group-split gnus-group-split-update ;;;;;; gnus-group-split-setup) "gnus-mlspl" "gnus/gnus-mlspl.el" -;;;;;; (17686 35982)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-mlspl.el (autoload (quote gnus-group-split-setup) "gnus-mlspl" "\ @@ -12159,7 +12245,7 @@ Calling (gnus-group-split-fancy nil nil \"mail.others\") returns: ;;;*** ;;;### (autoloads (gnus-change-server) "gnus-move" "gnus/gnus-move.el" -;;;;;; (17686 35982)) +;;;;;; (17788 21815)) ;;; Generated autoloads from gnus/gnus-move.el (autoload (quote gnus-change-server) "gnus-move" "\ @@ -12171,7 +12257,7 @@ Update the .newsrc.eld file to reflect the change of nntp server. ;;;*** ;;;### (autoloads (gnus-button-reply gnus-button-mailto gnus-msg-mail) -;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17686 35982)) +;;;;;; "gnus-msg" "gnus/gnus-msg.el" (17385 8493)) ;;; Generated autoloads from gnus/gnus-msg.el (autoload (quote gnus-msg-mail) "gnus-msg" "\ @@ -12196,7 +12282,7 @@ Like `message-reply'. ;;;*** ;;;### (autoloads (gnus-nocem-load-cache gnus-nocem-scan-groups) -;;;;;; "gnus-nocem" "gnus/gnus-nocem.el" (17686 35982)) +;;;;;; "gnus-nocem" "gnus/gnus-nocem.el" (17788 21815)) ;;; Generated autoloads from gnus/gnus-nocem.el (autoload (quote gnus-nocem-scan-groups) "gnus-nocem" "\ @@ -12213,7 +12299,7 @@ Load the NoCeM cache. ;;;### (autoloads (gnus-treat-newsgroups-picon gnus-treat-mail-picon ;;;;;; gnus-treat-from-picon) "gnus-picon" "gnus/gnus-picon.el" -;;;;;; (17686 35982)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-picon.el (autoload (quote gnus-treat-from-picon) "gnus-picon" "\ @@ -12240,7 +12326,7 @@ If picons are already displayed, remove them. ;;;;;; gnus-sorted-nintersection gnus-sorted-range-intersection ;;;;;; gnus-sorted-intersection gnus-intersection gnus-sorted-complement ;;;;;; gnus-sorted-ndifference gnus-sorted-difference) "gnus-range" -;;;;;; "gnus/gnus-range.el" (17686 35982)) +;;;;;; "gnus/gnus-range.el" (17385 8493)) ;;; Generated autoloads from gnus/gnus-range.el (autoload (quote gnus-sorted-difference) "gnus-range" "\ @@ -12308,7 +12394,7 @@ Add NUM into sorted LIST by side effect. ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (17703 53657)) +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (17704 4325)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload (quote gnus-registry-initialize) "gnus-registry" "\ @@ -12324,8 +12410,8 @@ Install the registry hooks. ;;;*** ;;;### (autoloads (gnus-sieve-article-add-rule gnus-sieve-generate -;;;;;; gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17686 -;;;;;; 35982)) +;;;;;; gnus-sieve-update) "gnus-sieve" "gnus/gnus-sieve.el" (17476 +;;;;;; 4800)) ;;; Generated autoloads from gnus/gnus-sieve.el (autoload (quote gnus-sieve-update) "gnus-sieve" "\ @@ -12353,7 +12439,7 @@ Not documented ;;;*** ;;;### (autoloads (gnus-batch-brew-soup) "gnus-soup" "gnus/gnus-soup.el" -;;;;;; (17686 35982)) +;;;;;; (17788 21815)) ;;; Generated autoloads from gnus/gnus-soup.el (autoload (quote gnus-batch-brew-soup) "gnus-soup" "\ @@ -12373,7 +12459,7 @@ Note -- this function hasn't been implemented yet. ;;;*** ;;;### (autoloads (gnus-update-format) "gnus-spec" "gnus/gnus-spec.el" -;;;;;; (17686 35982)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-spec.el (autoload (quote gnus-update-format) "gnus-spec" "\ @@ -12384,8 +12470,8 @@ Update the format specification near point. ;;;*** ;;;### (autoloads (gnus-fixup-nnimap-unread-after-getting-new-news -;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17686 -;;;;;; 35982)) +;;;;;; gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" (17767 +;;;;;; 19634)) ;;; Generated autoloads from gnus/gnus-start.el (autoload (quote gnus-declare-backend) "gnus-start" "\ @@ -12401,7 +12487,7 @@ Not documented ;;;*** ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el" -;;;;;; (17686 35982)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/gnus-win.el (autoload (quote gnus-add-configuration) "gnus-win" "\ @@ -12411,7 +12497,7 @@ Add the window configuration CONF to `gnus-buffer-configuration'. ;;;*** -;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17504 41540)) +;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (17767 19634)) ;;; Generated autoloads from play/gomoku.el (autoload (quote gomoku) "gomoku" "\ @@ -12438,7 +12524,7 @@ Use \\[describe-mode] for more info. ;;;*** ;;;### (autoloads (goto-address goto-address-at-point) "goto-addr" -;;;;;; "net/goto-addr.el" (17580 16976)) +;;;;;; "net/goto-addr.el" (17579 53341)) ;;; Generated autoloads from net/goto-addr.el (define-obsolete-function-alias (quote goto-address-at-mouse) (quote goto-address-at-point) "22.1") @@ -12468,7 +12554,7 @@ Also fontifies the buffer appropriately (see `goto-address-fontify-p' and ;;;### (autoloads (rgrep lgrep grep-find grep grep-mode grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (17645 45313)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (17645 64048)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12605,7 +12691,7 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]. ;;;*** -;;;### (autoloads (gs-load-image) "gs" "gs.el" (17598 60524)) +;;;### (autoloads (gs-load-image) "gs" "gs.el" (17385 8485)) ;;; Generated autoloads from gs.el (autoload (quote gs-load-image) "gs" "\ @@ -12619,7 +12705,7 @@ the form \"WINDOW-ID PIXMAP-ID\". Value is non-nil if successful. ;;;*** ;;;### (autoloads (gdb-script-mode bashdb jdb pdb perldb xdb dbx -;;;;;; sdb gdb) "gud" "progmodes/gud.el" (17661 56350)) +;;;;;; sdb gdb) "gud" "progmodes/gud.el" (17785 34467)) ;;; Generated autoloads from progmodes/gud.el (autoload (quote gdb) "gud" "\ @@ -12629,8 +12715,12 @@ directory and source-file directory for your debugger. By default this command starts GDB using a graphical interface. See `gdba' for more information. -To run GDB in text command mode, set `gud-gdb-command-name' to -\"gdb --fullname\" and include the pathname, if necessary. +To run GDB in text command mode, replace the GDB \"--annotate=3\" +option with \"--fullname\" either in the minibuffer for the +current Emacs session, or the custom variable +`gud-gdb-command-name' for all future sessions. You need to use +text command mode to debug multiple programs within one Emacs +session. \(fn COMMAND-LINE)" t nil) @@ -12675,7 +12765,7 @@ and source-file directory for your debugger. (autoload (quote jdb) "gud" "\ Run jdb with command line COMMAND-LINE in a buffer. The buffer is named \"*gud*\" if no initial class is given or -\"*gud-<initial-class-basename>*\" if there is. If the \"-classpath\" +\"*gud-<initial-class-basename>*\" if there is. If the \"-classpath\" switch is given, omit all whitespace between it and its value. See `gud-jdb-use-classpath' and `gud-jdb-classpath' documentation for @@ -12705,8 +12795,8 @@ Major mode for editing GDB scripts ;;;*** -;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17759 -;;;;;; 28871)) +;;;### (autoloads (handwrite) "handwrite" "play/handwrite.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from play/handwrite.el (autoload (quote handwrite) "handwrite" "\ @@ -12724,7 +12814,7 @@ Variables: handwrite-linespace (default 12) ;;;*** ;;;### (autoloads (hanoi-unix-64 hanoi-unix hanoi) "hanoi" "play/hanoi.el" -;;;;;; (17746 34862)) +;;;;;; (17743 18144)) ;;; Generated autoloads from play/hanoi.el (autoload (quote hanoi) "hanoi" "\ @@ -12754,7 +12844,7 @@ to be updated. ;;;### (autoloads (scan-buf-previous-region scan-buf-next-region ;;;;;; scan-buf-move-to-region help-at-pt-display-when-idle help-at-pt-set-timer ;;;;;; help-at-pt-cancel-timer display-local-help help-at-pt-kbd-string -;;;;;; help-at-pt-string) "help-at-pt" "help-at-pt.el" (17710 3074)) +;;;;;; help-at-pt-string) "help-at-pt" "help-at-pt.el" (17709 24917)) ;;; Generated autoloads from help-at-pt.el (autoload (quote help-at-pt-string) "help-at-pt" "\ @@ -12884,7 +12974,7 @@ different regions. With numeric argument ARG, behaves like ;;;### (autoloads (describe-categories describe-syntax describe-variable ;;;;;; variable-at-point describe-function-1 describe-simplify-lib-file-name ;;;;;; help-C-file-name describe-function) "help-fns" "help-fns.el" -;;;;;; (17736 44182)) +;;;;;; (17797 50969)) ;;; Generated autoloads from help-fns.el (autoload (quote describe-function) "help-fns" "\ @@ -12909,7 +12999,7 @@ Not documented \(fn FUNCTION)" nil nil) (autoload (quote variable-at-point) "help-fns" "\ -Return the bound variable symbol found around point. +Return the bound variable symbol found at or before point. Return 0 if there is no such symbol. If ANY-SYMBOL is non-nil, don't insist the symbol be bound. @@ -12941,7 +13031,7 @@ BUFFER should be a buffer or a buffer name. ;;;*** ;;;### (autoloads (three-step-help) "help-macro" "help-macro.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39501)) ;;; Generated autoloads from help-macro.el (defvar three-step-help nil "\ @@ -12957,7 +13047,7 @@ A value of nil means skip the middle step, so that ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button ;;;;;; help-make-xrefs help-setup-xref help-mode-finish help-mode-setup -;;;;;; help-mode) "help-mode" "help-mode.el" (17604 18983)) +;;;;;; help-mode) "help-mode" "help-mode.el" (17604 60389)) ;;; Generated autoloads from help-mode.el (autoload (quote help-mode) "help-mode" "\ @@ -13040,7 +13130,7 @@ Add xrefs for symbols in `pp's output between FROM and TO. ;;;*** ;;;### (autoloads (Helper-help Helper-describe-bindings) "helper" -;;;;;; "emacs-lisp/helper.el" (17586 63376)) +;;;;;; "emacs-lisp/helper.el" (17785 34467)) ;;; Generated autoloads from emacs-lisp/helper.el (autoload (quote Helper-describe-bindings) "helper" "\ @@ -13056,7 +13146,7 @@ Provide help for current mode. ;;;*** ;;;### (autoloads (hexlify-buffer hexl-find-file hexl-mode) "hexl" -;;;;;; "hexl.el" (17746 34860)) +;;;;;; "hexl.el" (17776 24487)) ;;; Generated autoloads from hexl.el (autoload (quote hexl-mode) "hexl" "\ @@ -13153,7 +13243,7 @@ This discards the buffer's undo information. ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer ;;;;;; hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer ;;;;;; global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8485)) ;;; Generated autoloads from hi-lock.el (autoload (quote hi-lock-mode) "hi-lock" "\ @@ -13206,10 +13296,11 @@ is found. A mode is excluded if it's in the list `hi-lock-exclude-modes'. Non-nil if Global-Hi-Lock mode is enabled. See the command `global-hi-lock-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `global-hi-lock-mode'.") +use either \\[customize] or the function `global-hi-lock-mode'.") -(custom-autoload (quote global-hi-lock-mode) "hi-lock" nil) +(custom-autoload (quote global-hi-lock-mode) "hi-lock") + +(put (quote global-hi-lock-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote global-hi-lock-mode) "hi-lock" "\ Toggle Hi-Lock mode in every buffer. @@ -13278,7 +13369,7 @@ be found in variable `hi-lock-interactive-patterns'. ;;;*** ;;;### (autoloads (hide-ifdef-lines hide-ifdef-read-only hide-ifdef-initially -;;;;;; hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17522 22309)) +;;;;;; hide-ifdef-mode) "hideif" "progmodes/hideif.el" (17520 49736)) ;;; Generated autoloads from progmodes/hideif.el (autoload (quote hide-ifdef-mode) "hideif" "\ @@ -13318,22 +13409,22 @@ how the hiding is done: (defvar hide-ifdef-initially nil "\ *Non-nil means call `hide-ifdefs' when Hide-Ifdef mode is first activated.") -(custom-autoload (quote hide-ifdef-initially) "hideif" t) +(custom-autoload (quote hide-ifdef-initially) "hideif") (defvar hide-ifdef-read-only nil "\ *Set to non-nil if you want buffer to be read-only while hiding text.") -(custom-autoload (quote hide-ifdef-read-only) "hideif" t) +(custom-autoload (quote hide-ifdef-read-only) "hideif") (defvar hide-ifdef-lines nil "\ *Non-nil means hide the #ifX, #else, and #endif lines.") -(custom-autoload (quote hide-ifdef-lines) "hideif" t) +(custom-autoload (quote hide-ifdef-lines) "hideif") ;;;*** ;;;### (autoloads (hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (17504 41540)) +;;;;;; (17771 26718)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (quote ((c-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (c++-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning) (bibtex-mode ("^@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil hs-c-like-adjust-block-beginning))) "\ @@ -13391,7 +13482,7 @@ Key bindings: ;;;;;; highlight-compare-buffers highlight-changes-rotate-faces ;;;;;; highlight-changes-previous-change highlight-changes-next-change ;;;;;; highlight-changes-mode highlight-changes-remove-highlight) -;;;;;; "hilit-chg" "hilit-chg.el" (17504 41540)) +;;;;;; "hilit-chg" "hilit-chg.el" (17781 39501)) ;;; Generated autoloads from hilit-chg.el (autoload (quote highlight-changes-remove-highlight) "hilit-chg" "\ @@ -13521,7 +13612,7 @@ variable `highlight-changes-global-changes-existing-buffers' is non-nil). ;;;;;; hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction ;;;;;; hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space ;;;;;; hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp" -;;;;;; "hippie-exp.el" (17504 41540)) +;;;;;; "hippie-exp.el" (17781 39501)) ;;; Generated autoloads from hippie-exp.el (defvar hippie-expand-try-functions-list (quote (try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol)) "\ @@ -13594,7 +13685,7 @@ argument VERBOSE non-nil makes the function verbose. ;;;*** ;;;### (autoloads (global-hl-line-mode hl-line-mode) "hl-line" "hl-line.el" -;;;;;; (17652 40095)) +;;;;;; (17656 37701)) ;;; Generated autoloads from hl-line.el (autoload (quote hl-line-mode) "hl-line" "\ @@ -13635,7 +13726,7 @@ Global-Hl-Line mode uses the functions `global-hl-line-unhighlight' and ;;;*** ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el" -;;;;;; (17504 41540)) +;;;;;; (17427 10521)) ;;; Generated autoloads from calendar/holidays.el (autoload (quote holidays) "holidays" "\ @@ -13671,8 +13762,35 @@ The optional LABEL is used to label the buffer created. ;;;*** -;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17746 -;;;;;; 34861)) +;;;### (autoloads (hscroll-global-mode hscroll-mode turn-on-hscroll) +;;;;;; "hscroll" "obsolete/hscroll.el" (17786 56015)) +;;; Generated autoloads from obsolete/hscroll.el + +(autoload (quote turn-on-hscroll) "hscroll" "\ +This function is obsolete. +Emacs now does hscrolling automatically, if `truncate-lines' is non-nil. +Also see `automatic-hscrolling'. + +\(fn)" nil nil) + +(autoload (quote hscroll-mode) "hscroll" "\ +This function is obsolete. +Emacs now does hscrolling automatically, if `truncate-lines' is non-nil. +Also see `automatic-hscrolling'. + +\(fn &optional ARG)" t nil) + +(autoload (quote hscroll-global-mode) "hscroll" "\ +This function is obsolete. +Emacs now does hscrolling automatically, if `truncate-lines' is non-nil. +Also see `automatic-hscrolling'. + +\(fn &optional ARG)" t nil) + +;;;*** + +;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (17740 +;;;;;; 981)) ;;; Generated autoloads from gnus/html2text.el (autoload (quote html2text) "html2text" "\ @@ -13704,7 +13822,7 @@ Convert HTML to plain text in the current buffer. ;;;;;; ibuffer-backward-filter-group ibuffer-forward-filter-group ;;;;;; ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group ;;;;;; ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode -;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17701 49517)) +;;;;;; ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" (17698 30385)) ;;; Generated autoloads from ibuf-ext.el (autoload (quote ibuffer-auto-mode) "ibuf-ext" "\ @@ -14070,8 +14188,8 @@ defaults to one. ;;;*** ;;;### (autoloads (define-ibuffer-filter define-ibuffer-op define-ibuffer-sorter -;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17504 -;;;;;; 41540)) +;;;;;; define-ibuffer-column) "ibuf-macs" "ibuf-macs.el" (17476 +;;;;;; 4797)) ;;; Generated autoloads from ibuf-macs.el (autoload (quote define-ibuffer-column) "ibuf-macs" "\ @@ -14160,7 +14278,7 @@ bound to the current value of the filter. ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (17652 14941)) +;;;;;; "ibuffer" "ibuffer.el" (17647 30728)) ;;; Generated autoloads from ibuffer.el (autoload (quote ibuffer-list-buffers) "ibuffer" "\ @@ -14201,7 +14319,7 @@ FORMATS is the value to use for `ibuffer-formats'. ;;;### (autoloads (icalendar-import-buffer icalendar-import-file ;;;;;; icalendar-export-region icalendar-export-file) "icalendar" -;;;;;; "calendar/icalendar.el" (17504 41540)) +;;;;;; "calendar/icalendar.el" (17797 50970)) ;;; Generated autoloads from calendar/icalendar.el (autoload (quote icalendar-export-file) "icalendar" "\ @@ -14253,8 +14371,8 @@ buffer `*icalendar-errors*'. ;;;*** -;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17686 -;;;;;; 53336)) +;;;### (autoloads (icomplete-mode) "icomplete" "icomplete.el" (17772 +;;;;;; 23868)) ;;; Generated autoloads from icomplete.el (defvar icomplete-mode nil "\ @@ -14274,7 +14392,7 @@ With a numeric argument, turn Icomplete mode on iff ARG is positive. ;;;*** -;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17504 41540)) +;;;### (autoloads (icon-mode) "icon" "progmodes/icon.el" (17394 12938)) ;;; Generated autoloads from progmodes/icon.el (autoload (quote icon-mode) "icon" "\ @@ -14315,7 +14433,7 @@ with no args, if that value is non-nil. ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" -;;;;;; (17596 14703)) +;;;;;; (17763 7936)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload (quote idlwave-shell) "idlw-shell" "\ @@ -14341,11 +14459,11 @@ See also the variable `idlwave-shell-prompt-pattern'. ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" -;;;;;; (17746 34862)) +;;;;;; (17789 35159)) ;;; Generated autoloads from progmodes/idlwave.el (autoload (quote idlwave-mode) "idlwave" "\ -Major mode for editing IDL source files (version 6.0_em22). +Major mode for editing IDL source files (version 6.1_em22). The main features of this mode are @@ -14476,8 +14594,8 @@ The main features of this mode are ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17759 -;;;;;; 28868)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17796 +;;;;;; 10831)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14738,7 +14856,7 @@ DEF, if non-nil, is the default value. ;;;*** -;;;### (autoloads (ielm) "ielm" "ielm.el" (17504 41540)) +;;;### (autoloads (ielm) "ielm" "ielm.el" (17781 39501)) ;;; Generated autoloads from ielm.el (add-hook 'same-window-buffer-names "*ielm*") @@ -14751,7 +14869,7 @@ Switches to the buffer `*ielm*', or creates it if it does not exist. ;;;*** ;;;### (autoloads (iimage-mode turn-on-iimage-mode) "iimage" "iimage.el" -;;;;;; (17504 41540)) +;;;;;; (17771 26718)) ;;; Generated autoloads from iimage.el (autoload (quote turn-on-iimage-mode) "iimage" "\ @@ -14770,7 +14888,7 @@ Toggle inline image minor mode. ;;;;;; insert-image put-image create-image image-type-available-p ;;;;;; image-type image-type-from-file-name image-type-from-file-header ;;;;;; image-type-from-buffer image-type-from-data) "image" "image.el" -;;;;;; (17504 41540)) +;;;;;; (17800 14311)) ;;; Generated autoloads from image.el (autoload (quote image-type-from-data) "image" "\ @@ -14932,7 +15050,7 @@ Example: ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp ;;;;;; image-file-name-regexps image-file-name-extensions) "image-file" -;;;;;; "image-file.el" (17504 41540)) +;;;;;; "image-file.el" (17385 8485)) ;;; Generated autoloads from image-file.el (defvar image-file-name-extensions (quote ("png" "jpeg" "jpg" "gif" "tiff" "tif" "xbm" "xpm" "pbm" "pgm" "ppm" "pnm")) "\ @@ -14945,7 +15063,7 @@ setting this variable directly does not take effect unless `auto-image-file-mode' is re-enabled; this happens automatically when the variable is set using \\[customize].") -(custom-autoload (quote image-file-name-extensions) "image-file" nil) +(custom-autoload (quote image-file-name-extensions) "image-file") (defvar image-file-name-regexps nil "\ *List of regexps matching image-file filenames. @@ -14957,7 +15075,7 @@ enabled, setting this variable directly does not take effect unless `auto-image-file-mode' is re-enabled; this happens automatically when the variable is set using \\[customize].") -(custom-autoload (quote image-file-name-regexps) "image-file" nil) +(custom-autoload (quote image-file-name-regexps) "image-file") (autoload (quote image-file-name-regexp) "image-file" "\ Return a regular expression matching image-file filenames. @@ -14975,10 +15093,11 @@ the command `insert-file-contents'. Non-nil if Auto-Image-File mode is enabled. See the command `auto-image-file-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `auto-image-file-mode'.") +use either \\[customize] or the function `auto-image-file-mode'.") -(custom-autoload (quote auto-image-file-mode) "image-file" nil) +(custom-autoload (quote auto-image-file-mode) "image-file") + +(put (quote auto-image-file-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote auto-image-file-mode) "image-file" "\ Toggle visiting of image files as images. @@ -14994,7 +15113,7 @@ Image files are those whose name has an extension in ;;;*** ;;;### (autoloads (image-mode-maybe image-minor-mode image-mode) -;;;;;; "image-mode" "image-mode.el" (17652 40095)) +;;;;;; "image-mode" "image-mode.el" (17656 37701)) ;;; Generated autoloads from image-mode.el (push '("\\.jpe?g\\'" . image-mode) auto-mode-alist) (push '("\\.png\\'" . image-mode) auto-mode-alist) @@ -15032,7 +15151,7 @@ information on these modes. ;;;*** ;;;### (autoloads (imenu imenu-add-menubar-index imenu-add-to-menubar -;;;;;; imenu-sort-function) "imenu" "imenu.el" (17656 34193)) +;;;;;; imenu-sort-function) "imenu" "imenu.el" (17781 39501)) ;;; Generated autoloads from imenu.el (defvar imenu-sort-function nil "\ @@ -15147,7 +15266,7 @@ for more information. ;;;### (autoloads (indian-char-glyph indian-glyph-char in-is13194-pre-write-conversion ;;;;;; in-is13194-post-read-conversion indian-compose-string indian-compose-region) -;;;;;; "ind-util" "language/ind-util.el" (17504 41540)) +;;;;;; "ind-util" "language/ind-util.el" (17788 21816)) ;;; Generated autoloads from language/ind-util.el (autoload (quote indian-compose-region) "ind-util" "\ @@ -15190,7 +15309,7 @@ See also the function `indian-glyph-char'. ;;;### (autoloads (inferior-lisp inferior-lisp-prompt inferior-lisp-load-command ;;;;;; inferior-lisp-program inferior-lisp-filter-regexp) "inf-lisp" -;;;;;; "progmodes/inf-lisp.el" (17541 35103)) +;;;;;; "progmodes/inf-lisp.el" (17536 30816)) ;;; Generated autoloads from progmodes/inf-lisp.el (defvar inferior-lisp-filter-regexp "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'" "\ @@ -15199,12 +15318,12 @@ Input matching this regexp is not saved on the input history in Inferior Lisp mode. Default is whitespace followed by 0 or 1 single-letter colon-keyword \(as in :a, :c, etc.)") -(custom-autoload (quote inferior-lisp-filter-regexp) "inf-lisp" t) +(custom-autoload (quote inferior-lisp-filter-regexp) "inf-lisp") (defvar inferior-lisp-program "lisp" "\ *Program name for invoking an inferior Lisp in Inferior Lisp mode.") -(custom-autoload (quote inferior-lisp-program) "inf-lisp" t) +(custom-autoload (quote inferior-lisp-program) "inf-lisp") (defvar inferior-lisp-load-command "(load \"%s\")\n" "\ *Format-string for building a Lisp expression to load a file. @@ -15215,7 +15334,7 @@ The string \"(progn (load \\\"%s\\\" :verbose nil :print t) (values))\\n\" produces cosmetically superior output for this application, but it works only in Common Lisp.") -(custom-autoload (quote inferior-lisp-load-command) "inf-lisp" t) +(custom-autoload (quote inferior-lisp-load-command) "inf-lisp") (defvar inferior-lisp-prompt "^[^> \n]*>+:? *" "\ Regexp to recognize prompts in the Inferior Lisp mode. @@ -15233,7 +15352,7 @@ kcl: \"^>+ *\" This is a fine thing to set in your .emacs file or through Custom.") -(custom-autoload (quote inferior-lisp-prompt) "inf-lisp" t) +(custom-autoload (quote inferior-lisp-prompt) "inf-lisp") (defvar inferior-lisp-mode-hook (quote nil) "\ *Hook for customising Inferior Lisp mode.") @@ -15257,7 +15376,7 @@ of `inferior-lisp-program'). Runs the hooks from ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node ;;;;;; Info-goto-emacs-command-node Info-mode info-apropos Info-index ;;;;;; Info-directory Info-on-current-buffer info-standalone info-emacs-manual -;;;;;; info info-other-window) "info" "info.el" (17665 54360)) +;;;;;; info info-other-window) "info" "info.el" (17798 49643)) ;;; Generated autoloads from info.el (autoload (quote info-other-window) "info" "\ @@ -15423,7 +15542,7 @@ This will add a speedbar major display mode. ;;;### (autoloads (info-complete-file info-complete-symbol info-lookup-file ;;;;;; info-lookup-symbol info-lookup-reset) "info-look" "info-look.el" -;;;;;; (17746 34860)) +;;;;;; (17771 1419)) ;;; Generated autoloads from info-look.el (autoload (quote info-lookup-reset) "info-look" "\ @@ -15471,7 +15590,7 @@ Perform completion on file preceding point. ;;;*** ;;;### (autoloads (info-xref-check-all-custom info-xref-check-all -;;;;;; info-xref-check) "info-xref" "info-xref.el" (17522 22308)) +;;;;;; info-xref-check) "info-xref" "info-xref.el" (17520 49736)) ;;; Generated autoloads from info-xref.el (autoload (quote info-xref-check) "info-xref" "\ @@ -15498,7 +15617,7 @@ quite a while. ;;;*** ;;;### (autoloads (batch-info-validate Info-validate Info-split Info-tagify) -;;;;;; "informat" "informat.el" (17504 41540)) +;;;;;; "informat" "informat.el" (17781 39501)) ;;; Generated autoloads from informat.el (autoload (quote Info-tagify) "informat" "\ @@ -15539,7 +15658,7 @@ For example, invoke \"emacs -batch -f batch-info-validate $info/ ~/*.info\" ;;;### (autoloads (isearch-process-search-multibyte-characters isearch-toggle-input-method ;;;;;; isearch-toggle-specified-input-method) "isearch-x" "international/isearch-x.el" -;;;;;; (17504 41540)) +;;;;;; (17792 9561)) ;;; Generated autoloads from international/isearch-x.el (autoload (quote isearch-toggle-specified-input-method) "isearch-x" "\ @@ -15559,8 +15678,8 @@ Not documented ;;;*** -;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (isearchb-activate) "isearchb" "isearchb.el" (17794 +;;;;;; 48602)) ;;; Generated autoloads from isearchb.el (autoload (quote isearchb-activate) "isearchb" "\ @@ -15573,10 +15692,41 @@ accessed via isearchb. ;;;*** +;;;### (autoloads (iso-accents-mode) "iso-acc" "obsolete/iso-acc.el" +;;;;;; (17385 8495)) +;;; Generated autoloads from obsolete/iso-acc.el + +(autoload (quote iso-accents-mode) "iso-acc" "\ +Toggle ISO Accents mode, in which accents modify the following letter. +This permits easy insertion of accented characters according to ISO-8859-1. +When Iso-accents mode is enabled, accent character keys +\(`, ', \", ^, / and ~) do not self-insert; instead, they modify the following +letter key so that it inserts an ISO accented letter. + +You can customize ISO Accents mode to a particular language +with the command `iso-accents-customize'. + +Special combinations: ~c gives a c with cedilla, +~d gives an Icelandic eth (d with dash). +~t gives an Icelandic thorn. +\"s gives German sharp s. +/a gives a with ring. +/e gives an a-e ligature. +~< and ~> give guillemots. +~! gives an inverted exclamation mark. +~? gives an inverted question mark. + +With an argument, a positive argument enables ISO Accents mode, +and a negative argument disables it. + +\(fn &optional ARG)" t nil) + +;;;*** + ;;;### (autoloads (iso-cvt-define-menu iso-cvt-write-only iso-cvt-read-only ;;;;;; iso-sgml2iso iso-iso2sgml iso-iso2duden iso-iso2gtex iso-gtex2iso ;;;;;; iso-tex2iso iso-iso2tex iso-german iso-spanish) "iso-cvt" -;;;;;; "international/iso-cvt.el" (17504 41540)) +;;;;;; "international/iso-cvt.el" (17788 21815)) ;;; Generated autoloads from international/iso-cvt.el (autoload (quote iso-spanish) "iso-cvt" "\ @@ -15660,7 +15810,7 @@ Add submenus to the File menu, to convert to and from various formats. ;;;*** ;;;### (autoloads nil "iso-transl" "international/iso-transl.el" -;;;;;; (17504 41540)) +;;;;;; (17788 21815)) ;;; Generated autoloads from international/iso-transl.el (or key-translation-map (setq key-translation-map (make-sparse-keymap))) (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map) @@ -15673,7 +15823,7 @@ Add submenus to the File menu, to convert to and from various formats. ;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell ;;;;;; ispell-help ispell-pdict-save ispell-word ispell-local-dictionary-alist ;;;;;; ispell-personal-dictionary) "ispell" "textmodes/ispell.el" -;;;;;; (17746 34863)) +;;;;;; (17743 18144)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -15961,18 +16111,19 @@ You can bind this to the key C-c i in GNUS or mail by adding to ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (17440 +;;;;;; 13082)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ Non-nil if Iswitchb mode is enabled. See the command `iswitchb-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `iswitchb-mode'.") +use either \\[customize] or the function `iswitchb-mode'.") -(custom-autoload (quote iswitchb-mode) "iswitchb" nil) +(custom-autoload (quote iswitchb-mode) "iswitchb") + +(put (quote iswitchb-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote iswitchb-mode) "iswitchb" "\ Toggle Iswitchb global minor mode. @@ -15987,7 +16138,7 @@ This mode enables switching between buffers using substrings. See ;;;### (autoloads (read-hiragana-string japanese-zenkaku-region japanese-hankaku-region ;;;;;; japanese-hiragana-region japanese-katakana-region japanese-zenkaku ;;;;;; japanese-hankaku japanese-hiragana japanese-katakana setup-japanese-environment-internal) -;;;;;; "japan-util" "language/japan-util.el" (17504 41540)) +;;;;;; "japan-util" "language/japan-util.el" (17792 9562)) ;;; Generated autoloads from language/japan-util.el (autoload (quote setup-japanese-environment-internal) "japan-util" "\ @@ -16065,7 +16216,7 @@ If non-nil, second arg INITIAL-INPUT is a string to insert before reading. ;;;*** ;;;### (autoloads (jka-compr-uninstall jka-compr-handler) "jka-compr" -;;;;;; "jka-compr.el" (17504 41540)) +;;;;;; "jka-compr.el" (17781 39501)) ;;; Generated autoloads from jka-compr.el (defvar jka-compr-inhibit nil "\ @@ -16090,7 +16241,7 @@ by `jka-compr-installed'. ;;;### (autoloads (keypad-setup keypad-numlock-shifted-setup keypad-shifted-setup ;;;;;; keypad-numlock-setup keypad-setup) "keypad" "emulation/keypad.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8491)) ;;; Generated autoloads from emulation/keypad.el (defvar keypad-setup nil "\ @@ -16098,28 +16249,28 @@ Specifies the keypad setup for unshifted keypad keys when NumLock is off. When selecting the plain numeric keypad setup, the character returned by the decimal key must be specified.") -(custom-autoload (quote keypad-setup) "keypad" nil) +(custom-autoload (quote keypad-setup) "keypad") (defvar keypad-numlock-setup nil "\ Specifies the keypad setup for unshifted keypad keys when NumLock is on. When selecting the plain numeric keypad setup, the character returned by the decimal key must be specified.") -(custom-autoload (quote keypad-numlock-setup) "keypad" nil) +(custom-autoload (quote keypad-numlock-setup) "keypad") (defvar keypad-shifted-setup nil "\ Specifies the keypad setup for shifted keypad keys when NumLock is off. When selecting the plain numeric keypad setup, the character returned by the decimal key must be specified.") -(custom-autoload (quote keypad-shifted-setup) "keypad" nil) +(custom-autoload (quote keypad-shifted-setup) "keypad") (defvar keypad-numlock-shifted-setup nil "\ Specifies the keypad setup for shifted keypad keys when NumLock is off. When selecting the plain numeric keypad setup, the character returned by the decimal key must be specified.") -(custom-autoload (quote keypad-numlock-shifted-setup) "keypad" nil) +(custom-autoload (quote keypad-numlock-shifted-setup) "keypad") (autoload (quote keypad-setup) "keypad" "\ Set keypad bindings in function-key-map according to SETUP. @@ -16146,7 +16297,7 @@ the decimal key on the keypad is mapped to DECIMAL instead of `.' ;;;*** ;;;### (autoloads (kinsoku) "kinsoku" "international/kinsoku.el" -;;;;;; (17504 41540)) +;;;;;; (17792 9561)) ;;; Generated autoloads from international/kinsoku.el (autoload (quote kinsoku) "kinsoku" "\ @@ -16167,8 +16318,8 @@ the context of text formatting. ;;;*** -;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17721 -;;;;;; 3805)) +;;;### (autoloads (kkc-region) "kkc" "international/kkc.el" (17792 +;;;;;; 9561)) ;;; Generated autoloads from international/kkc.el (defvar kkc-after-update-conversion-functions nil "\ @@ -16193,7 +16344,7 @@ and the return value is the length of the conversion. ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro ;;;;;; kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter ;;;;;; kmacro-call-macro kmacro-end-macro kmacro-start-macro) "kmacro" -;;;;;; "kmacro.el" (17652 14942)) +;;;;;; "kmacro.el" (17770 2412)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16300,7 +16451,7 @@ If kbd macro currently being defined end it before activating it. ;;;### (autoloads (kannada-post-read-conversion kannada-compose-string ;;;;;; kannada-compose-region) "knd-util" "language/knd-util.el" -;;;;;; (17504 41540)) +;;;;;; (17788 21816)) ;;; Generated autoloads from language/knd-util.el (defconst kannada-consonant "[\x51f75-\x51fb9]") @@ -16323,7 +16474,7 @@ Not documented ;;;*** ;;;### (autoloads (setup-korean-environment-internal) "korea-util" -;;;;;; "language/korea-util.el" (17504 41540)) +;;;;;; "language/korea-util.el" (17792 9562)) ;;; Generated autoloads from language/korea-util.el (defvar default-korean-keyboard (if (string-match "3" (or (getenv "HANGUL_KEYBOARD_TYPE") "")) "3" "") "\ @@ -16338,7 +16489,7 @@ Not documented ;;;*** ;;;### (autoloads (lm lm-test-run) "landmark" "play/landmark.el" -;;;;;; (17580 16977)) +;;;;;; (17786 56015)) ;;; Generated autoloads from play/landmark.el (defalias (quote landmark-repeat) (quote lm-test-run)) @@ -16372,8 +16523,8 @@ Use \\[describe-mode] for more info. ;;;### (autoloads (lao-compose-region lao-composition-function lao-post-read-conversion ;;;;;; lao-transcribe-roman-to-lao-string lao-transcribe-single-roman-syllable-to-lao -;;;;;; lao-compose-string) "lao-util" "language/lao-util.el" (17504 -;;;;;; 41540)) +;;;;;; lao-compose-string) "lao-util" "language/lao-util.el" (17792 +;;;;;; 9562)) ;;; Generated autoloads from language/lao-util.el (autoload (quote lao-compose-string) "lao-util" "\ @@ -16422,7 +16573,7 @@ Not documented ;;;### (autoloads (latexenc-find-file-coding-system latexenc-coding-system-to-inputenc ;;;;;; latexenc-inputenc-to-coding-system latex-inputenc-coding-alist) -;;;;;; "latexenc" "international/latexenc.el" (17664 29029)) +;;;;;; "latexenc" "international/latexenc.el" (17664 20313)) ;;; Generated autoloads from international/latexenc.el (defvar latex-inputenc-coding-alist (quote (("ansinew" . windows-1252) ("applemac" . mac-roman) ("ascii" . us-ascii) ("cp1250" . windows-1250) ("cp1252" . windows-1252) ("cp1257" . cp1257) ("cp437de" . cp437) ("cp437" . cp437) ("cp850" . cp850) ("cp852" . cp852) ("cp858" . cp858) ("cp865" . cp865) ("latin1" . iso-8859-1) ("latin2" . iso-8859-2) ("latin3" . iso-8859-3) ("latin4" . iso-8859-4) ("latin5" . iso-8859-5) ("latin9" . iso-8859-15) ("next" . next) ("utf8" . utf-8) ("utf8x" . utf-8))) "\ @@ -16454,7 +16605,7 @@ coding system names is determined from `latex-inputenc-coding-alist'. ;;;*** ;;;### (autoloads (latin1-display-ucs-per-lynx latin1-display latin1-display) -;;;;;; "latin1-disp" "international/latin1-disp.el" (17504 41540)) +;;;;;; "latin1-disp" "international/latin1-disp.el" (17788 21815)) ;;; Generated autoloads from international/latin1-disp.el (defvar latin1-display nil "\ @@ -16497,8 +16648,76 @@ use either \\[customize] or the function `latin1-display'.") ;;;*** +;;;### (autoloads (turn-on-lazy-lock lazy-lock-mode) "lazy-lock" +;;;;;; "obsolete/lazy-lock.el" (17385 8495)) +;;; Generated autoloads from obsolete/lazy-lock.el + +(autoload (quote lazy-lock-mode) "lazy-lock" "\ +Toggle Lazy Lock mode. +With arg, turn Lazy Lock mode on if and only if arg is positive. Enable it +automatically in your `~/.emacs' by: + + (setq font-lock-support-mode 'lazy-lock-mode) + +For a newer font-lock support mode with similar functionality, see +`jit-lock-mode'. Eventually, Lazy Lock mode will be deprecated in +JIT Lock's favor. + +When Lazy Lock mode is enabled, fontification can be lazy in a number of ways: + +- Demand-driven buffer fontification if `lazy-lock-minimum-size' is non-nil. + This means initial fontification does not occur if the buffer is greater than + `lazy-lock-minimum-size' characters in length. Instead, fontification occurs + when necessary, such as when scrolling through the buffer would otherwise + reveal unfontified areas. This is useful if buffer fontification is too slow + for large buffers. + +- Deferred scroll fontification if `lazy-lock-defer-on-scrolling' is non-nil. + This means demand-driven fontification does not occur as you scroll. + Instead, fontification is deferred until after `lazy-lock-defer-time' seconds + of Emacs idle time, while Emacs remains idle. This is useful if + fontification is too slow to keep up with scrolling. + +- Deferred on-the-fly fontification if `lazy-lock-defer-on-the-fly' is non-nil. + This means on-the-fly fontification does not occur as you type. Instead, + fontification is deferred until after `lazy-lock-defer-time' seconds of Emacs + idle time, while Emacs remains idle. This is useful if fontification is too + slow to keep up with your typing. + +- Deferred context fontification if `lazy-lock-defer-contextually' is non-nil. + This means fontification updates the buffer corresponding to true syntactic + context, after `lazy-lock-defer-time' seconds of Emacs idle time, while Emacs + remains idle. Otherwise, fontification occurs on modified lines only, and + subsequent lines can remain fontified corresponding to previous syntactic + contexts. This is useful where strings or comments span lines. + +- Stealthy buffer fontification if `lazy-lock-stealth-time' is non-nil. + This means remaining unfontified areas of buffers are fontified if Emacs has + been idle for `lazy-lock-stealth-time' seconds, while Emacs remains idle. + This is useful if any buffer has any deferred fontification. + +Basic Font Lock mode on-the-fly fontification behavior fontifies modified +lines only. Thus, if `lazy-lock-defer-contextually' is non-nil, Lazy Lock mode +on-the-fly fontification may fontify differently, albeit correctly. In any +event, to refontify some lines you can use \\[font-lock-fontify-block]. + +Stealth fontification only occurs while the system remains unloaded. +If the system load rises above `lazy-lock-stealth-load' percent, stealth +fontification is suspended. Stealth fontification intensity is controlled via +the variable `lazy-lock-stealth-nice' and `lazy-lock-stealth-lines', and +verbosity is controlled via the variable `lazy-lock-stealth-verbose'. + +\(fn &optional ARG)" t nil) + +(autoload (quote turn-on-lazy-lock) "lazy-lock" "\ +Unconditionally turn on Lazy Lock mode. + +\(fn)" nil nil) + +;;;*** + ;;;### (autoloads (ld-script-mode) "ld-script" "progmodes/ld-script.el" -;;;;;; (17610 3931)) +;;;;;; (17788 21816)) ;;; Generated autoloads from progmodes/ld-script.el (add-to-list (quote auto-mode-alist) (quote ("\\.ld[si]?\\>" . ld-script-mode))) @@ -16513,7 +16732,7 @@ A major mode to edit GNU ld script files ;;;*** ;;;### (autoloads (ledit-from-lisp-mode ledit-mode) "ledit" "ledit.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39501)) ;;; Generated autoloads from ledit.el (defconst ledit-save-files t "\ @@ -16534,6 +16753,7 @@ Like Lisp mode, plus these special commands: \\[ledit-go-to-lisp] -- transfer to Lisp job and transmit saved text. \\[ledit-go-to-liszt] -- transfer to Liszt (Lisp compiler) job and transmit saved text. + \\{ledit-mode-map} To make Lisp mode automatically change to Ledit mode, do (setq lisp-mode-hook 'ledit-from-lisp-mode) @@ -16547,7 +16767,7 @@ Not documented ;;;*** -;;;### (autoloads (life) "life" "play/life.el" (17675 64484)) +;;;### (autoloads (life) "life" "play/life.el" (17674 51268)) ;;; Generated autoloads from play/life.el (autoload (quote life) "life" "\ @@ -16560,8 +16780,8 @@ generations (this defaults to 1). ;;;*** -;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17746 -;;;;;; 34860)) +;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (17781 +;;;;;; 39501)) ;;; Generated autoloads from loadhist.el (autoload (quote unload-feature) "loadhist" "\ @@ -16584,7 +16804,7 @@ such as redefining an Emacs function. ;;;*** ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches) -;;;;;; "locate" "locate.el" (17668 1406)) +;;;;;; "locate" "locate.el" (17771 1419)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches "-al" "\ @@ -16631,7 +16851,7 @@ except that FILTER is not optional. ;;;*** -;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17504 41540)) +;;;### (autoloads (log-edit) "log-edit" "log-edit.el" (17781 39502)) ;;; Generated autoloads from log-edit.el (autoload (quote log-edit) "log-edit" "\ @@ -16652,8 +16872,8 @@ If BUFFER is non-nil `log-edit' will jump to that buffer, use it to edit the ;;;*** -;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (log-view-mode) "log-view" "log-view.el" (17587 +;;;;;; 57939)) ;;; Generated autoloads from log-view.el (autoload (quote log-view-mode) "log-view" "\ @@ -16663,8 +16883,8 @@ Major mode for browsing CVS log output. ;;;*** -;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17710 -;;;;;; 3074)) +;;;### (autoloads (longlines-mode) "longlines" "longlines.el" (17771 +;;;;;; 1419)) ;;; Generated autoloads from longlines.el (autoload (quote longlines-mode) "longlines" "\ @@ -16685,8 +16905,8 @@ are indicated with a symbol. ;;;*** ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer -;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17686 -;;;;;; 35928)) +;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (17682 +;;;;;; 43101)) ;;; Generated autoloads from lpr.el (defvar lpr-windows-system (memq system-type (quote (emx win32 w32 mswindows ms-dos windows-nt)))) @@ -16780,7 +17000,7 @@ for further customization of the printer command. ;;;*** ;;;### (autoloads (ls-lisp-support-shell-wildcards) "ls-lisp" "ls-lisp.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39502)) ;;; Generated autoloads from ls-lisp.el (defvar ls-lisp-support-shell-wildcards t "\ @@ -16791,8 +17011,8 @@ Otherwise they are treated as Emacs regexps (for backward compatibility).") ;;;*** -;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17386 +;;;;;; 33146)) ;;; Generated autoloads from calendar/lunar.el (autoload (quote phases-of-moon) "lunar" "\ @@ -16805,8 +17025,8 @@ This function is suitable for execution in a .emacs file. ;;;*** -;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (m4-mode) "m4-mode" "progmodes/m4-mode.el" (17394 +;;;;;; 12938)) ;;; Generated autoloads from progmodes/m4-mode.el (autoload (quote m4-mode) "m4-mode" "\ @@ -16818,7 +17038,7 @@ A major mode to edit m4 macro files. ;;;*** ;;;### (autoloads (macroexpand-all) "macroexp" "emacs-lisp/macroexp.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8490)) ;;; Generated autoloads from emacs-lisp/macroexp.el (autoload (quote macroexpand-all) "macroexp" "\ @@ -16832,7 +17052,7 @@ definitions to shadow the loaded ones for use in file byte-compilation. ;;;*** ;;;### (autoloads (apply-macro-to-region-lines kbd-macro-query insert-kbd-macro -;;;;;; name-last-kbd-macro) "macros" "macros.el" (17504 41540)) +;;;;;; name-last-kbd-macro) "macros" "macros.el" (17781 39502)) ;;; Generated autoloads from macros.el (autoload (quote name-last-kbd-macro) "macros" "\ @@ -16921,7 +17141,7 @@ and then select the region of un-tablified names and use ;;;*** ;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr" -;;;;;; "mail/mail-extr.el" (17504 41540)) +;;;;;; "mail/mail-extr.el" (17385 8494)) ;;; Generated autoloads from mail/mail-extr.el (autoload (quote mail-extract-address-components) "mail-extr" "\ @@ -16953,7 +17173,7 @@ Convert mail domain DOMAIN to the country it corresponds to. ;;;### (autoloads (mail-hist-put-headers-into-history mail-hist-keep-history ;;;;;; mail-hist-enable mail-hist-define-keys) "mail-hist" "mail/mail-hist.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from mail/mail-hist.el (autoload (quote mail-hist-define-keys) "mail-hist" "\ @@ -16984,8 +17204,8 @@ This function normally would be called when the message is sent. ;;;### (autoloads (mail-fetch-field mail-unquote-printable-region ;;;;;; mail-unquote-printable mail-quote-printable mail-file-babyl-p -;;;;;; mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17504 -;;;;;; 41540)) +;;;;;; mail-use-rfc822) "mail-utils" "mail/mail-utils.el" (17385 +;;;;;; 8494)) ;;; Generated autoloads from mail/mail-utils.el (defvar mail-use-rfc822 nil "\ @@ -16993,7 +17213,7 @@ This function normally would be called when the message is sent. Otherwise, (the default) use a smaller, somewhat faster, and often correct parser.") -(custom-autoload (quote mail-use-rfc822) "mail-utils" t) +(custom-autoload (quote mail-use-rfc822) "mail-utils") (autoload (quote mail-file-babyl-p) "mail-utils" "\ Not documented @@ -17037,7 +17257,7 @@ If 4th arg LIST is non-nil, return a list of all such fields. ;;;*** ;;;### (autoloads (define-mail-abbrev build-mail-abbrevs mail-abbrevs-setup) -;;;;;; "mailabbrev" "mail/mailabbrev.el" (17504 41540)) +;;;;;; "mailabbrev" "mail/mailabbrev.el" (17786 56015)) ;;; Generated autoloads from mail/mailabbrev.el (autoload (quote mail-abbrevs-setup) "mailabbrev" "\ @@ -17060,8 +17280,8 @@ If DEFINITION contains multiple addresses, separate them with commas. ;;;*** ;;;### (autoloads (mail-complete define-mail-alias expand-mail-aliases -;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (17504 -;;;;;; 41540)) +;;;;;; mail-complete-style) "mailalias" "mail/mailalias.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from mail/mailalias.el (defvar mail-complete-style (quote angles) "\ @@ -17107,7 +17327,7 @@ current header, calls `mail-complete-function' and passes prefix arg if any. ;;;*** ;;;### (autoloads (mailclient-send-it) "mailclient" "mail/mailclient.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/mailclient.el (autoload (quote mailclient-send-it) "mailclient" "\ @@ -17121,7 +17341,7 @@ The mail client is taken to be the handler of mailto URLs. ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode ;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) -;;;;;; "make-mode" "progmodes/make-mode.el" (17701 49519)) +;;;;;; "make-mode" "progmodes/make-mode.el" (17692 12587)) ;;; Generated autoloads from progmodes/make-mode.el (autoload (quote makefile-mode) "make-mode" "\ @@ -17238,8 +17458,8 @@ An adapted `makefile-mode' that knows about imake. ;;;*** -;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (make-command-summary) "makesum" "makesum.el" (17781 +;;;;;; 39502)) ;;; Generated autoloads from makesum.el (autoload (quote make-command-summary) "makesum" "\ @@ -17250,7 +17470,7 @@ Previous contents of that buffer are killed first. ;;;*** -;;;### (autoloads (man-follow man) "man" "man.el" (17658 57980)) +;;;### (autoloads (man-follow man) "man" "man.el" (17786 62407)) ;;; Generated autoloads from man.el (defalias (quote manual-entry) (quote man)) @@ -17277,7 +17497,7 @@ Get a Un*x manual page of the item under point and put it in a buffer. ;;;*** -;;;### (autoloads (master-mode) "master" "master.el" (17504 41540)) +;;;### (autoloads (master-mode) "master" "master.el" (17781 39502)) ;;; Generated autoloads from master.el (autoload (quote master-mode) "master" "\ @@ -17299,8 +17519,8 @@ yourself the value of `master-of' by calling `master-show-slave'. ;;;*** -;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17759 -;;;;;; 28868)) +;;;### (autoloads (menu-bar-mode) "menu-bar" "menu-bar.el" (17788 +;;;;;; 29144)) ;;; Generated autoloads from menu-bar.el (put (quote menu-bar-mode) (quote standard-value) (quote (t))) @@ -17335,7 +17555,7 @@ turn on menu bars; otherwise, turn off menu bars. ;;;;;; message-cite-function message-yank-prefix message-citation-line-function ;;;;;; message-send-mail-function message-user-organization-file ;;;;;; message-signature-separator message-from-style) "message" -;;;;;; "gnus/message.el" (17759 28869)) +;;;;;; "gnus/message.el" (17756 33825)) ;;; Generated autoloads from gnus/message.el (defvar message-from-style (quote default) "\ @@ -17589,7 +17809,7 @@ which specify the range to operate on. ;;;*** ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17394 12938)) ;;; Generated autoloads from progmodes/meta-mode.el (autoload (quote metafont-mode) "meta-mode" "\ @@ -17616,7 +17836,7 @@ Turning on MetaPost mode calls the value of the variable ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body ;;;;;; metamail-interpret-header) "metamail" "mail/metamail.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from mail/metamail.el (autoload (quote metamail-interpret-header) "metamail" "\ @@ -17661,7 +17881,7 @@ redisplayed as output is inserted. ;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose ;;;;;; mh-smail-batch mh-smail-other-window mh-smail) "mh-comp" -;;;;;; "mh-e/mh-comp.el" (17690 32932)) +;;;;;; "mh-e/mh-comp.el" (17689 24335)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload (quote mh-smail) "mh-comp" "\ @@ -17748,7 +17968,7 @@ delete the draft message. ;;;*** -;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17759 28870)) +;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (17752 39352)) ;;; Generated autoloads from mh-e/mh-e.el (put (quote mh-progs) (quote risky-local-variable) t) @@ -17765,7 +17985,7 @@ Display version information about MH-E and the MH mail handling system. ;;;*** ;;;### (autoloads (mh-folder-mode mh-nmail mh-rmail) "mh-folder" -;;;;;; "mh-e/mh-folder.el" (17504 41540)) +;;;;;; "mh-e/mh-folder.el" (17485 5461)) ;;; Generated autoloads from mh-e/mh-folder.el (autoload (quote mh-rmail) "mh-folder" "\ @@ -17847,7 +18067,7 @@ perform the operation on all messages in that region. ;;;*** ;;;### (autoloads (midnight-delay-set clean-buffer-list) "midnight" -;;;;;; "midnight.el" (17731 48935)) +;;;;;; "midnight.el" (17781 39502)) ;;; Generated autoloads from midnight.el (autoload (quote clean-buffer-list) "midnight" "\ @@ -17874,17 +18094,18 @@ to its second argument TM. ;;;*** ;;;### (autoloads (minibuffer-electric-default-mode) "minibuf-eldef" -;;;;;; "minibuf-eldef.el" (17504 41540)) +;;;;;; "minibuf-eldef.el" (17385 8487)) ;;; Generated autoloads from minibuf-eldef.el (defvar minibuffer-electric-default-mode nil "\ Non-nil if Minibuffer-Electric-Default mode is enabled. See the command `minibuffer-electric-default-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `minibuffer-electric-default-mode'.") +use either \\[customize] or the function `minibuffer-electric-default-mode'.") + +(custom-autoload (quote minibuffer-electric-default-mode) "minibuf-eldef") -(custom-autoload (quote minibuffer-electric-default-mode) "minibuf-eldef" nil) +(put (quote minibuffer-electric-default-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote minibuffer-electric-default-mode) "minibuf-eldef" "\ Toggle Minibuffer Electric Default mode. @@ -17902,7 +18123,7 @@ Returns non-nil if the new state is enabled. ;;;*** ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17394 12938)) ;;; Generated autoloads from progmodes/mixal-mode.el (autoload (quote mixal-mode) "mixal-mode" "\ @@ -17917,7 +18138,7 @@ Major mode for the mixal asm language. ;;;### (autoloads (malayalam-composition-function malayalam-post-read-conversion ;;;;;; malayalam-compose-region) "mlm-util" "language/mlm-util.el" -;;;;;; (17504 41540)) +;;;;;; (17788 21816)) ;;; Generated autoloads from language/mlm-util.el (autoload (quote malayalam-compose-region) "mlm-util" "\ @@ -17940,7 +18161,7 @@ PATTERN regexp. ;;;*** ;;;### (autoloads (mm-inline-external-body mm-extern-cache-contents) -;;;;;; "mm-extern" "gnus/mm-extern.el" (17632 36219)) +;;;;;; "mm-extern" "gnus/mm-extern.el" (17632 41885)) ;;; Generated autoloads from gnus/mm-extern.el (autoload (quote mm-extern-cache-contents) "mm-extern" "\ @@ -17959,7 +18180,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** ;;;### (autoloads (mm-inline-partial) "mm-partial" "gnus/mm-partial.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8493)) ;;; Generated autoloads from gnus/mm-partial.el (autoload (quote mm-inline-partial) "mm-partial" "\ @@ -17973,7 +18194,7 @@ If NO-DISPLAY is nil, display it. Otherwise, do nothing after replacing. ;;;*** ;;;### (autoloads (mm-url-insert-file-contents-external mm-url-insert-file-contents) -;;;;;; "mm-url" "gnus/mm-url.el" (17610 3931)) +;;;;;; "mm-url" "gnus/mm-url.el" (17780 18172)) ;;; Generated autoloads from gnus/mm-url.el (autoload (quote mm-url-insert-file-contents) "mm-url" "\ @@ -17990,7 +18211,7 @@ Insert file contents of URL using `mm-url-program'. ;;;*** ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu" -;;;;;; "gnus/mm-uu.el" (17715 55646)) +;;;;;; "gnus/mm-uu.el" (17761 54014)) ;;; Generated autoloads from gnus/mm-uu.el (autoload (quote mm-uu-dissect) "mm-uu" "\ @@ -18010,7 +18231,7 @@ Assume text has been decoded if DECODED is non-nil. ;;;*** ;;;### (autoloads (mml1991-sign mml1991-encrypt) "mml1991" "gnus/mml1991.el" -;;;;;; (17504 41540)) +;;;;;; (17495 43954)) ;;; Generated autoloads from gnus/mml1991.el (autoload (quote mml1991-encrypt) "mml1991" "\ @@ -18027,7 +18248,7 @@ Not documented ;;;### (autoloads (mml2015-self-encrypt mml2015-sign mml2015-encrypt ;;;;;; mml2015-verify-test mml2015-verify mml2015-decrypt-test mml2015-decrypt) -;;;;;; "mml2015" "gnus/mml2015.el" (17504 41540)) +;;;;;; "mml2015" "gnus/mml2015.el" (17776 24487)) ;;; Generated autoloads from gnus/mml2015.el (autoload (quote mml2015-decrypt) "mml2015" "\ @@ -18068,7 +18289,7 @@ Not documented ;;;*** ;;;### (autoloads (modula-2-mode) "modula2" "progmodes/modula2.el" -;;;;;; (17504 41540)) +;;;;;; (17276 54295)) ;;; Generated autoloads from progmodes/modula2.el (autoload (quote modula-2-mode) "modula2" "\ @@ -18100,7 +18321,7 @@ followed by the first character of the construct. ;;;*** ;;;### (autoloads (unmorse-region morse-region) "morse" "play/morse.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from play/morse.el (autoload (quote morse-region) "morse" "\ @@ -18115,8 +18336,8 @@ Convert morse coded text in region to ordinary ASCII text. ;;;*** -;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17704 -;;;;;; 3961)) +;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (17786 +;;;;;; 62747)) ;;; Generated autoloads from mouse-sel.el (defvar mouse-sel-mode nil "\ @@ -18168,7 +18389,7 @@ primary selection and region. ;;;*** -;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17504 41540)) +;;;### (autoloads (mpuz) "mpuz" "play/mpuz.el" (17786 56015)) ;;; Generated autoloads from play/mpuz.el (autoload (quote mpuz) "mpuz" "\ @@ -18178,17 +18399,18 @@ Multiplication puzzle with GNU Emacs. ;;;*** -;;;### (autoloads (msb-mode) "msb" "msb.el" (17566 60306)) +;;;### (autoloads (msb-mode) "msb" "msb.el" (17560 14582)) ;;; Generated autoloads from msb.el (defvar msb-mode nil "\ Non-nil if Msb mode is enabled. See the command `msb-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `msb-mode'.") +use either \\[customize] or the function `msb-mode'.") + +(custom-autoload (quote msb-mode) "msb") -(custom-autoload (quote msb-mode) "msb" nil) +(put (quote msb-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote msb-mode) "msb" "\ Toggle Msb mode. @@ -18205,7 +18427,7 @@ different buffer menu using the function `msb'. ;;;;;; describe-current-coding-system describe-current-coding-system-briefly ;;;;;; describe-coding-system describe-character-set list-charset-chars ;;;;;; read-charset list-character-sets) "mule-diag" "international/mule-diag.el" -;;;;;; (17623 45182)) +;;;;;; (17792 9561)) ;;; Generated autoloads from international/mule-diag.el (defvar non-iso-charset-alist (\` ((mac-roman (ascii latin-iso8859-1 mule-unicode-2500-33ff mule-unicode-0100-24ff mule-unicode-e000-ffff) mac-roman-decoder ((0 255))) (viscii (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-viscii-nonascii-translation-table ((0 255))) (vietnamese-tcvn (ascii vietnamese-viscii-lower vietnamese-viscii-upper) viet-tcvn-nonascii-translation-table ((0 255))) (koi8-r (ascii cyrillic-iso8859-5) cyrillic-koi8-r-nonascii-translation-table ((32 255))) (alternativnyj (ascii cyrillic-iso8859-5) cyrillic-alternativnyj-nonascii-translation-table ((32 255))) (koi8-u (ascii cyrillic-iso8859-5 mule-unicode-0100-24ff) cyrillic-koi8-u-nonascii-translation-table ((32 255))) (big5 (ascii chinese-big5-1 chinese-big5-2) decode-big5-char ((32 127) ((161 254) 64 126 161 254))) (sjis (ascii katakana-jisx0201 japanese-jisx0208) decode-sjis-char ((32 127 161 223) ((129 159 224 239) 64 126 128 252))))) "\ @@ -18379,7 +18601,7 @@ system which uses fontsets). ;;;;;; coding-system-translation-table-for-decode coding-system-pre-write-conversion ;;;;;; coding-system-post-read-conversion lookup-nested-alist set-nested-alist ;;;;;; truncate-string-to-width store-substring string-to-sequence) -;;;;;; "mule-util" "international/mule-util.el" (17504 41540)) +;;;;;; "mule-util" "international/mule-util.el" (17792 9561)) ;;; Generated autoloads from international/mule-util.el (autoload (quote string-to-sequence) "mule-util" "\ @@ -18508,17 +18730,18 @@ basis, this may not be accurate. ;;;*** ;;;### (autoloads (mwheel-install mouse-wheel-mode) "mwheel" "mwheel.el" -;;;;;; (17504 41540)) +;;;;;; (17515 24181)) ;;; Generated autoloads from mwheel.el (defvar mouse-wheel-mode nil "\ Non-nil if Mouse-Wheel mode is enabled. See the command `mouse-wheel-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `mouse-wheel-mode'.") +use either \\[customize] or the function `mouse-wheel-mode'.") -(custom-autoload (quote mouse-wheel-mode) "mwheel" nil) +(custom-autoload (quote mouse-wheel-mode) "mwheel") + +(put (quote mouse-wheel-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote mouse-wheel-mode) "mwheel" "\ Toggle mouse wheel support. @@ -18537,7 +18760,7 @@ Enable mouse wheel support. ;;;### (autoloads (network-connection network-connection-to-service ;;;;;; whois-reverse-lookup whois finger ftp run-dig dns-lookup-host ;;;;;; nslookup nslookup-host route arp netstat ipconfig ping traceroute) -;;;;;; "net-utils" "net/net-utils.el" (17504 41540)) +;;;;;; "net-utils" "net/net-utils.el" (17385 8495)) ;;; Generated autoloads from net/net-utils.el (autoload (quote traceroute) "net-utils" "\ @@ -18633,7 +18856,7 @@ Open a network connection to HOST on PORT. ;;;;;; uncomment-region comment-kill comment-set-column comment-indent ;;;;;; comment-indent-default comment-normalize-vars comment-multi-line ;;;;;; comment-padding comment-style comment-column) "newcomment" -;;;;;; "newcomment.el" (17707 61789)) +;;;;;; "newcomment.el" (17781 39502)) ;;; Generated autoloads from newcomment.el (defalias (quote indent-for-comment) (quote comment-indent)) @@ -18829,7 +19052,7 @@ unless optional argument SOFT is non-nil. ;;;### (autoloads (newsticker-show-news newsticker-start-ticker newsticker-start ;;;;;; newsticker-ticker-running-p newsticker-running-p) "newsticker" -;;;;;; "net/newsticker.el" (17504 41540)) +;;;;;; "net/newsticker.el" (17385 8495)) ;;; Generated autoloads from net/newsticker.el (autoload (quote newsticker-running-p) "newsticker" "\ @@ -18871,7 +19094,7 @@ Switch to newsticker buffer. You may want to bind this to a key. ;;;*** ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el" -;;;;;; (17746 34862)) +;;;;;; (17740 981)) ;;; Generated autoloads from gnus/nndiary.el (autoload (quote nndiary-generate-nov-databases) "nndiary" "\ @@ -18881,8 +19104,8 @@ Generate NOV databases in all nndiary directories. ;;;*** -;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (nndoc-add-type) "nndoc" "gnus/nndoc.el" (17385 +;;;;;; 8494)) ;;; Generated autoloads from gnus/nndoc.el (autoload (quote nndoc-add-type) "nndoc" "\ @@ -18897,7 +19120,7 @@ symbol in the alist. ;;;*** ;;;### (autoloads (nnfolder-generate-active-file) "nnfolder" "gnus/nnfolder.el" -;;;;;; (17504 41540)) +;;;;;; (17394 12936)) ;;; Generated autoloads from gnus/nnfolder.el (autoload (quote nnfolder-generate-active-file) "nnfolder" "\ @@ -18909,7 +19132,7 @@ This command does not work if you use short group names. ;;;*** ;;;### (autoloads (nnkiboze-generate-groups) "nnkiboze" "gnus/nnkiboze.el" -;;;;;; (17504 41540)) +;;;;;; (17788 21815)) ;;; Generated autoloads from gnus/nnkiboze.el (autoload (quote nnkiboze-generate-groups) "nnkiboze" "\ @@ -18921,7 +19144,7 @@ Finds out what articles are to be part of the nnkiboze groups. ;;;*** ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8494)) ;;; Generated autoloads from gnus/nnml.el (autoload (quote nnml-generate-nov-databases) "nnml" "\ @@ -18932,7 +19155,7 @@ Generate NOV databases in all nnml directories. ;;;*** ;;;### (autoloads (nnsoup-revert-variables nnsoup-set-variables nnsoup-pack-replies) -;;;;;; "nnsoup" "gnus/nnsoup.el" (17746 34862)) +;;;;;; "nnsoup" "gnus/nnsoup.el" (17740 981)) ;;; Generated autoloads from gnus/nnsoup.el (autoload (quote nnsoup-pack-replies) "nnsoup" "\ @@ -18953,7 +19176,7 @@ Revert posting and mailing methods to the standard Emacs methods. ;;;*** ;;;### (autoloads (disable-command enable-command disabled-command-function) -;;;;;; "novice" "novice.el" (17665 54360)) +;;;;;; "novice" "novice.el" (17781 39502)) ;;; Generated autoloads from novice.el (defvar disabled-command-function (quote disabled-command-function) "\ @@ -18986,7 +19209,7 @@ to future sessions. ;;;*** ;;;### (autoloads (nroff-mode) "nroff-mode" "textmodes/nroff-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8496)) ;;; Generated autoloads from textmodes/nroff-mode.el (autoload (quote nroff-mode) "nroff-mode" "\ @@ -19001,7 +19224,7 @@ closing requests for requests that are used in matched pairs. ;;;*** ;;;### (autoloads (octave-help) "octave-hlp" "progmodes/octave-hlp.el" -;;;;;; (17504 41540)) +;;;;;; (17394 12938)) ;;; Generated autoloads from progmodes/octave-hlp.el (autoload (quote octave-help) "octave-hlp" "\ @@ -19015,7 +19238,7 @@ If KEY is not a string, prompt for it with completion. ;;;*** ;;;### (autoloads (inferior-octave) "octave-inf" "progmodes/octave-inf.el" -;;;;;; (17731 48936)) +;;;;;; (17730 6653)) ;;; Generated autoloads from progmodes/octave-inf.el (autoload (quote inferior-octave) "octave-inf" "\ @@ -19038,7 +19261,7 @@ startup file, `~/.emacs-octave'. ;;;*** ;;;### (autoloads (octave-mode) "octave-mod" "progmodes/octave-mod.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39502)) ;;; Generated autoloads from progmodes/octave-mod.el (autoload (quote octave-mode) "octave-mod" "\ @@ -19136,13 +19359,35 @@ including a reproducible test case and send the message. ;;;*** +;;;### (autoloads (edit-options list-options) "options" "obsolete/options.el" +;;;;;; (17786 56015)) +;;; Generated autoloads from obsolete/options.el + +(autoload (quote list-options) "options" "\ +Display a list of Emacs user options, with values and documentation. +It is now better to use Customize instead. + +\(fn)" t nil) + +(autoload (quote edit-options) "options" "\ +Edit a list of Emacs user option values. +Selects a buffer containing such a list, +in which there are commands to set the option values. +Type \\[describe-mode] in that buffer for a list of commands. + +The Custom feature is intended to make this obsolete. + +\(fn)" t nil) + +;;;*** + ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files ;;;;;; org-export-icalendar-this-file orgtbl-mode turn-on-orgtbl ;;;;;; org-remember-handler org-remember-apply-template org-remember-annotation ;;;;;; org-store-link org-tags-view org-diary org-cycle-agenda-files ;;;;;; org-todo-list org-agenda-list org-batch-agenda org-agenda ;;;;;; org-global-cycle org-cycle org-mode) "org" "textmodes/org.el" -;;;;;; (17759 28874)) +;;;;;; (17798 49643)) ;;; Generated autoloads from textmodes/org.el (autoload (quote org-mode) "org" "\ @@ -19410,7 +19655,7 @@ The file is stored under the name `org-combined-agenda-icalendar-file'. ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" -;;;;;; (17508 50986)) +;;;;;; (17797 50970)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'string-or-null-p) @@ -19466,8 +19711,8 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads nil "paragraphs" "textmodes/paragraphs.el" (17504 -;;;;;; 41540)) +;;;### (autoloads nil "paragraphs" "textmodes/paragraphs.el" (17495 +;;;;;; 43955)) ;;; Generated autoloads from textmodes/paragraphs.el (put 'paragraph-start 'safe-local-variable 'stringp) (put 'paragraph-separate 'safe-local-variable 'stringp) @@ -19481,7 +19726,7 @@ See the command `outline-mode' for more information on this mode. ;;;*** -;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17504 41540)) +;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17779 6042)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -19506,7 +19751,7 @@ in `show-paren-style' after `show-paren-delay' seconds of Emacs idle time. ;;;*** ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el" -;;;;;; (17504 41540)) +;;;;;; (17386 33146)) ;;; Generated autoloads from calendar/parse-time.el (autoload (quote parse-time-string) "parse-time" "\ @@ -19518,8 +19763,8 @@ unknown are returned as nil. ;;;*** -;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (17394 +;;;;;; 12938)) ;;; Generated autoloads from progmodes/pascal.el (autoload (quote pascal-mode) "pascal" "\ @@ -19572,7 +19817,7 @@ no args, if that value is non-nil. ;;;*** ;;;### (autoloads (pc-bindings-mode) "pc-mode" "emulation/pc-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17785 34467)) ;;; Generated autoloads from emulation/pc-mode.el (autoload (quote pc-bindings-mode) "pc-mode" "\ @@ -19590,17 +19835,18 @@ C-Escape does list-buffers. ;;;*** ;;;### (autoloads (pc-selection-mode pc-selection-mode) "pc-select" -;;;;;; "emulation/pc-select.el" (17504 41540)) +;;;;;; "emulation/pc-select.el" (17385 8491)) ;;; Generated autoloads from emulation/pc-select.el (defvar pc-selection-mode nil "\ Non-nil if Pc-Selection mode is enabled. See the command `pc-selection-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `pc-selection-mode'.") +use either \\[customize] or the function `pc-selection-mode'.") + +(custom-autoload (quote pc-selection-mode) "pc-select") -(custom-autoload (quote pc-selection-mode) "pc-select" nil) +(put (quote pc-selection-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote pc-selection-mode) "pc-select" "\ Change mark behavior to emulate Motif, MAC or MS-Windows cut and paste style. @@ -19662,12 +19908,12 @@ This mode enables Delete Selection mode and Transient Mark mode. Setting this variable directly does not take effect; you must modify it using \\[customize] or \\[pc-selection-mode].") -(custom-autoload (quote pc-selection-mode) "pc-select" nil) +(custom-autoload (quote pc-selection-mode) "pc-select") ;;;*** -;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (pcomplete/cvs) "pcmpl-cvs" "pcmpl-cvs.el" (17781 +;;;;;; 39502)) ;;; Generated autoloads from pcmpl-cvs.el (autoload (quote pcomplete/cvs) "pcmpl-cvs" "\ @@ -19678,7 +19924,7 @@ Completion rules for the `cvs' command. ;;;*** ;;;### (autoloads (pcomplete/tar pcomplete/make pcomplete/bzip2 pcomplete/gzip) -;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (17504 41540)) +;;;;;; "pcmpl-gnu" "pcmpl-gnu.el" (17781 39502)) ;;; Generated autoloads from pcmpl-gnu.el (autoload (quote pcomplete/gzip) "pcmpl-gnu" "\ @@ -19706,7 +19952,7 @@ Completion for the GNU tar utility. ;;;*** ;;;### (autoloads (pcomplete/mount pcomplete/umount pcomplete/kill) -;;;;;; "pcmpl-linux" "pcmpl-linux.el" (17504 41540)) +;;;;;; "pcmpl-linux" "pcmpl-linux.el" (17781 39502)) ;;; Generated autoloads from pcmpl-linux.el (autoload (quote pcomplete/kill) "pcmpl-linux" "\ @@ -19726,8 +19972,8 @@ Completion for GNU/Linux `mount'. ;;;*** -;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (pcomplete/rpm) "pcmpl-rpm" "pcmpl-rpm.el" (17781 +;;;;;; 39502)) ;;; Generated autoloads from pcmpl-rpm.el (autoload (quote pcomplete/rpm) "pcmpl-rpm" "\ @@ -19743,7 +19989,7 @@ You can use \\[eshell-report-bug] to do so. ;;;### (autoloads (pcomplete/chgrp pcomplete/chown pcomplete/which ;;;;;; pcomplete/xargs pcomplete/rm pcomplete/rmdir pcomplete/cd) -;;;;;; "pcmpl-unix" "pcmpl-unix.el" (17504 41540)) +;;;;;; "pcmpl-unix" "pcmpl-unix.el" (17781 39502)) ;;; Generated autoloads from pcmpl-unix.el (autoload (quote pcomplete/cd) "pcmpl-unix" "\ @@ -19789,8 +20035,8 @@ Completion for the `chgrp' command. ;;;### (autoloads (pcomplete-shell-setup pcomplete-comint-setup pcomplete-list ;;;;;; pcomplete-help pcomplete-expand pcomplete-continue pcomplete-expand-and-complete -;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17504 -;;;;;; 41540)) +;;;;;; pcomplete-reverse pcomplete) "pcomplete" "pcomplete.el" (17476 +;;;;;; 4798)) ;;; Generated autoloads from pcomplete.el (autoload (quote pcomplete) "pcomplete" "\ @@ -19849,7 +20095,7 @@ Setup shell-mode to use pcomplete. ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status ;;;;;; cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs" -;;;;;; "pcvs.el" (17759 28868)) +;;;;;; "pcvs.el" (17781 39502)) ;;; Generated autoloads from pcvs.el (autoload (quote cvs-checkout) "pcvs" "\ @@ -19926,7 +20172,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** -;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17672 28070)) +;;;### (autoloads nil "pcvs-defs" "pcvs-defs.el" (17781 39502)) ;;; Generated autoloads from pcvs-defs.el (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] (quote (menu-item "Directory Status" cvs-status :help "A more verbose status of a workarea"))) (define-key m [checkout] (quote (menu-item "Checkout Module" cvs-checkout :help "Check out a module from the repository"))) (define-key m [update] (quote (menu-item "Update Directory" cvs-update :help "Fetch updates from the repository"))) (define-key m [examine] (quote (menu-item "Examine Directory" cvs-examine :help "Examine the current state of a workarea"))) (fset (quote cvs-global-menu) m))) @@ -19934,7 +20180,7 @@ The exact behavior is determined also by `cvs-dired-use-hook'." (when (stringp d ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17515 24182)) ;;; Generated autoloads from progmodes/perl-mode.el (autoload (quote perl-mode) "perl-mode" "\ @@ -19992,7 +20238,7 @@ Turning on Perl mode runs the normal hook `perl-mode-hook'. ;;;### (autoloads (pgg-snarf-keys pgg-snarf-keys-region pgg-insert-key ;;;;;; pgg-verify pgg-verify-region pgg-sign pgg-sign-region pgg-decrypt ;;;;;; pgg-decrypt-region pgg-encrypt pgg-encrypt-symmetric pgg-encrypt-symmetric-region -;;;;;; pgg-encrypt-region) "pgg" "pgg.el" (17661 56347)) +;;;;;; pgg-encrypt-region) "pgg" "pgg.el" (17661 55157)) ;;; Generated autoloads from pgg.el (autoload (quote pgg-encrypt-region) "pgg" "\ @@ -20126,7 +20372,7 @@ Import public keys in the current buffer. ;;;*** ;;;### (autoloads (pgg-gpg-symmetric-key-p) "pgg-gpg" "pgg-gpg.el" -;;;;;; (17664 29027)) +;;;;;; (17797 53312)) ;;; Generated autoloads from pgg-gpg.el (autoload (quote pgg-gpg-symmetric-key-p) "pgg-gpg" "\ @@ -20137,7 +20383,7 @@ True if decoded armor MESSAGE-KEYS has symmetric encryption indicator. ;;;*** ;;;### (autoloads (picture-mode) "picture" "textmodes/picture.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from textmodes/picture.el (autoload (quote picture-mode) "picture" "\ @@ -20218,7 +20464,7 @@ they are not defaultly assigned to keys. ;;;*** ;;;### (autoloads (po-find-file-coding-system) "po" "textmodes/po.el" -;;;;;; (17604 18984)) +;;;;;; (17601 9092)) ;;; Generated autoloads from textmodes/po.el (autoload (quote po-find-file-coding-system) "po" "\ @@ -20229,7 +20475,7 @@ Called through `file-coding-system-alist', before the file is visited for real. ;;;*** -;;;### (autoloads (pong) "pong" "play/pong.el" (17557 12730)) +;;;### (autoloads (pong) "pong" "play/pong.el" (17551 7908)) ;;; Generated autoloads from play/pong.el (autoload (quote pong) "pong" "\ @@ -20246,7 +20492,7 @@ pong-mode keybindings:\\<pong-mode-map> ;;;*** ;;;### (autoloads (pp-eval-last-sexp pp-eval-expression pp pp-buffer -;;;;;; pp-to-string) "pp" "emacs-lisp/pp.el" (17746 34861)) +;;;;;; pp-to-string) "pp" "emacs-lisp/pp.el" (17740 981)) ;;; Generated autoloads from emacs-lisp/pp.el (autoload (quote pp-to-string) "pp" "\ @@ -20307,7 +20553,7 @@ Ignores leading comment characters. ;;;;;; pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview ;;;;;; pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript ;;;;;; pr-ps-directory-preview pr-interface) "printing" "printing.el" -;;;;;; (17746 34861)) +;;;;;; (17780 18172)) ;;; Generated autoloads from printing.el (autoload (quote pr-interface) "printing" "\ @@ -20895,7 +21141,7 @@ are both set to t. ;;;*** ;;;### (autoloads (switch-to-prolog prolog-mode) "prolog" "progmodes/prolog.el" -;;;;;; (17665 30176)) +;;;;;; (17664 20313)) ;;; Generated autoloads from progmodes/prolog.el (autoload (quote prolog-mode) "prolog" "\ @@ -20918,7 +21164,7 @@ With prefix argument \\[universal-prefix], prompt for the program to use. ;;;*** -;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17504 41540)) +;;;### (autoloads nil "ps-bdf" "ps-bdf.el" (17792 9561)) ;;; Generated autoloads from ps-bdf.el (defvar bdf-directory-list (if (memq system-type (quote (ms-dos windows-nt))) (list (expand-file-name "fonts/bdf" installation-directory)) (quote ("/usr/local/share/emacs/fonts/bdf"))) "\ @@ -20927,8 +21173,8 @@ The default value is '(\"/usr/local/share/emacs/fonts/bdf\").") ;;;*** -;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (17394 +;;;;;; 12938)) ;;; Generated autoloads from progmodes/ps-mode.el (autoload (quote ps-mode) "ps-mode" "\ @@ -20977,7 +21223,7 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number ;;;### (autoloads (ps-mule-begin-page ps-mule-begin-job ps-mule-encode-header-string ;;;;;; ps-mule-initialize ps-mule-plot-composition ps-mule-plot-string ;;;;;; ps-mule-set-ascii-font ps-mule-prepare-ascii-font ps-multibyte-buffer) -;;;;;; "ps-mule" "ps-mule.el" (17504 41540)) +;;;;;; "ps-mule" "ps-mule.el" (17780 18172)) ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ @@ -21098,8 +21344,8 @@ Not documented ;;;;;; ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer ;;;;;; ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces ;;;;;; ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type -;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17686 -;;;;;; 35929)) +;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (17780 +;;;;;; 18172)) ;;; Generated autoloads from ps-print.el (defvar ps-page-dimensions-database (list (list (quote a4) (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list (quote a3) (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list (quote letter) (* 72 8.5) (* 72 11.0) "Letter") (list (quote legal) (* 72 8.5) (* 72 14.0) "Legal") (list (quote letter-small) (* 72 7.68) (* 72 10.16) "LetterSmall") (list (quote tabloid) (* 72 11.0) (* 72 17.0) "Tabloid") (list (quote ledger) (* 72 17.0) (* 72 11.0) "Ledger") (list (quote statement) (* 72 5.5) (* 72 8.5) "Statement") (list (quote executive) (* 72 7.5) (* 72 10.0) "Executive") (list (quote a4small) (* 72 7.47) (* 72 10.85) "A4Small") (list (quote b4) (* 72 10.125) (* 72 14.33) "B4") (list (quote b5) (* 72 7.16) (* 72 10.125) "B5")) "\ @@ -21296,7 +21542,7 @@ If EXTENSION is any other symbol, it is ignored. ;;;*** ;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" -;;;;;; (17759 28873)) +;;;;;; (17780 18172)) ;;; Generated autoloads from progmodes/python.el (add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode))) @@ -21371,7 +21617,7 @@ Runs `jython-mode-hook' after `python-mode-hook'. ;;;*** ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el" -;;;;;; (17504 41540)) +;;;;;; (17408 40148)) ;;; Generated autoloads from gnus/qp.el (autoload (quote quoted-printable-decode-region) "qp" "\ @@ -21394,7 +21640,7 @@ them into characters should be done separately. ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (17660 47810)) +;;;;;; "international/quail.el" (17792 9562)) ;;; Generated autoloads from international/quail.el (autoload (quote quail-title) "quail" "\ @@ -21625,8 +21871,8 @@ of each directory. ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls ;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url -;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17504 -;;;;;; 41540)) +;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (17385 +;;;;;; 8495)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -21698,7 +21944,7 @@ Display `quickurl-list' as a formatted list using `quickurl-list-mode'. ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (17672 28071)) +;;;;;; "net/rcirc.el" (17767 19634)) ;;; Generated autoloads from net/rcirc.el (autoload (quote rcirc) "rcirc" "\ @@ -21730,8 +21976,8 @@ Global minor mode for tracking activity in rcirc buffers. ;;;*** -;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17578 -;;;;;; 29458)) +;;;### (autoloads (remote-compile) "rcompile" "net/rcompile.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from net/rcompile.el (autoload (quote remote-compile) "rcompile" "\ @@ -21743,7 +21989,7 @@ See \\[compile]. ;;;*** ;;;### (autoloads (re-builder) "re-builder" "emacs-lisp/re-builder.el" -;;;;;; (17759 28868)) +;;;;;; (17751 22876)) ;;; Generated autoloads from emacs-lisp/re-builder.el (defalias (quote regexp-builder) (quote re-builder)) @@ -21755,7 +22001,7 @@ Construct a regexp interactively. ;;;*** -;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17718 30636)) +;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (17718 28532)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -21782,8 +22028,8 @@ that were operated on recently. ;;;### (autoloads (clear-rectangle string-insert-rectangle string-rectangle ;;;;;; delete-whitespace-rectangle open-rectangle insert-rectangle ;;;;;; yank-rectangle kill-rectangle extract-rectangle delete-extract-rectangle -;;;;;; delete-rectangle move-to-column-force) "rect" "rect.el" (17639 -;;;;;; 6256)) +;;;;;; delete-rectangle move-to-column-force) "rect" "rect.el" (17637 +;;;;;; 59300)) ;;; Generated autoloads from rect.el (autoload (quote move-to-column-force) "rect" "\ @@ -21911,8 +22157,8 @@ rectangle which were empty. ;;;*** -;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (refill-mode) "refill" "textmodes/refill.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from textmodes/refill.el (autoload (quote refill-mode) "refill" "\ @@ -21928,7 +22174,7 @@ refilling if they would cause auto-filling. ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17504 41540)) +;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (17408 40149)) ;;; Generated autoloads from textmodes/reftex.el (autoload (quote turn-on-reftex) "reftex" "\ @@ -21978,7 +22224,7 @@ This enforces rescanning the buffer on next use. ;;;*** ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el" -;;;;;; (17746 34863)) +;;;;;; (17786 56015)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload (quote reftex-citation) "reftex-cite" "\ @@ -22008,7 +22254,7 @@ While entering the regexp, completion on knows citation keys is possible. ;;;*** ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el" -;;;;;; (17712 1062)) +;;;;;; (17786 56015)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload (quote reftex-isearch-minor-mode) "reftex-global" "\ @@ -22025,7 +22271,7 @@ With no argument, this command toggles ;;;*** ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload (quote reftex-index-phrases-mode) "reftex-index" "\ @@ -22058,7 +22304,7 @@ Here are all local bindings. ;;;*** ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload (quote reftex-all-document-files) "reftex-parse" "\ @@ -22070,8 +22316,8 @@ of master file. ;;;*** -;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17704 -;;;;;; 3967)) +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22081,11 +22327,11 @@ of master file. ;;;*** ;;;### (autoloads (regexp-opt-depth regexp-opt) "regexp-opt" "emacs-lisp/regexp-opt.el" -;;;;;; (17504 41540)) +;;;;;; (17785 34467)) ;;; Generated autoloads from emacs-lisp/regexp-opt.el (autoload (quote regexp-opt) "regexp-opt" "\ -Return a regexp to match a string in STRINGS. +Return a regexp to match a string in the list STRINGS. Each string should be unique in STRINGS and should not contain any regexps, quoted or not. If optional PAREN is non-nil, ensure that the returned regexp is enclosed by at least one regexp grouping construct. @@ -22108,7 +22354,7 @@ This means the number of non-shy regexp grouping constructs ;;;*** -;;;### (autoloads (repeat) "repeat" "repeat.el" (17504 41540)) +;;;### (autoloads (repeat) "repeat" "repeat.el" (17781 39502)) ;;; Generated autoloads from repeat.el (autoload (quote repeat) "repeat" "\ @@ -22126,7 +22372,7 @@ can be modified by the global variable `repeat-on-final-keystroke'. ;;;*** ;;;### (autoloads (reporter-submit-bug-report) "reporter" "mail/reporter.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from mail/reporter.el (autoload (quote reporter-submit-bug-report) "reporter" "\ @@ -22158,7 +22404,7 @@ mail-sending package is used for editing and sending the message. ;;;*** ;;;### (autoloads (reposition-window) "reposition" "reposition.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39502)) ;;; Generated autoloads from reposition.el (autoload (quote reposition-window) "reposition" "\ @@ -22185,8 +22431,8 @@ first comment line visible (if point is in a comment). ;;;*** -;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17746 -;;;;;; 34861)) +;;;### (autoloads (resume-suspend-hook) "resume" "resume.el" (17781 +;;;;;; 39502)) ;;; Generated autoloads from resume.el (autoload (quote resume-suspend-hook) "resume" "\ @@ -22197,7 +22443,7 @@ Clear out the file used for transmitting args when Emacs resumes. ;;;*** ;;;### (autoloads (global-reveal-mode reveal-mode) "reveal" "reveal.el" -;;;;;; (17504 41540)) +;;;;;; (17495 43954)) ;;; Generated autoloads from reveal.el (autoload (quote reveal-mode) "reveal" "\ @@ -22214,10 +22460,11 @@ With zero or negative ARG turn mode off. Non-nil if Global-Reveal mode is enabled. See the command `global-reveal-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `global-reveal-mode'.") +use either \\[customize] or the function `global-reveal-mode'.") + +(custom-autoload (quote global-reveal-mode) "reveal") -(custom-autoload (quote global-reveal-mode) "reveal" nil) +(put (quote global-reveal-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote global-reveal-mode) "reveal" "\ Toggle Reveal mode in all buffers on or off. @@ -22232,7 +22479,7 @@ With zero or negative ARG turn mode off. ;;;*** ;;;### (autoloads (make-ring ring-p) "ring" "emacs-lisp/ring.el" -;;;;;; (17504 41540)) +;;;;;; (17785 34467)) ;;; Generated autoloads from emacs-lisp/ring.el (autoload (quote ring-p) "ring" "\ @@ -22247,7 +22494,7 @@ Make a ring that can contain SIZE elements. ;;;*** -;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17504 41540)) +;;;### (autoloads (rlogin) "rlogin" "net/rlogin.el" (17786 56015)) ;;; Generated autoloads from net/rlogin.el (add-hook 'same-window-regexps "^\\*rlogin-.*\\*\\(\\|<[0-9]+>\\)") @@ -22298,8 +22545,8 @@ variable. ;;;;;; rmail-mail-new-frame rmail-primary-inbox-list rmail-delete-after-output ;;;;;; rmail-highlight-face rmail-highlighted-headers rmail-retry-ignored-headers ;;;;;; rmail-displayed-headers rmail-ignored-headers rmail-dont-reply-to-names -;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17746 -;;;;;; 34862)) +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (17742 +;;;;;; 7456)) ;;; Generated autoloads from mail/rmail.el (autoload (quote rmail-movemail-variant-p) "rmail" "\ @@ -22564,7 +22811,7 @@ Set PASSWORD to be used for retrieving mail from a POP or IMAP server. ;;;*** ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "mail/rmailedit.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8494)) ;;; Generated autoloads from mail/rmailedit.el (autoload (quote rmail-edit-current-message) "rmailedit" "\ @@ -22576,7 +22823,7 @@ Edit the contents of this message. ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message ;;;;;; rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd" -;;;;;; "mail/rmailkwd.el" (17504 41540)) +;;;;;; "mail/rmailkwd.el" (17385 8494)) ;;; Generated autoloads from mail/rmailkwd.el (autoload (quote rmail-add-label) "rmailkwd" "\ @@ -22615,7 +22862,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "mail/rmailmsc.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from mail/rmailmsc.el (autoload (quote set-rmail-inbox-list) "rmailmsc" "\ @@ -22629,7 +22876,7 @@ If FILE-NAME is empty, remove any existing inbox list. ;;;### (autoloads (rmail-output-body-to-file rmail-output rmail-fields-not-to-output ;;;;;; rmail-output-to-rmail-file rmail-output-file-alist) "rmailout" -;;;;;; "mail/rmailout.el" (17759 28870)) +;;;;;; "mail/rmailout.el" (17752 39352)) ;;; Generated autoloads from mail/rmailout.el (defvar rmail-output-file-alist nil "\ @@ -22696,8 +22943,8 @@ FILE-NAME defaults, interactively, from the Subject field of the message. ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent ;;;;;; rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject -;;;;;; rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17504 -;;;;;; 41540)) +;;;;;; rmail-sort-by-date) "rmailsort" "mail/rmailsort.el" (17385 +;;;;;; 8494)) ;;; Generated autoloads from mail/rmailsort.el (autoload (quote rmail-sort-by-date) "rmailsort" "\ @@ -22749,18 +22996,18 @@ KEYWORDS is a comma-separated list of labels. ;;;;;; rmail-summary-by-senders rmail-summary-by-topic rmail-summary-by-regexp ;;;;;; rmail-summary-by-recipients rmail-summary-by-labels rmail-summary ;;;;;; rmail-summary-line-count-flag rmail-summary-scroll-between-messages) -;;;;;; "rmailsum" "mail/rmailsum.el" (17504 41540)) +;;;;;; "rmailsum" "mail/rmailsum.el" (17427 10522)) ;;; Generated autoloads from mail/rmailsum.el (defvar rmail-summary-scroll-between-messages t "\ *Non-nil means Rmail summary scroll commands move between messages.") -(custom-autoload (quote rmail-summary-scroll-between-messages) "rmailsum" t) +(custom-autoload (quote rmail-summary-scroll-between-messages) "rmailsum") (defvar rmail-summary-line-count-flag t "\ *Non-nil means Rmail summary should show the number of lines in each message.") -(custom-autoload (quote rmail-summary-line-count-flag) "rmailsum" t) +(custom-autoload (quote rmail-summary-line-count-flag) "rmailsum") (autoload (quote rmail-summary) "rmailsum" "\ Display a summary of all messages, one line per message. @@ -22810,7 +23057,7 @@ SENDERS is a string of names separated by commas. By default, `identity' is set.") -(custom-autoload (quote rmail-summary-line-decoder) "rmailsum" t) +(custom-autoload (quote rmail-summary-line-decoder) "rmailsum") (defvar rmail-user-mail-address-regexp nil "\ *Regexp matching user mail addresses. @@ -22826,50 +23073,107 @@ Then it should be a regexp matching your mail addresses. Setting this variable has an effect only before reading a mail.") -(custom-autoload (quote rmail-user-mail-address-regexp) "rmailsum" t) +(custom-autoload (quote rmail-user-mail-address-regexp) "rmailsum") + +;;;*** + +;;;### (autoloads (news-post-news) "rnewspost" "obsolete/rnewspost.el" +;;;;;; (17786 56015)) +;;; Generated autoloads from obsolete/rnewspost.el + +(autoload (quote news-post-news) "rnewspost" "\ +Begin editing a new USENET news article to be posted. +Type \\[describe-mode] once editing the article to get a list of commands. +If NOQUERY is non-nil, we do not query before doing the work. + +\(fn &optional NOQUERY)" t nil) ;;;*** ;;;### (autoloads (toggle-rot13-mode rot13-other-window rot13-region -;;;;;; rot13-string rot13) "rot13" "rot13.el" (17504 41540)) +;;;;;; rot13-string rot13) "rot13" "rot13.el" (17781 39502)) ;;; Generated autoloads from rot13.el (autoload (quote rot13) "rot13" "\ -Return Rot13 encryption of OBJECT, a buffer or string. +Return ROT13 encryption of OBJECT, a buffer or string. \(fn OBJECT &optional START END)" nil nil) (autoload (quote rot13-string) "rot13" "\ -Return Rot13 encryption of STRING. +Return ROT13 encryption of STRING. \(fn STRING)" nil nil) (autoload (quote rot13-region) "rot13" "\ -Rot13 encrypt the region between START and END in current buffer. +ROT13 encrypt the region between START and END in current buffer. \(fn START END)" t nil) (autoload (quote rot13-other-window) "rot13" "\ -Display current buffer in rot 13 in another window. +Display current buffer in ROT13 in another window. The text itself is not modified, only the way it is displayed is affected. -To terminate the rot13 display, delete that window. As long as that window +To terminate the ROT13 display, delete that window. As long as that window is not deleted, any buffer displayed in it will become instantly encoded -in rot 13. +in ROT13. See also `toggle-rot13-mode'. \(fn)" t nil) (autoload (quote toggle-rot13-mode) "rot13" "\ -Toggle the use of rot 13 encoding for the current window. +Toggle the use of ROT13 encoding for the current window. \(fn)" t nil) ;;;*** -;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17746 -;;;;;; 34861)) +;;;### (autoloads (resize-minibuffer-mode resize-minibuffer-frame-exactly +;;;;;; resize-minibuffer-frame-max-height resize-minibuffer-frame +;;;;;; resize-minibuffer-window-exactly resize-minibuffer-window-max-height +;;;;;; resize-minibuffer-mode) "rsz-mini" "obsolete/rsz-mini.el" +;;;;;; (17786 56015)) +;;; Generated autoloads from obsolete/rsz-mini.el + +(defvar resize-minibuffer-mode nil "\ +*This variable is obsolete.") + +(custom-autoload (quote resize-minibuffer-mode) "rsz-mini" t) + +(defvar resize-minibuffer-window-max-height nil "\ +*This variable is obsolete.") + +(custom-autoload (quote resize-minibuffer-window-max-height) "rsz-mini" t) + +(defvar resize-minibuffer-window-exactly t "\ +*This variable is obsolete.") + +(custom-autoload (quote resize-minibuffer-window-exactly) "rsz-mini" t) + +(defvar resize-minibuffer-frame nil "\ +*This variable is obsolete.") + +(custom-autoload (quote resize-minibuffer-frame) "rsz-mini" t) + +(defvar resize-minibuffer-frame-max-height nil "\ +*This variable is obsolete.") + +(custom-autoload (quote resize-minibuffer-frame-max-height) "rsz-mini" t) + +(defvar resize-minibuffer-frame-exactly t "\ +*This variable is obsolete.") + +(custom-autoload (quote resize-minibuffer-frame-exactly) "rsz-mini" t) + +(autoload (quote resize-minibuffer-mode) "rsz-mini" "\ +This function is obsolete. + +\(fn &optional PREFIX)" t nil) + +;;;*** + +;;;### (autoloads (ruler-mode) "ruler-mode" "ruler-mode.el" (17743 +;;;;;; 45091)) ;;; Generated autoloads from ruler-mode.el (autoload (quote ruler-mode) "ruler-mode" "\ @@ -22879,8 +23183,8 @@ Display a ruler in the header line if ARG > 0. ;;;*** -;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (17420 +;;;;;; 32030)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload (quote rx-to-string) "rx" "\ @@ -23188,7 +23492,7 @@ enclosed in `(and ...)'. ;;;*** ;;;### (autoloads (savehist-mode savehist-mode) "savehist" "savehist.el" -;;;;;; (17504 41540)) +;;;;;; (17476 4798)) ;;; Generated autoloads from savehist.el (defvar savehist-mode nil "\ @@ -23196,7 +23500,7 @@ Mode for automatic saving of minibuffer history. Set this by calling the `savehist-mode' function or using the customize interface.") -(custom-autoload (quote savehist-mode) "savehist" nil) +(custom-autoload (quote savehist-mode) "savehist") (autoload (quote savehist-mode) "savehist" "\ Toggle savehist-mode. @@ -23214,7 +23518,7 @@ which is probably undesirable. ;;;*** ;;;### (autoloads (dsssl-mode scheme-mode) "scheme" "progmodes/scheme.el" -;;;;;; (17504 41540)) +;;;;;; (17394 12938)) ;;; Generated autoloads from progmodes/scheme.el (autoload (quote scheme-mode) "scheme" "\ @@ -23256,7 +23560,7 @@ that variable's value is a string. ;;;*** ;;;### (autoloads (gnus-score-mode) "score-mode" "gnus/score-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8494)) ;;; Generated autoloads from gnus/score-mode.el (autoload (quote gnus-score-mode) "score-mode" "\ @@ -23269,8 +23573,33 @@ This mode is an extended emacs-lisp mode. ;;;*** +;;;### (autoloads (scribe-mode) "scribe" "obsolete/scribe.el" (17786 +;;;;;; 56015)) +;;; Generated autoloads from obsolete/scribe.el + +(autoload (quote scribe-mode) "scribe" "\ +Major mode for editing files of Scribe (a text formatter) source. +Scribe-mode is similar to text-mode, with a few extra commands added. +\\{scribe-mode-map} + +Interesting variables: + +`scribe-fancy-paragraphs' + Non-nil makes Scribe mode use a different style of paragraph separation. + +`scribe-electric-quote' + Non-nil makes insert of double quote use `` or '' depending on context. + +`scribe-electric-parenthesis' + Non-nil makes an open-parenthesis char (one of `([<{') + automatically insert its close if typed after an @Command form. + +\(fn)" t nil) + +;;;*** + ;;;### (autoloads (scroll-all-mode) "scroll-all" "scroll-all.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39502)) ;;; Generated autoloads from scroll-all.el (defvar scroll-all-mode nil "\ @@ -23293,7 +23622,7 @@ apply to all visible windows in the same frame. ;;;*** ;;;### (autoloads (scroll-lock-mode) "scroll-lock" "scroll-lock.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8487)) ;;; Generated autoloads from scroll-lock.el (autoload (quote scroll-lock-mode) "scroll-lock" "\ @@ -23315,7 +23644,7 @@ during scrolling. ;;;;;; mail-alias-file mail-default-reply-to mail-archive-file-name ;;;;;; mail-header-separator send-mail-function mail-interactive ;;;;;; mail-self-blind mail-specify-envelope-from mail-from-style) -;;;;;; "sendmail" "mail/sendmail.el" (17660 47811)) +;;;;;; "sendmail" "mail/sendmail.el" (17660 26729)) ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style (quote angles) "\ @@ -23616,7 +23945,7 @@ Like `mail' command, but display mail buffer in another frame. ;;;*** ;;;### (autoloads (server-mode server-start) "server" "server.el" -;;;;;; (17759 28868)) +;;;;;; (17771 26718)) ;;; Generated autoloads from server.el (autoload (quote server-start) "server" "\ @@ -23649,7 +23978,7 @@ Server mode runs a process that accepts commands from the ;;;*** -;;;### (autoloads (ses-mode) "ses" "ses.el" (17759 28868)) +;;;### (autoloads (ses-mode) "ses" "ses.el" (17750 12548)) ;;; Generated autoloads from ses.el (autoload (quote ses-mode) "ses" "\ @@ -23668,7 +23997,7 @@ These are active only in the minibuffer, when entering or editing a formula: ;;;*** ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" -;;;;;; (17522 22309)) +;;;;;; (17780 18172)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload (quote sgml-mode) "sgml-mode" "\ @@ -23736,7 +24065,7 @@ To work around that, do: ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (17710 3081)) +;;;;;; (17788 21816)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -23800,7 +24129,7 @@ with your script for an edit-interpret-debug cycle. ;;;*** -;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17504 41540)) +;;;### (autoloads (sha1) "sha1" "gnus/sha1.el" (17385 8494)) ;;; Generated autoloads from gnus/sha1.el (autoload (quote sha1) "sha1" "\ @@ -23815,7 +24144,7 @@ If BINARY is non-nil, return a string in binary form. ;;;*** ;;;### (autoloads (list-load-path-shadows) "shadow" "emacs-lisp/shadow.el" -;;;;;; (17746 34861)) +;;;;;; (17785 34467)) ;;; Generated autoloads from emacs-lisp/shadow.el (autoload (quote list-load-path-shadows) "shadow" "\ @@ -23862,8 +24191,8 @@ buffer called `*Shadows*'. Shadowings are located by calling the ;;;*** ;;;### (autoloads (shadow-initialize shadow-define-regexp-group shadow-define-literal-group -;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (17746 -;;;;;; 34861)) +;;;;;; shadow-define-cluster) "shadowfile" "shadowfile.el" (17743 +;;;;;; 18143)) ;;; Generated autoloads from shadowfile.el (autoload (quote shadow-define-cluster) "shadowfile" "\ @@ -23902,7 +24231,7 @@ Set up file shadowing. ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (17715 55645)) +;;;;;; (17796 10831)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp "cmd\\(proxy\\)?\\.exe" "\ @@ -23921,10 +24250,10 @@ If BUFFER exists but shell process is not running, make new shell. If BUFFER exists and shell process is running, just switch to BUFFER. Program used comes from variable `explicit-shell-file-name', or (if that is nil) from the ESHELL environment variable, - or else from SHELL if there is no ESHELL. -If a file `~/.emacs_SHELLNAME' exists, it is given as initial input - (Note that this may lose due to a timing error if the shell - discards input when it starts up.) + or (if that is nil) from `shell-file-name'. +If a file `~/.emacs_SHELLNAME' exists, or `~/.emacs.d/init_SHELLNAME.sh', +it is given as initial input (but this may be lost, due to a timing +error, if the shell discards input when it starts up). The buffer is put in Shell mode, giving commands for sending input and controlling the subjobs of the shell. See `shell-mode'. See also the variable `shell-prompt-pattern'. @@ -23949,7 +24278,7 @@ Otherwise, one argument `-i' is passed to the shell. ;;;*** ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage) -;;;;;; "sieve" "gnus/sieve.el" (17504 41540)) +;;;;;; "sieve" "gnus/sieve.el" (17385 8494)) ;;; Generated autoloads from gnus/sieve.el (autoload (quote sieve-manage) "sieve" "\ @@ -23970,7 +24299,7 @@ Not documented ;;;*** ;;;### (autoloads (sieve-mode) "sieve-mode" "gnus/sieve-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8494)) ;;; Generated autoloads from gnus/sieve-mode.el (autoload (quote sieve-mode) "sieve-mode" "\ @@ -23985,14 +24314,14 @@ Turning on Sieve mode runs `sieve-mode-hook'. ;;;*** -;;;### (autoloads nil "simple" "simple.el" (17746 34861)) +;;;### (autoloads nil "simple" "simple.el" (17797 50970)) ;;; Generated autoloads from simple.el (put 'fill-prefix 'safe-local-variable 'string-or-null-p) ;;;*** -;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (simula-mode) "simula" "progmodes/simula.el" (17788 +;;;;;; 21816)) ;;; Generated autoloads from progmodes/simula.el (autoload (quote simula-mode) "simula" "\ @@ -24041,7 +24370,7 @@ with no arguments, if that value is non-nil. ;;;*** ;;;### (autoloads (skeleton-pair-insert-maybe skeleton-insert skeleton-proxy-new -;;;;;; define-skeleton) "skeleton" "skeleton.el" (17522 22308)) +;;;;;; define-skeleton) "skeleton" "skeleton.el" (17781 39502)) ;;; Generated autoloads from skeleton.el (defvar skeleton-filter-function (quote identity) "\ @@ -24151,7 +24480,7 @@ symmetrical ones, and the same character twice for the others. ;;;*** ;;;### (autoloads (smerge-mode smerge-ediff) "smerge-mode" "smerge-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17495 43954)) ;;; Generated autoloads from smerge-mode.el (autoload (quote smerge-ediff) "smerge-mode" "\ @@ -24170,7 +24499,7 @@ Minor mode to simplify editing output from the diff3 program. ;;;*** ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el" -;;;;;; (17504 41540)) +;;;;;; (17476 4800)) ;;; Generated autoloads from gnus/smiley.el (autoload (quote smiley-region) "smiley" "\ @@ -24188,7 +24517,7 @@ interactively. If there's no argument, do it at the current buffer ;;;*** ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail" -;;;;;; "mail/smtpmail.el" (17718 30637)) +;;;;;; "mail/smtpmail.el" (17767 19634)) ;;; Generated autoloads from mail/smtpmail.el (autoload (quote smtpmail-send-it) "smtpmail" "\ @@ -24203,7 +24532,7 @@ Send mail that was queued as a result of setting `smtpmail-queue-mail'. ;;;*** -;;;### (autoloads (snake) "snake" "play/snake.el" (17504 41540)) +;;;### (autoloads (snake) "snake" "play/snake.el" (17786 56015)) ;;; Generated autoloads from play/snake.el (autoload (quote snake) "snake" "\ @@ -24227,7 +24556,7 @@ Snake mode keybindings: ;;;*** ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from net/snmp-mode.el (autoload (quote snmp-mode) "snmp-mode" "\ @@ -24258,7 +24587,7 @@ then `snmpv2-mode-hook'. ;;;### (autoloads (solar-equinoxes-solstices sunrise-sunset calendar-location-name ;;;;;; calendar-longitude calendar-latitude calendar-time-display-form) -;;;;;; "solar" "calendar/solar.el" (17504 41540)) +;;;;;; "solar" "calendar/solar.el" (17386 33146)) ;;; Generated autoloads from calendar/solar.el (defvar calendar-time-display-form (quote (12-hours ":" minutes am-pm (if time-zone " (") time-zone (if time-zone ")"))) "\ @@ -24275,7 +24604,7 @@ For example, the form would give military-style times like `21:07 (UTC)'.") -(custom-autoload (quote calendar-time-display-form) "solar" t) +(custom-autoload (quote calendar-time-display-form) "solar") (defvar calendar-latitude nil "\ *Latitude of `calendar-location-name' in degrees. @@ -24287,7 +24616,7 @@ York City. This variable should be set in `site-start'.el.") -(custom-autoload (quote calendar-latitude) "solar" t) +(custom-autoload (quote calendar-latitude) "solar") (defvar calendar-longitude nil "\ *Longitude of `calendar-location-name' in degrees. @@ -24299,7 +24628,7 @@ York City. This variable should be set in `site-start'.el.") -(custom-autoload (quote calendar-longitude) "solar" t) +(custom-autoload (quote calendar-longitude) "solar") (defvar calendar-location-name (quote (let ((float-output-format "%.1f")) (format "%s%s, %s%s" (if (numberp calendar-latitude) (abs calendar-latitude) (+ (aref calendar-latitude 0) (/ (aref calendar-latitude 1) 60.0))) (if (numberp calendar-latitude) (if (> calendar-latitude 0) "N" "S") (if (equal (aref calendar-latitude 2) (quote north)) "N" "S")) (if (numberp calendar-longitude) (abs calendar-longitude) (+ (aref calendar-longitude 0) (/ (aref calendar-longitude 1) 60.0))) (if (numberp calendar-longitude) (if (> calendar-longitude 0) "E" "W") (if (equal (aref calendar-longitude 2) (quote east)) "E" "W"))))) "\ *Expression evaluating to name of `calendar-longitude', `calendar-latitude'. @@ -24308,7 +24637,7 @@ pair. This variable should be set in `site-start'.el.") -(custom-autoload (quote calendar-location-name) "solar" t) +(custom-autoload (quote calendar-location-name) "solar") (autoload (quote sunrise-sunset) "solar" "\ Local time of sunrise and sunset for today. Accurate to a few seconds. @@ -24329,8 +24658,8 @@ Requires floating point. ;;;*** -;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from play/solitaire.el (autoload (quote solitaire) "solitaire" "\ @@ -24407,7 +24736,7 @@ Pick your favourite shortcuts: ;;;### (autoloads (reverse-region sort-columns sort-regexp-fields ;;;;;; sort-fields sort-numeric-fields sort-pages sort-paragraphs -;;;;;; sort-lines sort-subr) "sort" "sort.el" (17746 34861)) +;;;;;; sort-lines sort-subr) "sort" "sort.el" (17781 39502)) ;;; Generated autoloads from sort.el (autoload (quote sort-subr) "sort" "\ @@ -24549,8 +24878,8 @@ From a program takes two point or marker arguments, BEG and END. ;;;*** -;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (17476 +;;;;;; 4800)) ;;; Generated autoloads from gnus/spam.el (autoload (quote spam-initialize) "spam" "\ @@ -24562,7 +24891,7 @@ Install the spam.el hooks and do other initialization ;;;### (autoloads (spam-report-deagentize spam-report-agentize spam-report-url-to-file ;;;;;; spam-report-url-ping-mm-url spam-report-process-queue) "spam-report" -;;;;;; "gnus/spam-report.el" (17504 41540)) +;;;;;; "gnus/spam-report.el" (17386 33146)) ;;; Generated autoloads from gnus/spam-report.el (autoload (quote spam-report-process-queue) "spam-report" "\ @@ -24605,7 +24934,7 @@ Spam reports will be queued with the method used when ;;;*** ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar" -;;;;;; "speedbar.el" (17746 34861)) +;;;;;; "speedbar.el" (17771 1419)) ;;; Generated autoloads from speedbar.el (defalias (quote speedbar) (quote speedbar-frame-mode)) @@ -24630,7 +24959,7 @@ selected. If the speedbar frame is active, then select the attached frame. ;;;*** ;;;### (autoloads (spell-string spell-region spell-word spell-buffer) -;;;;;; "spell" "textmodes/spell.el" (17504 41540)) +;;;;;; "spell" "textmodes/spell.el" (17786 56015)) ;;; Generated autoloads from textmodes/spell.el (put (quote spell-filter) (quote risky-local-variable) t) @@ -24666,8 +24995,8 @@ Check spelling of string supplied as argument. ;;;*** -;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (snarf-spooks spook) "spook" "play/spook.el" (17786 +;;;;;; 56015)) ;;; Generated autoloads from play/spook.el (autoload (quote spook) "spook" "\ @@ -24685,8 +25014,8 @@ Return a vector containing the lines from `spook-phrases-file'. ;;;### (autoloads (sql-linter sql-db2 sql-interbase sql-postgres ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-mode sql-help -;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (17504 -;;;;;; 41540)) +;;;;;; sql-add-product-keywords) "sql" "progmodes/sql.el" (17781 +;;;;;; 39502)) ;;; Generated autoloads from progmodes/sql.el (autoload (quote sql-add-product-keywords) "sql" "\ @@ -25117,8 +25446,8 @@ input. See `sql-interactive-mode'. ;;;;;; strokes-mode strokes-list-strokes strokes-load-user-strokes ;;;;;; strokes-help strokes-describe-stroke strokes-do-complex-stroke ;;;;;; strokes-do-stroke strokes-read-complex-stroke strokes-read-stroke -;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (17704 -;;;;;; 3962)) +;;;;;; strokes-global-set-stroke) "strokes" "strokes.el" (17781 +;;;;;; 39502)) ;;; Generated autoloads from strokes.el (autoload (quote strokes-global-set-stroke) "strokes" "\ @@ -25228,7 +25557,7 @@ Read a complex stroke and insert its glyph into the current buffer. ;;;*** ;;;### (autoloads (studlify-buffer studlify-word studlify-region) -;;;;;; "studly" "play/studly.el" (17504 41540)) +;;;;;; "studly" "play/studly.el" (17075 55479)) ;;; Generated autoloads from play/studly.el (autoload (quote studlify-region) "studly" "\ @@ -25248,7 +25577,7 @@ Studlify-case the current buffer. ;;;*** -;;;### (autoloads (locate-library) "subr" "subr.el" (17759 28868)) +;;;### (autoloads (locate-library) "subr" "subr.el" (17789 35159)) ;;; Generated autoloads from subr.el (autoload (quote locate-library) "subr" "\ @@ -25270,7 +25599,7 @@ and the file name is displayed in the echo area. ;;;*** ;;;### (autoloads (sc-cite-original) "supercite" "mail/supercite.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from mail/supercite.el (autoload (quote sc-cite-original) "supercite" "\ @@ -25302,7 +25631,7 @@ before, and `sc-post-hook' is run after the guts of this function. ;;;*** -;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17746 34861)) +;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17743 18143)) ;;; Generated autoloads from t-mouse.el (defvar t-mouse-mode nil "\ @@ -25324,7 +25653,7 @@ Turn it on to use Emacs mouse commands, and off to use t-mouse commands. ;;;*** -;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17610 3931)) +;;;### (autoloads (tabify untabify) "tabify" "tabify.el" (17781 39502)) ;;; Generated autoloads from tabify.el (autoload (quote untabify) "tabify" "\ @@ -25359,7 +25688,7 @@ The variable `tab-width' controls the spacing of tab stops. ;;;;;; table-recognize table-insert-row-column table-insert-column ;;;;;; table-insert-row table-insert table-point-left-cell-hook ;;;;;; table-point-entered-cell-hook table-load-hook table-cell-map-hook) -;;;;;; "table" "textmodes/table.el" (17746 34863)) +;;;;;; "table" "textmodes/table.el" (17740 982)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -25947,7 +26276,7 @@ converts a table into plain text without frames. It is a companion to ;;;*** -;;;### (autoloads (talk-connect) "talk" "talk.el" (17504 41540)) +;;;### (autoloads (talk-connect) "talk" "talk.el" (17781 39502)) ;;; Generated autoloads from talk.el (autoload (quote talk-connect) "talk" "\ @@ -25957,7 +26286,7 @@ Connect to display DISPLAY for the Emacs talk group. ;;;*** -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17527 7050)) +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (17771 1419)) ;;; Generated autoloads from tar-mode.el (autoload (quote tar-mode) "tar-mode" "\ @@ -25981,7 +26310,7 @@ See also: variables `tar-update-datestamp' and `tar-anal-blocksize'. ;;;*** ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl" -;;;;;; "progmodes/tcl.el" (17504 41540)) +;;;;;; "progmodes/tcl.el" (17485 5461)) ;;; Generated autoloads from progmodes/tcl.el (autoload (quote tcl-mode) "tcl" "\ @@ -26032,7 +26361,7 @@ Prefix argument means invert sense of `tcl-use-smart-word-finder'. ;;;*** -;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17504 41540)) +;;;### (autoloads (rsh telnet) "telnet" "net/telnet.el" (17786 56015)) ;;; Generated autoloads from net/telnet.el (add-hook 'same-window-regexps "\\*telnet-.*\\*\\(\\|<[0-9]+>\\)") @@ -26059,8 +26388,8 @@ Normally input is edited in Emacs and sent a line at a time. ;;;*** -;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17566 -;;;;;; 60306)) +;;;### (autoloads (ansi-term term make-term) "term" "term.el" (17781 +;;;;;; 39502)) ;;; Generated autoloads from term.el (autoload (quote make-term) "term" "\ @@ -26088,8 +26417,8 @@ Start a terminal-emulator in a new buffer. ;;;*** -;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17746 -;;;;;; 34861)) +;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (17781 +;;;;;; 39502)) ;;; Generated autoloads from terminal.el (autoload (quote terminal-emulator) "terminal" "\ @@ -26126,7 +26455,7 @@ subprocess started. ;;;*** ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8490)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload (quote testcover-this-defun) "testcover" "\ @@ -26136,7 +26465,7 @@ Start coverage on function under point. ;;;*** -;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17504 41540)) +;;;### (autoloads (tetris) "tetris" "play/tetris.el" (17786 56015)) ;;; Generated autoloads from play/tetris.el (autoload (quote tetris) "tetris" "\ @@ -26167,7 +26496,7 @@ tetris-mode keybindings: ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (17566 60308)) +;;;;;; (17786 56015)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -26469,7 +26798,7 @@ Major mode to edit DocTeX files. ;;;*** ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer) -;;;;;; "texinfmt" "textmodes/texinfmt.el" (17746 34863)) +;;;;;; "texinfmt" "textmodes/texinfmt.el" (17743 18144)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload (quote texinfo-format-buffer) "texinfmt" "\ @@ -26509,18 +26838,18 @@ if large. You can use Info-split to do this manually. ;;;*** ;;;### (autoloads (texinfo-mode texinfo-close-quote texinfo-open-quote) -;;;;;; "texinfo" "textmodes/texinfo.el" (17504 41540)) +;;;;;; "texinfo" "textmodes/texinfo.el" (17385 8496)) ;;; Generated autoloads from textmodes/texinfo.el (defvar texinfo-open-quote "``" "\ *String inserted by typing \\[texinfo-insert-quote] to open a quotation.") -(custom-autoload (quote texinfo-open-quote) "texinfo" t) +(custom-autoload (quote texinfo-open-quote) "texinfo") (defvar texinfo-close-quote "''" "\ *String inserted by typing \\[texinfo-insert-quote] to close a quotation.") -(custom-autoload (quote texinfo-close-quote) "texinfo" t) +(custom-autoload (quote texinfo-close-quote) "texinfo") (autoload (quote texinfo-mode) "texinfo" "\ Major mode for editing Texinfo files. @@ -26596,7 +26925,7 @@ value of `texinfo-mode-hook'. ;;;### (autoloads (thai-auto-composition-mode thai-composition-function ;;;;;; thai-post-read-conversion thai-compose-buffer thai-compose-string ;;;;;; thai-compose-region) "thai-util" "language/thai-util.el" -;;;;;; (17504 41540)) +;;;;;; (17792 9562)) ;;; Generated autoloads from language/thai-util.el (autoload (quote thai-compose-region) "thai-util" "\ @@ -26640,7 +26969,7 @@ Minor mode for automatically correct Thai character composition. ;;;### (autoloads (list-at-point number-at-point symbol-at-point ;;;;;; sexp-at-point thing-at-point bounds-of-thing-at-point forward-thing) -;;;;;; "thingatpt" "thingatpt.el" (17675 64484)) +;;;;;; "thingatpt" "thingatpt.el" (17781 39502)) ;;; Generated autoloads from thingatpt.el (autoload (quote forward-thing) "thingatpt" "\ @@ -26697,7 +27026,7 @@ Not documented ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked ;;;;;; thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el" -;;;;;; (17591 28068)) +;;;;;; (17601 9091)) ;;; Generated autoloads from thumbs.el (autoload (quote thumbs-find-thumb) "thumbs" "\ @@ -26736,7 +27065,7 @@ In dired, call the setroot program on the image at point. ;;;;;; tibetan-composition-function tibetan-decompose-string tibetan-decompose-region ;;;;;; tibetan-compose-region tibetan-compose-string tibetan-transcription-to-tibetan ;;;;;; tibetan-tibetan-to-transcription tibetan-char-p) "tibet-util" -;;;;;; "language/tibet-util.el" (17504 41540)) +;;;;;; "language/tibet-util.el" (17792 9562)) ;;; Generated autoloads from language/tibet-util.el (autoload (quote tibetan-char-p) "tibet-util" "\ @@ -26815,7 +27144,7 @@ Not documented ;;;*** ;;;### (autoloads (tildify-buffer tildify-region) "tildify" "textmodes/tildify.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from textmodes/tildify.el (autoload (quote tildify-region) "tildify" "\ @@ -26839,7 +27168,7 @@ This function performs no refilling of the changed text. ;;;*** ;;;### (autoloads (display-time-mode display-time display-time-day-and-date) -;;;;;; "time" "time.el" (17675 64484)) +;;;;;; "time" "time.el" (17674 51268)) ;;; Generated autoloads from time.el (defvar display-time-day-and-date nil "\ @@ -26881,8 +27210,8 @@ This runs the normal hook `display-time-hook' after each update. ;;;### (autoloads (safe-date-to-time time-to-days time-to-day-in-year ;;;;;; date-leap-year-p days-between date-to-day time-add time-subtract ;;;;;; time-since days-to-time time-less-p seconds-to-time time-to-seconds -;;;;;; date-to-time) "time-date" "calendar/time-date.el" (17504 -;;;;;; 41540)) +;;;;;; date-to-time) "time-date" "calendar/time-date.el" (17386 +;;;;;; 33146)) ;;; Generated autoloads from calendar/time-date.el (autoload (quote date-to-time) "time-date" "\ @@ -26968,7 +27297,7 @@ If DATE is malformed, return a time value of zeros. ;;;*** ;;;### (autoloads (time-stamp-toggle-active time-stamp) "time-stamp" -;;;;;; "time-stamp.el" (17504 41540)) +;;;;;; "time-stamp.el" (17771 1419)) ;;; Generated autoloads from time-stamp.el (put 'time-stamp-format 'safe-local-variable 'stringp) (put 'time-stamp-line-limit 'safe-local-variable 'integerp) @@ -27011,7 +27340,7 @@ With ARG, turn time stamping on if and only if arg is positive. ;;;;;; timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out ;;;;;; timeclock-change timeclock-status-string timeclock-out timeclock-in ;;;;;; timeclock-modeline-display) "timeclock" "calendar/timeclock.el" -;;;;;; (17628 62478)) +;;;;;; (17632 41885)) ;;; Generated autoloads from calendar/timeclock.el (autoload (quote timeclock-modeline-display) "timeclock" "\ @@ -27112,7 +27441,7 @@ relative only to the time worked today, and not to past time. ;;;### (autoloads (with-timeout run-with-idle-timer add-timeout run-with-timer ;;;;;; run-at-time cancel-function-timers cancel-timer) "timer" -;;;;;; "emacs-lisp/timer.el" (17687 61868)) +;;;;;; "emacs-lisp/timer.el" (17785 34467)) ;;; Generated autoloads from emacs-lisp/timer.el (defalias (quote disable-timeout) (quote cancel-timer)) @@ -27188,7 +27517,7 @@ be detected. ;;;*** ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv" -;;;;;; "international/titdic-cnv.el" (17504 41540)) +;;;;;; "international/titdic-cnv.el" (17792 9562)) ;;; Generated autoloads from international/titdic-cnv.el (autoload (quote titdic-convert) "titdic-cnv" "\ @@ -27211,8 +27540,8 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** ;;;### (autoloads (tamil-composition-function tamil-post-read-conversion -;;;;;; tamil-compose-region) "tml-util" "language/tml-util.el" (17504 -;;;;;; 41540)) +;;;;;; tamil-compose-region) "tml-util" "language/tml-util.el" (17788 +;;;;;; 21816)) ;;; Generated autoloads from language/tml-util.el (autoload (quote tamil-compose-region) "tml-util" "\ @@ -27235,7 +27564,7 @@ PATTERN regexp. ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" -;;;;;; "tmm.el" (17504 41540)) +;;;;;; "tmm.el" (17771 1419)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [f10] 'tmm-menubar) @@ -27276,7 +27605,7 @@ Its value should be an event that has a binding in MENU. ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities ;;;;;; todo-insert-item todo-add-item-non-interactively todo-add-category) -;;;;;; "todo-mode" "calendar/todo-mode.el" (17504 41540)) +;;;;;; "todo-mode" "calendar/todo-mode.el" (17386 33146)) ;;; Generated autoloads from calendar/todo-mode.el (autoload (quote todo-add-category) "todo-mode" "\ @@ -27337,7 +27666,7 @@ Show TODO list. ;;;### (autoloads (tool-bar-local-item-from-menu tool-bar-add-item-from-menu ;;;;;; tool-bar-local-item tool-bar-add-item) "tool-bar" "tool-bar.el" -;;;;;; (17504 41540)) +;;;;;; (17495 43954)) ;;; Generated autoloads from tool-bar.el (put (quote tool-bar-mode) (quote standard-value) (quote (t))) @@ -27404,7 +27733,7 @@ holds a keymap. ;;;*** ;;;### (autoloads (tpu-edt-on tpu-edt-mode) "tpu-edt" "emulation/tpu-edt.el" -;;;;;; (17746 34861)) +;;;;;; (17785 34467)) ;;; Generated autoloads from emulation/tpu-edt.el (defvar tpu-edt-mode nil "\ @@ -27431,7 +27760,7 @@ Turn on TPU/edt emulation. ;;;*** ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins) -;;;;;; "tpu-extras" "emulation/tpu-extras.el" (17504 41540)) +;;;;;; "tpu-extras" "emulation/tpu-extras.el" (17785 34467)) ;;; Generated autoloads from emulation/tpu-extras.el (autoload (quote tpu-set-scroll-margins) "tpu-extras" "\ @@ -27451,7 +27780,7 @@ Constrain the cursor to the flow of the text. ;;;*** -;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17652 14943)) +;;;### (autoloads (tq-create) "tq" "emacs-lisp/tq.el" (17785 34467)) ;;; Generated autoloads from emacs-lisp/tq.el (autoload (quote tq-create) "tq" "\ @@ -27465,7 +27794,7 @@ to a tcp server on another machine. ;;;*** ;;;### (autoloads (trace-function-background trace-function trace-buffer) -;;;;;; "trace" "emacs-lisp/trace.el" (17656 34194)) +;;;;;; "trace" "emacs-lisp/trace.el" (17785 34467)) ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer "*trace-output*" "\ @@ -27502,7 +27831,7 @@ BUFFER defaults to `trace-buffer'. ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-completion-file-name-regexp -;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17759 28871)) +;;;;;; tramp-file-name-regexp) "tramp" "net/tramp.el" (17800 14311)) ;;; Generated autoloads from net/tramp.el (defvar tramp-unified-filenames (not (featurep (quote xemacs))) "\ @@ -27615,7 +27944,7 @@ Discard Tramp from loading remote files. ;;;*** ;;;### (autoloads (tramp-ftp-enable-ange-ftp) "tramp-ftp" "net/tramp-ftp.el" -;;;;;; (17504 41540)) +;;;;;; (17366 25285)) ;;; Generated autoloads from net/tramp-ftp.el (autoload (quote tramp-ftp-enable-ange-ftp) "tramp-ftp" "\ @@ -27630,8 +27959,8 @@ Not documented ;;;;;; tumme-display-thumb tumme-display-thumbs-append tumme-setup-dired-keybindings ;;;;;; tumme-jump-thumbnail-buffer tumme-delete-tag tumme-tag-files ;;;;;; tumme-show-all-from-dir tumme-display-thumbs tumme-dired-with-window-configuration -;;;;;; tumme-dired-insert-marked-thumbs) "tumme" "tumme.el" (17647 -;;;;;; 30168)) +;;;;;; tumme-dired-insert-marked-thumbs) "tumme" "tumme.el" (17645 +;;;;;; 64048)) ;;; Generated autoloads from tumme.el (autoload (quote tumme-dired-insert-marked-thumbs) "tumme" "\ @@ -27761,8 +28090,8 @@ easy-to-use form. ;;;*** -;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17735 -;;;;;; 57938)) +;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17763 +;;;;;; 9424)) ;;; Generated autoloads from tutorial.el (autoload (quote help-with-tutorial) "tutorial" "\ @@ -27787,7 +28116,7 @@ resumed later. ;;;*** ;;;### (autoloads (2C-split 2C-associate-buffer 2C-two-columns) "two-column" -;;;;;; "textmodes/two-column.el" (17706 55365)) +;;;;;; "textmodes/two-column.el" (17786 56015)) ;;; Generated autoloads from textmodes/two-column.el (autoload '2C-command "two-column" () t 'keymap) (global-set-key "\C-x6" '2C-command) @@ -27838,7 +28167,7 @@ First column's text sSs Second column's text ;;;;;; type-break type-break-mode type-break-keystroke-threshold ;;;;;; type-break-good-break-interval type-break-good-rest-interval ;;;;;; type-break-interval type-break-mode) "type-break" "type-break.el" -;;;;;; (17504 41540)) +;;;;;; (17781 39502)) ;;; Generated autoloads from type-break.el (defvar type-break-mode nil "\ @@ -28021,7 +28350,7 @@ FRAC should be the inverse of the fractional value; for example, a value of ;;;*** ;;;### (autoloads (ununderline-region underline-region) "underline" -;;;;;; "textmodes/underline.el" (17504 41540)) +;;;;;; "textmodes/underline.el" (17786 56015)) ;;; Generated autoloads from textmodes/underline.el (autoload (quote underline-region) "underline" "\ @@ -28042,7 +28371,7 @@ which specify the range to operate on. ;;;*** ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message) -;;;;;; "undigest" "mail/undigest.el" (17504 41540)) +;;;;;; "undigest" "mail/undigest.el" (17786 56015)) ;;; Generated autoloads from mail/undigest.el (autoload (quote undigestify-rmail-message) "undigest" "\ @@ -28061,7 +28390,7 @@ following the containing message. ;;;*** ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el" -;;;;;; (17504 41540)) +;;;;;; (17786 56015)) ;;; Generated autoloads from mail/unrmail.el (autoload (quote batch-unrmail) "unrmail" "\ @@ -28080,8 +28409,8 @@ Convert Rmail file FILE to system inbox format file TO-FILE. ;;;*** -;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (unsafep) "unsafep" "emacs-lisp/unsafep.el" (17408 +;;;;;; 40148)) ;;; Generated autoloads from emacs-lisp/unsafep.el (autoload (quote unsafep) "unsafep" "\ @@ -28094,7 +28423,7 @@ of symbols with local bindings. ;;;*** ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url" -;;;;;; "url/url.el" (17746 34863)) +;;;;;; "url/url.el" (17785 34468)) ;;; Generated autoloads from url/url.el (autoload (quote url-retrieve) "url" "\ @@ -28134,7 +28463,7 @@ no further processing). URL is either a string or a parsed URL. ;;;*** ;;;### (autoloads (url-register-auth-scheme url-get-authentication) -;;;;;; "url-auth" "url/url-auth.el" (17504 41540)) +;;;;;; "url-auth" "url/url-auth.el" (17729 4745)) ;;; Generated autoloads from url/url-auth.el (autoload (quote url-get-authentication) "url-auth" "\ @@ -28176,8 +28505,8 @@ RATING a rating between 1 and 10 of the strength of the authentication. ;;;*** ;;;### (autoloads (url-cache-expired url-cache-extract url-is-cached -;;;;;; url-store-in-cache) "url-cache" "url/url-cache.el" (17504 -;;;;;; 41540)) +;;;;;; url-store-in-cache) "url-cache" "url/url-cache.el" (17729 +;;;;;; 4745)) ;;; Generated autoloads from url/url-cache.el (autoload (quote url-store-in-cache) "url-cache" "\ @@ -28202,7 +28531,7 @@ Return t iff a cached file has expired. ;;;*** -;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17504 41540)) +;;;### (autoloads (url-cid) "url-cid" "url/url-cid.el" (17729 4745)) ;;; Generated autoloads from url/url-cid.el (autoload (quote url-cid) "url-cid" "\ @@ -28213,7 +28542,7 @@ Not documented ;;;*** ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav" -;;;;;; "url/url-dav.el" (17686 35930)) +;;;;;; "url/url-dav.el" (17729 4745)) ;;; Generated autoloads from url/url-dav.el (autoload (quote url-dav-supported-p) "url-dav" "\ @@ -28228,8 +28557,8 @@ Not documented ;;;*** -;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (url-file) "url-file" "url/url-file.el" (17729 +;;;;;; 4745)) ;;; Generated autoloads from url/url-file.el (autoload (quote url-file) "url-file" "\ @@ -28240,7 +28569,7 @@ Handle file: and ftp: URLs. ;;;*** ;;;### (autoloads (url-open-stream url-gateway-nslookup-host) "url-gw" -;;;;;; "url/url-gw.el" (17759 30290)) +;;;;;; "url/url-gw.el" (17789 35159)) ;;; Generated autoloads from url/url-gw.el (autoload (quote url-gateway-nslookup-host) "url-gw" "\ @@ -28259,8 +28588,8 @@ Might do a non-blocking connection; use `process-status' to check. ;;;*** ;;;### (autoloads (url-insert-file-contents url-file-local-copy url-copy-file -;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (17652 -;;;;;; 14946)) +;;;;;; url-handler-mode) "url-handlers" "url/url-handlers.el" (17729 +;;;;;; 4745)) ;;; Generated autoloads from url/url-handlers.el (defvar url-handler-mode nil "\ @@ -28304,7 +28633,7 @@ Not documented ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (17759 28874)) +;;;;;; url-http) "url-http" "url/url-http.el" (17785 34468)) ;;; Generated autoloads from url/url-http.el (autoload (quote url-http) "url-http" "\ @@ -28369,7 +28698,7 @@ HTTPS retrievals are asynchronous.") ;;;*** -;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17592 59703)) +;;;### (autoloads (url-irc) "url-irc" "url/url-irc.el" (17729 4745)) ;;; Generated autoloads from url/url-irc.el (autoload (quote url-irc) "url-irc" "\ @@ -28379,8 +28708,8 @@ Not documented ;;;*** -;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (17729 +;;;;;; 4745)) ;;; Generated autoloads from url/url-ldap.el (autoload (quote url-ldap) "url-ldap" "\ @@ -28394,7 +28723,7 @@ URL can be a URL string, or a URL vector of the type returned by ;;;*** ;;;### (autoloads (url-mailto url-mail) "url-mailto" "url/url-mailto.el" -;;;;;; (17504 41540)) +;;;;;; (17729 4745)) ;;; Generated autoloads from url/url-mailto.el (autoload (quote url-mail) "url-mailto" "\ @@ -28410,7 +28739,7 @@ Handle the mailto: URL syntax. ;;;*** ;;;### (autoloads (url-data url-generic-emulator-loader url-info -;;;;;; url-man) "url-misc" "url/url-misc.el" (17504 41540)) +;;;;;; url-man) "url-misc" "url/url-misc.el" (17729 4745)) ;;; Generated autoloads from url/url-misc.el (autoload (quote url-man) "url-misc" "\ @@ -28442,7 +28771,7 @@ Fetch a data URL (RFC 2397). ;;;*** ;;;### (autoloads (url-snews url-news) "url-news" "url/url-news.el" -;;;;;; (17504 41540)) +;;;;;; (17729 4745)) ;;; Generated autoloads from url/url-news.el (autoload (quote url-news) "url-news" "\ @@ -28459,7 +28788,7 @@ Not documented ;;;### (autoloads (url-ns-user-pref url-ns-prefs isInNet isResolvable ;;;;;; dnsResolve dnsDomainIs isPlainHostName) "url-ns" "url/url-ns.el" -;;;;;; (17504 41540)) +;;;;;; (17729 4745)) ;;; Generated autoloads from url/url-ns.el (autoload (quote isPlainHostName) "url-ns" "\ @@ -28500,7 +28829,7 @@ Not documented ;;;*** ;;;### (autoloads (url-generic-parse-url url-recreate-url) "url-parse" -;;;;;; "url/url-parse.el" (17759 28874)) +;;;;;; "url/url-parse.el" (17756 33825)) ;;; Generated autoloads from url/url-parse.el (autoload (quote url-recreate-url) "url-parse" "\ @@ -28518,7 +28847,7 @@ Format is: ;;;*** ;;;### (autoloads (url-setup-privacy-info) "url-privacy" "url/url-privacy.el" -;;;;;; (17504 41540)) +;;;;;; (17729 4745)) ;;; Generated autoloads from url/url-privacy.el (autoload (quote url-setup-privacy-info) "url-privacy" "\ @@ -28534,7 +28863,7 @@ Setup variables that expose info about you and your system. ;;;;;; url-strip-leading-spaces url-eat-trailing-space url-get-normalized-date ;;;;;; url-lazy-message url-normalize-url url-insert-entities-in-string ;;;;;; url-parse-args url-debug url-debug) "url-util" "url/url-util.el" -;;;;;; (17615 40606)) +;;;;;; (17767 19634)) ;;; Generated autoloads from url/url-util.el (defvar url-debug nil "\ @@ -28663,7 +28992,7 @@ This uses `url-current-object', set locally to the buffer. ;;;*** ;;;### (autoloads (ask-user-about-supersession-threat ask-user-about-lock) -;;;;;; "userlock" "userlock.el" (17504 41540)) +;;;;;; "userlock" "userlock.el" (17781 39502)) ;;; Generated autoloads from userlock.el (autoload (quote ask-user-about-lock) "userlock" "\ @@ -28693,7 +29022,7 @@ The buffer in question is current when this function is called. ;;;### (autoloads (uudecode-decode-region uudecode-decode-region-internal ;;;;;; uudecode-decode-region-external) "uudecode" "gnus/uudecode.el" -;;;;;; (17548 26487)) +;;;;;; (17551 7908)) ;;; Generated autoloads from gnus/uudecode.el (autoload (quote uudecode-decode-region-external) "uudecode" "\ @@ -28723,7 +29052,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;;;; vc-directory vc-merge vc-insert-headers vc-version-other-window ;;;;;; vc-diff vc-register vc-next-action vc-do-command edit-vc-file ;;;;;; with-vc-file vc-branch-part vc-trunk-p vc-before-checkin-hook -;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17721 3805)) +;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc.el" (17721 20491)) ;;; Generated autoloads from vc.el (defvar vc-checkout-hook nil "\ @@ -29011,7 +29340,7 @@ colors. `vc-annotate-background' specifies the background color. ;;;*** -;;;### (autoloads nil "vc-arch" "vc-arch.el" (17504 41540)) +;;;### (autoloads nil "vc-arch" "vc-arch.el" (17385 8488)) ;;; Generated autoloads from vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -29021,7 +29350,7 @@ colors. `vc-annotate-background' specifies the background color. ;;;*** -;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17504 41540)) +;;;### (autoloads nil "vc-cvs" "vc-cvs.el" (17587 57307)) ;;; Generated autoloads from vc-cvs.el (defun vc-cvs-registered (f) (when (file-readable-p (expand-file-name @@ -29031,7 +29360,7 @@ colors. `vc-annotate-background' specifies the background color. ;;;*** -;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17504 41540)) +;;;### (autoloads nil "vc-mcvs" "vc-mcvs.el" (17385 8488)) ;;; Generated autoloads from vc-mcvs.el (defun vc-mcvs-registered (file) (if (vc-find-root file "MCVS/CVS") @@ -29042,27 +29371,27 @@ colors. `vc-annotate-background' specifies the background color. ;;;*** ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc-rcs.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8488)) ;;; Generated autoloads from vc-rcs.el (defvar vc-rcs-master-templates (quote ("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ *Where to look for RCS master files. For a description of possible values, see `vc-check-master-templates'.") -(custom-autoload (quote vc-rcs-master-templates) "vc-rcs" t) +(custom-autoload (quote vc-rcs-master-templates) "vc-rcs") (defun vc-rcs-registered (f) (vc-default-registered 'RCS f)) ;;;*** ;;;### (autoloads (vc-sccs-master-templates) "vc-sccs" "vc-sccs.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8488)) ;;; Generated autoloads from vc-sccs.el (defvar vc-sccs-master-templates (quote ("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) "\ *Where to look for SCCS master files. For a description of possible values, see `vc-check-master-templates'.") -(custom-autoload (quote vc-sccs-master-templates) "vc-sccs" t) +(custom-autoload (quote vc-sccs-master-templates) "vc-sccs") (defun vc-sccs-registered(f) (vc-default-registered 'SCCS f)) (defun vc-sccs-search-project-dir (dirname basename) "\ @@ -29072,7 +29401,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** -;;;### (autoloads nil "vc-svn" "vc-svn.el" (17746 41336)) +;;;### (autoloads nil "vc-svn" "vc-svn.el" (17747 24147)) ;;; Generated autoloads from vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -29090,7 +29419,7 @@ find any project directory." (let ((project-dir (getenv "PROJECTDIR")) dirs dir) ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (17759 28874)) +;;;;;; (17781 39502)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload (quote vhdl-mode) "vhdl-mode" "\ @@ -29631,7 +29960,7 @@ Key bindings: ;;;*** -;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17504 41540)) +;;;### (autoloads (vi-mode) "vi" "emulation/vi.el" (17789 35159)) ;;; Generated autoloads from emulation/vi.el (autoload (quote vi-mode) "vi" "\ @@ -29686,7 +30015,7 @@ Syntax table and abbrevs while in vi mode remain as they were in Emacs. ;;;### (autoloads (viqr-pre-write-conversion viqr-post-read-conversion ;;;;;; viet-encode-viqr-buffer viet-encode-viqr-region viet-decode-viqr-buffer ;;;;;; viet-decode-viqr-region viet-encode-viscii-char) "viet-util" -;;;;;; "language/viet-util.el" (17504 41540)) +;;;;;; "language/viet-util.el" (17792 9562)) ;;; Generated autoloads from language/viet-util.el (autoload (quote viet-encode-viscii-char) "viet-util" "\ @@ -29732,8 +30061,8 @@ Not documented ;;;### (autoloads (View-exit-and-edit view-mode-enter view-mode view-buffer-other-frame ;;;;;; view-buffer-other-window view-buffer view-file-other-frame -;;;;;; view-file-other-window view-file) "view" "view.el" (17504 -;;;;;; 41540)) +;;;;;; view-file-other-window view-file) "view" "view.el" (17385 +;;;;;; 8488)) ;;; Generated autoloads from view.el (defvar view-mode nil "\ @@ -29942,8 +30271,8 @@ Exit View mode and make the current buffer editable. ;;;*** -;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17746 -;;;;;; 34861)) +;;;### (autoloads (vip-mode vip-setup) "vip" "emulation/vip.el" (17785 +;;;;;; 34467)) ;;; Generated autoloads from emulation/vip.el (autoload (quote vip-setup) "vip" "\ @@ -29959,7 +30288,7 @@ Turn on VIP emulation of VI. ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" -;;;;;; (17746 34861)) +;;;;;; (17743 18143)) ;;; Generated autoloads from emulation/viper.el (autoload (quote toggle-viper-mode) "viper" "\ @@ -29976,7 +30305,7 @@ Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'. ;;;*** ;;;### (autoloads (warn lwarn display-warning) "warnings" "emacs-lisp/warnings.el" -;;;;;; (17504 41540)) +;;;;;; (17495 43954)) ;;; Generated autoloads from emacs-lisp/warnings.el (defvar warning-prefix-function nil "\ @@ -30065,7 +30394,7 @@ this is equivalent to `display-warning', using ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (17611 30621)) +;;;;;; (17786 57515)) ;;; Generated autoloads from wdired.el (autoload (quote wdired-change-to-wdired-mode) "wdired" "\ @@ -30081,7 +30410,7 @@ See `wdired-mode'. ;;;*** -;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17504 41540)) +;;;### (autoloads (webjump) "webjump" "net/webjump.el" (17786 56015)) ;;; Generated autoloads from net/webjump.el (autoload (quote webjump) "webjump" "\ @@ -30098,7 +30427,7 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke ;;;*** ;;;### (autoloads (which-function-mode) "which-func" "progmodes/which-func.el" -;;;;;; (17611 25727)) +;;;;;; (17608 57530)) ;;; Generated autoloads from progmodes/which-func.el (put 'which-func-format 'risky-local-variable t) (put 'which-func-current 'risky-local-variable t) @@ -30109,8 +30438,7 @@ Please submit bug reports and other feedback to the author, Neil W. Van Dyke Non-nil if Which-Function mode is enabled. See the command `which-function-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `which-function-mode'.") +use either \\[customize] or the function `which-function-mode'.") (custom-autoload (quote which-function-mode) "which-func" nil) @@ -30131,7 +30459,7 @@ and off otherwise. ;;;;;; whitespace-buffer whitespace-toggle-ateol-check whitespace-toggle-spacetab-check ;;;;;; whitespace-toggle-indent-check whitespace-toggle-trailing-check ;;;;;; whitespace-toggle-leading-check) "whitespace" "whitespace.el" -;;;;;; (17746 34861)) +;;;;;; (17781 39502)) ;;; Generated autoloads from whitespace.el (autoload (quote whitespace-toggle-leading-check) "whitespace" "\ @@ -30222,7 +30550,7 @@ This is meant to be added buffer-locally to `write-file-functions'. ;;;*** ;;;### (autoloads (widget-minor-mode widget-browse-other-window widget-browse -;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (17504 41540)) +;;;;;; widget-browse-at) "wid-browse" "wid-browse.el" (17781 39502)) ;;; Generated autoloads from wid-browse.el (autoload (quote widget-browse-at) "wid-browse" "\ @@ -30249,8 +30577,8 @@ With arg, turn widget mode on if and only if arg is positive. ;;;*** ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create -;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17746 -;;;;;; 34861)) +;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (17743 +;;;;;; 45278)) ;;; Generated autoloads from wid-edit.el (autoload (quote widgetp) "wid-edit" "\ @@ -30294,8 +30622,8 @@ Setup current buffer so editing string widgets works. ;;;*** ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right -;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (17504 -;;;;;; 41540)) +;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (17781 +;;;;;; 39502)) ;;; Generated autoloads from windmove.el (autoload (quote windmove-left) "windmove" "\ @@ -30348,7 +30676,7 @@ Default MODIFIER is 'shift. ;;;*** ;;;### (autoloads (winner-mode winner-mode) "winner" "winner.el" -;;;;;; (17504 41540)) +;;;;;; (17385 8488)) ;;; Generated autoloads from winner.el (defvar winner-mode nil "\ @@ -30356,7 +30684,7 @@ Toggle Winner mode. Setting this variable directly does not take effect; use either \\[customize] or the function `winner-mode'.") -(custom-autoload (quote winner-mode) "winner" nil) +(custom-autoload (quote winner-mode) "winner") (autoload (quote winner-mode) "winner" "\ Toggle Winner mode. @@ -30367,7 +30695,7 @@ With arg, turn Winner mode on if and only if arg is positive. ;;;*** ;;;### (autoloads (woman-find-file woman-dired-find-file woman) "woman" -;;;;;; "woman.el" (17715 55645)) +;;;;;; "woman.el" (17781 39502)) ;;; Generated autoloads from woman.el (autoload (quote woman) "woman" "\ @@ -30403,7 +30731,7 @@ decompress the file if appropriate. See the documentation for the ;;;*** ;;;### (autoloads (wordstar-mode) "ws-mode" "emulation/ws-mode.el" -;;;;;; (17504 41540)) +;;;;;; (17785 34467)) ;;; Generated autoloads from emulation/ws-mode.el (autoload (quote wordstar-mode) "ws-mode" "\ @@ -30516,7 +30844,7 @@ The key bindings are: ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (17610 3931)) +;;;;;; (17607 45512)) ;;; Generated autoloads from xml.el (autoload (quote xml-parse-file) "xml" "\ @@ -30541,18 +30869,19 @@ If PARSE-NS is non-nil, then QNAMES are expanded. ;;;*** -;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17504 -;;;;;; 41540)) +;;;### (autoloads (xterm-mouse-mode) "xt-mouse" "xt-mouse.el" (17385 +;;;;;; 8488)) ;;; Generated autoloads from xt-mouse.el (defvar xterm-mouse-mode nil "\ Non-nil if Xterm-Mouse mode is enabled. See the command `xterm-mouse-mode' for a description of this minor-mode. Setting this variable directly does not take effect; -either customize it (see the info node `Easy Customization') -or call the function `xterm-mouse-mode'.") +use either \\[customize] or the function `xterm-mouse-mode'.") + +(custom-autoload (quote xterm-mouse-mode) "xt-mouse") -(custom-autoload (quote xterm-mouse-mode) "xt-mouse" nil) +(put (quote xterm-mouse-mode) (quote custom-set) (quote custom-set-minor-mode)) (autoload (quote xterm-mouse-mode) "xt-mouse" "\ Toggle XTerm mouse mode. @@ -30570,7 +30899,7 @@ down the SHIFT key while pressing the mouse button. ;;;*** ;;;### (autoloads (yenc-extract-filename yenc-decode-region) "yenc" -;;;;;; "gnus/yenc.el" (17504 41540)) +;;;;;; "gnus/yenc.el" (17385 8494)) ;;; Generated autoloads from gnus/yenc.el (autoload (quote yenc-decode-region) "yenc" "\ @@ -30586,7 +30915,7 @@ Extract file name from an yenc header. ;;;*** ;;;### (autoloads (psychoanalyze-pinhead apropos-zippy insert-zippyism -;;;;;; yow) "yow" "play/yow.el" (17504 41540)) +;;;;;; yow) "yow" "play/yow.el" (17786 56015)) ;;; Generated autoloads from play/yow.el (autoload (quote yow) "yow" "\ @@ -30612,7 +30941,7 @@ Zippy goes to the analyst. ;;;*** -;;;### (autoloads (zone) "zone" "play/zone.el" (17504 41540)) +;;;### (autoloads (zone) "zone" "play/zone.el" (17385 8495)) ;;; Generated autoloads from play/zone.el (autoload (quote zone) "zone" "\ @@ -30641,10 +30970,10 @@ Zone out, completely. ;;;;;; "calendar/cal-iso.el" "calendar/cal-julian.el" "calendar/cal-mayan.el" ;;;;;; "calendar/cal-menu.el" "calendar/cal-move.el" "calendar/cal-persia.el" ;;;;;; "calendar/cal-tex.el" "calendar/cal-x.el" "case-table.el" -;;;;;; "cdl.el" "cus-dep.el" "cus-start.el" "custom.el" "dframe.el" -;;;;;; "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el" "ediff-init.el" -;;;;;; "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el" "ediff-wind.el" -;;;;;; "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el" +;;;;;; "cdl.el" "cus-dep.el" "cus-load.el" "cus-start.el" "custom.el" +;;;;;; "dframe.el" "dos-fns.el" "dos-vars.el" "dos-w32.el" "ediff-diff.el" +;;;;;; "ediff-init.el" "ediff-merg.el" "ediff-ptch.el" "ediff-vers.el" +;;;;;; "ediff-wind.el" "electric.el" "emacs-lisp/assoc.el" "emacs-lisp/authors.el" ;;;;;; "emacs-lisp/bindat.el" "emacs-lisp/byte-opt.el" "emacs-lisp/byte-run.el" ;;;;;; "emacs-lisp/cl-compat.el" "emacs-lisp/cl-extra.el" "emacs-lisp/cl-macs.el" ;;;;;; "emacs-lisp/cl-seq.el" "emacs-lisp/cl-specs.el" "emacs-lisp/cust-print.el" @@ -30727,9 +31056,10 @@ Zone out, completely. ;;;;;; "net/eudcb-bbdb.el" "net/eudcb-ldap.el" "net/eudcb-mab.el" ;;;;;; "net/eudcb-ph.el" "net/ldap.el" "net/netrc.el" "net/tls.el" ;;;;;; "net/tramp-smb.el" "net/tramp-util.el" "net/tramp-uu.el" -;;;;;; "net/tramp-vc.el" "net/trampver.el" "patcomp.el" "paths.el" -;;;;;; "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el" "pgg-def.el" -;;;;;; "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el" +;;;;;; "net/tramp-vc.el" "net/trampver.el" "obsolete/bg-mouse.el" +;;;;;; "obsolete/hilit19.el" "obsolete/sc.el" "obsolete/uncompress.el" +;;;;;; "patcomp.el" "paths.el" "pcvs-info.el" "pcvs-parse.el" "pcvs-util.el" +;;;;;; "pgg-def.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el" ;;;;;; "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el" ;;;;;; "progmodes/cc-align.el" "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" ;;;;;; "progmodes/cc-cmds.el" "progmodes/cc-defs.el" "progmodes/cc-fonts.el" @@ -30740,26 +31070,24 @@ Zone out, completely. ;;;;;; "progmodes/idlw-toolbar.el" "progmodes/mantemp.el" "progmodes/xscheme.el" ;;;;;; "register.el" "replace.el" "rfn-eshadow.el" "s-region.el" ;;;;;; "saveplace.el" "sb-image.el" "scroll-bar.el" "select.el" -;;;;;; "soundex.el" "startup.el" "subdirs.el" "tempo.el" "term/AT386.el" -;;;;;; "term/apollo.el" "term/bobcat.el" "term/cygwin.el" "term/internal.el" -;;;;;; "term/iris-ansi.el" "term/linux.el" "term/lk201.el" "term/mac-win.el" -;;;;;; "term/news.el" "term/pc-win.el" "term/rxvt.el" "term/sun-mouse.el" -;;;;;; "term/sun.el" "term/sup-mouse.el" "term/tty-colors.el" "term/tvi970.el" -;;;;;; "term/vt100.el" "term/vt102.el" "term/vt125.el" "term/vt200.el" +;;;;;; "soundex.el" "startup.el" "subdirs.el" "tempo.el" "term/apollo.el" +;;;;;; "term/bobcat.el" "term/cygwin.el" "term/internal.el" "term/linux.el" +;;;;;; "term/lk201.el" "term/pc-win.el" "term/rxvt.el" "term/sun.el" +;;;;;; "term/tty-colors.el" "term/vt102.el" "term/vt125.el" "term/vt200.el" ;;;;;; "term/vt201.el" "term/vt220.el" "term/vt240.el" "term/vt300.el" -;;;;;; "term/vt320.el" "term/vt400.el" "term/vt420.el" "term/w32-win.el" -;;;;;; "term/wyse50.el" "textmodes/bib-mode.el" "textmodes/makeinfo.el" -;;;;;; "textmodes/page-ext.el" "textmodes/page.el" "textmodes/refbib.el" -;;;;;; "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" -;;;;;; "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" -;;;;;; "textmodes/texnfo-upd.el" "textmodes/text-mode.el" "timezone.el" -;;;;;; "tooltip.el" "tree-widget.el" "uniquify.el" "url/url-about.el" -;;;;;; "url/url-cookie.el" "url/url-dired.el" "url/url-expand.el" -;;;;;; "url/url-ftp.el" "url/url-history.el" "url/url-imap.el" "url/url-methods.el" -;;;;;; "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "url/vc-dav.el" -;;;;;; "vc-hooks.el" "vcursor.el" "version.el" "vms-patch.el" "vmsproc.el" -;;;;;; "vt-control.el" "vt100-led.el" "w32-fns.el" "w32-vars.el" -;;;;;; "widget.el" "window.el" "x-dnd.el") (17759 32231 360716)) +;;;;;; "term/vt320.el" "term/vt400.el" "term/vt420.el" "textmodes/bib-mode.el" +;;;;;; "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/page.el" +;;;;;; "textmodes/refbib.el" "textmodes/refer.el" "textmodes/reftex-auc.el" +;;;;;; "textmodes/reftex-dcr.el" "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" +;;;;;; "textmodes/reftex-toc.el" "textmodes/texnfo-upd.el" "textmodes/text-mode.el" +;;;;;; "timezone.el" "tooltip.el" "tree-widget.el" "uniquify.el" +;;;;;; "url/url-about.el" "url/url-cookie.el" "url/url-dired.el" +;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" +;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" +;;;;;; "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el" +;;;;;; "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el" +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el" +;;;;;; "x-dnd.el") (17800 15098 489655)) ;;;*** diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el index da7e5fcf579..b2374490026 100644 --- a/lisp/mail/footnote.el +++ b/lisp/mail/footnote.el @@ -501,7 +501,8 @@ styles." (regexp-quote footnote-end-tag))) nil t) (unless (beginning-of-line) t)) - (goto-char (point-max))))) + (Footnote-goto-char-point-max) + (re-search-backward (concat "^" footnote-section-tag-regexp) nil t)))) (unless (looking-at "^$") (insert "\n")) (when (eobp) diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 1c15be1f5d4..812ce91d235 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -374,7 +374,12 @@ pre-mh-loaddefs.el-CMD: # sources only. # Need separate version for sh and native cmd.exe -bootstrap-clean: bootstrap-clean-$(SHELLTYPE) $(lisp)/loaddefs.el +# Note that bootstrap-clean-$(SHELLTYPE) copies ldefs-boot.el to loaddefs.el, +# and thus the almost-empty loaddefs.el crafted by the $(lisp)/loaddefs.el +# target can NOT be built _after_ bootstrap-clean-$(SHELLTYPE) does its +# thing, or else an empty loaddefs.el will overwrite the full one. +bootstrap-clean: $(lisp)/loaddefs.el + $(MAKE) $(MFLAGS) bootstrap-clean-$(SHELLTYPE) bootstrap-clean-CMD: # if exist "$(EMACS)" $(MAKE) $(MFLAGS) autoloads diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index c77dbbd64b3..75c9b04a040 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -3977,7 +3977,7 @@ E.g., ange-ftp-this-dir)) (ange-ftp-real-file-name-all-completions file ange-ftp-this-dir))))) -(defun ange-ftp-file-name-completion (file dir) +(defun ange-ftp-file-name-completion (file dir &optional predicate) (let ((ange-ftp-this-dir (expand-file-name dir))) (if (ange-ftp-ftp-name ange-ftp-this-dir) (progn @@ -4005,8 +4005,13 @@ E.g., file (nconc (ange-ftp-generate-root-prefixes) (ange-ftp-real-file-name-all-completions - file ange-ftp-this-dir))) - (ange-ftp-real-file-name-completion file ange-ftp-this-dir))))) + file ange-ftp-this-dir)) + predicate) + (if predicate + (ange-ftp-real-file-name-completion + file ange-ftp-this-dir predicate) + (ange-ftp-real-file-name-completion + file ange-ftp-this-dir)))))) (defun ange-ftp-file-name-completion-1 (file tbl dir &optional predicate) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index a45e1a22ad5..822a995230e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -326,35 +326,24 @@ This variable defaults to the value of `tramp-encoding-shell'." (tramp-login-program "ssh") (tramp-copy-program "scp") (tramp-remote-sh "/bin/sh") - (tramp-login-args ("-o" "ControlPath=%t.%%r@%%h:%%p" - "-o" "ControlMaster=yes" - "-e" "none")) - (tramp-copy-args ("-o" "ControlPath=%t.%%r@%%h:%%p" - "-o" "ControlMaster=auto")) + (tramp-login-args ("-e" "none")) + (tramp-copy-args nil) (tramp-copy-keep-date-arg "-p") (tramp-password-end-of-line nil)) ("scp1" (tramp-connection-function tramp-open-connection-rsh) (tramp-login-program "ssh") (tramp-copy-program "scp") (tramp-remote-sh "/bin/sh") - (tramp-login-args ("-o" "ControlPath=%t.%%r@%%h:%%p" - "-o" "ControlMaster=yes" - "-1" "-e" "none")) - (tramp-copy-args ("-o" "ControlPath=%t.%%r@%%h:%%p" - "-o" "ControlMaster=auto" - "-1")) + (tramp-login-args ("-1" "-e" "none")) + (tramp-copy-args ("-1")) (tramp-copy-keep-date-arg "-p") (tramp-password-end-of-line nil)) ("scp2" (tramp-connection-function tramp-open-connection-rsh) (tramp-login-program "ssh") (tramp-copy-program "scp") (tramp-remote-sh "/bin/sh") - (tramp-login-args ("-o" "ControlPath=%t.%%r@%%h:%%p" - "-o" "ControlMaster=yes" - "-2" "-e" "none")) - (tramp-copy-args ("-o" "ControlPath=%t.%%r@%%h:%%p" - "-o" "ControlMaster=auto" - "-2")) + (tramp-login-args ("-2" "-e" "none")) + (tramp-copy-args ("-2")) (tramp-copy-keep-date-arg "-p") (tramp-password-end-of-line nil)) ("scp1_old" @@ -483,6 +472,17 @@ This variable defaults to the value of `tramp-encoding-shell'." (tramp-copy-args nil) (tramp-copy-keep-date-arg nil) (tramp-password-end-of-line nil)) + ("scpc" (tramp-connection-function tramp-open-connection-rsh) + (tramp-login-program "ssh") + (tramp-copy-program "scp") + (tramp-remote-sh "/bin/sh") + (tramp-login-args ("-o" "ControlPath=%t.%%r@%%h:%%p" + "-o" "ControlMaster=yes" + "-e" "none")) + (tramp-copy-args ("-o" "ControlPath=%t.%%r@%%h:%%p" + "-o" "ControlMaster=auto")) + (tramp-copy-keep-date-arg "-p") + (tramp-password-end-of-line nil)) ("scpx" (tramp-connection-function tramp-open-connection-rsh) (tramp-login-program "ssh") (tramp-copy-program "scp") @@ -684,10 +684,39 @@ various functions for details." :type '(repeat (list string function string))) (defcustom tramp-default-method - (if (and (fboundp 'executable-find) - (executable-find "pscp")) - "pscp" - "scp") + ;; An external copy method seems to be preferred, because it is much + ;; more performant for large files, and it hasn't too serious delays + ;; for small files. But it must be ensured that there aren't + ;; permanent password queries. Either a password agent like + ;; "ssh-agent" or "Pageant" shall run, or the optional password.el + ;; package shall be active for password caching. "scpc" would be + ;; another good choice because of the "ControlMaster" option, but + ;; this is a more modern alternative in OpenSSH 4, which cannot be + ;; taken as default. + (let ((e-f (fboundp 'executable-find))) + (cond + ;; PuTTY is installed. + ((and e-f (funcall 'executable-find "pscp")) + (if (or (fboundp 'password-read) + ;; Pageant is running. + (and (fboundp 'w32-window-exists-p) + (funcall 'w32-window-exists-p "Pageant" "Pageant"))) + "pscp" + "plink")) + ;; There is an ssh installation. + ((and e-f (funcall 'executable-find "scp")) + (if (or (fboundp 'password-read) + ;; ssh-agent is running. + (getenv "SSH_AUTH_SOCK") + (getenv "SSH_AGENT_PID")) + "scp" + "ssh")) + ;; Under Emacs 20, `executable-find' does not exists. So we + ;; couldn't check whether there is an ssh implementation. Let's + ;; hope the best. + ((not e-f) "ssh") + ;; Fallback. + (t "ftp"))) "*Default method to use for transferring files. See `tramp-methods' for possibilities. Also see `tramp-default-method-alist'." @@ -925,8 +954,10 @@ See also `tramp-yn-prompt-regexp'." :type 'regexp) (defcustom tramp-yn-prompt-regexp - (concat (regexp-opt '("Store key in cache? (y/n)") t) - "\\s-*") + (concat + (regexp-opt '("Store key in cache? (y/n)" + "Update cached key? (y/n, Return cancels connection)") t) + "\\s-*") "Regular expression matching all y/n queries which need to be confirmed. The confirmation should be done with y or n. The regexp should match at end of buffer. @@ -2044,7 +2075,9 @@ If VAR is nil, then we bind `v' to the structure and `multi-method', ;; Enable debugging. (def-edebug-spec with-parsed-tramp-file-name (form symbolp body)) ;; Highlight as keyword. -(font-lock-add-keywords 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>")) +(when (functionp 'font-lock-add-keywords) + (funcall 'font-lock-add-keywords + 'emacs-lisp-mode '("\\<with-parsed-tramp-file-name\\>"))) (defmacro tramp-let-maybe (variable value &rest body) "Let-bind VARIABLE to VALUE in BODY, but only if VARIABLE is not obsolete. @@ -2834,17 +2867,18 @@ of." ;; The following isn't needed for Emacs 20 but for 19.34? -(defun tramp-handle-file-name-completion (filename directory) +(defun tramp-handle-file-name-completion + (filename directory &optional predicate) "Like `file-name-completion' for tramp files." (unless (tramp-tramp-file-p directory) (error "tramp-handle-file-name-completion invoked on non-tramp directory `%s'" directory)) - (with-parsed-tramp-file-name directory nil - (try-completion - filename - (mapcar (lambda (x) (cons x nil)) - (file-name-all-completions filename directory))))) + (try-completion + filename + (mapcar 'list (file-name-all-completions filename directory)) + (when predicate + (lambda (x) (funcall predicate (expand-file-name (car x) directory)))))) ;; cp, mv and ln @@ -4494,7 +4528,6 @@ Falls back to normal file name handler if no tramp file name handler exists." "Checks whether method / user name / host name completion is active." (cond (tramp-completion-mode t) - ((not tramp-unified-filenames) t) ((string-match "^/.*:.*:$" file) nil) ((string-match (concat tramp-prefix-regexp @@ -4503,7 +4536,7 @@ Falls back to normal file name handler if no tramp file name handler exists." (member (match-string 1 file) (mapcar 'car tramp-methods))) ((or (equal last-input-event 'tab) ;; Emacs - (and (integerp last-input-event) + (and (wholenump last-input-event) (or ;; ?\t has event-modifier 'control (char-equal last-input-event ?\t) @@ -4605,10 +4638,14 @@ Falls back to normal file name handler if no tramp file name handler exists." ;; Method, host name and user name completion for a file. ;;;###autoload -(defun tramp-completion-handle-file-name-completion (filename directory) +(defun tramp-completion-handle-file-name-completion + (filename directory &optional predicate) "Like `file-name-completion' for tramp files." - (try-completion filename - (mapcar 'list (file-name-all-completions filename directory)))) + (try-completion + filename + (mapcar 'list (file-name-all-completions filename directory)) + (when predicate + (lambda (x) (funcall predicate (expand-file-name (car x) directory)))))) ;; I misuse a little bit the tramp-file-name structure in order to handle ;; completion possibilities for partial methods / user names / host names. @@ -5068,13 +5105,23 @@ hosts, or files, disagree." (defun tramp-touch (file time) "Set the last-modified timestamp of the given file. TIME is an Emacs internal time value as returned by `current-time'." - (let ((touch-time (format-time-string "%Y%m%d%H%M.%S" time t))) + (let* ((utc + ;; With GNU Emacs, `format-time-string' has an optional + ;; parameter UNIVERSAL. This is preferred. + (and (functionp 'subr-arity) + (= 3 (cdr (funcall (symbol-function 'subr-arity) + (symbol-function 'format-time-string)))))) + (touch-time + (if utc + (format-time-string "%Y%m%d%H%M.%S" time t) + (format-time-string "%Y%m%d%H%M.%S" time)))) (if (tramp-tramp-file-p file) (with-parsed-tramp-file-name file nil (let ((buf (tramp-get-buffer multi-method method user host))) (unless (zerop (tramp-send-command-and-check multi-method method user host - (format "TZ=UTC; export TZ; touch -t %s %s" + (format "%s touch -t %s %s" + (if utc "TZ=UTC; export TZ;" "") touch-time (tramp-shell-quote-argument localname)) t)) @@ -6943,8 +6990,8 @@ localname (file name on remote host)." item) (while choices (setq item (pop choices)) - (when (and (string-match (nth 0 item) (or host "")) - (string-match (nth 1 item) (or user ""))) + (when (and (string-match (or (nth 0 item) "") (or host "")) + (string-match (or (nth 1 item) "") (or user ""))) (setq method (nth 2 item)) (setq choices nil))) method)) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 710022f885b..8061b78e124 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -30,7 +30,7 @@ ;; are auto-frobbed from configure.ac, so you should edit that file and run ;; "autoconf && ./configure" to change them. -(defconst tramp-version "2.0.54" +(defconst tramp-version "2.0.55" "This version of Tramp.") (defconst tramp-bug-report-address "tramp-devel@gnu.org" diff --git a/lisp/outline.el b/lisp/outline.el index 0ec527060a1..95594ebec9f 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -652,19 +652,24 @@ A heading line is one that starts with a `*' (or that (if (< arg 0) (beginning-of-line) (end-of-line)) - (while (and (not (bobp)) (< arg 0)) - (while (and (not (bobp)) - (re-search-backward (concat "^\\(?:" outline-regexp "\\)") - nil 'move) - (outline-invisible-p))) - (setq arg (1+ arg))) - (while (and (not (eobp)) (> arg 0)) - (while (and (not (eobp)) - (re-search-forward (concat "^\\(?:" outline-regexp "\\)") - nil 'move) - (outline-invisible-p (match-beginning 0)))) - (setq arg (1- arg))) - (beginning-of-line)) + (let (found-heading-p) + (while (and (not (bobp)) (< arg 0)) + (while (and (not (bobp)) + (setq found-heading-p + (re-search-backward + (concat "^\\(?:" outline-regexp "\\)") + nil 'move)) + (outline-invisible-p))) + (setq arg (1+ arg))) + (while (and (not (eobp)) (> arg 0)) + (while (and (not (eobp)) + (setq found-heading-p + (re-search-forward + (concat "^\\(?:" outline-regexp "\\)") + nil 'move)) + (outline-invisible-p (match-beginning 0)))) + (setq arg (1- arg))) + (if found-heading-p (beginning-of-line)))) (defun outline-previous-visible-heading (arg) "Move to the previous heading line. @@ -690,6 +695,11 @@ This puts point at the start of the current subtree, and mark at the end." (goto-char beg))) +(defvar outline-isearch-open-invisible-function nil + "Function called if `isearch' finishes in an invisible overlay. +The function is called with the overlay as its only argument. +If nil, `show-entry' is called to reveal the invisible text.") + (put 'outline 'reveal-toggle-invisible 'outline-reveal-toggle-invisible) (defun outline-flag-region (from to flag) "Hide or show lines from FROM to TO, according to FLAG. @@ -698,7 +708,9 @@ If FLAG is nil then text is shown, while if FLAG is t the text is hidden." (when flag (let ((o (make-overlay from to))) (overlay-put o 'invisible 'outline) - (overlay-put o 'isearch-open-invisible 'outline-isearch-open-invisible))) + (overlay-put o 'isearch-open-invisible + (or outline-isearch-open-invisible-function + 'outline-isearch-open-invisible)))) ;; Seems only used by lazy-lock. I.e. obsolete. (run-hooks 'outline-view-change-hook)) diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el index 790b6bd1e6b..95f0d7658f6 100644 --- a/lisp/pgg-def.el +++ b/lisp/pgg-def.el @@ -71,9 +71,7 @@ Whether the passphrase is cached at all is controlled by :group 'pgg :type 'integer) -(defcustom pgg-passphrase-coding-system - (if (boundp 'locale-coding-system) - locale-coding-system) +(defcustom pgg-passphrase-coding-system nil "Coding system to encode passphrase." :group 'pgg :type 'coding-system) diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el index 4b8b79b068e..514be51a6a3 100644 --- a/lisp/pgg-gpg.el +++ b/lisp/pgg-gpg.el @@ -52,7 +52,7 @@ :type '(choice (const :tag "New `--recipient' option" "--recipient") (const :tag "Old `--remote-user' option" "--remote-user"))) -(defcustom pgg-gpg-use-agent nil +(defcustom pgg-gpg-use-agent t "Whether to use gnupg agent for key caching." :group 'pgg-gpg :type 'boolean) @@ -94,8 +94,10 @@ (if pgg-passphrase-coding-system (progn (setq encoded-passphrase-with-new-line - (encode-coding-string passphrase-with-newline - pgg-passphrase-coding-system)) + (encode-coding-string + passphrase-with-newline + (coding-system-change-eol-conversion + pgg-passphrase-coding-system 'unix))) (pgg-clear-string passphrase-with-newline)) (setq encoded-passphrase-with-new-line passphrase-with-newline passphrase-with-newline nil)) diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 7c48967abde..40407f3819a 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -531,9 +531,11 @@ that requires a literal mode spec at compile time." ;; heuristic that open parens in column 0 are defun starters. Since ;; we have c-state-cache, that heuristic isn't useful and only causes ;; trouble, so turn it off. - (when (memq 'col-0-paren c-emacs-features) - (make-local-variable 'open-paren-in-column-0-is-defun-start) - (setq open-paren-in-column-0-is-defun-start nil)) +;; 2006/12/17: This facility is somewhat confused, and doesn't really seem +;; helpful. Comment it out for now. +;; (when (memq 'col-0-paren c-emacs-features) +;; (make-local-variable 'open-paren-in-column-0-is-defun-start) +;; (setq open-paren-in-column-0-is-defun-start nil)) (c-clear-found-types) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 48dd31b19f9..3a253796f28 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -79,6 +79,8 @@ ;; 5) If you wish to call procedures from your program in GDB ;; e.g "call myproc ()", "p mysquare (5)" then use level 2 annotations ;; "gdb --annotate=2 myprog" to keep source buffer/selected frame fixed. +;; 6) After detaching from a process, clicking on the "GO" icon on toolbar +;; (gud-go) sends "continue" to GDB (should be "run"). ;;; Problems with watch expressions, GDB/MI: @@ -708,11 +710,6 @@ With arg, enter name of variable to be watched in the minibuffer." (buffer-substring (region-beginning) (region-end)) (tooltip-identifier-from-point (point)))))) (speedbar 1) - (catch 'already-watched - (dolist (var gdb-var-list) - (unless (string-match "\\." (car var)) - (if (string-equal expr (nth 1 var)) - (throw 'already-watched nil)))) (set-text-properties 0 (length expr) nil expr) (gdb-enqueue-input (list @@ -720,7 +717,7 @@ With arg, enter name of variable to be watched in the minibuffer." (concat "server interpreter mi \"-var-create - * " expr "\"\n") (concat"-var-create - * " expr "\n")) - `(lambda () (gdb-var-create-handler ,expr)))))))) + `(lambda () (gdb-var-create-handler ,expr))))))) (message "gud-watch is a no-op in this mode.")))) (defconst gdb-var-create-regexp @@ -849,32 +846,24 @@ type_changed=\".*?\".*?}") (interactive) (if (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer) '(gdbmi gdba)) - (let ((text (speedbar-line-text))) - ;; Can't use \\S-+ for whitespace because - ;; speedbar has a whacky syntax table. - (string-match "\\([^ \t]+\\)" text) - (let ((expr (match-string 1 text)) var varnum) - (catch 'expr-found - (dolist (var1 gdb-var-list) - (when (string-equal expr (nth 1 var1)) - (setq var var1) - (setq varnum (car var1)) - (throw 'expr-found nil)))) - (unless (string-match "\\." (car var)) - (gdb-enqueue-input - (list - (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) - 'gdba) - (concat "server interpreter mi \"-var-delete " varnum "\"\n") - (concat "-var-delete " varnum "\n")) - 'ignore)) - (setq gdb-var-list (delq var gdb-var-list)) - (dolist (varchild gdb-var-list) - (if (string-match (concat (car var) "\\.") (car varchild)) - (setq gdb-var-list (delq varchild gdb-var-list))))))))) + (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list)) + (varnum (car var))) + (if (string-match "\\." (car var)) + (message-box "Can only delete a root expression") + (gdb-enqueue-input + (list + (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) + 'gdba) + (concat "server interpreter mi \"-var-delete " varnum "\"\n") + (concat "-var-delete " varnum "\n")) + 'ignore)) + (setq gdb-var-list (delq var gdb-var-list)) + (dolist (varchild gdb-var-list) + (if (string-match (concat (car var) "\\.") (car varchild)) + (setq gdb-var-list (delq varchild gdb-var-list)))))))) (defun gdb-var-delete-children (varnum) - "Delete children of variable object point from the speedbar." + "Delete children of variable object at point from the speedbar." (gdb-enqueue-input (list (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba) @@ -1015,7 +1004,7 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'." 'gdb-partial-output-name) (defun gdb-partial-output-name () - (concat "*partial-output-" + (concat " *partial-output-" (gdb-get-target-string) "*")) @@ -1401,7 +1390,7 @@ sink to `user' in `gdb-stopping', that is fine." (if (and gdb-frame-begin gdb-printing) (setq gud-overlay-arrow-position gud-old-arrow) ;;Pop up GUD buffer to display current frame when it doesn't have source - ;;information i.e id not compiled with -g as with libc routines generally. + ;;information i.e if not compiled with -g as with libc routines generally. (if gdb-same-frame (gdb-display-gdb-buffer) (gdb-frame-gdb-buffer)) @@ -1415,6 +1404,7 @@ sink to `user' in `gdb-stopping', that is fine." (gdb-invalidate-frames) 'delete)))))) (unless (member gdb-inferior-status '("exited" "signal")) + (setq gdb-active-process t) ;Just for attaching case. (setq gdb-inferior-status "stopped") (gdb-force-mode-line-update (propertize gdb-inferior-status 'face font-lock-warning-face))) @@ -1785,7 +1775,7 @@ static char *magick[] = { (dolist (buffer (buffer-list)) (with-current-buffer buffer (if (and (memq gud-minor-mode '(gdba gdbmi)) - (not (string-match "\\`\\*.+\\*\\'" (buffer-name)))) + (not (string-match "\\` ?\\*.+\\*\\'" (buffer-name)))) (gdb-remove-breakpoint-icons (point-min) (point-max))))) (with-current-buffer (gdb-get-buffer 'gdb-breakpoints-buffer) (save-excursion @@ -2934,7 +2924,7 @@ Kills the gdb buffers, and resets variables and the source buffers." (unless (eq buffer gud-comint-buffer) (with-current-buffer buffer (if (memq gud-minor-mode '(gdbmi gdba)) - (if (string-match "\\`\\*.+\\*\\'" (buffer-name)) + (if (string-match "\\` ?\\*.+\\*\\'" (buffer-name)) (kill-buffer nil) (gdb-remove-breakpoint-icons (point-min) (point-max) t) (setq gud-minor-mode nil) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index de2a00c3ad7..e7de415fe2a 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1890,7 +1890,7 @@ To revert all these variables to the global values, use command `sh-reset-indent-vars-to-global-values'." (interactive) (mapcar 'make-local-variable sh-var-list) - (message "Indentation variable are now local.")) + (message "Indentation variables are now local.")) (defun sh-reset-indent-vars-to-global-values () "Reset local indentation variables to the global values. diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 4b5a8bb51f1..afc0f35f26c 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -5,7 +5,7 @@ ;; Author: Alex Schroeder <alex@gnu.org> ;; Maintainer: Michael Mauger <mmaug@yahoo.com> -;; Version: 2.0.1 +;; Version: 2.0.2 ;; Keywords: comm languages processes ;; URL: http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/progmodes/sql.el ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?SqlMode @@ -30,26 +30,40 @@ ;;; Commentary: ;; Please send bug reports and bug fixes to the mailing list at -;; sql.el@gnu.org. If you want to subscribe to the mailing list, send -;; mail to sql.el-request@gnu.org with `subscribe sql.el FIRSTNAME -;; LASTNAME' in the mail body. - -;; This file provides a sql-mode and a sql-interactive-mode. My goals -;; were two simple modes providing syntactic hilighting. The -;; interactive mode had to provide a command-line history; the other -;; mode had to provide "send region/buffer to SQL interpreter" -;; functions. "simple" in this context means easy to use, easy to -;; maintain and little or no bells and whistles. +;; help-gnu-emacs@gnu.org. If you want to subscribe to the mailing +;; list, see the web page at +;; http://lists.gnu.org/mailman/listinfo/help-gnu-emacs for +;; instructions. I monitor this list actively. If you send an e-mail +;; to Alex Schroeder it usually makes it to me when Alex has a chance +;; to forward them along (Thanks, Alex). + +;; This file provides a sql-mode and a sql-interactive-mode. The +;; original goals were two simple modes providing syntactic +;; highlighting. The interactive mode had to provide a command-line +;; history; the other mode had to provide "send region/buffer to SQL +;; interpreter" functions. "simple" in this context means easy to +;; use, easy to maintain and little or no bells and whistles. This +;; has changed somewhat as experience with the mode has accumulated. + +;; Support for different flavors of SQL and command interpreters was +;; available in early versions of sql.el. This support has been +;; extended and formalized in later versions. Part of the impetus for +;; the improved support of SQL flavors was borne out of the current +;; maintainer's consulting experience. In the past fifteen years, I +;; have used Oracle, Sybase, Informix, MySQL, Postgres, and SQLServer. +;; On some assignments, I have used two or more of these concurrently. ;; If anybody feels like extending this sql mode, take a look at the ;; above mentioned modes and write a sqlx-mode on top of this one. If ;; this proves to be difficult, please suggest changes that will -;; facilitate your plans. +;; facilitate your plans. Facilities have been provided to add +;; products and product-specific configuration. ;; sql-interactive-mode is used to interact with a SQL interpreter ;; process in a SQLi buffer (usually called `*SQL*'). The SQLi buffer -;; is created by calling a SQL interpreter-specific entry function. Do -;; *not* call sql-interactive-mode by itself. +;; is created by calling a SQL interpreter-specific entry function or +;; sql-product-interactive. Do *not* call sql-interactive-mode by +;; itself. ;; The list of currently supported interpreters and the corresponding ;; entry function used to create the SQLi buffers is shown with @@ -850,7 +864,7 @@ Based on `comint-mode-map'.") (define-abbrev-table 'sql-mode-abbrev-table nil)) (mapcar - ;; In Emacs 21.3+, provide SYSTEM-FLAG to define-abbrev. + ;; In Emacs 22+, provide SYSTEM-FLAG to define-abbrev. '(lambda (abbrev) (let ((name (car abbrev)) (expansion (cdr abbrev))) @@ -858,13 +872,13 @@ Based on `comint-mode-map'.") (define-abbrev sql-mode-abbrev-table name expansion nil 0 t) (error (define-abbrev sql-mode-abbrev-table name expansion))))) - '(("ins" "insert") - ("upd" "update") - ("del" "delete") - ("sel" "select") - ("proc" "procedure") - ("func" "function") - ("cr" "create"))) + '(("ins" . "insert") + ("upd" . "update") + ("del" . "delete") + ("sel" . "select") + ("proc" . "procedure") + ("func" . "function") + ("cr" . "create"))) ;; Syntax Table @@ -873,13 +887,15 @@ Based on `comint-mode-map'.") ;; C-style comments /**/ (see elisp manual "Syntax Flags")) (modify-syntax-entry ?/ ". 14" table) (modify-syntax-entry ?* ". 23" table) - ;; double-dash starts comment + ;; double-dash starts comments (modify-syntax-entry ?- ". 12b" table) - ;; newline and formfeed end coments + ;; newline and formfeed end comments (modify-syntax-entry ?\n "> b" table) (modify-syntax-entry ?\f "> b" table) - ;; single quotes (') quotes delimit strings + ;; single quotes (') delimit strings (modify-syntax-entry ?' "\"" table) + ;; double quotes (") don't delimit strings + (modify-syntax-entry ?\" "." table) ;; backslash is no escape character (modify-syntax-entry ?\\ "." table) table) @@ -888,12 +904,13 @@ Based on `comint-mode-map'.") ;; Font lock support (defvar sql-mode-font-lock-object-name - (list (concat "^\\s-*\\(create\\|drop\\|alter\\)\\s-+" ;; lead off with CREATE, DROP or ALTER - "\\(\\w+\\s-+\\)*" ;; optional intervening keywords - "\\(table\\|view\\|package\\(\\s-+body\\)?\\|proc\\(edure\\)?" - "\\|function\\|trigger\\|sequence\\|rule\\|default\\)\\s-+" - "\\(\\w+\\)") - 6 'font-lock-function-name-face) + (eval-when-compile + (list (concat "^\\s-*\\(?:create\\|drop\\|alter\\)\\s-+" ;; lead off with CREATE, DROP or ALTER + "\\(?:\\w+\\s-+\\)*" ;; optional intervening keywords + "\\(?:table\\|view\\|\\(?:package\\|type\\)\\(?:\\s-+body\\)?\\|proc\\(?:edure\\)?" + "\\|function\\|trigger\\|sequence\\|rule\\|default\\)\\s-+" + "\\(\\w+\\)") + 1 'font-lock-function-name-face)) "Pattern to match the names of top-level objects. diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el index 69d696f7741..438aa8f14dd 100644 --- a/lisp/scroll-bar.el +++ b/lisp/scroll-bar.el @@ -75,6 +75,7 @@ SIDE must be the symbol `left' or `right'." ;;;; Helpful functions for enabling and disabling scroll bars. (defvar scroll-bar-mode) +(defvar previous-scroll-bar-mode nil) (defvar scroll-bar-mode-explicit nil "Non-nil means `set-scroll-bar-mode' should really do something. @@ -85,6 +86,9 @@ This is nil while loading `scroll-bar.el', and t afterward.") (defun set-scroll-bar-mode (value) "Set `scroll-bar-mode' to VALUE and put the new value into effect." + (if scroll-bar-mode + (setq previous-scroll-bar-mode scroll-bar-mode)) + (setq scroll-bar-mode value) (when scroll-bar-mode-explicit @@ -137,7 +141,8 @@ turn off scroll bars; otherwise, turn on scroll bars." (not scroll-bar-mode) (setq flag (prefix-numeric-value flag)) (or (not (numberp flag)) (>= flag 0))) - default-frame-scroll-bars))) + (or previous-scroll-bar-mode + default-frame-scroll-bars)))) (defun toggle-scroll-bar (arg) "Toggle whether or not the selected frame has vertical scroll bars. diff --git a/lisp/simple.el b/lisp/simple.el index 293f8d25431..1af1649113d 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -706,8 +706,8 @@ Leave one space or none, according to the context." (defun delete-horizontal-space (&optional backward-only) "Delete all spaces and tabs around point. -If BACKWARD-ONLY is non-nil, only delete spaces before point." - (interactive "*") +If BACKWARD-ONLY is non-nil, only delete them before point." + (interactive "*P") (let ((orig-pos (point))) (delete-region (if backward-only diff --git a/lisp/startup.el b/lisp/startup.el index f086ab7c6d8..4095a218258 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1206,6 +1206,7 @@ Values less than twice `fancy-splash-delay' are ignored." (defvar fancy-splash-help-echo nil) (defvar fancy-splash-stop-time nil) (defvar fancy-splash-outer-buffer nil) +(defvar fancy-splash-last-input-event nil) (defun fancy-splash-insert (&rest args) "Insert text into the current buffer, with faces. @@ -1363,6 +1364,14 @@ mouse." (push last-command-event unread-command-events)) (throw 'exit nil)) +(defun fancy-splash-special-event-action () + "Save the last event and stop displaying the splash screen buffer. +This is an internal function used to turn off the splash screen after +the user caused an input event that is bound in `special-event-map'" + (interactive) + (setq fancy-splash-last-input-event last-input-event) + (throw 'exit nil)) + (defun fancy-splash-screens (&optional hide-on-input) "Display fancy splash screens when Emacs starts." @@ -1372,6 +1381,7 @@ mouse." splash-buffer (old-minor-mode-map-alist minor-mode-map-alist) (old-emulation-mode-map-alists emulation-mode-map-alists) + (old-special-event-map special-event-map) (frame (fancy-splash-frame)) timer) (save-selected-window @@ -1387,6 +1397,20 @@ mouse." (define-key map [t] 'fancy-splash-default-action) (define-key map [mouse-movement] 'ignore) (define-key map [mode-line t] 'ignore) + ;; Temporarily bind special events to + ;; fancy-splash-special-event-action so as to stop + ;; displaying splash screens with such events. + ;; Otherwise, drag-n-drop into splash screens may + ;; leave us in recursive editing with invisible + ;; cursors for a while. + (setq special-event-map (make-sparse-keymap)) + (map-keymap + (lambda (key def) + (define-key special-event-map (vector key) + (if (eq def 'ignore) + 'ignore + 'fancy-splash-special-event-action))) + old-special-event-map) (setq display-hourglass nil minor-mode-map-alist nil emulation-mode-map-alists nil @@ -1403,8 +1427,15 @@ mouse." (cancel-timer timer) (setq display-hourglass old-hourglass minor-mode-map-alist old-minor-mode-map-alist - emulation-mode-map-alists old-emulation-mode-map-alists) - (kill-buffer splash-buffer))))) + emulation-mode-map-alists old-emulation-mode-map-alists + special-event-map old-special-event-map) + (kill-buffer splash-buffer) + (when fancy-splash-last-input-event + (setq last-input-event fancy-splash-last-input-event + fancy-splash-last-input-event nil) + (command-execute (lookup-key special-event-map + (vector last-input-event)) + nil (vector last-input-event) t)))))) ;; If hide-on-input is nil, don't hide the buffer on input. (if (or (window-minibuffer-p) (window-dedicated-p (selected-window))) diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index c49c8893b21..b7a4d3a2f98 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -2014,6 +2014,22 @@ the echo area or in a buffer where the cursor is not displayed." (mac-split-string-by-property-change string) "")) +(defun mac-keyboard-translate-char (ch) + (if (and (char-valid-p ch) + (or (char-table-p keyboard-translate-table) + (and (or (stringp keyboard-translate-table) + (vectorp keyboard-translate-table)) + (> (length keyboard-translate-table) ch)))) + (or (aref keyboard-translate-table ch) ch) + ch)) + +(defun mac-unread-string (string) + ;; Unread characters and insert them in a keyboard macro being + ;; defined. + (apply 'isearch-unread + (mapcar 'mac-keyboard-translate-char + (mac-replace-untranslated-utf-8-chars string)))) + (defun mac-ts-update-active-input-area (event) "Update Mac TSM active input area according to EVENT. The confirmed text is converted to Emacs input events and pushed @@ -2092,11 +2108,7 @@ either in the current buffer or in the echo area." (point) (point) (current-buffer)) (overlay-put mac-ts-active-input-overlay 'before-string active-input-string)) - ;; Unread confirmed characters and insert them in a keyboard - ;; macro being defined. - (apply 'isearch-unread - (append (mac-replace-untranslated-utf-8-chars - (funcall decode-fun confirmed coding)) '()))) + (mac-unread-string (funcall decode-fun confirmed coding))) ;; The event is successfully processed. Sync the sequence number. (setq mac-ts-update-active-input-area-seqno (1+ seqno)))) @@ -2109,11 +2121,7 @@ either in the current buffer or in the echo area." (coding (or (cdr (assq (car script-language) mac-script-code-coding-systems)) 'mac-roman))) - ;; Unread characters and insert them in a keyboard macro being - ;; defined. - (apply 'isearch-unread - (append (mac-replace-untranslated-utf-8-chars - (mac-utxt-to-string text coding)) '())))) + (mac-unread-string (mac-utxt-to-string text coding)))) ;; kEventClassTextInput/kEventTextInputUpdateActiveInputArea (define-key mac-apple-event-map [text-input update-active-input-area] diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 518c7b9f58e..6dcaaac0958 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -2463,6 +2463,10 @@ order until succeed.") (if res-selection-timeout (setq x-selection-timeout (string-to-number res-selection-timeout)))) +;; Set scroll bar mode to right if set by X resources. Default is left. +(if (equal (x-get-resource "verticalScrollBars" "ScrollBars") "right") + (customize-set-variable 'scroll-bar-mode 'right)) + (defun x-win-suspend-error () (error "Suspending an Emacs running under X makes no sense")) (add-hook 'suspend-hook 'x-win-suspend-error) diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 6aae79a825f..4113a884c4c 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -767,7 +767,7 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling." (list (if current-prefix-arg 'full)))) ;; First try fill-paragraph-function. (or (and (or fill-paragraph-function - (and (window-minibuffer-p (selected-window)) + (and (minibufferp (current-buffer)) (= 1 (point-min)))) (let ((function (or fill-paragraph-function ;; In the minibuffer, don't count the width @@ -843,14 +843,16 @@ can take care of filling. JUSTIFY is used as in `fill-paragraph'." (commark (comment-string-strip (buffer-substring comstart comin) nil t)) (comment-re - (if (string-match comment-start-skip (concat commark "a")) + ;; `commark' is surrounded with arbitrary text (`\0' and `a') + ;; to make sure it can be used as an optimization of + ;; `comment-start-skip' in the middle of a line. For example, + ;; `commark' can't be used with the "@c" in TeXinfo (hence + ;; the `a') or with the "C" at BOL in Fortran (hence the `\0'). + (if (string-match comment-start-skip (concat "\0" commark "a")) (concat "[ \t]*" (regexp-quote commark) ;; Make sure we only match comments that use ;; the exact same comment marker. "[^" (substring commark -1) "]") - ;; If the commark needs to be followed by some special - ;; set of characters (like @c in TeXinfo), we can't - ;; rely just on `commark'. (concat "[ \t]*\\(?:" comment-start-skip "\\)"))) (comment-fill-prefix ; Compute a fill prefix. (save-excursion diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el index d9baad489a3..4cd697af36d 100644 --- a/lisp/textmodes/org.el +++ b/lisp/textmodes/org.el @@ -5,7 +5,7 @@ ;; Author: Carsten Dominik <dominik at science dot uva dot nl> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/ -;; Version: 4.56b +;; Version: 4.56e ;; ;; This file is part of GNU Emacs. ;; @@ -114,7 +114,7 @@ ;;; Customization variables -(defvar org-version "4.56b" +(defvar org-version "4.56e" "The version number of the file org.el.") (defun org-version () (interactive) @@ -3211,6 +3211,9 @@ The following commands are available: ;; Paragraphs and auto-filling (org-set-autofill-regexps) (org-update-radio-target-regexp) + ;; Make isearch reveal context after success + (org-set-local 'outline-isearch-open-invisible-function + (lambda (&rest ignore) (org-show-context nil t))) (if (and org-insert-mode-line-in-empty-file (interactive-p) @@ -3238,7 +3241,7 @@ The following commands are available: (defsubst org-current-line (&optional pos) (save-excursion (and pos (goto-char pos)) - (+ (if (bolp) 1 0) (count-lines (point-min) (point))))) + (+ (if (bolp) 1 0) (count-lines 1 (point))))) (defun org-current-time () "Current time, possibly rounded to `org-time-stamp-rounding-minutes'." @@ -5691,6 +5694,7 @@ When SIBLINGS is non-nil, show all siblings on each hierarchy level." (save-excursion (and (if heading-p (org-goto-sibling) (outline-next-heading)) (org-flag-heading nil)))) + (when siblings (org-show-siblings)) (when hierarchy-p ;; show all higher headings, possibly with siblings (save-excursion @@ -5699,12 +5703,15 @@ When SIBLINGS is non-nil, show all siblings on each hierarchy level." (error nil)) (not (bobp))) (org-flag-heading nil) - (when siblings - (save-excursion - (while (org-goto-sibling) (org-flag-heading nil))) - (save-excursion - (while (org-goto-sibling 'previous) - (org-flag-heading nil)))))))))) + (when siblings (org-show-siblings)))))))) + +(defun org-show-siblings () + "Show all siblings of the current headline." + (save-excursion + (while (org-goto-sibling) (org-flag-heading nil))) + (save-excursion + (while (org-goto-sibling 'previous) + (org-flag-heading nil)))) (defun org-reveal (&optional siblings) "Show current entry, hierarchy above it, and the following headline. @@ -12375,11 +12382,11 @@ with `org-table-paste-rectangle'." (rpl (if cut " " nil))) (goto-char beg) (org-table-check-inside-data-field) - (setq l01 (count-lines (point-min) (point)) + (setq l01 (org-current-line) c01 (org-table-current-column)) (goto-char end) (org-table-check-inside-data-field) - (setq l02 (count-lines (point-min) (point)) + (setq l02 (org-current-line) c02 (org-table-current-column)) (setq l1 (min l01 l02) l2 (max l01 l02) c1 (min c01 c02) c2 (max c01 c02)) @@ -12410,7 +12417,7 @@ lines." (error "First cut/copy a region to paste!")) (org-table-check-inside-data-field) (let* ((clip org-table-clip) - (line (count-lines (point-min) (point))) + (line (org-current-line)) (col (org-table-current-column)) (org-enable-table-editor t) (org-table-automatic-realign nil) @@ -16278,6 +16285,7 @@ The images can be removed again with \\[org-ctrl-c-ctrl-c]." (define-key org-mode-map [(tab)] 'org-cycle) (define-key org-mode-map [(control tab)] 'org-force-cycle-archived) (define-key org-mode-map [(meta tab)] 'org-complete) +(define-key org-mode-map "\M-\t" 'org-complete) ;; The following line is necessary under Suse GNU/Linux (unless (featurep 'xemacs) (define-key org-mode-map [S-iso-lefttab] 'org-shifttab)) diff --git a/lisp/tutorial.el b/lisp/tutorial.el index b171ee9a07b..be50d793f0f 100644 --- a/lisp/tutorial.el +++ b/lisp/tutorial.el @@ -33,21 +33,11 @@ ;;; Code: (require 'help-mode) ;; for function help-buffer -(eval-when-compile (require 'cl)) (defface tutorial-warning-face - '((((class color) (min-colors 88) (background light)) - (:foreground "Red1" :weight bold)) - (((class color) (min-colors 88) (background dark)) - (:foreground "Pink" :weight bold)) - (((class color) (min-colors 16) (background light)) - (:foreground "Red1" :weight bold)) - (((class color) (min-colors 16) (background dark)) - (:foreground "Pink" :weight bold)) - (((class color) (min-colors 8)) (:foreground "red")) - (t (:inverse-video t :weight bold))) + '((t :inherit font-lock-warning-face)) "Face used to highlight warnings in the tutorial." - :group 'font-lock-faces) + :group 'help) (defvar tutorial--point-before-chkeys 0 "Point before display of key changes.") @@ -168,8 +158,7 @@ options: where " to get the function `" (format "%s" db) - "'.")) - ) + "'."))) (fill-region (point-min) (point))))) (print-help-return-message)))) @@ -213,110 +202,83 @@ LEFT and RIGHT are the elements to compare." ((and (symbolp cx) (symbolp cy)) (string< (symbol-name cy) - (symbol-name cx))) - )))) + (symbol-name cx))))))) (defconst tutorial--default-keys - (let* ( - ;; On window system suspend Emacs is replaced in the - ;; default keymap so honor this here. - (suspend-emacs (if window-system + ;; On window system, `suspend-emacs' is replaced in the default + ;; keymap + (let* ((suspend-emacs (if window-system 'iconify-or-deiconify-frame 'suspend-emacs)) (default-keys - `( - ;; These are not mentioned but are basic: - (ESC-prefix [27]) + `((ESC-prefix [27]) (Control-X-prefix [?\C-x]) (mode-specific-command-prefix [?\C-c]) - (save-buffers-kill-emacs [?\C-x ?\C-c]) - ;; * SUMMARY (scroll-up [?\C-v]) (scroll-down [?\M-v]) (recenter [?\C-l]) - ;; * BASIC CURSOR CONTROL (forward-char [?\C-f]) (backward-char [?\C-b]) - (forward-word [?\M-f]) (backward-word [?\M-b]) - (next-line [?\C-n]) (previous-line [?\C-p]) - (move-beginning-of-line [?\C-a]) (move-end-of-line [?\C-e]) - (backward-sentence [?\M-a]) (forward-sentence [?\M-e]) - (newline "\r") - (beginning-of-buffer [?\M-<]) (end-of-buffer [?\M->]) - (universal-argument [?\C-u]) - ;; * WHEN EMACS IS HUNG (keyboard-quit [?\C-g]) - ;; * DISABLED COMMANDS (downcase-region [?\C-x ?\C-l]) - ;; * WINDOWS (delete-other-windows [?\C-x ?1]) ;; C-u 0 C-l ;; Type CONTROL-h k CONTROL-f. - ;; * INSERTING AND DELETING ;; C-u 8 * to insert ********. - (delete-backward-char [backspace]) (delete-backward-char "\d") (delete-char [?\C-d]) - (backward-kill-word [(meta backspace)]) (kill-word [?\M-d]) - (kill-line [?\C-k]) (kill-sentence [?\M-k]) - (set-mark-command [?\C-@]) (set-mark-command [?\C- ]) (kill-region [?\C-w]) (yank [?\C-y]) (yank-pop [?\M-y]) - ;; * UNDO (advertised-undo [?\C-x ?u]) (advertised-undo [?\C-x ?u]) - ;; * FILES (find-file [?\C-x ?\C-f]) (save-buffer [?\C-x ?\C-s]) - ;; * BUFFERS (list-buffers [?\C-x ?\C-b]) (switch-to-buffer [?\C-x ?b]) (save-some-buffers [?\C-x ?s]) - ;; * EXTENDING THE COMMAND SET ;; C-x Character eXtend. Followed by one character. (execute-extended-command [?\M-x]) - ;; C-x C-f Find file ;; C-x C-s Save file ;; C-x s Save some buffers @@ -326,44 +288,35 @@ LEFT and RIGHT are the elements to compare." ;; C-x 1 Delete all but one window ;; C-x u Undo - ;; * MODE LINE (describe-mode [?\C-h ?m]) - (set-fill-column [?\C-x ?f]) (fill-paragraph [?\M-q]) - ;; * SEARCHING (isearch-forward [?\C-s]) (isearch-backward [?\C-r]) - ;; * MULTIPLE WINDOWS (split-window-vertically [?\C-x ?2]) (scroll-other-window [?\C-\M-v]) (other-window [?\C-x ?o]) (find-file-other-window [?\C-x ?4 ?\C-f]) - ;; * RECURSIVE EDITING LEVELS (keyboard-escape-quit [27 27 27]) - ;; * GETTING MORE HELP ;; The most basic HELP feature is C-h c (describe-key-briefly [?\C-h ?c]) (describe-key [?\C-h ?k]) - ;; * MORE FEATURES ;; F10 - ;; * CONCLUSION ;;(iconify-or-deiconify-frame [?\C-z]) - (,suspend-emacs [?\C-z]) - ))) + (,suspend-emacs [?\C-z])))) (sort default-keys 'tutorial--sort-keys)) "Default Emacs key bindings that the tutorial depends on.") @@ -374,7 +327,6 @@ LEFT and RIGHT are the elements to compare." (interactive-p)) (with-current-buffer (help-buffer) (let* ((tutorial-buffer (button-get button 'tutorial-buffer)) - ;;(tutorial-arg (button-get button 'tutorial-arg)) (explain-key-desc (button-get button 'explain-key-desc)) (changed-keys (with-current-buffer tutorial-buffer (save-excursion @@ -384,7 +336,7 @@ LEFT and RIGHT are the elements to compare." (when changed-keys (insert "The following key bindings used in the tutorial had been changed -from Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) +from the Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) (let ((frm " %-9s %-27s %-11s %s\n")) (insert (format frm "Key" "Standard Binding" "Is Now On" "Remark"))) (dolist (tk changed-keys) @@ -405,7 +357,7 @@ from Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) (insert " " key-txt " ") (setq tot-len (length key-txt)) (when (> 9 tot-len) - (insert (make-string (- 9 tot-len) ? )) + (insert (make-string (- 9 tot-len) ?\s)) (setq tot-len 9)) ;; Insert a link describing the old binding: (insert-button def-fun-txt @@ -417,7 +369,7 @@ from Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) 'follow-link t) (setq tot-len (+ tot-len (length def-fun-txt))) (when (> 36 tot-len) - (insert (make-string (- 36 tot-len) ? ))) + (insert (make-string (- 36 tot-len) ?\s))) (when (listp where) (setq where "list")) ;; Tell where the old binding is now: @@ -438,29 +390,18 @@ from Emacs default in the " (buffer-name tutorial-buffer) " buffer:\n\n" ) (insert "\n"))))) (insert " -It is legitimate to change key bindings, but changed bindings do not -correspond to what the tutorial says. (See also " ) - (insert-button "Key Binding Conventions" - 'action - (lambda(button) (interactive) - (info - "(elisp) Key Binding Conventions") - (message "Type C-x 0 to close the new window")) - 'follow-link t) - (insert ".)\n\n") +It is OK to change key bindings, but changed bindings do not +correspond to what the tutorial says.\n\n") (print-help-return-message))))) (defun tutorial--find-changed-keys (default-keys) - "Find the key bindings that have changed. -Check if the default Emacs key bindings that the tutorial depends -on have been changed. + "Find the key bindings used in the tutorial that have changed. +Return a list with elements of the form -Return a list with the keys that have been changed. The element -of this list have the following format: + '(KEY DEF-FUN DEF-FUN-TXT WHERE REMARK QUIET) - \(list KEY DEF-FUN DEF-FUN-TXT WHERE REMARK) +where -Where KEY is a key sequence whose standard binding has been changed DEF-FUN is the standard binding of KEY DEF-FUN-TXT is a short descriptive text for DEF-FUN @@ -477,9 +418,10 @@ Where rest of the list is used to show information when the user clicks the link. - KEY-FUN is the actual binding for KEY." + KEY-FUN is the actual binding for KEY. + QUIET is t if this changed keybinding should be handled quietly. + This is used by `tutorial--display-changes'." (let (changed-keys remark) - ;; (default-keys tutorial--default-keys)) (dolist (kdf default-keys) ;; The variables below corresponds to those with the same names ;; described in the doc string. @@ -518,26 +460,21 @@ Where (setq remark (list "cua-mode, more info" 'cua-mode)) nil) ((and cua-mode - (or - (and (eq def-fun 'ESC-prefix) - (equal key-fun + (or (and (eq def-fun 'ESC-prefix) + (equal key-fun `(keymap - (118 . cua-repeat-replace-region)))) - (and (eq def-fun 'mode-specific-command-prefix) - (equal key-fun - '(keymap - (timeout . copy-region-as-kill)))) - (and (eq def-fun 'Control-X-prefix) - (equal key-fun - '(keymap (timeout . kill-region)))))) + (118 . cua-repeat-replace-region))) + (setq def-fun-txt "\"ESC prefix\"")) + (and (eq def-fun 'mode-specific-command-prefix) + (equal key-fun + '(keymap + (timeout . copy-region-as-kill))) + (setq def-fun-txt "\"C-c prefix\"")) + (and (eq def-fun 'Control-X-prefix) + (equal key-fun + '(keymap (timeout . kill-region))) + (setq def-fun-txt "\"C-x prefix\"")))) (setq remark (list "cua-mode replacement" 'cua-mode)) - (cond - ((eq def-fun 'mode-specific-command-prefix) - (setq def-fun-txt "\"C-c prefix\"")) - ((eq def-fun 'Control-X-prefix) - (setq def-fun-txt "\"C-x prefix\"")) - ((eq def-fun 'ESC-prefix) - (setq def-fun-txt "\"ESC prefix\""))) (setq where "Same key") nil) ;; viper-mode specials: @@ -567,124 +504,110 @@ Where key-fun def-fun key where)) nil)) (add-to-list 'changed-keys - (list key def-fun def-fun-txt where remark))))) + (list key def-fun def-fun-txt where remark nil))))) changed-keys)) -(defvar tutorial--tab-map - (let ((map (make-sparse-keymap))) - (define-key map [tab] 'forward-button) - (define-key map [(shift tab)] 'backward-button) - (define-key map [(meta tab)] 'backward-button) - map) - "Keymap that allows tabbing between buttons.") +(defun tutorial--key-description (key) + (let ((desc (key-description key))) + (cond ((string= "ESC" desc) "<ESC>") + ((string= "RET" desc) "<Return>") + ((string= "DEL" desc) "<Delback>") + (t desc)))) -(defun tutorial--display-changes (changed-keys) +(defun tutorial--display-changes () "Display changes to some default key bindings. If some of the default key bindings that the tutorial depends on have been changed then display the changes in the tutorial buffer -with some explanatory links. - -CHANGED-KEYS should be a list in the format returned by -`tutorial--find-changed-keys'." - (when (or changed-keys - (boundp 'viper-mode-string)) +with some explanatory links." + (let* ((changed-keys (tutorial--find-changed-keys + tutorial--default-keys)) + ;; Alist of element (DESC . CK) where DESC is the + ;; key-description of a changed key and CK is the + ;; corresponding element in `changed-keys'. + (changed-keys-alist + (mapcar (lambda (ck) (cons (tutorial--key-description (car ck)) ck)) + changed-keys)) + changed-key + (start (point)) + (case-fold-search nil) + (keybindings-regexp + (concat "[[:space:]]\\(" + (mapconcat (lambda (kdf) (regexp-quote + (tutorial--key-description + (nth 1 kdf)))) + tutorial--default-keys + "\\|") + "\\)[[:punct:][:space:]]"))) ;; Need the custom button face for viper buttons: - (when (boundp 'viper-mode-string) - (require 'cus-edit)) - (let ((start (point)) - end - (head (get-lang-string tutorial--lang 'tut-chgdhead)) - (head2 (get-lang-string tutorial--lang 'tut-chgdhead2))) - (when (and head head2) - (goto-char tutorial--point-before-chkeys) - (insert head) - (insert-button head2 - 'tutorial-buffer - (current-buffer) - ;;'tutorial-arg arg - 'action - 'tutorial--detailed-help - 'follow-link t - 'face 'link) - (insert "]\n\n" ) - (when changed-keys - (dolist (tk changed-keys) - (let* ((def-fun (nth 1 tk)) - (key (nth 0 tk)) - (def-fun-txt (nth 2 tk)) - (where (nth 3 tk)) - (remark (nth 4 tk)) - (rem-fun (command-remapping def-fun)) - (key-txt (key-description key)) - (key-fun (key-binding key)) - tot-len) - (unless (eq def-fun key-fun) - ;; Mark the key in the tutorial text - (unless (string= "Same key" where) - (let ((here (point)) - (case-fold-search nil) - (key-desc (key-description key))) - (cond ((string= "ESC" key-desc) - (setq key-desc "<ESC>")) - ((string= "RET" key-desc) - (setq key-desc "<Return>")) - ((string= "DEL" key-desc) - (setq key-desc "<Delback>"))) - (while (re-search-forward - (concat "[[:space:]]\\(" - (regexp-quote key-desc) - "\\)[[:space:]]") nil t) - (put-text-property (match-beginning 1) - (match-end 1) - 'tutorial-remark 'only-colored) - (put-text-property (match-beginning 1) - (match-end 1) - 'face 'tutorial-warning-face) - (forward-line) - (let ((s (get-lang-string tutorial--lang 'tut-chgdkey)) - (s2 (get-lang-string tutorial--lang 'tut-chgdkey2)) - (start (point)) - end) - (when (and s s2) - (setq s (format s key-desc where s2)) - (insert s) - (insert-button s2 - 'tutorial-buffer - (current-buffer) - ;;'tutorial-arg arg - 'action - 'tutorial--detailed-help - 'explain-key-desc key-desc - 'follow-link t - 'face 'link) - (insert "] **") - (insert "\n") - (setq end (point)) - (put-text-property start end 'local-map tutorial--tab-map) - ;; Add a property so we can remove the remark: - (put-text-property start end 'tutorial-remark t) - (put-text-property start end - 'face 'tutorial-warning-face) - (put-text-property start end 'read-only t)))) - (goto-char here))))))) - - - (setq end (point)) - ;; Make the area with information about change key - ;; bindings stand out: - (put-text-property start end 'tutorial-remark t) - (put-text-property start end - 'face 'tutorial-warning-face) - ;; Make it possible to use Tab/S-Tab between fields in - ;; this area: - (put-text-property start end 'local-map tutorial--tab-map) - (setq tutorial--point-after-chkeys (point-marker)) - ;; Make this area read-only: - (put-text-property start end 'read-only t))))) + (if (boundp 'viper-mode-string) (require 'cus-edit)) + + (if (or changed-keys (boundp 'viper-mode-string)) + (let ((head (get-lang-string tutorial--lang 'tut-chgdhead)) + (head2 (get-lang-string tutorial--lang 'tut-chgdhead2))) + (when (and head head2) + (goto-char tutorial--point-before-chkeys) + (insert head " [") + (insert-button head2 'tutorial-buffer (current-buffer) + 'action 'tutorial--detailed-help + 'follow-link t 'face 'link) + (insert "]\n\n") + (add-text-properties tutorial--point-before-chkeys (point) + '(tutorial-remark remark + face tutorial-warning-face + read-only t))))) + + ;; Scan the tutorial for all key sequences. + (goto-char (point-min)) + (while (re-search-forward keybindings-regexp (point-max) t) + ;; Then highlight each rebound key sequence. + ;; This avoids issuing a warning for, e.g., C-x C-b if C-b is rebound. + (setq changed-key (assoc (match-string 1) changed-keys-alist)) + (and changed-key + (not (get-text-property (match-beginning 1) 'tutorial-remark)) + (let* ((desc (car changed-key)) + (ck (cdr changed-key)) + (key (nth 0 ck)) + (def-fun (nth 1 ck)) + (where (nth 3 ck)) + s1 s2 help-string) + (unless (string= where "Same key") + (setq tutorial--point-after-chkeys (point-marker) + s1 (get-lang-string tutorial--lang 'tut-chgdkey) + s2 (get-lang-string tutorial--lang 'tut-chgdkey2) + help-string (and s1 s2 (format s1 desc where))) + (add-text-properties (match-beginning 1) (match-end 1) + '(face tutorial-warning-face + tutorial-remark key-sequence)) + (if help-string + (if (nth 5 ck) + ;; Put help string in the tooltip. + (put-text-property (match-beginning 1) (match-end 1) + 'help-echo help-string) + ;; Put help string in the buffer. + (save-excursion + (setcar (nthcdr 5 ck) t) + (forward-line) + ;; Two or more changed keys were on the same line. + (while (eq (get-text-property (point) 'tutorial-remark) + 'remark) + (forward-line)) + (setq start (point)) + (insert "** " help-string " [") + (insert-button s2 'tutorial-buffer (current-buffer) + 'action 'tutorial--detailed-help + 'explain-key-desc desc 'follow-link t + 'face 'link) + (insert "] **\n") + (add-text-properties start (point) + '(tutorial-remark remark + rear-nonsticky t + face tutorial-warning-face + read-only t))))))))))) (defun tutorial--saved-dir () - "Directory where to save tutorials." - (expand-file-name ".emacstut" "~/")) + "Directory to which tutorials are saved." + (expand-file-name "tutorial" + (if (eq system-type 'ms-dos) "~/_emacs.d/" "~/.emacs.d/"))) (defun tutorial--saved-file () "File name in which to save tutorials." @@ -711,11 +634,8 @@ CHANGED-KEYS should be a list in the format returned by (unless prop-end (setq prop-end (point-max))) (goto-char prop-end) - (if (eq prop-val 'only-colored) - (put-text-property prop-start prop-end 'face '(:background nil)) - (let ((orig-text (get-text-property prop-start 'tutorial-orig))) - (delete-region prop-start prop-end) - (when orig-text (insert orig-text)))))))) + (unless (eq prop-val 'key-sequence) + (delete-region prop-start prop-end)))))) (defun tutorial--save-tutorial () "Save the tutorial buffer. @@ -724,9 +644,10 @@ showing changed keys. It also saves the point position and the position where the display of changed bindings was inserted." ;; This runs in a hook so protect it: (condition-case err - (tutorial--save-tutorial-to (tutorial--saved-file)) - (error (message "Error saving tutorial state: %s" (error-message-string err)) - (sit-for 4)))) + (if (y-or-n-p "Save your position in the tutorial? ") + (tutorial--save-tutorial-to (tutorial--saved-file))) + (error (message "Error saving tutorial state: %s" + (error-message-string err))))) (defun tutorial--save-tutorial-to (saved-file) "Save the tutorial buffer to SAVED-FILE. @@ -908,13 +829,7 @@ Run the Viper tutorial? ")) (forward-line) (setq tutorial--point-before-chkeys (point-marker))) - - ;; Check if there are key bindings that may disturb the - ;; tutorial. If so tell the user. - (let ((changed-keys (tutorial--find-changed-keys tutorial--default-keys))) - (when changed-keys - (tutorial--display-changes changed-keys))) - + (tutorial--display-changes) ;; Clear message: (unless dont-ask-for-revert @@ -971,22 +886,17 @@ Run the Viper tutorial? ")) ;; are currently only used in the tutorial. (defconst lang-strings - '( - ("English" . - ( - (tut-chgdkey . "** The key %s has been rebound, but you can use %s instead [") - (tut-chgdkey2 . "More information") + '(("English" . + ((tut-chgdkey . "%s has been rebound, but you can use %s instead") + (tut-chgdkey2 . "More") (tut-chgdhead . " NOTICE: The main purpose of the Emacs tutorial is to teach you the most important standard Emacs commands (key bindings). However, your Emacs has been customized by changing some of these basic editing commands, so it doesn't correspond to the tutorial. We have inserted colored notices where the altered - commands have been introduced. [") - (tut-chgdhead2 . "Details") - ) - ) - ) + commands have been introduced.") + (tut-chgdhead2 . "More")))) "Language specific strings for Emacs. This is an association list with the keys equal to the strings that can be returned by `read-language-name'. The elements in diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 6259cf974f1..c4a22bd314e 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -2,6 +2,18 @@ * url-gw.el (url-gateway-nslookup-program): Doc fix. +2006-12-08 Magnus Henoch <mange@freemail.hu> + + * url-proxy.el (url-proxy-object): New variable. + (url-proxy): Bind it instead of `proxy-object'. + + * url-http.el (url-http-create-request): Remove url argument, use + the buffer-local variable `url-http-target-url' instead. Both + callers updated. Simplify proxy handling. + (url-http): Don't make proxy-object buffer local. + + * url.el (url-retrieve-internal): Bind url-proxy-object to nil. + 2006-11-26 Magnus Henoch <mange@freemail.hu> * url-http.el (url-http-wait-for-headers-change-function): Use @@ -1734,9 +1746,14 @@ * Initial checkin of rewritten URL library. -Local variables: -coding: utf-8 -add-log-time-zone-rule: t -End: +;; Local variables: +;; coding: utf-8 +;; add-log-time-zone-rule: t +;; End: + + Copyright (C) 1999, 2001, 2002, 2004, 2005, + 2006 Free Software Foundation, Inc. + Copying and distribution of this file, with or without modification, + are permitted provided the copyright notice and this notice are preserved. ;; arch-tag: ac117078-3091-4533-be93-098162ac2926 diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el index a0fc8af8345..bac6c26cc93 100644 --- a/lisp/vc-arch.el +++ b/lisp/vc-arch.el @@ -406,6 +406,20 @@ Return non-nil if FILE is unchanged." (defun vc-arch-init-version () nil) +;;; Less obvious implementations. + +(defun vc-arch-find-version (file rev buffer) + (let ((out (make-temp-file "vc-out"))) + (unwind-protect + (progn + (with-temp-buffer + (vc-arch-command (current-buffer) 1 nil "file-diffs" file rev) + (call-process-region (point-min) (point-max) + "patch" nil nil nil "-R" "-o" out file)) + (with-current-buffer buffer + (insert-file-contents out))) + (delete-file out)))) + (provide 'vc-arch) ;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704 diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index b602d79383f..7aae75c8a76 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -625,9 +625,10 @@ the user should be returned; if REGEXP is non-nil that means to return a regexp for matching all such backup files, regardless of the version." (if regexp (concat (regexp-quote (file-name-nondirectory file)) - "\\.~[0-9.]+" (unless manual "\\.") "~") + "\\.~.+" (unless manual "\\.") "~") (expand-file-name (concat (file-name-nondirectory file) - ".~" (or rev (vc-workfile-version file)) + ".~" (subst-char-in-string + ?/ ?_ (or rev (vc-workfile-version file))) (unless manual ".") "~") (file-name-directory file)))) diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el index 11c2dcd78f4..85b4be732d1 100644 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@ -240,28 +240,28 @@ On Windows and DOS, replace invalid characters. On DOS, make sure to obey the 8.3 limitations. On Windows, turn Cygwin names into native names, and also turn slashes into backslashes if the shell requires it (see `w32-shell-dos-semantics')." - (let ((name - (save-match-data - (if (string-match "\\`/cygdrive/\\([a-zA-Z]\\)/" filename) + (save-match-data + (let ((name + (if (string-match "\\`/cygdrive/\\([a-zA-Z]\\)/" filename) (replace-match "\\1:/" t nil filename) - (copy-sequence filename)))) - (start 0)) - ;; leave ':' if part of drive specifier - (if (and (> (length name) 1) - (eq (aref name 1) ?:)) - (setq start 2)) - ;; destructively replace invalid filename characters with ! - (while (string-match "[?*:<>|\"\000-\037]" name start) - (aset name (match-beginning 0) ?!) - (setq start (match-end 0))) - ;; convert directory separators to Windows format - ;; (but only if the shell in use requires it) - (when (w32-shell-dos-semantics) - (setq start 0) - (while (string-match "/" name start) - (aset name (match-beginning 0) ?\\) - (setq start (match-end 0)))) - name)) + (copy-sequence filename))) + (start 0)) + ;; leave ':' if part of drive specifier + (if (and (> (length name) 1) + (eq (aref name 1) ?:)) + (setq start 2)) + ;; destructively replace invalid filename characters with ! + (while (string-match "[?*:<>|\"\000-\037]" name start) + (aset name (match-beginning 0) ?!) + (setq start (match-end 0))) + ;; convert directory separators to Windows format + ;; (but only if the shell in use requires it) + (when (w32-shell-dos-semantics) + (setq start 0) + (while (string-match "/" name start) + (aset name (match-beginning 0) ?\\) + (setq start (match-end 0)))) + name))) ;;; Fix interface to (X-specific) mouse.el (defun x-set-selection (type data) diff --git a/lisp/woman.el b/lisp/woman.el index e8387584ab7..2d3513f0097 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -2102,6 +2102,18 @@ No external programs are used." (interactive) ; mainly for testing (WoMan-log-begin) (run-hooks 'woman-pre-format-hook) + + ;; look for macro sets that woman cannot handle: + (goto-char (point-min)) + (let ((case-fold-search nil)) + (unless (and (re-search-forward "^\\.SH[ \n]" (point-max) t) + (progn (goto-char (point-min)) + (re-search-forward "^\\.TH[ \n]" (point-max) t)) + (progn (goto-char (point-min)) + (not (re-search-forward "^\\.\\([pnil]p\\|sh\\)[ \n]" + (point-max) t)))) + (error "WoMan can only format manpages written in the an format"))) + (and (boundp 'font-lock-mode) font-lock-mode (font-lock-mode -1)) ;; (fundamental-mode) (let ((start-time (current-time)) ; (HIGH LOW MICROSEC) diff --git a/lispref/ChangeLog b/lispref/ChangeLog index 69098b20e64..7cf5f461079 100644 --- a/lispref/ChangeLog +++ b/lispref/ChangeLog @@ -1,3 +1,61 @@ +2006-12-30 Kim F. Storm <storm@cua.dk> + + * keymaps.texi (Tool Bar): Describe `grow-only' value of + `auto-resize-tool-bars'. + +2006-12-30 Richard Stallman <rms@gnu.org> + + * keymaps.texi (Active Keymaps): Fix previous change. + +2006-12-30 Nick Roberts <nickrob@snap.net.nz> + + * keymaps.texi (Active Keymaps): Make xref to lookup-key. + +2006-12-30 Kim F. Storm <storm@cua.dk> + + * processes.texi (Bindat Spec): Clarify using field names in + length specifications. + +2006-12-29 Kim F. Storm <storm@cua.dk> + + * processes.texi (Bindat Spec): Explain eval forms and lengths better. + Add count and index variables for eval forms in repeat blocks. + +2006-12-24 Richard Stallman <rms@gnu.org> + + * customize.texi (Variable Definitions): Document + new name custom-add-frequent-value. + +2006-12-19 Kim F. Storm <storm@cua.dk> + + * commands.texi (Misc Events): User signals now result in sigusr1 + and sigusr2 events which are handled through special-event-map. + (Special Events): User signals and drag-n-drop are special. + +2006-12-17 Richard Stallman <rms@gnu.org> + + * loading.texi (Named Features): Explain subfeatures better. + + * customize.texi: Use "option" only for user options. + For the keyword values inside defcustom etc, say "keywords". + For :options value's elements, say "elements". + :group should not be omitted. + + * syntax.texi (Parsing Expressions): Split up node. + (Motion via Parsing, Position Parse, Parser State) + (Low-Level Parsing, Control Parsing): New subnodes. + (Parser State): Document syntax-ppss-toplevel-pos. + + * positions.texi (List Motion): Punctuation fix. + + * files.texi (File Name Completion): Document PREDICATE arg + to file-name-completion. + +2006-12-16 Eli Zaretskii <eliz@gnu.org> + + * internals.texi (Building Emacs, Writing Emacs Primitives): Add + index entries. + 2006-12-11 Richard Stallman <rms@gnu.org> * modes.texi (Font Lock Basics): Explain how nil for font-lock-defaults @@ -395,7 +453,7 @@ 2006-07-31 Nick Roberts <nickrob@snap.net.nz> - * modes.texi (Minor Mode Conventions): Update link for add-to-list. + * modes.texi (Minor Mode Conventions): Update xref for add-to-list. * lists.texi (Sets And Lists): Likewise. diff --git a/lispref/commands.texi b/lispref/commands.texi index 7188961e344..0f45ddbdd04 100644 --- a/lispref/commands.texi +++ b/lispref/commands.texi @@ -1586,14 +1586,33 @@ The precise meaning of the event parameters and the way these parameters are used to display the help-echo text are described in @ref{Text help-echo}. -@cindex @code{signal usr1} event -@cindex @code{signal usr2} event +@cindex @code{sigusr1} event +@cindex @code{sigusr2} event @cindex user signals -@item signal usr1 -@itemx signal usr2 -These event sequences are generated when the Emacs process receives +@item sigusr1 +@itemx sigusr2 +These events are generated when the Emacs process receives the signals @code{SIGUSR1} and @code{SIGUSR2}. They contain no additional data because signals do not carry additional information. + +To catch a user signal, bind the corresponding event to an interactive +command in the @code{special-event-map} (@pxref{Active Keymaps}). +The command is called with no arguments, and the specific signal event is +available in @code{last-input-event}. For example: + +@example +(defun sigusr-handler () + (interactive) + (message "Caught signal %S" last-input-event)) + +(define-key special-event-map [sigusr1] 'sigusr-handler) +@end example + +To test the signal handler, you can make Emacs send a signal to itself: + +@example +(signal-process (emacs-pid) 'sigusr1) +@end example @end table If one of these events arrives in the middle of a key sequence---that @@ -2634,8 +2653,9 @@ These events do, however, appear in @code{last-input-event} immediately after they are read, and this is the way for the event's definition to find the actual event. -The events types @code{iconify-frame}, @code{make-frame-visible} and -@code{delete-frame} are normally handled in this way. The keymap which +The events types @code{iconify-frame}, @code{make-frame-visible}, +@code{delete-frame}, @code{drag-n-drop}, and user signals like +@code{sigusr1} are normally handled in this way. The keymap which defines how to handle special events---and which events are special---is in the variable @code{special-event-map} (@pxref{Active Keymaps}). diff --git a/lispref/customize.texi b/lispref/customize.texi index d47c86308c8..ee188c76c79 100644 --- a/lispref/customize.texi +++ b/lispref/customize.texi @@ -135,13 +135,13 @@ any effect unless the code which implements the mode is loaded. @item :version @var{version} @kindex version@r{, customization keyword} -This option specifies that the item was first introduced in Emacs +This keyword specifies that the item was first introduced in Emacs version @var{version}, or that its default value was changed in that version. The value @var{version} must be a string. @item :package-version '(@var{package} . @var{version}) @kindex package-version@r{, customization keyword} -This option specifies that the item was first introduced in +This keyword specifies that the item was first introduced in @var{package} version @var{version}, or that its meaning or default value was changed in that version. The value of @var{package} is a symbol and @var{version} is a string. @@ -289,7 +289,9 @@ evaluate at any time. We recommend avoiding backquotes in @var{standard}, because they are not expanded when editing the value, so list values will appear to have the wrong structure. -If you specify the @code{:set} option, to make the variable take other +Every @code{defcustom} should specify @code{:group} at least once. + +If you specify the @code{:set} keyword, to make the variable take other special actions when set through the customization buffer, the variable's documentation string should tell the user specifically how to do the same job in hand-written Lisp code. @@ -309,9 +311,9 @@ Use @var{type} as the data type for this option. It specifies which values are legitimate, and how to display the value. @xref{Customization Types}, for more information. -@item :options @var{list} +@item :options @var{value-list} @kindex options@r{, @code{defcustom} keyword} -Specify @var{list} as the list of reasonable values for use in this +Specify the list of reasonable values for use in this option. The user is not restricted to using only these values, but they are offered as convenient alternatives. @@ -399,7 +401,7 @@ setting this variable until after those others have been handled. Use those other variables already have their intended values. @end table - The @code{:require} option is useful for an option that turns on the + The @code{:require} keyword is useful for an option that turns on the operation of a certain feature. Assuming that the package is coded to check the value of the option, you still need to arrange for the package to be loaded. You can do that with @code{:require}. @xref{Common @@ -413,25 +415,26 @@ Keywords}. Here is an example, from the library @file{saveplace.el}: :group 'save-place) @end example -If a customization item has a type such as @code{hook} or @code{alist}, -which supports @code{:options}, you can add additional options to the -item, outside the @code{defcustom} declaration, by calling -@code{custom-add-option}. For example, if you define a function -@code{my-lisp-mode-initialization} intended to be called from +If a customization item has a type such as @code{hook} or +@code{alist}, which supports @code{:options}, you can add additional +values to the list from outside the @code{defcustom} declaration by +calling @code{custom-add-frequent-value}. For example, if you define a +function @code{my-lisp-mode-initialization} intended to be called from @code{emacs-lisp-mode-hook}, you might want to add that to the list of -options for @code{emacs-lisp-mode-hook}, but not by editing its -definition. You can do it thus: +reasonable values for @code{emacs-lisp-mode-hook}, but not by editing +its definition. You can do it thus: @example -(custom-add-option 'emacs-lisp-mode-hook - 'my-lisp-mode-initialization) +(custom-add-frequent-value 'emacs-lisp-mode-hook + 'my-lisp-mode-initialization) @end example -@defun custom-add-option symbol option -To the customization @var{symbol}, add @var{option}. +@defun custom-add-frequent-value symbol value +For the customization option @var{symbol}, add @var{value} to the +list of reasonable values. -The precise effect of adding @var{option} depends on the customization -type of @var{symbol}. +The precise effect of adding a value depends on the customization type +of @var{symbol}. @end defun Internally, @code{defcustom} uses the symbol property @@ -567,9 +570,9 @@ value), with a checkbox to include or exclude or disable the key/value pair from the alist. The user will not be able to edit the keys specified by the @code{:options} keyword argument. -The argument to the @code{:options} keywords should be a list of option -specifications. Ordinarily, the options are simply atoms, which are the -specified keys. For example: +The argument to the @code{:options} keywords should be a list of +specifications for reasonable keys in the alist. Ordinarily, they are +simply atoms, which stand for themselves as. For example: @smallexample :options '("foo" "bar" "baz") @@ -579,11 +582,11 @@ specified keys. For example: specifies that there are three ``known'' keys, namely @code{"foo"}, @code{"bar"} and @code{"baz"}, which will always be shown first. -You may want to restrict the value type for specific keys, for example, -the value associated with the @code{"bar"} key can only be an integer. -You can specify this by using a list instead of an atom in the option -specification. The first element will specify the key, like before, -while the second element will specify the value type. +You may want to restrict the value type for specific keys, for +example, the value associated with the @code{"bar"} key can only be an +integer. You can specify this by using a list instead of an atom in +the list. The first element will specify the key, like before, while +the second element will specify the value type. For example: @smallexample :options '("foo" ("bar" integer) "baz") diff --git a/lispref/elisp.texi b/lispref/elisp.texi index 7b869d04041..bfd91c58562 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -7,7 +7,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 2.9 -@set EMACSVER 22.0.91 +@set EMACSVER 22.0.92 @dircategory Emacs @direntry diff --git a/lispref/files.texi b/lispref/files.texi index 03e5db318f4..36e44dbece6 100644 --- a/lispref/files.texi +++ b/lispref/files.texi @@ -2232,10 +2232,13 @@ default directory, and has five files whose names begin with @samp{f}: @end example @end defun -@defun file-name-completion filename directory +@defun file-name-completion filename directory &optional predicate This function completes the file name @var{filename} in directory @var{directory}. It returns the longest prefix common to all file names -in directory @var{directory} that start with @var{filename}. +in directory @var{directory} that start with @var{filename}. If +@var{predicate} is non-@code{nil} then it ignores possible completions +that don't satisfy @var{predicate}, after calling that function +with one argument, the expanded absolute file name. If only one match exists and @var{filename} matches it exactly, the function returns @code{t}. The function returns @code{nil} if directory diff --git a/lispref/internals.texi b/lispref/internals.texi index db7694585aa..7767f0feeb3 100644 --- a/lispref/internals.texi +++ b/lispref/internals.texi @@ -44,6 +44,7 @@ the real runnable Emacs executable. These arguments direct environment, resulting in an Emacs that is still impure but no longer bare. +@cindex dumping Emacs It takes a substantial time to load the standard Lisp files. Luckily, you don't have to do this each time you run Emacs; @file{temacs} can dump out an executable program called @file{emacs} that has these files @@ -86,6 +87,7 @@ calling @code{Snarf-documentation} (@pxref{Definition of Snarf-documentation,, Accessing Documentation}). @cindex @file{site-init.el} +@cindex preloading additional functions and variables You can specify other Lisp expressions to execute just before dumping by putting them in a library named @file{site-init.el}. This file is executed after the documentation strings are found. @@ -491,6 +493,7 @@ Emacs session. @node Writing Emacs Primitives @appendixsec Writing Emacs Primitives @cindex primitive function internals +@cindex writing Emacs primitives Lisp primitives are Lisp functions implemented in C. The details of interfacing the C function so that Lisp can call it are handled by a few @@ -539,6 +542,7 @@ usage: (or CONDITIONS ...) */) @end group @end smallexample +@cindex @code{DEFUN}, C macro to define Lisp primitives Let's start with a precise explanation of the arguments to the @code{DEFUN} macro. Here is a template for them: @@ -619,6 +623,8 @@ receives exactly two arguments: the first is the number of Lisp arguments, and the second is the address of a block containing their values. They have types @code{int} and @w{@code{Lisp_Object *}}. +@cindex @code{GCPRO} and @code{UNGCPRO} +@cindex protect C variables from garbage collection Within the function @code{For} itself, note the use of the macros @code{GCPRO1} and @code{UNGCPRO}. @code{GCPRO1} is used to ``protect'' a variable from garbage collection---to inform the garbage @@ -672,6 +678,7 @@ macro. (This definition is used because those systems put all variables declared static in a place that becomes read-only after dumping, whether they have initializers or not.) +@cindex @code{defsubr}, Lisp symbol for a primitive Defining the C function is not enough to make a Lisp primitive available; you must also create the Lisp symbol for the primitive and store a suitable subr object in its function cell. The code looks like @@ -696,6 +703,8 @@ of these functions are called, and add a call to @anchor{Defining Lisp variables in C} @vindex byte-boolean-vars +@cindex defining Lisp variables in C +@cindex @code{DEFVAR_INT}, @code{DEFVAR_LISP}, @code{DEFVAR_BOOL} The function @code{syms_of_@var{filename}} is also the place to define any C variables that are to be visible as Lisp variables. @code{DEFVAR_LISP} makes a C variable of type @code{Lisp_Object} visible @@ -706,6 +715,7 @@ with a value that is either @code{t} or @code{nil}. Note that variables defined with @code{DEFVAR_BOOL} are automatically added to the list @code{byte-boolean-vars} used by the byte compiler. +@cindex @code{staticpro}, protect file-scope variables from GC If you define a file-scope C variable of type @code{Lisp_Object}, you must protect it from garbage-collection by calling @code{staticpro} in @code{syms_of_@var{filename}}, like this: diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi index a9b9ca2d512..023fddaba58 100644 --- a/lispref/keymaps.texi +++ b/lispref/keymaps.texi @@ -669,7 +669,7 @@ current active keymaps. The result is @code{nil} if @var{key} is undefined in the keymaps. The argument @var{accept-defaults} controls checking for default -bindings, as in @code{lookup-key} (above). +bindings, as in @code{lookup-key} (@pxref{Functions for Key Lookup}). When commands are remapped (@pxref{Remapping Commands}), @code{key-binding} normally processes command remappings so as to @@ -2540,6 +2540,11 @@ zero value suppresses the tool bar. If the value is nonzero, and @code{auto-resize-tool-bars} is non-@code{nil}, the tool bar expands and contracts automatically as needed to hold the specified contents. + If the value of @code{auto-resize-tool-bars} is @code{grow-only}, +the tool bar expands automatically, but does not contract automatically. +To contract the tool bar, the user has to redraw the frame by entering +@kbd{C-l}. + The tool bar contents are controlled by a menu keymap attached to a fake ``function key'' called @code{tool-bar} (much like the way the menu bar is controlled). So you define a tool bar item using @@ -2667,6 +2672,10 @@ specifies the local map to make the definition in. The argument If this variable is non-@code{nil}, the tool bar automatically resizes to show all defined tool bar items---but not larger than a quarter of the frame's height. + +If the value is @code{grow-only}, the tool bar expands automatically, +but does not contract automatically. To contract the tool bar, the +user has to redraw the frame by entering @kbd{C-l}. @end defvar @defvar auto-raise-tool-bar-buttons diff --git a/lispref/loading.texi b/lispref/loading.texi index eb576f8fbbc..150e20275b1 100644 --- a/lispref/loading.texi +++ b/lispref/loading.texi @@ -726,8 +726,14 @@ The argument @var{feature} must be a symbol. @code{provide} returns @var{feature}. If provided, @var{subfeatures} should be a list of symbols indicating -a set of specific subfeatures provided by this version of @var{feature}. -You can test the presence of a subfeature using @code{featurep}. +a set of specific subfeatures provided by this version of +@var{feature}. You can test the presence of a subfeature using +@code{featurep}. The idea of subfeatures is that you use them when a +package (which is one @var{feature}) is complex enough to make it +useful to give names to various parts or functionalities of the +package, which might or might not be loaded, or might or might not be +present in a given version. @xref{Network Feature Testing}, for +an example. @smallexample features diff --git a/lispref/positions.texi b/lispref/positions.texi index d8242158675..f37d885627d 100644 --- a/lispref/positions.texi +++ b/lispref/positions.texi @@ -677,7 +677,7 @@ deeper in parentheses (@minus{}@var{arg} levels). @deffn Command forward-sexp &optional arg This function moves forward across @var{arg} (default 1) balanced expressions. Balanced expressions include both those delimited by parentheses and -other kinds, such as words and string constants +other kinds, such as words and string constants. @xref{Parsing Expressions}. For example, @example diff --git a/lispref/processes.texi b/lispref/processes.texi index 7aa4aa9eb7d..2fd1f5ec963 100644 --- a/lispref/processes.texi +++ b/lispref/processes.texi @@ -2144,7 +2144,7 @@ Unsigned integer in little endian order, with length 2, 3 and 4, respectively. String of length @var{len}. @item strz @var{len} -Zero-terminated string of length @var{len}. +Zero-terminated string, in a fixed-size field with length @var{len}. @item vec @var{len} Vector of @var{len} bytes. @@ -2166,6 +2166,16 @@ unpacked or packed. The result of the evaluation should be one of the above-listed type specifications. @end table +For a fixed-size field, the length @var{len} is given as an integer +specifying the number of bytes in the field. + +When the length of a field is not fixed, it typically depends on the +value of a preceding field. In this case, the length @var{len} can be +given either as a list @code{(@var{name} ...)} identifying a +@dfn{field name} in the format specified for @code{bindat-get-field} +below, or by an expression @code{(eval @var{form})} where @var{form} +should evaluate to an integer, specifying the field length. + A field specification generally has the form @code{([@var{name}] @var{handler})}. The square braces indicate that @var{name} is optional. (Don't use names that are symbols meaningful as type @@ -2184,21 +2194,6 @@ Unpack/pack this field according to the type specification @var{type}. @item eval @var{form} Evaluate @var{form}, a Lisp expression, for side-effect only. If the field name is specified, the value is bound to that field name. -@var{form} can access and update these dynamically bound variables: - -@table @code -@item bindat-raw -The data as a byte array. - -@item bindat-idx -Current index into bindat-raw of the unpacking or packing operation. - -@item struct -Alist. - -@item last -Value of the last field processed. -@end table @item fill @var{len} Skip @var{len} bytes. In packing, this leaves them unchanged, @@ -2235,9 +2230,37 @@ of @var{form}. A non-@code{nil} result indicates a match. @item repeat @var{count} @var{field-specs}@dots{} Process the @var{field-specs} recursively, in order, then repeat starting from the first one, processing all the specs @var{count} -times overall. @var{count} may be an integer, or a list of one -element that names a previous field. For correct operation, each spec -in @var{field-specs} must include a name. +times overall. The @var{count} is given using the same formats as a +field length---if an @code{eval} form is used, it is evaluated just once. +For correct operation, each spec in @var{field-specs} must include a name. +@end table + +For the @code{(eval @var{form})} forms used in a bindat specification, +the @var{form} can access and update these dynamically bound variables +during evaluation: + +@table @code +@item last +Value of the last field processed. + +@item bindat-raw +The data as a byte array. + +@item bindat-idx +Current index into bindat-raw of the unpacking or packing operation. + +@item struct +The alist containing the structured data that have been unpacked so +far, or the entire structure being packed. You can use +@code{bindat-get-field} to access specific fields of this structure. + +@item count +@itemx index +Inside a @code{repeat} block, these contain the maximum number of +repetitions (as specified by the @var{count} parameter), and the +current repetition number (counting from 0). Setting @code{count} to +zero will terminate the inner-most repeat block after the current +repetition has completed. @end table @node Bindat Functions diff --git a/lispref/syntax.texi b/lispref/syntax.texi index 54b0d4a0bc0..4458547f7d2 100644 --- a/lispref/syntax.texi +++ b/lispref/syntax.texi @@ -597,26 +597,26 @@ expression prefix syntax class, and characters with the @samp{p} flag. @end defun @node Parsing Expressions -@section Parsing Balanced Expressions +@section Parsing Expressions - Here are several functions for parsing and scanning balanced + This section describes functions for parsing and scanning balanced expressions, also known as @dfn{sexps}. Basically, a sexp is either a -balanced parenthetical grouping, or a symbol name (a sequence of -characters whose syntax is either word constituent or symbol -constituent). However, characters whose syntax is expression prefix -are treated as part of the sexp if they appear next to it. +balanced parenthetical grouping, a string, or a symbol name (a +sequence of characters whose syntax is either word constituent or +symbol constituent). However, characters whose syntax is expression +prefix are treated as part of the sexp if they appear next to it. The syntax table controls the interpretation of characters, so these functions can be used for Lisp expressions when in Lisp mode and for C expressions when in C mode. @xref{List Motion}, for convenient higher-level functions for moving over balanced expressions. - A syntax table only describes how each character changes the state -of the parser, rather than describing the state itself. For example, -a string delimiter character toggles the parser state between -``in-string'' and ``in-code'' but the characters inside the string do -not have any particular syntax to identify them as such. For example -(note that 15 is the syntax code for generic string delimiters), + A character's syntax controls how it changes the state of the +parser, rather than describing the state itself. For example, a +string delimiter character toggles the parser state between +``in-string'' and ``in-code,'' but the syntax of characters does not +directly say whether they are inside a string. For example (note that +15 is the syntax code for generic string delimiters), @example (put-text-property 1 9 'syntax-table '(15 . nil)) @@ -627,46 +627,128 @@ does not tell Emacs that the first eight chars of the current buffer are a string, but rather that they are all string delimiters. As a result, Emacs treats them as four consecutive empty string constants. - Every time you use the parser, you specify it a starting state as -well as a starting position. If you omit the starting state, the -default is ``top level in parenthesis structure,'' as it would be at -the beginning of a function definition. (This is the case for -@code{forward-sexp}, which blindly assumes that the starting point is -in such a state.) +@menu +* Motion via Parsing:: Motion functions that work by parsing. +* Position Parse:: Determining the syntactic state of a position. +* Parser State:: How Emacs represents a syntactic state. +* Low-Level Parsing:: Parsing across a specified region. +* Control Parsing:: Parameters that affect parsing. +@end menu -@defun parse-partial-sexp start limit &optional target-depth stop-before state stop-comment -This function parses a sexp in the current buffer starting at -@var{start}, not scanning past @var{limit}. It stops at position -@var{limit} or when certain criteria described below are met, and sets -point to the location where parsing stops. It returns a value -describing the status of the parse at the point where it stops. +@node Motion via Parsing +@subsection Motion Commands Based on Parsing -If @var{state} is @code{nil}, @var{start} is assumed to be at the top -level of parenthesis structure, such as the beginning of a function -definition. Alternatively, you might wish to resume parsing in the -middle of the structure. To do this, you must provide a @var{state} -argument that describes the initial status of parsing. + This section describes simple point-motion functions that operate +based on parsing expressions. -@cindex parenthesis depth -If the third argument @var{target-depth} is non-@code{nil}, parsing -stops if the depth in parentheses becomes equal to @var{target-depth}. -The depth starts at 0, or at whatever is given in @var{state}. +@defun scan-lists from count depth +This function scans forward @var{count} balanced parenthetical groupings +from position @var{from}. It returns the position where the scan stops. +If @var{count} is negative, the scan moves backwards. -If the fourth argument @var{stop-before} is non-@code{nil}, parsing -stops when it comes to any character that starts a sexp. If -@var{stop-comment} is non-@code{nil}, parsing stops when it comes to the -start of a comment. If @var{stop-comment} is the symbol -@code{syntax-table}, parsing stops after the start of a comment or a -string, or the end of a comment or a string, whichever comes first. +If @var{depth} is nonzero, parenthesis depth counting begins from that +value. The only candidates for stopping are places where the depth in +parentheses becomes zero; @code{scan-lists} counts @var{count} such +places and then stops. Thus, a positive value for @var{depth} means go +out @var{depth} levels of parenthesis. + +Scanning ignores comments if @code{parse-sexp-ignore-comments} is +non-@code{nil}. + +If the scan reaches the beginning or end of the buffer (or its +accessible portion), and the depth is not zero, an error is signaled. +If the depth is zero but the count is not used up, @code{nil} is +returned. +@end defun + +@defun scan-sexps from count +This function scans forward @var{count} sexps from position @var{from}. +It returns the position where the scan stops. If @var{count} is +negative, the scan moves backwards. + +Scanning ignores comments if @code{parse-sexp-ignore-comments} is +non-@code{nil}. + +If the scan reaches the beginning or end of (the accessible part of) the +buffer while in the middle of a parenthetical grouping, an error is +signaled. If it reaches the beginning or end between groupings but +before count is used up, @code{nil} is returned. +@end defun + +@defun forward-comment count +This function moves point forward across @var{count} complete comments + (that is, including the starting delimiter and the terminating +delimiter if any), plus any whitespace encountered on the way. It +moves backward if @var{count} is negative. If it encounters anything +other than a comment or whitespace, it stops, leaving point at the +place where it stopped. This includes (for instance) finding the end +of a comment when moving forward and expecting the beginning of one. +The function also stops immediately after moving over the specified +number of complete comments. If @var{count} comments are found as +expected, with nothing except whitespace between them, it returns +@code{t}; otherwise it returns @code{nil}. + +This function cannot tell whether the ``comments'' it traverses are +embedded within a string. If they look like comments, it treats them +as comments. +@end defun + +To move forward over all comments and whitespace following point, use +@code{(forward-comment (buffer-size))}. @code{(buffer-size)} is a good +argument to use, because the number of comments in the buffer cannot +exceed that many. + +@node Position Parse +@subsection Finding the Parse State for a Position + + For syntactic analysis, such as in indentation, often the useful +thing is to compute the syntactic state corresponding to a given buffer +position. This function does that conveniently. + +@defun syntax-ppss &optional pos +This function returns the parser state (see next section) that the +parser would reach at position @var{pos} starting from the beginning +of the buffer. This is equivalent to @code{(parse-partial-sexp +(point-min) @var{pos})}, except that @code{syntax-ppss} uses a cache +to speed up the computation. Due to this optimization, the 2nd value +(previous complete subexpression) and 6th value (minimum parenthesis +depth) of the returned parser state are not meaningful. +@end defun + + @code{syntax-ppss} automatically hooks itself to +@code{before-change-functions} to keep its cache consistent. But +updating can fail if @code{syntax-ppss} is called while +@code{before-change-functions} is temporarily let-bound, or if the +buffer is modified without obeying the hook, such as when using +@code{inhibit-modification-hooks}. For this reason, it is sometimes +necessary to flush the cache manually. + +@defun syntax-ppss-flush-cache beg +This function flushes the cache used by @code{syntax-ppss}, starting at +position @var{beg}. +@end defun + + Major modes can make @code{syntax-ppss} run faster by specifying +where it needs to start parsing. -@cindex parse state -The fifth argument @var{state} is a ten-element list of the same form -as the value of this function, described below. The return value of -one call may be used to initialize the state of the parse on another -call to @code{parse-partial-sexp}. +@defvar syntax-begin-function +If this is non-@code{nil}, it should be a function that moves to an +earlier buffer position where the parser state is equivalent to +@code{nil}---in other words, a position outside of any comment, +string, or parenthesis. @code{syntax-ppss} uses it to further +optimize its computations, when the cache gives no help. +@end defvar + +@node Parser State +@subsection Parser State +@cindex parser state -The result is a list of ten elements describing the final state of -the parse: + A @dfn{parser state} is a list of ten elements describing the final +state of parsing text syntactically as part of an expression. The +parsing functions in the following sections return a parser state as +the value, and in some cases accept one as an argument also, so that +you can resume parsing after it stops. Here are the meanings of the +elements of the parser state: @enumerate 0 @item @@ -721,82 +803,66 @@ data is subject to change; it is used if you pass this list as the @var{state} argument to another call. @end enumerate -Elements 1, 2, and 6 are ignored in the argument @var{state}. Element -8 is used only to set the corresponding element of the return value, -in certain simple cases. Element 9 is used only to set element 1 of -the return value, in trivial cases where parsing starts and stops -within the same pair of parentheses. + Elements 1, 2, and 6 are ignored in a state which you pass as an +argument to continue parsing, and elements 8 and 9 are used only in +trivial cases. Those elements serve primarily to convey information +to the Lisp program which does the parsing. -@cindex indenting with parentheses -This function is most often used to compute indentation for languages -that have nested parentheses. -@end defun + One additional piece of useful information is available from a +parser state using this function: -@defun syntax-ppss &optional pos -This function returns the state that the parser would have at position -@var{pos}, if it were started with a default start state at the -beginning of the buffer. Thus, it is equivalent to -@code{(parse-partial-sexp (point-min) @var{pos})}, except that -@code{syntax-ppss} uses a cache to speed up the computation. Also, -the 2nd value (previous complete subexpression) and 6th value (minimum -parenthesis depth) of the returned state are not meaningful. -@end defun +@defun syntax-ppss-toplevel-pos state +This function extracts, from parser state @var{state}, the last +position scanned in the parse which was at top level in grammatical +structure. ``At top level'' means outside of any parentheses, +comments, or strings. -@defun syntax-ppss-flush-cache beg -This function flushes the cache used by @code{syntax-ppss}, starting at -position @var{beg}. - -When @code{syntax-ppss} is called, it automatically hooks itself -to @code{before-change-functions} to keep its cache consistent. -But this can fail if @code{syntax-ppss} is called while -@code{before-change-functions} is temporarily let-bound, or if the -buffer is modified without obeying the hook, such as when using -@code{inhibit-modification-hooks}. For this reason, it is sometimes -necessary to flush the cache manually. +The value is @code{nil} if @var{state} represents a parse which has +arrived at a top level position. @end defun -@defvar syntax-begin-function -If this is non-@code{nil}, it should be a function that moves to an -earlier buffer position where the parser state is equivalent to -@code{nil}---in other words, a position outside of any comment, -string, or parenthesis. @code{syntax-ppss} uses it to supplement its -cache. -@end defvar - -@defun scan-lists from count depth -This function scans forward @var{count} balanced parenthetical groupings -from position @var{from}. It returns the position where the scan stops. -If @var{count} is negative, the scan moves backwards. + We have provided this access function rather than document how the +data is represented in the state, because we plan to change the +representation in the future. -If @var{depth} is nonzero, parenthesis depth counting begins from that -value. The only candidates for stopping are places where the depth in -parentheses becomes zero; @code{scan-lists} counts @var{count} such -places and then stops. Thus, a positive value for @var{depth} means go -out @var{depth} levels of parenthesis. +@node Low-Level Parsing +@subsection Low-Level Parsing -Scanning ignores comments if @code{parse-sexp-ignore-comments} is -non-@code{nil}. + The most basic way to use the expression parser is to tell it +to start at a given position with a certain state, and parse up to +a specified end position. -If the scan reaches the beginning or end of the buffer (or its -accessible portion), and the depth is not zero, an error is signaled. -If the depth is zero but the count is not used up, @code{nil} is -returned. -@end defun +@defun parse-partial-sexp start limit &optional target-depth stop-before state stop-comment +This function parses a sexp in the current buffer starting at +@var{start}, not scanning past @var{limit}. It stops at position +@var{limit} or when certain criteria described below are met, and sets +point to the location where parsing stops. It returns a parser state +describing the status of the parse at the point where it stops. -@defun scan-sexps from count -This function scans forward @var{count} sexps from position @var{from}. -It returns the position where the scan stops. If @var{count} is -negative, the scan moves backwards. +@cindex parenthesis depth +If the third argument @var{target-depth} is non-@code{nil}, parsing +stops if the depth in parentheses becomes equal to @var{target-depth}. +The depth starts at 0, or at whatever is given in @var{state}. -Scanning ignores comments if @code{parse-sexp-ignore-comments} is -non-@code{nil}. +If the fourth argument @var{stop-before} is non-@code{nil}, parsing +stops when it comes to any character that starts a sexp. If +@var{stop-comment} is non-@code{nil}, parsing stops when it comes to the +start of a comment. If @var{stop-comment} is the symbol +@code{syntax-table}, parsing stops after the start of a comment or a +string, or the end of a comment or a string, whichever comes first. -If the scan reaches the beginning or end of (the accessible part of) the -buffer while in the middle of a parenthetical grouping, an error is -signaled. If it reaches the beginning or end between groupings but -before count is used up, @code{nil} is returned. +If @var{state} is @code{nil}, @var{start} is assumed to be at the top +level of parenthesis structure, such as the beginning of a function +definition. Alternatively, you might wish to resume parsing in the +middle of the structure. To do this, you must provide a @var{state} +argument that describes the initial status of parsing. The value +returned by a previous call to @code{parse-partial-sexp} will do +nicely. @end defun +@node Control Parsing +@subsection Parameters to Control Parsing + @defvar multibyte-syntax-as-symbol If this variable is non-@code{nil}, @code{scan-sexps} treats all non-@acronym{ASCII} characters as symbol constituents regardless @@ -817,29 +883,6 @@ The behavior of @code{parse-partial-sexp} is also affected by You can use @code{forward-comment} to move forward or backward over one comment or several comments. -@defun forward-comment count -This function moves point forward across @var{count} complete comments -(that is, including the starting delimiter and the terminating -delimiter if any), plus any whitespace encountered on the way. It -moves backward if @var{count} is negative. If it encounters anything -other than a comment or whitespace, it stops, leaving point at the -place where it stopped. This includes (for instance) finding the end -of a comment when moving forward and expecting the beginning of one. -The function also stops immediately after moving over the specified -number of complete comments. If @var{count} comments are found as -expected, with nothing except whitespace between them, it returns -@code{t}; otherwise it returns @code{nil}. - -This function cannot tell whether the ``comments'' it traverses are -embedded within a string. If they look like comments, it treats them -as comments. -@end defun - -To move forward over all comments and whitespace following point, use -@code{(forward-comment (buffer-size))}. @code{(buffer-size)} is a good -argument to use, because the number of comments in the buffer cannot -exceed that many. - @node Standard Syntax Tables @section Some Standard Syntax Tables diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 5a8f10f02d5..904d8eadf05 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1314,7 +1314,7 @@ ;; Local Variables: -;; coding: iso-2022-7bit-unix +;; coding: iso-2022-7bit ;; add-log-time-zone-rule: t ;; End: diff --git a/mac/ChangeLog b/mac/ChangeLog index 7c8e0ed6673..225d953dfc4 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -863,7 +863,7 @@ * src/macterm.c: New file. ;; Local Variables: -;; coding: iso-2022-7bit-unix +;; coding: iso-2022-7bit ;; add-log-time-zone-rule: t ;; End: diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings index d297cfb34ef..88098f4728f 100644 --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "22.0.91"; -CFBundleGetInfoString = "22.0.91, Copyright (C) 2006 Free Software Foundation, Inc."; +CFBundleShortVersionString = "22.0.92"; +CFBundleGetInfoString = "22.0.92, Copyright (C) 2006 Free Software Foundation, Inc."; diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r index 73be8488f6b..37d6d0f7c39 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r @@ -221,10 +221,10 @@ resource 'vers' (1) { 0x22, /* Major revision in BCD */ 0x0, /* Minor revision in BCD */ alpha, /* development, alpha, beta, or final (release) */ - 91, /* Non-final release # */ + 92, /* Non-final release # */ 0, /* Region code */ - "22.0.91", /* Short version number */ - "22.0.91, Copyright \0xa9 2006 " + "22.0.92", /* Short version number */ + "22.0.92, Copyright \0xa9 2006 " "Free Software Foundation, Inc." /* Long version number */ }; diff --git a/man/ChangeLog b/man/ChangeLog index 09eb469c53f..3e6fb6d8164 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,156 @@ +2006-12-31 Kim F. Storm <storm@cua.dk> + + * major.texi (Choosing Modes): Document auto-mode-case-fond. + +2006-12-30 Kim F. Storm <storm@cua.dk> + + * killing.texi (CUA Bindings): Fix typo. + + * xresources.texi (Table of Resources): Mention grow-only value for + auto-resize-tool-bars. + +2006-12-30 Michael Albinus <michael.albinus@gmx.de> + + Sync with Tramp 2.0.55. + + * trampver.texi: Update release number. + +2006-12-29 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.texi (Customizing Articles): Add index entries for all + gnus-treat-* variables. + +2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> + + * gnus.texi (IMAP): Fix incorrect explanation of + nnimap-search-uids-not-since-is-evil in documentation for + nnimap-expunge-search-string. + +2006-12-27 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to + spam-ifile-database. + +2006-12-26 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.texi (Spam Package Configuration Examples): Don't encourage to + rebind C-s. + +2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> + + * gnus.texi (Group Parameters, Group Maintenance, Topic Commands) + (Mail Group Commands, Expiring Mail, IMAP): Add index entries for + "expiring mail". + (IMAP): Document nnimap-search-uids-not-since-is-evil and + nnimap-nov-is-evil. + +2006-12-27 Eli Zaretskii <eliz@gnu.org> + + * msdog.texi (Windows Keyboard): Mention widespread Windows bindings, + and how to get them back. + +2006-12-26 Richard Stallman <rms@gnu.org> + + * calendar.texi (Holidays): Holiday listing is based on current + practice, but DST is not. + +2006-12-25 Richard Stallman <rms@gnu.org> + + * emacs.texi (Top): Update subnode menus. + + * mark.texi (Transient Mark): Fix xref. + + * killing.texi (Graphical Kill): Node deleted. + (Killing): Add xref to Cut and Paste. + (CUA Bindings): Update xref. + + * frames.texi (Cut and Paste): New section to hold other nodes. + (Mouse Commands): Node demoted. + (Cut/Paste Other App): Split out from Mouse Commands. + (Word and Line Mouse): Likewise. + (Secondary Selection, Clipboard): Nodes demoted. + +2006-12-25 Kevin Ryde <user42@zip.com.au> + + * cl.texi (Sorting Sequences): In sort*, add a little cautionary note + about the key procedure being used heavily. + +2006-12-24 Chong Yidong <cyd@stupidchicken.com> + + * pgg.texi (Caching passphrase): Default for pgg-gpg-use-agent changed + to t. + (Prerequisites): Add explanation about gpg-agent. + +2006-12-24 Kevin Ryde <user42@zip.com.au> + + * calendar.texi (Holidays): US daylight savings begins second Sunday + in March for 2007 onwards. + (Daylight Savings): Show new US default daylight savings rules, 2nd + Sun in Mar to 1st Sun in Nov, now in cal-dst.el. + +2006-12-23 Chong Yidong <cyd@stupidchicken.com> + + * calendar.texi (Scroll Calendar): < and > are switched. + +2006-12-23 Kevin Rodgers <ihs_4664@yahoo.com> + + * killing.texi (Deletion): Describe M-\ prefix argument. + +2006-12-23 Richard Stallman <rms@gnu.org> + + * search.texi (Regexp Search): Explain why forward and reverse regexp + search are not mirror images. + +2006-12-22 Kevin Ryde <user42@zip.com.au> + + * cl.texi (Sorting Sequences): Typo in sort*, example showed plain + "sort" instead of "sort*". + +2006-12-19 Richard Stallman <rms@gnu.org> + + * calc.texi (History and Acknowledgements): Recognize that Emacs + now does have floating point. + +2006-12-19 Kim F. Storm <storm@cua.dk> + + * major.texi (Choosing Modes): Describe match-function elements for + magic-mode-alist. + +2006-12-19 Michael Albinus <michael.albinus@gmx.de> + + * tramp.texi (External transfer methods): Describe new method `scpc'. + +2006-12-18 Eli Zaretskii <eliz@gnu.org> + + * msdog.texi (Windows Keyboard): Add a footnote about "Windows" keys + peculiarities. + +2006-12-18 Richard Stallman <rms@gnu.org> + + * abbrevs.texi (Editing Abbrevs): Fix previous change. + +2006-12-17 Sascha Wilde <wilde@sha-bang.de> + + * pgg.texi: Added short note on gpg-agent to the introduction. + +2006-12-17 Alan Mackenzie <acm@muc.de> + + * programs.texi (Left Margin Paren): Remove the bit which says + that CC Mode sets open-paren-in-column-0-is-defun-start to nil. + Discuss some of the issues of setting this option to nil. + +2006-12-17 Glenn Morris <rgm@gnu.org> + + * abbrevs.texi (Editing Abbrevs): Mention system abbrevs. + +2006-12-16 Eli Zaretskii <eliz@gnu.org> + + * msdog.texi (Windows Keyboard): Clarify `w32-recognize-altgr' effect. + (Windows Files): `w32-get-true-file-attributes' is only relevant for + NTFS volumes. + (ls in Lisp): `links' in `ls-lisp-verbosity' is only relevant to NTFS + volumes. + 2006-12-15 Eli Zaretskii <eliz@gnu.org> * text.texi (HTML Mode): Fix "C-c TAB". diff --git a/man/abbrevs.texi b/man/abbrevs.texi index 0283b332976..bea460a9a61 100644 --- a/man/abbrevs.texi +++ b/man/abbrevs.texi @@ -255,6 +255,10 @@ keeps track of this to help you see which abbrevs you actually use, so that you can eliminate those that you don't use often. The string at the end of the line is the expansion. + Some abbrevs are marked with @samp{(sys)}. These ``system'' abbrevs +(@pxref{Abbrevs,,, elisp, The Emacs Lisp Reference Manual}) are +pre-defined by various modes, and are not saved to your abbrev file. + @findex edit-abbrevs @kindex C-c C-c @r{(Edit Abbrevs)} @kbd{M-x edit-abbrevs} allows you to add, change or kill abbrev diff --git a/man/calc.texi b/man/calc.texi index 6f3082fb776..d38becd46d9 100644 --- a/man/calc.texi +++ b/man/calc.texi @@ -1539,7 +1539,8 @@ To make a long story short, Emacs Lisp turned out to be a distressingly solid implementation of Lisp, and the humble task of calculating turned out to be more open-ended than one might have expected. -Emacs Lisp doesn't have built-in floating point math, so it had to be +Emacs Lisp didn't have built-in floating point math (now it does), so +this had to be simulated in software. In fact, Emacs integers will only comfortably fit six decimal digits or so---not enough for a decent calculator. So I had to write my own high-precision integer code as well, and once I had diff --git a/man/calendar.texi b/man/calendar.texi index 8b66cb6113e..45aec25be9b 100644 --- a/man/calendar.texi +++ b/man/calendar.texi @@ -240,9 +240,9 @@ the months on it. Scrolling the calendar means moving the strip horizontally, so that new months become visible in the window. @table @kbd -@item < -Scroll calendar one month forward (@code{scroll-calendar-left}). @item > +Scroll calendar one month forward (@code{scroll-calendar-left}). +@item < Scroll calendar one month backward (@code{scroll-calendar-right}). @item C-v @itemx @key{NEXT} @@ -254,16 +254,15 @@ Scroll calendar three months backward (@code{scroll-calendar-right-three-months}). @end table -@kindex < @r{(Calendar mode)} -@findex scroll-calendar-left @kindex > @r{(Calendar mode)} +@findex scroll-calendar-left +@kindex < @r{(Calendar mode)} @findex scroll-calendar-right The most basic calendar scroll commands scroll by one month at a time. This means that there are two months of overlap between the -display before the command and the display after. @kbd{<} scrolls -the calendar contents one month to the left; that is, it moves the -display forward in time. @kbd{>} scrolls the contents to the -right, which moves backwards in time. +display before the command and the display after. @kbd{>} scrolls the +calendar contents one month forward in time. @kbd{<} scrolls the +contents one month backwards in time. @kindex C-v @r{(Calendar mode)} @findex scroll-calendar-left-three-months @@ -527,12 +526,8 @@ categories of holidays. You can use this command even if you don't have a calendar window. The dates used by Emacs for holidays are based on @emph{current -practice}, not historical fact. Historically, for instance, the start -of daylight savings time and even its existence have varied from year to -year, but present United States law mandates that daylight savings time -begins on the first Sunday in April. When the daylight savings rules -are set up for the United States, Emacs always uses the present -definition, even though it is wrong for some prior years. +practice}, not historical fact. For example Veteran's Day began in +1919, but is shown in earlier years. @node Sunrise/Sunset @section Times of Sunrise and Sunset @@ -1593,14 +1588,14 @@ day in the solar and lunar calculations. The values for Cambridge, Massachusetts are as follows: @example -(calendar-nth-named-day 1 0 4 year) -(calendar-nth-named-day -1 0 10 year) +(calendar-nth-named-day 2 0 3 year) +(calendar-nth-named-day 1 0 11 year) @end example @noindent -That is, the first 0th day (Sunday) of the fourth month (April) in -the year specified by @code{year}, and the last Sunday of the tenth month -(October) of that year. If daylight savings time were +That is, the second 0th day (Sunday) of the third month (March) in +the year specified by @code{year}, and the first Sunday of the eleventh month +(November) of that year. If daylight savings time were changed to start on October 1, you would set @code{calendar-daylight-savings-starts} to this: diff --git a/man/cl.texi b/man/cl.texi index 051aa18e02c..2c357f5fec6 100644 --- a/man/cl.texi +++ b/man/cl.texi @@ -4086,13 +4086,15 @@ accepts a @code{:key} argument which is used to preprocess data fed to the @var{predicate} function. For example, @example -(setq data (sort data 'string-lessp :key 'downcase)) +(setq data (sort* data 'string-lessp :key 'downcase)) @end example @noindent sorts @var{data}, a sequence of strings, into increasing alphabetical order without regard to case. A @code{:key} function of @code{car} -would be useful for sorting association lists. +would be useful for sorting association lists. It should only be a +simple accessor though, it's used heavily in the current +implementation. The @code{sort*} function is destructive; it sorts lists by actually rearranging the @code{cdr} pointers in suitable fashion. diff --git a/man/emacs.texi b/man/emacs.texi index 76b77f38f8b..d8bb5e8d5dc 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 22.0.91 +@set EMACSVER 22.0.92 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual}, @@ -297,8 +297,6 @@ Killing and Moving Text * Killing by Lines:: How to kill entire lines of text at one time. * Other Kill Commands:: Commands to kill large regions of text and syntactic units such as words and sentences. -* Graphical Kill:: The kill ring on graphical displays: - yanking between applications. * CUA Bindings:: Using @kbd{C-x}, @kbd{C-c}, @kbd{C-v} for copy and paste, with enhanced rectangle support. @@ -441,9 +439,7 @@ Multiple Windows Frames and X Windows -* Mouse Commands:: Moving, cutting, and pasting, with the mouse. -* Secondary Selection:: Cutting without altering point and mark. -* Clipboard:: Using the clipboard for selections. +* Cut and Paste:: Mouse commands for cut and paste. * Mouse References:: Using the mouse to select an item from a list. * Menu Mouse Clicks:: Mouse clicks that bring up menus. * Mode Line Mouse:: Mouse clicks on the mode line. diff --git a/man/frames.texi b/man/frames.texi index f3191014434..7d8fdbfd0ce 100644 --- a/man/frames.texi +++ b/man/frames.texi @@ -34,11 +34,8 @@ so that you can use many of the features described in this chapter. @xref{MS-DOS Mouse}. @end ifnottex - @menu -* Mouse Commands:: Moving, cutting, and pasting, with the mouse. -* Secondary Selection:: Cutting without altering point and mark. -* Clipboard:: Using the clipboard for selections. +* Cut and Paste:: Mouse commands for cut and paste. * Mouse References:: Using the mouse to select an item from a list. * Menu Mouse Clicks:: Mouse clicks that bring up menus. * Mode Line Mouse:: Mouse clicks on the mode line. @@ -60,8 +57,22 @@ so that you can use many of the features described in this chapter. * Text-Only Mouse:: Using the mouse in text-only terminals. @end menu +@node Cut and Paste +@section Killing and Yanking on Graphical Displays + + This section describes facilities for selecting a region, killing, +and yanking using the mouse. + +@menu +* Mouse Commands:: Moving, cutting, and pasting, with the mouse. +* Cut/Paste Other App:: Transfering text between Emacs and other apps. +* Word and Line Mouse:: Mouse commands for selecting whole words or lines. +* Secondary Selection:: Cutting without altering point and mark. +* Clipboard:: Using the clipboard for selections. +@end menu + @node Mouse Commands -@section Mouse Commands for Editing +@subsection Mouse Commands for Editing @cindex mouse buttons (what they do) The mouse commands for selecting and copying a region are mostly @@ -154,27 +165,6 @@ entire words or lines. If you use @kbd{Mouse-3} a second time consecutively, at the same place, that kills the region already selected. - -@item Double-Mouse-1 -This key sets the region around the word which you click on. If you -click on a character with ``symbol'' syntax (such as underscore, in C -mode), it sets the region around the symbol surrounding that character. - -If you click on a character with open-parenthesis or close-parenthesis -syntax, it sets the region around the parenthetical grouping -which that character starts or ends. If you click on a character with -string-delimiter syntax (such as a singlequote or doublequote in C), it -sets the region around the string constant (using heuristics to figure -out whether that character is the beginning or the end of it). - -@item Double-Drag-Mouse-1 -This key selects a region made up of the words you drag across. - -@item Triple-Mouse-1 -This key sets the region around the line you click on. - -@item Triple-Drag-Mouse-1 -This key selects a region made up of the lines you drag across. @end table The simplest way to kill text with the mouse is to press @kbd{Mouse-1} @@ -191,6 +181,20 @@ point. Then it does not matter where you click, or even which of the frame's windows you click on. The default value is @code{nil}. This variable also affects yanking the secondary selection. +@cindex Delete Selection mode +@cindex mode, Delete Selection +@findex delete-selection-mode + Many graphical applications follow the convention that insertion while text +is selected deletes the selected text. You can make Emacs behave this +way by enabling Delete Selection mode---with @kbd{M-x +delete-selection-mode} or using Custom. Another effect of this mode +is that @key{DEL}, @kbd{C-d} and some other keys, when a selection +exists, will kill the whole selection. It also enables Transient Mark +mode (@pxref{Transient Mark}). + +@node Cut/Paste Other App +@subsection Cut and Paste with Other Window Applications + @cindex cutting @cindex pasting @cindex X cutting and pasting @@ -224,8 +228,36 @@ to yank, the kill ring contents are used. system for selections, use @kbd{C-x @key{RET} x} or @kbd{C-x @key{RET} X}. @xref{Communication Coding}. +@node Word and Line Mouse +@subsection Mouse Commands for Words and Lines + + These variants of @kbd{Mouse-1} select entire words or lines at a time. + +@table @kbd +@item Double-Mouse-1 +This key sets the region around the word which you click on. If you +click on a character with ``symbol'' syntax (such as underscore, in C +mode), it sets the region around the symbol surrounding that character. + +If you click on a character with open-parenthesis or close-parenthesis +syntax, it sets the region around the parenthetical grouping +which that character starts or ends. If you click on a character with +string-delimiter syntax (such as a singlequote or doublequote in C), it +sets the region around the string constant (using heuristics to figure +out whether that character is the beginning or the end of it). + +@item Double-Drag-Mouse-1 +This key selects a region made up of the words you drag across. + +@item Triple-Mouse-1 +This key sets the region around the line you click on. + +@item Triple-Drag-Mouse-1 +This key selects a region made up of the lines you drag across. +@end table + @node Secondary Selection -@section Secondary Selection +@subsection Secondary Selection @cindex secondary selection The @dfn{secondary selection} is another way of selecting text using @@ -280,7 +312,7 @@ yanks at point. Then it does not matter precisely where you click; all that matters is which window you click on. @xref{Mouse Commands}. @node Clipboard -@section Using the Clipboard +@subsection Using the Clipboard @cindex clipboard @vindex x-select-enable-clipboard @findex menu-bar-enable-clipboard diff --git a/man/gnus.texi b/man/gnus.texi index 7a83ea66a97..ea959671c06 100644 --- a/man/gnus.texi +++ b/man/gnus.texi @@ -2810,6 +2810,7 @@ doesn't accept articles. @item auto-expire @cindex auto-expire +@cindex expiring mail If the group parameter has an element that looks like @code{(auto-expire . t)}, all articles read will be marked as expirable. For an alternative approach, @pxref{Expiring Mail}. @@ -2818,6 +2819,7 @@ See also @code{gnus-auto-expirable-newsgroups}. @item total-expire @cindex total-expire +@cindex expiring mail If the group parameter has an element that looks like @code{(total-expire . t)}, all read articles will be put through the expiry process, even if they are not marked as expirable. Use with @@ -3407,6 +3409,7 @@ zombies. @item C-c C-x @kindex C-c C-x (Group) @findex gnus-group-expire-articles +@cindex expiring mail Run all expirable articles in the current group through the expiry process (if any) (@code{gnus-group-expire-articles}). That is, delete all expirable articles in the group that have been around for a while. @@ -3415,6 +3418,7 @@ all expirable articles in the group that have been around for a while. @item C-c C-M-x @kindex C-c C-M-x (Group) @findex gnus-group-expire-all-groups +@cindex expiring mail Run all expirable articles in all groups through the expiry process (@code{gnus-group-expire-all-groups}). @@ -3775,6 +3779,7 @@ sub-topics unless given a prefix. @item C-c C-x @kindex C-c C-x (Topic) @findex gnus-topic-expire-articles +@cindex expiring mail Run all expirable articles in the current group or topic through the expiry process (if any) (@code{gnus-topic-expire-articles}). (@pxref{Expiring Mail}). @@ -10060,6 +10065,7 @@ process/prefix convention (@pxref{Process/Prefix}). @item B e @kindex B e (Summary) @findex gnus-summary-expire-articles +@cindex expiring mail Run all expirable articles in the current group through the expiry process (@code{gnus-summary-expire-articles}). That is, delete all expirable articles in the group that have been around for a while. @@ -10068,6 +10074,7 @@ expirable articles in the group that have been around for a while. @item B C-M-e @kindex B C-M-e (Summary) @findex gnus-summary-expire-articles-now +@cindex expiring mail Delete all the expirable articles in the group (@code{gnus-summary-expire-articles-now}). This means that @strong{all} articles eligible for expiry in the current group will @@ -11216,42 +11223,66 @@ group. Values in parenthesis are suggested sensible values. Others are possible but those listed are probably sufficient for most people. @table @code +@vindex gnus-treat-buttonize @item gnus-treat-buttonize (t, integer) +@vindex gnus-treat-buttonize-head @item gnus-treat-buttonize-head (head) @xref{Article Buttons}. +@vindex gnus-treat-capitalize-sentences @item gnus-treat-capitalize-sentences (t, integer) +@vindex gnus-treat-overstrike @item gnus-treat-overstrike (t, integer) +@vindex gnus-treat-strip-cr @item gnus-treat-strip-cr (t, integer) +@vindex gnus-treat-strip-headers-in-body @item gnus-treat-strip-headers-in-body (t, integer) +@vindex gnus-treat-strip-leading-blank-lines @item gnus-treat-strip-leading-blank-lines (t, integer) +@vindex gnus-treat-strip-multiple-blank-lines @item gnus-treat-strip-multiple-blank-lines (t, integer) +@vindex gnus-treat-strip-pem @item gnus-treat-strip-pem (t, last, integer) +@vindex gnus-treat-strip-trailing-blank-lines @item gnus-treat-strip-trailing-blank-lines (t, last, integer) +@vindex gnus-treat-unsplit-urls @item gnus-treat-unsplit-urls (t, integer) +@vindex gnus-treat-wash-html @item gnus-treat-wash-html (t, integer) @xref{Article Washing}. +@vindex gnus-treat-date-english @item gnus-treat-date-english (head) +@vindex gnus-treat-date-iso8601 @item gnus-treat-date-iso8601 (head) +@vindex gnus-treat-date-lapsed @item gnus-treat-date-lapsed (head) +@vindex gnus-treat-date-local @item gnus-treat-date-local (head) +@vindex gnus-treat-date-original @item gnus-treat-date-original (head) +@vindex gnus-treat-date-user-defined @item gnus-treat-date-user-defined (head) +@vindex gnus-treat-date-ut @item gnus-treat-date-ut (head) @xref{Article Date}. +@vindex gnus-treat-from-picon @item gnus-treat-from-picon (head) +@vindex gnus-treat-mail-picon @item gnus-treat-mail-picon (head) +@vindex gnus-treat-newsgroups-picon @item gnus-treat-newsgroups-picon (head) @xref{Picons}. +@vindex gnus-treat-display-smileys @item gnus-treat-display-smileys (t, integer) +@vindex gnus-treat-body-boundary @item gnus-treat-body-boundary (head) @vindex gnus-body-boundary-delimiter @@ -11260,40 +11291,62 @@ is controlled by @code{gnus-body-boundary-delimiter}. @xref{Smileys}. +@vindex gnus-treat-display-x-face @item gnus-treat-display-x-face (head) @xref{X-Face}. +@vindex gnus-treat-display-face @item gnus-treat-display-face (head) @xref{Face}. +@vindex gnus-treat-emphasize @item gnus-treat-emphasize (t, head, integer) +@vindex gnus-treat-fill-article @item gnus-treat-fill-article (t, integer) +@vindex gnus-treat-fill-long-lines @item gnus-treat-fill-long-lines (t, integer) +@vindex gnus-treat-hide-boring-headers @item gnus-treat-hide-boring-headers (head) +@vindex gnus-treat-hide-citation @item gnus-treat-hide-citation (t, integer) +@vindex gnus-treat-hide-citation-maybe @item gnus-treat-hide-citation-maybe (t, integer) +@vindex gnus-treat-hide-headers @item gnus-treat-hide-headers (head) +@vindex gnus-treat-hide-signature @item gnus-treat-hide-signature (t, last) +@vindex gnus-treat-strip-banner @item gnus-treat-strip-banner (t, last) +@vindex gnus-treat-strip-list-identifiers @item gnus-treat-strip-list-identifiers (head) @xref{Article Hiding}. +@vindex gnus-treat-highlight-citation @item gnus-treat-highlight-citation (t, integer) +@vindex gnus-treat-highlight-headers @item gnus-treat-highlight-headers (head) +@vindex gnus-treat-highlight-signature @item gnus-treat-highlight-signature (t, last, integer) @xref{Article Highlighting}. +@vindex gnus-treat-play-sounds @item gnus-treat-play-sounds +@vindex gnus-treat-translate @item gnus-treat-translate +@vindex gnus-treat-x-pgp-sig @item gnus-treat-x-pgp-sig (head) +@vindex gnus-treat-unfold-headers @item gnus-treat-unfold-headers (head) +@vindex gnus-treat-fold-headers @item gnus-treat-fold-headers (head) +@vindex gnus-treat-fold-newsgroups @item gnus-treat-fold-newsgroups (head) +@vindex gnus-treat-leading-whitespace @item gnus-treat-leading-whitespace (head) @xref{Article Header}. @@ -14511,6 +14564,7 @@ using the new mail back end. @node Expiring Mail @subsection Expiring Mail @cindex article expiry +@cindex expiring mail Traditional mail readers have a tendency to remove mail articles when you mark them as read, in some way. Gnus takes a fundamentally @@ -16454,6 +16508,7 @@ as ticked for other users. @item nnimap-expunge-search-string @cindex expunging @vindex nnimap-expunge-search-string +@cindex expiring @acronym{IMAP} mail This variable contain the @acronym{IMAP} search command sent to server when searching for articles eligible for expiring. The default is @@ -16465,6 +16520,10 @@ Probably the only useful value to change this to is messages instead of the internal article date. See section 6.4.4 of RFC 2060 for more information on valid strings. +However, if @code{nnimap-search-uids-not-since-is-evil} +is true, this variable has no effect since the search logic +is reversed, as described below. + @item nnimap-authinfo-file @vindex nnimap-authinfo-file @@ -16490,6 +16549,47 @@ Unselect mailboxes before looking for new mail in them. Some servers seem to need this under some circumstances; it was reported that Courier 1.7.1 did. +@item nnimap-nov-is-evil +@vindex nnimap-nov-is-evil +@cindex Courier @acronym{IMAP} server +@cindex @acronym{NOV} + +Never generate or use a local @acronym{NOV} database. Defaults to the +value of @code{gnus-agent}. + +Using a @acronym{NOV} database usually makes header fetching much +faster, but it uses the @code{UID SEARCH UID} command, which is very +slow on some servers (notably some versions of Courier). Since the Gnus +Agent caches the information in the @acronym{NOV} database without using +the slow command, this variable defaults to true if the Agent is in use, +and false otherwise. + +@item nnimap-search-uids-not-since-is-evil +@vindex nnimap-search-uids-not-since-is-evil +@cindex Courier @acronym{IMAP} server +@cindex expiring @acronym{IMAP} mail + +Avoid the @code{UID SEARCH UID @var{message numbers} NOT SINCE +@var{date}} command, which is slow on some @acronym{IMAP} servers +(notably, some versions of Courier). Instead, use @code{UID SEARCH SINCE +@var{date}} and prune the list of expirable articles within Gnus. + +When Gnus expires your mail (@pxref{Expiring Mail}), it starts with a +list of expirable articles and asks the IMAP server questions like ``Of +these articles, which ones are older than a week?'' While this seems +like a perfectly reasonable question, some IMAP servers take a long time +to answer it, since they seemingly go looking into every old article to +see if it is one of the expirable ones. Curiously, the question ``Of +@emph{all} articles, which ones are newer than a week?'' seems to be +much faster to answer, so setting this variable causes Gnus to ask this +question and figure out the answer to the real question itself. + +This problem can really sneak up on you: when you first configure Gnus, +everything works fine, but once you accumulate a couple thousand +messages, you start cursing Gnus for being so slow. On the other hand, +if you get a lot of email within a week, setting this variable will +cause a lot of network traffic between Gnus and the IMAP server. + @end table @menu @@ -16677,7 +16777,7 @@ splitting function that analyzes the body to split the article. @node Expiring in IMAP @subsection Expiring in IMAP -@cindex expiring imap mail +@cindex expiring @acronym{IMAP} mail Even though @code{nnimap} is not a proper @code{nnmail} derived back end, it supports most features in regular expiring (@pxref{Expiring @@ -16696,6 +16796,9 @@ you to view client specific flags on the message. It also means that your server must support permanent storage of client specific flags on messages. Most do, fortunately. +If expiring @acronym{IMAP} mail seems very slow, try setting the server +variable @code{nnimap-search-uids-not-since-is-evil}. + @table @code @item nnmail-expiry-wait @@ -18605,7 +18708,7 @@ sense if you are using a nntp or nnimap back end. @findex gnus-agent-expire-group @cindex agent expiry @cindex Gnus agent expiry -@cindex expiry +@cindex expiry, in Gnus agent The Agent back end, @code{nnagent}, doesn't handle expiry. Well, at least it doesn't handle it like other back ends. Instead, there are @@ -23324,9 +23427,6 @@ From Ted Zlatanov <tzz@@lifelogs.com>. (gnus-registry-initialize) (spam-initialize) -;; @r{I like @kbd{C-s} for marking spam} -(define-key gnus-summary-mode-map "\C-s" 'gnus-summary-mark-as-spam) - (setq spam-log-to-registry t ; @r{for spam autodetection} spam-use-BBDB t @@ -23898,7 +23998,7 @@ The actual string used is irrelevant, but you probably want to leave the default value of @samp{spam}. @end defvar -@defvar spam-ifile-database-path +@defvar spam-ifile-database This is the filename for the ifile database. It is not specified by default, so ifile will use its own default database name. diff --git a/man/killing.texi b/man/killing.texi index 4be77e2d6f8..396a76328aa 100644 --- a/man/killing.texi +++ b/man/killing.texi @@ -56,14 +56,14 @@ an error message when this happens. But if you set the variable @code{kill-read-only-ok} to a non-@code{nil} value, they just print a message in the echo area to explain why the text has not been erased. + You can also use the mouse to kill and yank. @xref{Cut and Paste}. + @menu * Deletion:: Commands for deleting small amounts of text and blank areas. * Killing by Lines:: How to kill entire lines of text at one time. * Other Kill Commands:: Commands to kill large regions of text and syntactic units such as words and sentences. -* Graphical Kill:: The kill ring on graphical displays: - yanking between applications. @end menu @need 1500 @@ -148,10 +148,11 @@ enters Help instead, see @ref{DEL Does Not Delete}. The other delete commands are those which delete only whitespace characters: spaces, tabs and newlines. @kbd{M-\} (@code{delete-horizontal-space}) deletes all the spaces and tab -characters before and after point. @kbd{M-@key{SPC}} +characters before and after point. (With a prefix argument, it +deletes them before point, but not after.) @kbd{M-@key{SPC}} (@code{just-one-space}) does likewise but leaves a single space after -point, regardless of the number of spaces that existed previously (even -if there were none before). With a numeric argument @var{n}, it +point, regardless of the number of spaces that existed previously +(even if there were none before). With a numeric argument @var{n}, it leaves @var{n} spaces after point. @kbd{C-x C-o} (@code{delete-blank-lines}) deletes all blank lines @@ -250,28 +251,6 @@ and @kbd{M-d} (@pxref{Words}); balanced expressions, with @kbd{C-M-k} (@pxref{Expressions}); and sentences, with @kbd{C-x @key{DEL}} and @kbd{M-k} (@pxref{Sentences}).@refill -@node Graphical Kill -@subsection Killing on Graphical Displays - - On graphical displays with window systems, the most recent kill done -in Emacs is also the primary selection, if it is more recent than any -selection you made in another program. This means that the paste -commands of other window-based applications copy the text that you -killed in Emacs. In addition, Emacs yank commands treat other -applications' selections as part of the kill ring, so you can yank -them into Emacs. - -@cindex Delete Selection mode -@cindex mode, Delete Selection -@findex delete-selection-mode - Many graphical applications follow the convention that insertion while text -is selected deletes the selected text. You can make Emacs behave this -way by enabling Delete Selection mode---with @kbd{M-x -delete-selection-mode} or using Custom. Another effect of this mode -is that @key{DEL}, @kbd{C-d} and some other keys, when a selection -exists, will kill the whole selection. It also enables Transient Mark -mode (@pxref{Transient Mark}). - @node Yanking, Accumulating Text, Killing, Top @section Yanking @cindex moving text @@ -668,14 +647,14 @@ applications. @kbd{C-x} means cut (kill), @kbd{C-c} copy, @kbd{C-v} paste (yank), and @kbd{C-z} undo. Standard Emacs commands like @kbd{C-x C-c} still work, because @kbd{C-x} and @kbd{C-c} only take effect when the mark is active (and the region is highlighted). -However, if you don't want to override these bindings Emacs at all, set -@code{cua-enable-cua-keys} to @code{nil}. +However, if you don't want to override these bindings in Emacs at all, +set @code{cua-enable-cua-keys} to @code{nil}. In CUA mode, using @kbd{Shift} together with the movement keys activates and highlights the region over which they move. The standard (unshifted) movement keys deactivate the mark, and typed text replaces the active region as in Delete-Selection mode -(@pxref{Graphical Kill}). +(@pxref{Mouse Commands}). To enter an Emacs command like @kbd{C-x C-f} while the mark is active, use one of the following methods: either hold @kbd{Shift} diff --git a/man/major.texi b/man/major.texi index d1f3fbaeebf..fe9416aacde 100644 --- a/man/major.texi +++ b/man/major.texi @@ -102,17 +102,21 @@ the element has the form @code{(@var{regexp} @var{mode-function} @vindex magic-mode-alist Sometimes the major mode is determined from the way the file's text begins. The variable @code{magic-mode-alist} controls this. Its value -is a list of elements of this form: +is a list of elements of these forms: @example (@var{regexp} . @var{mode-function}) +(@var{match-function} . @var{mode-function}) @end example @noindent -This looks like an element of @code{auto-mode-alist}, but it doesn't work -the same: this @var{regexp} is matched against the text at the start -of the buffer, not against the file name. @code{magic-mode-alist} -takes priority over @code{auto-mode-alist}. +The first form looks like an element of @code{auto-mode-alist}, but it +doesn't work the same: this @var{regexp} is matched against the text +at the start of the buffer, not against the file name. Likewise, the +second form calls @var{match-function} at the beginning of the buffer, +and if the function returns non-@code{nil}, the @var{mode-function} is +called. @code{magic-mode-alist} takes priority over +@code{auto-mode-alist}. You can specify the major mode to use for editing a certain file by special text in the first nonblank line of the file. The @@ -144,6 +148,14 @@ which allows you to specify local variables as well, like this: @noindent @xref{File Variables}, for more information about this. +@vindex auto-mode-case-fold + On systems with case-insensitive file names, only a single +case-insensitive search through the @code{auto-mode-alist} is made. +On other systems, Emacs normally performs a single case-sensitive +search through the alist, but if you set this variable to a +non-@code{nil} value, Emacs will perform a second case-insensitive +search if the first search fails. + @vindex interpreter-mode-alist When a file's contents begin with @samp{#!}, it can serve as an executable shell command, which works by running an interpreter named on diff --git a/man/mark.texi b/man/mark.texi index e39800ab1b5..7cba4f0d004 100644 --- a/man/mark.texi +++ b/man/mark.texi @@ -192,7 +192,7 @@ region active again by typing @kbd{C-x C-x}. @item If Delete Selection mode is also enabled, some commands delete the -region when used while the mark is active. @xref{Graphical Kill}. +region when used while the mark is active. @xref{Mouse Commands}. @item Quitting with @kbd{C-g} deactivates the mark. diff --git a/man/msdog.texi b/man/msdog.texi index d92929ea04e..69126dca207 100644 --- a/man/msdog.texi +++ b/man/msdog.texi @@ -173,9 +173,9 @@ default ignores letter-case in file names during completion. @vindex w32-get-true-file-attributes If the variable @code{w32-get-true-file-attributes} is non-@code{nil} (the default), Emacs tries to determine the accurate -link counts for files. This option is only useful on the NT family of -Windows (2K/XP/2K3), and it considerably slows down Dired and other -features, so use it only on fast machines. +link counts for files. This option is only useful on NTFS volumes, +and it considerably slows down Dired and other features, so use it +only on fast machines. @node ls in Lisp @section Emulation of @code{ls} on MS-Windows @@ -234,10 +234,11 @@ that @file{ls-lisp.el} displays. The value should be a list that contains one or more of the symbols @code{links}, @code{uid}, and @code{gid}. @code{links} means display the count of different file names that are associated with (a.k.a.@: @dfn{links to}) the file's -data. @code{uid} means display the numerical identifier of the user -who owns the file. @code{gid} means display the numerical identifier -of the file owner's group. The default value is @code{(links uid gid)} -i.e.@: all the 3 optional attributes are displayed. +data; this is only useful on NTFS volumes. @code{uid} means display +the numerical identifier of the user who owns the file. @code{gid} +means display the numerical identifier of the file owner's group. The +default value is @code{(links uid gid)} i.e.@: all the 3 optional +attributes are displayed. @vindex ls-lisp-emulation The variable @code{ls-lisp-emulation} controls the flavour of the @@ -332,6 +333,13 @@ directory, whereas @file{.emacs} does not. This section describes the Windows-specific features related to keyboard input in Emacs. +@cindex MS-Windows keyboard shortcuts + Many key combinations (known as ``keyboard shortcuts'') that are in +widespread use in MS-Windows programs are taken by various Emacs +features. Examples include @kbd{C-C}, @kbd{C-X}, @kbd{C-Z}, +@kbd{C-A}, and @kbd{W-SPC}. You can get some of them back by turning +on CUA Mode (@pxref{CUA Bindings}). + @kindex F10 @r{(MS-Windows)} @cindex menu bar access using keyboard @r{(MS-Windows)} The @key{F10} key on Windows activates the menu bar in a way that @@ -420,16 +428,24 @@ keys are passed to Windows or swallowed by Emacs. If the value is otherwise it is passed to Windows. The default is @code{t} for both of these variables. Passing each of these keys to Windows produces its normal effect: for example, @kbd{@key{Lwindow}} opens the -@code{Start} menu, etc. +@code{Start} menu, etc.@footnote{ +Some combinations of the ``Windows'' keys with other keys are caught +by Windows at low level in a way that Emacs currently cannot prevent. +For example, @kbd{@key{Lwindow} r} always pops up the Windows +@samp{Run} dialog. Customizing the value of +@code{w32-phantom-key-code} might help in some cases, though.} @vindex w32-recognize-altgr @kindex AltGr @r{(MS-Windows)} @cindex AltGr key (MS-Windows) - The variable @code{w32-recognize-altgr} controls whether the right -@key{Alt} and left @key{Ctrl} keys are recognized as the @key{AltGr} -key. The default is @code{t}, which means these keys produce -@code{AltGr}; setting them to @code{nil} causes these keys to be -interpreted normally (as the respective modifiers). + The variable @code{w32-recognize-altgr} controls whether the +@key{AltGr} key (if it exists on your keyboard), or its equivalent, +the combination of the right @key{Alt} and left @key{Ctrl} keys +pressed together, is recognized as the @key{AltGr} key. The default +is @code{t}, which means these keys produce @code{AltGr}; setting it +to @code{nil} causes @key{AltGr} or the equivalent key combination to +be interpreted as the combination of @key{CTRL} and @key{META} +modifiers. @end ifnottex @node Windows Mouse diff --git a/man/pgg.texi b/man/pgg.texi index 23bcd5cbb1e..af97ddec45d 100644 --- a/man/pgg.texi +++ b/man/pgg.texi @@ -74,10 +74,19 @@ PGG requires at least one implementation of privacy guard system. This document assumes that you have already obtained and installed them and that you are familiar with its basic functions. -By default, PGG uses GnuPG, but Pretty Good Privacy version 2 or version -5 are also supported. If you are new to such a system, I recommend that -you should look over the GNU Privacy Handbook (GPH) which is available -at @uref{http://www.gnupg.org/gph/}. +By default, PGG uses GnuPG. If you are new to such a system, I +recommend that you should look over the GNU Privacy Handbook (GPH) +which is available at @uref{http://www.gnupg.org/documentation/}. + +When using GnuPG, we recommend the use of the @code{gpg-agent} +program, which is distributed with versions 2.0 and later of GnuPG. +This is a daemon to manage private keys independently from any +protocol, and provides the most secure way to input and cache your +passphrases (@pxref{Caching passphrase}). By default, PGG will +attempt to use @code{gpg-agent} if it is running. @xref{Invoking +GPG-AGENT,,,gnupg,Using the GNU Privacy Guard}. + +PGG also supports Pretty Good Privacy version 2 or version 5. @node How to use @chapter How to use @@ -238,8 +247,8 @@ Elapsed time for expiration in seconds. When using GnuPG (gpg) as PGP scheme you can use @code{gpg-agent} for caching@footnote{Actually @code{gpg-agent} does not cache passphrases but private keys. On the other hand, from a users point of view this -technical difference isn't visible.}. If non-@code{nil} try to use a -running @code{gpg-agent}. It defaults to @code{nil}. +technical difference isn't visible.}. It defaults to @code{t}. +Setting this to @code{nil} is not recommended. @end defvar @node Default user identity diff --git a/man/programs.texi b/man/programs.texi index fb85e470f86..200c787cf08 100644 --- a/man/programs.texi +++ b/man/programs.texi @@ -156,23 +156,11 @@ from Lisp, but in Emacs we use it for all languages. @cindex open-parenthesis in leftmost column @cindex ( in leftmost column Emacs assumes by default that any opening delimiter found at the -left margin is the start of a top-level definition, or defun. You can -override this default by setting this user option: - -@defvar open-paren-in-column-0-is-defun-start -If this user option is set to @code{t} (the default), opening -parentheses or braces at column zero always start defuns. When it's -@code{nil}, defuns are found by searching for parens or braces at the -outermost level. Some major modes, including C and related modes, set -@code{open-paren-in-column-0-is-defun-start} buffer-locally to -@code{nil} -@end defvar - - In modes where @code{open-paren-in-column-0-is-defun-start} is -@code{t}, @strong{don't put an opening delimiter at the left margin -unless it is a defun start}. For instance, never put an +left margin is the start of a top-level definition, or defun. +Therefore, @strong{don't put an opening delimiter at the left margin +unless it should have that significance}. For instance, never put an open-parenthesis at the left margin in a Lisp file unless it is the -start of a top-level list. +start of a top-level list. If you don't follow this convention, not only will you have trouble when you explicitly use the commands for motion by defuns; other @@ -182,10 +170,10 @@ mode (@pxref{Font Lock}). The most likely problem case is when you want an opening delimiter at the start of a line inside a string. To avoid trouble, put an -escape character (@samp{\}, in Emacs Lisp, @samp{/} in some other Lisp -dialects) before the opening delimiter. This will not affect the -contents of the string, but will prevent that opening delimiter from -starting a defun. Here's an example: +escape character (@samp{\}, in C and Emacs Lisp, @samp{/} in some +other Lisp dialects) before the opening delimiter. This will not +affect the contents of the string, but will prevent that opening +delimiter from starting a defun. Here's an example: @example (insert "Foo: @@ -197,6 +185,25 @@ starting a defun. Here's an example: highlights confusing opening delimiters (those that ought to be quoted) in bold red. +If you need to override this convention, you can so by setting this +user option: + +@defvar open-paren-in-column-0-is-defun-start +If this user option is set to @code{t} (the default), opening +parentheses or braces at column zero always start defuns. When it's +@code{nil}, defuns are found by searching for parens or braces at the +outermost level. +@end defvar + + Usually, you shouldn't need to set +@code{open-paren-in-column-0-is-defun-start} to @code{nil}. However, +if your buffer contains parentheses or braces in column zero which +don't start defuns and this confuses Emacs, it sometimes helps to set +the option to @code{nil}. Be aware, though, that this will make +scrolling and display in large buffers quite sluggish, and that +parentheses and braces must be correctly matched throughout the buffer +for it to work properly. + In the earliest days, the original Emacs found defuns by moving upward a level of parentheses or braces until there were no more levels to go up. This always required scanning all the way back to @@ -1557,10 +1564,10 @@ preprocessor commands. @table @kbd @item C-c C-@key{DEL} @itemx C-c @key{DEL} -@findex c-hungry-backspace +@findex c-hungry-delete-backwards @kindex C-c C-@key{DEL} (C Mode) @kindex C-c @key{DEL} (C Mode) -@code{c-hungry-backspace}---Delete the entire block of whitespace +@code{c-hungry-delete-backwards}---Delete the entire block of whitespace preceding point. @item C-c C-d diff --git a/man/search.texi b/man/search.texi index 67b61aeac07..532d58fb9d8 100644 --- a/man/search.texi +++ b/man/search.texi @@ -488,6 +488,13 @@ search can make the cursor move back and start again. For example, if you have searched for @samp{foo} and you add @samp{\|bar}, the cursor backs up in case the first @samp{bar} precedes the first @samp{foo}. + Forward and backward regexp search are not symmetrical, because +regexp matching in Emacs always operates forward, starting with the +beginning of the regexp. Thus, forward regexp search scans forward, +trying a forward match at each possible starting position. Backward +regexp search scans backward, trying a forward match at each possible +starting position. These search methods are not mirror images. + @findex re-search-forward @findex re-search-backward Nonincremental search for a regexp is done by the functions diff --git a/man/tramp.texi b/man/tramp.texi index 48d13b67ee3..4a09e2daa3c 100644 --- a/man/tramp.texi +++ b/man/tramp.texi @@ -832,6 +832,26 @@ to not print any shell prompt, which confuses @value{tramp} mightily. This method supports the @samp{-p} hack. +@item @option{scpc} --- @command{ssh} and @command{scp} +@cindex method scpx +@cindex scpx method +@cindex scp (with scpx method) +@cindex ssh (with scpx method) + +Newer versions of @option{ssh} (for example OpenSSH 4) offer an option +@option{ControlMaster}. This allows @option{scp} to reuse an existing +@option{ssh} channel, which increases performance. + +Before you use this method, you shall check whether your @option{ssh} +implementation does support this option. Try from the command line + +@example +ssh localhost -o ControlMaster=yes +@end example + +This method supports the @samp{-p} hack. + + @item @option{pscp} --- @command{plink} and @command{pscp} @cindex method pscp @cindex pscp method diff --git a/man/trampver.texi b/man/trampver.texi index bf220f4b195..a7777b00c79 100644 --- a/man/trampver.texi +++ b/man/trampver.texi @@ -4,12 +4,12 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.0.54 +@set trampver 2.0.55 @c Other flags from configuration @set prefix /usr/local @set lispdir /usr/local/share/emacs/site-lisp -@set infodir /usr/local/info +@set infodir /usr/local/share/info @c Formatting of the tramp program name consistent. @set tramp @sc{tramp} diff --git a/man/xresources.texi b/man/xresources.texi index e9233df25d5..142b1bc70a0 100644 --- a/man/xresources.texi +++ b/man/xresources.texi @@ -11,7 +11,7 @@ can customize some of the same aspects using the system registry. @xref{MS-Windows Registry}. Likewise, Emacs on MacOS Carbon emulates X resources using the Preferences system. @xref{Mac Environment Variables}. - When Emacs is built using an ``X toolkit'', such as Lucid or + When Emacs is built using an ``X toolkit'', such as Lucid or LessTif, you need to use X resources to customize the appearance of the widgets, including the menu-bar, scroll-bar, and dialog boxes. This is because the libraries that implement these don't provide for @@ -73,7 +73,7 @@ and their particular meanings. Case distinctions are significant in these names. Each resource specification in @file{~/.Xdefaults} states the name of the program and the name of the resource. For Emacs, the program name is @samp{Emacs}. It looks like this: - + @example Emacs.borderWidth: 2 @end example @@ -321,6 +321,9 @@ Number of lines to reserve for the tool bar. A zero value suppresses the tool bar. If the value is non-zero and @code{auto-resize-tool-bars} is non-@code{nil}, the tool bar's size will be changed automatically so that all tool bar items are visible. + If the value of @code{auto-resize-tool-bars} is @code{grow-only}, +the tool bar expands automatically, but does not contract automatically. +To contract the tool bar, you must redraw the frame by entering @kbd{C-l}. @item @code{useXIM} (class @code{UseXIM}) @cindex XIM @@ -438,7 +441,7 @@ Emacs.pane.menubar.font: 8x16 @noindent Resources for @emph{non-menubar} toolkit pop-up menus have -@samp{menu*} instead of @samp{pane.menubar}. For example, to specify +@samp{menu*} instead of @samp{pane.menubar}. For example, to specify the font @samp{8x16} for the pop-up menu items, write this: @example @@ -701,7 +704,7 @@ the menubar and the scroll bar in Emacs we use: widget "Emacs.pane.menubar" style "my_style" widget "Emacs.pane.emacs.verticalScrollBar" style "my_style" @end smallexample - + But to avoid having to type it all, wildcards are often used. @samp{*} matches zero or more characters and @samp{?} matches one character. So "*" matches all widgets. diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 7e5128387a8..ef25dc257f0 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -624,7 +624,7 @@ * sed1.inp: New file for changing src/makefile.in.in into src/makefile ;; Local Variables: -;; coding: iso-2022-7bit-unix +;; coding: iso-2022-7bit ;; add-log-time-zone-rule: t ;; End: diff --git a/nt/.gitignore b/nt/.gitignore index 26f5de661a0..cfa059286f2 100644 --- a/nt/.gitignore +++ b/nt/.gitignore @@ -5,3 +5,4 @@ config.log makefile obj oo +stamp_BLD diff --git a/nt/ChangeLog b/nt/ChangeLog index 7bb8528fd82..179efe7a8d4 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,65 @@ +2006-12-29 Jason Rumney <jasonr@gnu.org> + + * nmake.defs (TEMACS_EXTRA_LINK): Remove duplicated flags from + DEBUG_LINK. + (DEBUG_LINK): Remove -debugtype:both + +2006-12-27 Eli Zaretskii <eliz@gnu.org> + + * INSTALL: Update table of supported Make ports. Show "make -j" + command that is known to work. + + * configure.bat: Update table of supported Make ports. + +2006-12-24 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in ($(TRES)): Don't use $<, as nmake supports it + only in implicit rules. Use literal "emacs.rc" instead. + +2006-12-23 Eli Zaretskii <eliz@gnu.org> + + * gmake.defs: Export XMFLAGS. + + * makefile.w32-in (all-other-dirs-nmake, recompile-nmake): Don't + use $(XMFLAGS) for nmake, as it doesn't support parallelism. + +2006-12-22 Eli Zaretskii <eliz@gnu.org> + + * INSTALL: Explain how to invoke GNU Make for parallel builds. + + * makefile.w32-in (bootstrap-gmake): Pass XMFLAGS="$(XMFLAGS)" + command-line argument to sub-Make in src, since src/makefile.w32-in + invokes Make recursively during bootstrap. + (clean): Delete stamp_BLD. + (bootstrap): Make `all' explicitly in a recursive Make. + + * gmake.defs (stamp_BLD): Rename from $(BLD). Create a file + stamp_BLD after creating the $(BLD) directory. + + * nmake.defs (stamp_BLD): Rename from $(BLD). Create a file + stamp_BLD after creating the $(BLD) directory. + + * makefile.w32-in (addpm, ddeclient, cmdproxy, addsection) + (preprep, $(TRES), runemacs) + ($(BLD)/addpm.$(O), $(BLD)/ddeclient.$(O), $(BLD)/runemacs.$(O)) + ($(BLD)/cmdproxy.$(O), (BLD)/addsection.$(O), $(BLD)/preprep.$(O)): + Depend on stamp_BLD instead of on $(BLD). + (XMFLAGS): New macro. + (all-other-dirs-nmake, all-other-dirs-gmake, recompile-nmake) + (recompile-gmake, bootstrap-gmake, bootstrap-clean-gmake) + (install-other-dirs-gmake, info-gmake, clean-other-dirs-gmake) + (cleanall-other-dirs-gmake): Pass $(XMFLAGS) to sub-Make. + +2006-12-20 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in ($(TRES)): Depend on $(BLD). Use $< instead of + $(ALL_DEPS). + ($(BLD)/addpm.$(O), $(BLD)/ddeclient.$(O), $(BLD)/runemacs.$(O) + ($(BLD)/cmdproxy.$(O), $(BLD)/addsection.$(O), $(BLD)/preprep.$(O)): + New dependency on $(BLD). + (all-other-dirs-nmake, all-other-dirs-gmake, bootstrap-nmake) + (bootstrap-gmake): Depend on addsection. + 2006-10-29 Juanma Barranquero <lekktu@gmail.com> * runemacs.c (WinMain): Process all recognized arguments, not just diff --git a/nt/INSTALL b/nt/INSTALL index 8415b1893ff..9033153fcae 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -43,7 +43,18 @@ gmake (If you are building from CVS, say "make bootstrap" or "nmake - bootstrap" instead and avoid using Cygwin make.) + bootstrap" instead, and avoid using Cygwin make.) + + With GNU Make, you can use the -j command-line option to have + Make execute several commands at once, like this: + + gmake -j 2 XMFLAGS="-j 2" + + The XMFLAGS variable overrides the default behavior of GNU Make + on Windows, whereby recursive Make invocations reset the maximum + number of simultaneous commands to 1. The above command allows + up to 4 simultaneous commands at once in the top-level Make, and + up to 3 in each one of the recursive Make's. 4. Generate the Info manuals (only if you are building out of CVS, and if you have makeinfo.exe installed): @@ -95,6 +106,9 @@ build (latest versions of the Cygwin toolkit, at least since v1.3.3, include the MinGW headers and libraries as an integral part). + Note that building Emacs with Visual Studio 2005 is not supported at + this time. + The rest of this file assumes you have a working development environment. If you just installed such an environment, try building a trivial C "Hello world" program, and see if it works. If @@ -132,7 +146,7 @@ cygwin compiled make 3.80: fails?[6] fails?[6] cygwin compiled make 3.81: fails fails?[6] mingw32 compiled make 3.79.1: okay okay - mingw32 compiled make 3.80: okay unknown[6] + mingw32 compiled make 3.80: okay okay[6] mingw32 compiled make 3.81: okay okay[7] Notes: @@ -145,7 +159,7 @@ [4] may fail on Windows 9X and Windows ME; if so, install Bash. [5] fails when building leim due to the use of cygwin style paths. May work if building emacs without leim. - [6] please report if you try this combination. + [6] not recommended; please report if you try this combination. [7] tested only on Windows XP. Other compilers may work, but specific reports from people that have @@ -252,6 +266,18 @@ The warnings may be fixed in the main FSF source at some point, but until then we will just live with them. + With GNU Make, you can use the -j command-line option to have Make + execute several commands at once, like this: + + gmake -j 4 XMFLAGS="-j 3" + + The XMFLAGS variable overrides the default behavior of GNU Make on + Windows, whereby recursive Make invocations reset the maximum number + of simultaneous commands to 1. The above command allows up to 4 + simultaneous commands at once in the top-level Make, and up to 3 in + each one of the recursive Make's; you can use other numbers of jobs, + if you wish. + If you are building from CVS, the following commands will produce the Info manuals (which are not part of the CVS repository): diff --git a/nt/configure.bat b/nt/configure.bat index ffc11542ce0..1e411e8ad2c 100755 --- a/nt/configure.bat +++ b/nt/configure.bat @@ -25,27 +25,38 @@ rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS: rem
rem + MS Windows 95/98/Me or NT/2000/XP
rem + either MSVC 2.x or later, or gcc-2.95 or later (with gmake 3.75
-rem or later) and the Mingw32 and W32 API headers and libraries
+rem or later) and the Mingw32 and W32 API headers and libraries.
+rem + Visual Studio 2005 is not supported at this time.
rem
rem For reference, here is a list of which builds of gmake are known to
rem work or not, and whether they work in the presence and/or absence of
rem sh.exe.
rem
rem sh exists no sh
-rem cygwin b20.1 make (3.75): okay[1] fails[2]
+rem cygwin b20.1 make (3.75): fails[1,5] fails[2,5]
rem MSVC compiled gmake 3.77: okay okay
rem MSVC compiled gmake 3.78.1: okay okay
rem MSVC compiled gmake 3.79.1: okay okay
-rem mingw32/gcc-2.92.2 make (3.77): okay okay
-rem cygwin compiled gmake 3.77: okay[1] fails[2]
-rem cygwin compiled gmake 3.78.1: okay fails[2]
-rem cygwin compiled gmake 3.79.1: couldn't build make[3]
+rem mingw32/gcc-2.92.2 make (3.77): okay okay[4]
+rem cygwin compiled gmake 3.77: fails[1,5] fails[2,5]
+rem cygwin compiled gmake 3.78.1: fails[5] fails[2,5]
+rem cygwin compiled gmake 3.79.1: fails[3,5] fails[2?,5]
+rem cygwin compiled make 3.80: fails?[6] fails?[6]
+rem cygwin compiled make 3.81: fails fails?[6]
+rem mingw32 compiled make 3.79.1: okay okay
+rem mingw32 compiled make 3.80: okay okay?[6]
+rem mingw32 compiled make 3.81: okay okay[7]
rem
rem [1] doesn't cope with makefiles with DOS line endings, so must mount
rem emacs source with text!=binary.
rem [2] fails when needs to invoke shell commands; okay invoking gcc etc.
-rem [3] requires LC_MESSAGES support to build; maybe 2.95.x update to
-rem cygwin provides this?
+rem [3] requires LC_MESSAGES support to build; cannot build with early
+rem versions of cygwin.
+rem [4] may fail on Windows 9X and Windows ME; if so, install Bash.
+rem [5] fails when building leim due to the use of cygwin style paths.
+rem May work if building emacs without leim.
+rem [6] not recommended; please report if you try this combination.
+rem [7] tested only on Windows XP.
rem
if exist config.log del config.log
diff --git a/nt/emacs.rc b/nt/emacs.rc index 0384adc2816..4dbd51c6adc 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -6,8 +6,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 22,0,91,0 - PRODUCTVERSION 22,0,91,0 + FILEVERSION 22,0,92,0 + PRODUCTVERSION 22,0,92,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -24,12 +24,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" - VALUE "FileVersion", "22, 0, 91, 0\0" + VALUE "FileVersion", "22, 0, 92, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" - VALUE "ProductVersion", "22, 0, 91, 0\0" + VALUE "ProductVersion", "22, 0, 92, 0\0" VALUE "OLESelfRegister", "\0" END END diff --git a/nt/gmake.defs b/nt/gmake.defs index 56799f783e1..cf3b3a57990 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs @@ -200,8 +200,9 @@ OBJDIR = oo-spd endif $(OBJDIR):; -mkdir "$(OBJDIR)" BLD = $(OBJDIR)/$(ARCH) -$(BLD): $(OBJDIR) +stamp_BLD: $(OBJDIR) -mkdir "$(BLD)" + echo $(BLD) > $@ COMPILER_TEMP_FILES = @@ -266,6 +267,8 @@ endif LINK_FLAGS = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(NOCYGWIN) $(USER_LDFLAGS) +export XMFLAGS + .DEFAULT: $(BLD)/%.o: %.c diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 5e8de8bdf65..e63df000f08 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -21,33 +21,38 @@ # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
+# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out
+# (and remove or replace this comment).
+
ALL = addpm ddeclient runemacs cmdproxy addsection preprep
.PHONY: $(ALL)
TRES = $(BLD)/emacs.res
-addpm: $(BLD) $(BLD)/addpm.exe
+XMFLAGS =
+
+addpm: stamp_BLD $(BLD)/addpm.exe
$(BLD)/addpm.exe: $(BLD)/addpm.$(O)
$(LINK) $(LINK_OUT)$@ \
$(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
-ddeclient: $(BLD) $(BLD)/ddeclient.exe
+ddeclient: stamp_BLD $(BLD)/ddeclient.exe
$(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O)
$(LINK) $(LINK_OUT)$@ \
$(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
-cmdproxy: $(BLD) $(BLD)/cmdproxy.exe
+cmdproxy: stamp_BLD $(BLD)/cmdproxy.exe
$(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O)
$(LINK) $(LINK_OUT)$@ \
$(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
-addsection: $(BLD) $(BLD)/addsection.exe
+addsection: stamp_BLD $(BLD)/addsection.exe
$(BLD)/addsection.exe: $(BLD)/addsection.$(O)
$(LINK) $(LINK_OUT)$@ \
$(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
-preprep: $(BLD) $(BLD)/preprep.exe
+preprep: stamp_BLD $(BLD)/preprep.exe
$(BLD)/preprep.exe: $(BLD)/preprep.$(O)
$(LINK) $(LINK_OUT)$@ \
$(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS)
@@ -56,10 +61,10 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O) # The resource file. NT 3.10 requires the use of cvtres; even though
# it is not necessary on later versions, it is still ok to use it.
#
-$(TRES): emacs.rc
- $(RC) $(RC_OUT)$(BLD)/emacs.res $(ALL_DEPS)
+$(TRES): emacs.rc stamp_BLD
+ $(RC) $(RC_OUT)$(BLD)/emacs.res emacs.rc
-runemacs: $(BLD) $(BLD)/runemacs.exe
+runemacs: stamp_BLD $(BLD)/runemacs.exe
$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
$(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \
$(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
@@ -67,12 +72,18 @@ $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) which-sh:
@echo Using $(THE_SHELL) as shell.
+# These depend on stamp_BLD to make sure the $(BLD) directory is created
+# before the compilation begins, even if Make runs several commands
+# in parallel under "make -j".
+#
+$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): stamp_BLD
+
#
# Build emacs
#
-all: which-sh $(BLD) $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)
+all: which-sh stamp_BLD $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)
-all-other-dirs-nmake:
+all-other-dirs-nmake: addsection
cd ..\lib-src
$(MAKE) $(MFLAGS) all
cd ..\src
@@ -83,11 +94,11 @@ all-other-dirs-nmake: $(MAKE) $(MFLAGS) all
cd ..\nt
-all-other-dirs-gmake:
- $(MAKE) $(MFLAGS) -C ../lib-src all
- $(MAKE) $(MFLAGS) -C ../src all
- $(MAKE) $(MFLAGS) -C ../lisp all
- $(MAKE) $(MFLAGS) -C ../leim all
+all-other-dirs-gmake: addsection
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim all
recompile: recompile-$(MAKETYPE)
@@ -97,7 +108,7 @@ recompile-nmake: cd ..\nt
recompile-gmake:
- $(MAKE) $(MFLAGS) -C ../lisp recompile
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp recompile
#### Bootstrapping.
@@ -127,9 +138,10 @@ maybe-bootstrap-SH: doit exit -1; \
fi
-bootstrap: addsection bootstrap-$(MAKETYPE) all
+bootstrap: addsection bootstrap-$(MAKETYPE)
+ $(MAKE) $(MFLAGS) $(XMFLAGS) all
-bootstrap-nmake:
+bootstrap-nmake: addsection
cd ..\lisp
$(MAKE) $(MFLAGS) bootstrap-clean
cd ..\src
@@ -145,14 +157,14 @@ bootstrap-nmake: $(MAKE) $(MFLAGS) DOC
cd ..\nt
-bootstrap-gmake:
- $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean
- $(MAKE) $(MFLAGS) -C ../src clean
- $(MAKE) $(MFLAGS) -C ../lib-src clean
- $(MAKE) $(MFLAGS) -C ../src bootstrap
- $(MAKE) $(MFLAGS) -C ../src bootstrap-clean
- $(MAKE) $(MFLAGS) -C ../lisp bootstrap
- $(MAKE) $(MFLAGS) -C ../lib-src DOC
+bootstrap-gmake: addsection
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC
bootstrap-clean: bootstrap-clean-$(MAKETYPE)
@@ -163,8 +175,8 @@ bootstrap-clean-nmake: $(MAKE) $(MFLAGS) bootstrap-clean
bootstrap-clean-gmake:
- $(MAKE) $(MFLAGS) -C ../src bootstrap-clean
- $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
$(INSTALL_DIR):
- mkdir "$(INSTALL_DIR)"
@@ -209,10 +221,10 @@ install-other-dirs-nmake: cd ..\nt
install-other-dirs-gmake:
- $(MAKE) $(MFLAGS) -C ../lib-src install
- $(MAKE) $(MFLAGS) -C ../src install
- $(MAKE) $(MFLAGS) -C ../lisp install
- $(MAKE) $(MFLAGS) -C ../leim install
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src install
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src install
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
force-info:
# Note that man/makefile knows how to
@@ -229,15 +241,16 @@ info-nmake: $(MAKE) $(MFLAGS) info
info-gmake:
- $(MAKE) $(MFLAGS) -C ../man info
- $(MAKE) $(MFLAGS) -C ../lispref info
- $(MAKE) $(MFLAGS) -C ../lispintro info
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../man info
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispref info
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispintro info
#
# Maintenance
#
clean: clean-other-dirs-$(MAKETYPE)
- $(DEL) *~ $(COMPILER_TEMP_FILES)
- $(DEL_TREE) $(OBJDIR)
+ - $(DEL) stamp_BLD
- $(DEL) ../etc/DOC ../etc/DOC-X
clean-other-dirs-nmake:
@@ -258,10 +271,10 @@ clean-other-dirs-nmake: cd ..\nt
clean-other-dirs-gmake:
- $(MAKE) $(MFLAGS) -C ../lib-src clean
- $(MAKE) $(MFLAGS) -C ../src clean
- $(MAKE) $(MFLAGS) -C ../lisp clean
- $(MAKE) $(MFLAGS) -C ../leim clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp clean
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean
cleanall-other-dirs-nmake:
cd ..\lib-src
@@ -271,8 +284,8 @@ cleanall-other-dirs-nmake: cd ..\nt
cleanall-other-dirs-gmake:
- $(MAKE) $(MFLAGS) -C ../lib-src cleanall
- $(MAKE) $(MFLAGS) -C ../src cleanall
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall
+ $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall
cleanall: clean cleanall-other-dirs-$(MAKETYPE)
- $(DEL_TREE) obj
diff --git a/nt/nmake.defs b/nt/nmake.defs index 94fa9f431e9..96973e53a32 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs @@ -139,7 +139,7 @@ SYS_LDFLAGS = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swapru # see comments in allocate_heap in w32heap.c before changing any of the
# -stack, -heap, or -base settings.
-TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)
+TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)
!ifdef NOOPT
OBJDIR = obj
@@ -148,8 +148,9 @@ OBJDIR = obj-spd !endif
$(OBJDIR):; -mkdir $(OBJDIR)
BLD = $(OBJDIR)/$(ARCH)
-$(BLD): $(OBJDIR)
+stamp_BLD: $(OBJDIR)
-mkdir "$(BLD)"
+ echo $(BLD) > $@
COMPILER_TEMP_FILES = *.pdb
@@ -172,7 +173,7 @@ DEBUG_FLAG = DEBUG_LINK =
!else
DEBUG_FLAG = -Zi
-DEBUG_LINK = -debug:full -debugtype:both
+DEBUG_LINK = -debug:full
!endif
!if "$(ARCH)" == "i386"
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 9f7967aa6bf..07c4654b278 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -440,7 +440,7 @@ ;; Local Variables: -;; coding: iso-2022-7bit-unix +;; coding: iso-2022-7bit ;; add-log-time-zone-rule: t ;; End: diff --git a/src/.gdbinit b/src/.gdbinit index e1ad68e9eb3..aa6ec1bfe59 100644 --- a/src/.gdbinit +++ b/src/.gdbinit @@ -34,6 +34,10 @@ handle 2 noprint pass # Make it work like SIGINT normally does. handle SIGTSTP nopass +# Pass on user signals +handle SIGUSR1 noprint pass +handle SIGUSR2 noprint pass + # Don't pass SIGALRM to Emacs. This makes problems when # debugging. handle SIGALRM ignore diff --git a/src/.gitignore b/src/.gitignore index 8dbbc9f86b6..9bb6e8932b6 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -19,3 +19,4 @@ prefix-args stamp-oldxmenu temacs buildobj.lst +stamp_BLD diff --git a/src/ChangeLog b/src/ChangeLog index 27411da33cb..717e4cdf963 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,11 +1,165 @@ +2006-12-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * gtkutil.c (update_frame_tool_bar): Connect create-menu-proxy with + xg_tool_bar_menu_proxy. + (xg_tool_bar_menu_proxy): New function. + (xg_tool_bar_proxy_callback): New function. + +2006-12-30 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * gtkutil.c (xg_tool_bar_button_cb): Save last modifier on widget. + (xg_tool_bar_callback): Remove check for button. + (update_frame_tool_bar): Put an event box in the tool bar and a button + in the event box. Attach enter/leave-notify-event to the event box. + +2006-12-30 Richard Stallman <rms@gnu.org> + + * keymap.c (Fdefine_key): Doc fix. + +2006-12-29 Kim F. Storm <storm@cua.dk> + + * frame.h (struct frame): New member minimize_tool_bar_window_p. + + * xdisp.c (auto_resize_tool_bars_p): Replace with ... + (Vauto_resize_tool_bars): ... this. + (syms_of_xdisp): DEFVAR_LISP and initialize it. Update doc string + to describe new value `grow-only', and use of C-l. + (display_tool_bar_line): Only use default face for border below + toolbar if not grow-only (to get acceptable visual appearence). + Explicitly set visible_height for empty toolbar lines. + (redisplay_tool_bar): Handle `grow-only' setting. Check and clear + minimize_tool_bar_window_p flag. + + * window.c (Frecenter): Set minimize_tool_bar_window_p flag + when called without arg to redraw with minimum toolbar height. + Update doc string. + +2006-12-29 Jason Rumney <jasonr@gnu.org> + + * s/ms-w32.h (tzname): Do not define in msvc8. + (utime): Do not define in msvc8. + + * regex.c (regerror): Change parameter name err_code. + +2006-12-26 Richard Stallman <rms@gnu.org> + + * search.c (Fsearch_forward): Doc fix. + + * callint.c (Finteractive): Doc fix. + +2006-12-25 Kim F. Storm <storm@cua.dk> + + * s/ms-w32.h (BROKEN_DATAGRAM_SOCKETS): Define it. + +2006-12-23 Eli Zaretskii <eliz@gnu.org> + + * keyboard.c (some_mouse_moved): Fix last change. + +2006-12-22 Eli Zaretskii <eliz@gnu.org> + + * callproc.c (syms_of_callproc) <shell-file-name>: Doc fix. + +2006-12-22 Mark Davies <mark@mcs.vuw.ac.nz> + + * m/amdx86-64.h, m/hp800.h: Add support for NetBSD. + * m/sh3el.h: New file. + +2006-12-22 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (emacs, temacs): Depend on stamp_BLD instead of + $(BLD). + ($(OBJ0) $(OBJ1) $(WIN32OBJ)): New dependency on stamp_BLD. + (bootstrap-temacs): Pass $(XMFLAGS) to sub-make. + ($(OBJ0) $(OBJ1) $(WIN32OBJ)): Add lastfile.$(O) and firstfile.$(O). + (clean): Delete stamp_BLD. + +2006-12-22 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macfns.c (mac_update_title_bar) [TARGET_API_MAC_CARBON]: Call + mac_update_proxy_icon also when buffer modification flag changed. + [TARGET_API_MAC_CARBON] (mac_update_proxy_icon): Don't update alias, + but compare FSRef/FSSpec of resolved alias. + +2006-12-21 Kim F. Storm <storm@cua.dk> + + * w32.c (_sys_wait_accept): Fix handle leak. + +2006-12-20 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * sound.c: Include <alsa/asoundlib.h> if ALSA_SUBDIR_INCLUDE is + defined. + +2006-12-20 Kim F. Storm <storm@cua.dk> + + * s/ms-w32.h (BROKEN_NON_BLOCKING_CONNECT): Define it. + +2006-12-19 Juanma Barranquero <lekktu@gmail.com> + + * keyboard.c (syms_of_keyboard) <double-click-time>: + * mac.c (Fmac_code_convert_string): + * search.c (Fsearch_forward): Doc fixes. + +2006-12-19 Kim F. Storm <storm@cua.dk> + + Rework 2006-12-04 change. A SIGUSR1 (SIGUSR2) signal now generates + a sigusr1 event instead of [signal usr1] sequence, and signal events + are now supposed to be handled via special-event-map. + + * keyboard.c (kbd_buffer_store_event_hold): Undo 2006-12-04 change. + (make_lispy_event): Don't generate Qsignal prefix for code 0. + Abort if signal code is unknown. + (store_user_signal_events): Don't make Qsignal prefix (code 0). + (Qsignal): Move declaration back to process.c. + (syms_of_keyboard): Don't intern or staticpro it here. + + * process.c (Qsignal): Declare here. + (syms_of_process): Intern or staticpro it. + + * emacs.c (main): Rename user signals to sigusr1 and sigusr2. + + * .gdbinit: Pass on SIGUSR1 and SIGUSR2 to Emacs. + +2006-12-19 Juanma Barranquero <lekktu@gmail.com> + + * buffer.c (syms_of_buffer) <buffer-display-table> + <scroll-up-aggressively, scroll-down-aggressively>: Doc fixes. + +2006-12-17 Richard Stallman <rms@gnu.org> + + * fileio.c (Fread_file_name_internal): Pass Vread_file_name_predicate + to Ffile_name_completion. + + * dired.c (file_name_completion): New arg PREDICATE. Some cleanup. + (Ffile_name_completion): New arg PREDICATE. + +2006-12-17 Juanma Barranquero <lekktu@gmail.com> + + * buffer.c (Fkill_buffer): Doc fix. + (syms_of_buffer) <kill-buffer-query-functions>: Doc fix. + +2006-12-16 Juanma Barranquero <lekktu@gmail.com> + + * minibuf.c (Ftry_completion): Check that obarray buckets are symbols. + +2006-12-16 Eli Zaretskii <eliz@gnu.org> + + * w32fns.c (w32-window-exists-p): New function. + (syms_of_w32fns): Defsubr it. + + * prefix-args.c [STDC_HEADERS]: Include stdlib.h. + +2006-12-16 Juanma Barranquero <lekktu@gmail.com> + + * minibuf.c (Ftry_completion): Use `check_obarray' if ALIST is a vector. + 2006-12-15 Eli Zaretskii <eliz@gnu.org> * emacs.c (USAGE3): Clarify documentation of --color. 2006-12-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> - * mac.c (wakeup_from_rne_enabled_p) [TARGET_API_MAC_CARBON]: New - variable. + * mac.c (wakeup_from_rne_enabled_p) [TARGET_API_MAC_CARBON]: + New variable. (ENABLE_WAKEUP_FROM_RNE, DISABLE_WAKEUP_FROM_RNE): New macros. [!MAC_OSX] (select): Use them. [MAC_OSX] (select_and_poll_event, sys_select): Likewise. @@ -20,7 +174,7 @@ * macterm.c (mac_query_char_extents) [USE_ATSUI]: Don't call ATSUGetGlyphBounds if not necessary. - (Vmac_atsu_font_table) [USE_ATSUI]: Remove Variable. + (Vmac_atsu_font_table) [USE_ATSUI]: Remove variable. (syms_of_macterm) [USE_ATSUI]: Don't defvar it. (fm_get_style_from_font, atsu_find_font_from_family_name) (atsu_find_font_family_name, mac_atsu_font_face_attributes) diff --git a/src/buffer.c b/src/buffer.c index e9c3c47a959..6e3b39ad2bb 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1332,15 +1332,16 @@ See `kill-buffer'." */ DEFUN ("kill-buffer", Fkill_buffer, Skill_buffer, 1, 1, "bKill buffer: ", doc: /* Kill the buffer BUFFER. -The argument may be a buffer or may be the name of a buffer. -An argument of nil means kill the current buffer. +The argument may be a buffer or the name of a buffer. +With a nil argument, kill the current buffer. -Value is t if the buffer is actually killed, nil if user says no. +Value is t if the buffer is actually killed, nil otherwise. -The value of `kill-buffer-hook' (which may be local to that buffer), -if not void, is a list of functions to be called, with no arguments, -before the buffer is actually killed. The buffer to be killed is current -when the hook functions are called. +The functions in `kill-buffer-query-functions' are called with BUFFER as +the current buffer. If any of them returns nil, the buffer is not killed. + +The hook `kill-buffer-hook' is run before the buffer is actually killed. +The buffer being killed will be current while the hook is running. Any processes that have this buffer as the `process-buffer' are killed with SIGHUP. */) @@ -5371,8 +5372,8 @@ This is the same as (default-value 'fill-column). */); This is the same as (default-value 'left-margin). */); DEFVAR_LISP_NOPRO ("default-tab-width", - &buffer_defaults.tab_width, - doc: /* Default value of `tab-width' for buffers that do not override it. + &buffer_defaults.tab_width, + doc: /* Default value of `tab-width' for buffers that do not override it. This is the same as (default-value 'tab-width). */); DEFVAR_LISP_NOPRO ("default-case-fold-search", @@ -5694,9 +5695,9 @@ primitives `aref' and `aset' can be used to access elements of a char-table. Each of the char-table elements control how to display the corresponding text character: the element at index C in the table says how to display the character whose code is C. Each element should be a vector of -characters or nil. nil means display the character in the default fashion; -otherwise, the characters from the vector are delivered to the screen -instead of the original character. +characters or nil. The value nil means display the character in the +default fashion; otherwise, the characters from the vector are delivered +to the screen instead of the original character. For example, (aset buffer-display-table ?X ?Y) will cause Emacs to display a capital Y instead of each X character. @@ -5827,7 +5828,7 @@ cursor type. */); ¤t_buffer->scroll_up_aggressively, Qnil, doc: /* How far to scroll windows upward. If you move point off the bottom, the window scrolls automatically. -This variable controls how far it scrolls. nil, the default, +This variable controls how far it scrolls. The value nil, the default, means scroll to center point. A fraction means scroll to put point that fraction of the window's height from the bottom of the window. When the value is 0.0, point goes at the bottom line, which in the simple @@ -5840,7 +5841,7 @@ between 0.0 and 1.0, inclusive. */); ¤t_buffer->scroll_down_aggressively, Qnil, doc: /* How far to scroll windows downward. If you move point off the top, the window scrolls automatically. -This variable controls how far it scrolls. nil, the default, +This variable controls how far it scrolls. The value nil, the default, means scroll to center point. A fraction means scroll to put point that fraction of the window's height from the top of the window. When the value is 0.0, point goes at the top line, which in the simple @@ -6031,7 +6032,7 @@ is a member of the list. */); Vinhibit_read_only = Qnil; DEFVAR_PER_BUFFER ("cursor-type", ¤t_buffer->cursor_type, Qnil, - doc: /* Cursor to use when this buffer is in the selected window. + doc: /* Cursor to use when this buffer is in the selected window. Values are interpreted as follows: t use the cursor specified for the frame @@ -6056,11 +6057,13 @@ to the default frame line height. A value of nil means add no extra space. */) DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", ¤t_buffer->cursor_in_non_selected_windows, Qnil, - doc: /* *Cursor type to display in non-selected windows. + doc: /* *Cursor type to display in non-selected windows. The value t means to use hollow box cursor. See `cursor-type' for other values. */); DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, - doc: /* List of functions called with no args to query before killing a buffer. */); + doc: /* List of functions called with no args to query before killing a buffer. +The buffer being killed will be current while the functions are running. +If any of them returns nil, the buffer is not killed. */); Vkill_buffer_query_functions = Qnil; DEFVAR_LISP ("change-major-mode-hook", &Vchange_major_mode_hook, diff --git a/src/callint.c b/src/callint.c index b65ef144d5d..68cfdfc7aa6 100644 --- a/src/callint.c +++ b/src/callint.c @@ -60,7 +60,7 @@ static Lisp_Object point_marker; /* String for the prompt text used in Fcall_interactively. */ static Lisp_Object callint_message; - + /* ARGSUSED */ DEFUN ("interactive", Finteractive, Sinteractive, 0, UNEVALLED, 0, doc: /* Specify a way of parsing arguments for interactive use of a function. @@ -102,7 +102,7 @@ K -- Key sequence to be redefined (do not downcase the last event). m -- Value of mark as number. Does not do I/O. M -- Any string. Inherits the current input method. n -- Number read using minibuffer. -N -- Raw prefix arg, or if none, do like code `n'. +N -- Numeric prefix arg, or if none, do like code `n'. p -- Prefix arg converted to number. Does not do I/O. P -- Prefix arg in raw form. Does not do I/O. r -- Region: point and mark as 2 numeric args, smallest first. Does no I/O. @@ -688,7 +688,7 @@ invoke it. If KEYS is omitted or nil, the return value of Qnil, Qnil, Qnil, Qt); break; - case 'N': /* Prefix arg, else number from minibuffer */ + case 'N': /* Prefix arg as number, else number from minibuffer */ if (!NILP (prefix_arg)) goto have_prefix_arg; case 'n': /* Read number from minibuffer. */ diff --git a/src/callproc.c b/src/callproc.c index d8eebac08a6..819e7ff4a32 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1553,7 +1553,8 @@ syms_of_callproc () DEFVAR_LISP ("shell-file-name", &Vshell_file_name, doc: /* *File name to load inferior shells from. -Initialized from the SHELL environment variable. */); +Initialized from the SHELL environment variable, or to a system-dependent +default if SHELL is not set. */); DEFVAR_LISP ("exec-path", &Vexec_path, doc: /* *List of directories to search programs to run in subprocesses. diff --git a/src/config.in b/src/config.in index 7903c749513..8ee525a611b 100644 --- a/src/config.in +++ b/src/config.in @@ -121,6 +121,10 @@ Boston, MA 02110-1301, USA. */ don't. */ #undef HAVE_DECL_SYS_SIGLIST +/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. + */ +#undef HAVE_DECL_TZNAME + /* Define to 1 if you have the declaration of `__sys_siglist', and to 0 if you don't. */ #undef HAVE_DECL___SYS_SIGLIST @@ -248,6 +252,9 @@ Boston, MA 02110-1301, USA. */ /* Define to 1 if you have the `gtk_file_selection_new' function. */ #undef HAVE_GTK_FILE_SELECTION_NEW +/* Define to 1 if you have the `gtk_main' function. */ +#undef HAVE_GTK_MAIN + /* Define to 1 if GTK can handle more than one display. */ #undef HAVE_GTK_MULTIDISPLAY @@ -808,7 +815,7 @@ Boston, MA 02110-1301, USA. */ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ diff --git a/src/data.c b/src/data.c index 00ef0b1c822..120a92d66d7 100644 --- a/src/data.c +++ b/src/data.c @@ -1264,7 +1264,7 @@ set_internal (symbol, newval, buf, bindflag) XSETCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr, tem1); - /* Set `buffer' and `frame' slots for thebinding now loaded. */ + /* Set `buffer' and `frame' slots for the binding now loaded. */ XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, buf); XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame; } diff --git a/src/dired.c b/src/dired.c index 5d187a32b8e..3283d38eb4b 100644 --- a/src/dired.c +++ b/src/dired.c @@ -396,17 +396,20 @@ ID-FORMAT specifies the preferred format of attributes uid and gid, see Lisp_Object file_name_completion (); DEFUN ("file-name-completion", Ffile_name_completion, Sfile_name_completion, - 2, 2, 0, + 2, 3, 0, doc: /* Complete file name FILE in directory DIRECTORY. Returns the longest string common to all file names in DIRECTORY that start with FILE. If there is only one and FILE matches it exactly, returns t. Returns nil if DIRECTORY contains no name starting with FILE. +If PREDICATE is non-nil, call PREDICATE with each possible +completion (in absolute form) and ignore it if PREDICATE returns nil. + This function ignores some of the possible completions as determined by the variable `completion-ignored-extensions', which see. */) - (file, directory) - Lisp_Object file, directory; + (file, directory, predicate) + Lisp_Object file, directory, predicate; { Lisp_Object handler; @@ -414,15 +417,15 @@ determined by the variable `completion-ignored-extensions', which see. */) call the corresponding file handler. */ handler = Ffind_file_name_handler (directory, Qfile_name_completion); if (!NILP (handler)) - return call3 (handler, Qfile_name_completion, file, directory); + return call4 (handler, Qfile_name_completion, file, directory, predicate); /* If the file name has special constructs in it, call the corresponding file handler. */ handler = Ffind_file_name_handler (file, Qfile_name_completion); if (!NILP (handler)) - return call3 (handler, Qfile_name_completion, file, directory); + return call4 (handler, Qfile_name_completion, file, directory, predicate); - return file_name_completion (file, directory, 0, 0); + return file_name_completion (file, directory, 0, 0, predicate); } DEFUN ("file-name-all-completions", Ffile_name_all_completions, @@ -446,21 +449,25 @@ These are all file names in directory DIRECTORY which begin with FILE. */) if (!NILP (handler)) return call3 (handler, Qfile_name_all_completions, file, directory); - return file_name_completion (file, directory, 1, 0); + return file_name_completion (file, directory, 1, 0, Qnil); } static int file_name_completion_stat (); Lisp_Object -file_name_completion (file, dirname, all_flag, ver_flag) +file_name_completion (file, dirname, all_flag, ver_flag, predicate) Lisp_Object file, dirname; int all_flag, ver_flag; + Lisp_Object predicate; { DIR *d; int bestmatchsize = 0, skip; register int compare, matchsize; unsigned char *p1, *p2; int matchcount = 0; + /* If ALL_FLAG is 1, BESTMATCH is the list of all matches, decoded. + If ALL_FLAG is 0, BESTMATCH is either nil + or the best match so far, not decoded. */ Lisp_Object bestmatch, tem, elt, name; Lisp_Object encoded_file; Lisp_Object encoded_dir; @@ -568,8 +575,8 @@ file_name_completion (file, dirname, all_flag, ver_flag) #ifndef TRIVIAL_DIRECTORY_ENTRY #define TRIVIAL_DIRECTORY_ENTRY(n) (!strcmp (n, ".") || !strcmp (n, "..")) #endif - /* "." and ".." are never interesting as completions, but are - actually in the way in a directory contains only one file. */ + /* "." and ".." are never interesting as completions, and are + actually in the way in a directory with only one file. */ if (!passcount && TRIVIAL_DIRECTORY_ENTRY (dp->d_name)) continue; if (!passcount && len > SCHARS (encoded_file)) @@ -650,30 +657,38 @@ file_name_completion (file, dirname, all_flag, ver_flag) continue; } - /* Update computation of how much all possible completions match */ + /* This is a possible completion */ + if (directoryp) + { + /* This completion is a directory; make it end with '/' */ + name = Ffile_name_as_directory (make_string (dp->d_name, len)); + } + else + name = make_string (dp->d_name, len); + + /* Test the predicate, if any. */ + + if (!NILP (predicate)) + { + Lisp_Object decoded; + decoded = Fexpand_file_name (DECODE_FILE (name), dirname); + if (NILP (call1 (predicate, decoded))) + continue; + } + + /* Suitably record this match. */ matchcount++; - if (all_flag || NILP (bestmatch)) + if (all_flag) { - /* This is a possible completion */ - if (directoryp) - { - /* This completion is a directory; make it end with '/' */ - name = Ffile_name_as_directory (make_string (dp->d_name, len)); - } - else - name = make_string (dp->d_name, len); - if (all_flag) - { - name = DECODE_FILE (name); - bestmatch = Fcons (name, bestmatch); - } - else - { - bestmatch = name; - bestmatchsize = SCHARS (name); - } + name = DECODE_FILE (name); + bestmatch = Fcons (name, bestmatch); + } + else if (NILP (bestmatch)) + { + bestmatch = name; + bestmatchsize = SCHARS (name); } else { @@ -709,11 +724,7 @@ file_name_completion (file, dirname, all_flag, ver_flag) == SCHARS (bestmatch))) && !bcmp (p2, SDATA (encoded_file), SCHARS (encoded_file)) && bcmp (p1, SDATA (encoded_file), SCHARS (encoded_file)))) - { - bestmatch = make_string (dp->d_name, len); - if (directoryp) - bestmatch = Ffile_name_as_directory (bestmatch); - } + bestmatch = name; } /* If this dirname all matches, see if implicit following @@ -836,7 +847,7 @@ DEFUN ("file-name-all-versions", Ffile_name_all_versions, (file, directory) Lisp_Object file, directory; { - return file_name_completion (file, directory, 1, 1); + return file_name_completion (file, directory, 1, 1, Qnil); } DEFUN ("file-version-limit", Ffile_version_limit, Sfile_version_limit, 1, 1, 0, diff --git a/src/emacs.c b/src/emacs.c index 6601336edd5..1db552c33e5 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1196,10 +1196,10 @@ main (argc, argv signal (SIGILL, fatal_error_signal); signal (SIGTRAP, fatal_error_signal); #ifdef SIGUSR1 - add_user_signal (SIGUSR1, "usr1"); + add_user_signal (SIGUSR1, "sigusr1"); #endif #ifdef SIGUSR2 - add_user_signal (SIGUSR2, "usr2"); + add_user_signal (SIGUSR2, "sigusr2"); #endif #ifdef SIGABRT signal (SIGABRT, fatal_error_signal); diff --git a/src/fileio.c b/src/fileio.c index 1cd1188cb63..e276426487e 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -6075,7 +6075,7 @@ DEFUN ("read-file-name-internal", Fread_file_name_internal, Sread_file_name_inte if (NILP (action)) { specdir = Ffile_name_directory (string); - val = Ffile_name_completion (name, realdir); + val = Ffile_name_completion (name, realdir, Vread_file_name_predicate); UNGCPRO; if (!STRINGP (val)) { diff --git a/src/frame.h b/src/frame.h index 3148e583e89..9c74a2d777c 100644 --- a/src/frame.h +++ b/src/frame.h @@ -484,6 +484,10 @@ struct frame /* Set to non-zero when current redisplay has updated frame. */ unsigned updated_p : 1; + + /* Set to non-zero to minimize tool-bar height even when + auto-resize-tool-bar is set to grow-only. */ + unsigned minimize_tool_bar_window_p : 1; }; #ifdef MULTI_KBOARD diff --git a/src/gtkutil.c b/src/gtkutil.c index 6fd18882a74..3dcdef2b0ae 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -3350,11 +3350,8 @@ xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole) get them. */ #define XG_TOOL_BAR_LAST_MODIFIER "emacs-tool-bar-modifier" - -/* Callback function invoked when a tool bar item is pressed. - W is the button widget in the tool bar that got pressed, - CLIENT_DATA is an integer that is the index of the button in the - tool bar. 0 is the first button. */ +/* The key for storing the button widget in its proxy menu item. */ +#define XG_TOOL_BAR_PROXY_BUTTON "emacs-tool-bar-proxy-button" static gboolean xg_tool_bar_button_cb (widget, event, user_data) @@ -3364,11 +3361,16 @@ xg_tool_bar_button_cb (widget, event, user_data) { /* Casts to avoid warnings when gpointer is 64 bits and int is 32 bits */ gpointer ptr = (gpointer) (EMACS_INT) event->state; - g_object_set_data (G_OBJECT (user_data), XG_TOOL_BAR_LAST_MODIFIER, ptr); + g_object_set_data (G_OBJECT (widget), XG_TOOL_BAR_LAST_MODIFIER, ptr); return FALSE; } +/* Callback function invoked when a tool bar item is pressed. + W is the button widget in the tool bar that got pressed, + CLIENT_DATA is an integer that is the index of the button in the + tool bar. 0 is the first button. */ + static void xg_tool_bar_callback (w, client_data) GtkWidget *w; @@ -3406,6 +3408,92 @@ xg_tool_bar_callback (w, client_data) kbd_buffer_store_event (&event); } +/* Callback function invoked when a tool bar item is pressed in a detached + tool bar or the overflow drop down menu. + We just call xg_tool_bar_callback. + W is the menu item widget that got pressed, + CLIENT_DATA is an integer that is the index of the button in the + tool bar. 0 is the first button. */ + +static void +xg_tool_bar_proxy_callback (w, client_data) + GtkWidget *w; + gpointer client_data; +{ + GtkWidget *wbutton = GTK_WIDGET (g_object_get_data (G_OBJECT (w), + XG_TOOL_BAR_PROXY_BUTTON)); + xg_tool_bar_callback (wbutton, client_data); +} + +/* This callback is called when a tool item should create a proxy item, + such as for the overflow menu. Also called when the tool bar is detached. + If we don't create a proxy menu item, the detached tool bar will be + blank. */ + +static gboolean +xg_tool_bar_menu_proxy (toolitem, user_data) + GtkToolItem *toolitem; + gpointer user_data; +{ + GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (toolitem)); + GtkButton *wbutton = GTK_BUTTON (gtk_bin_get_child (GTK_BIN (weventbox))); + GtkWidget *wmenuitem = gtk_image_menu_item_new (); + GtkWidget *wmenuimage; + + if (gtk_button_get_use_stock (wbutton)) + wmenuimage = gtk_image_new_from_stock (gtk_button_get_label (wbutton), + GTK_ICON_SIZE_MENU); + else + { + GtkImage *wimage = GTK_IMAGE (gtk_bin_get_child (GTK_BIN (wbutton))); + GtkSettings *settings = gtk_widget_get_settings (GTK_WIDGET (wbutton)); + GtkImageType store_type = gtk_image_get_storage_type (wimage); + if (store_type == GTK_IMAGE_STOCK) + { + gchar *stock_id; + gtk_image_get_stock (wimage, &stock_id, NULL); + wmenuimage = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU); + } + else if (store_type == GTK_IMAGE_ICON_SET) + { + GtkIconSet *icon_set; + gtk_image_get_icon_set (wimage, &icon_set, NULL); + wmenuimage = gtk_image_new_from_icon_set (icon_set, + GTK_ICON_SIZE_MENU); + } + else if (store_type == GTK_IMAGE_PIXBUF) + { + gint width, height; + + if (settings && + gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, + &width, &height)) + { + GdkPixbuf *src_pixbuf, *dest_pixbuf; + + src_pixbuf = gtk_image_get_pixbuf (wimage); + dest_pixbuf = gdk_pixbuf_scale_simple (src_pixbuf, width, height, + GDK_INTERP_BILINEAR); + + wmenuimage = gtk_image_new_from_pixbuf (dest_pixbuf); + } + } + } + if (wmenuimage) + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (wmenuitem), wmenuimage); + + g_signal_connect (G_OBJECT (wmenuitem), + "activate", + GTK_SIGNAL_FUNC (xg_tool_bar_proxy_callback), + user_data); + + g_object_set_data (G_OBJECT (wmenuitem), XG_TOOL_BAR_PROXY_BUTTON, + (gpointer) wbutton); + gtk_tool_item_set_proxy_menu_item (toolitem, "Emacs toolbar item", wmenuitem); + + return TRUE; +} + /* This callback is called when a tool bar is detached. We must set the height of the tool bar to zero when this happens so frame sizes are correctly calculated. @@ -3491,9 +3579,6 @@ xg_tool_bar_help_callback (w, event, client_data) FRAME_PTR f = (FRAME_PTR) g_object_get_data (G_OBJECT (w), XG_FRAME_DATA); Lisp_Object help, frame; - if (! GTK_IS_BUTTON (w)) - return FALSE; - if (! f || ! f->n_tool_bar_items || NILP (f->tool_bar_items)) return FALSE; @@ -3631,10 +3716,9 @@ update_frame_tool_bar (f) { int i; GtkRequisition old_req, new_req; - GList *icon_list; - GList *iter; struct x_output *x = f->output_data.x; int hmargin, vmargin; + GtkToolItem *ti; if (! FRAME_GTK_WIDGET (f)) return; @@ -3670,9 +3754,6 @@ update_frame_tool_bar (f) gtk_widget_size_request (x->toolbar_widget, &old_req); - icon_list = gtk_container_get_children (GTK_CONTAINER (x->toolbar_widget)); - iter = icon_list; - for (i = 0; i < f->n_tool_bar_items; ++i) { #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX)) @@ -3683,12 +3764,16 @@ update_frame_tool_bar (f) int img_id; struct image *img; Lisp_Object image; - GtkWidget *wicon = iter ? GTK_WIDGET (iter->data) : 0; - GtkToolItem *ti = NULL; - GtkWidget *wvbox; - GList *chlist; + GtkWidget *wbutton; + GtkWidget *weventbox; - if (iter) iter = g_list_next (iter); + ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i); + + if (ti) + { + weventbox = gtk_bin_get_child (GTK_BIN (ti)); + wbutton = gtk_bin_get_child (GTK_BIN (weventbox)); + } /* If image is a vector, choose the image according to the button state. */ @@ -3713,7 +3798,7 @@ update_frame_tool_bar (f) /* Ignore invalid image specifications. */ if (!valid_image_p (image)) { - if (wicon) gtk_widget_hide (wicon); + if (ti) gtk_widget_hide_all (GTK_WIDGET (ti)); continue; } @@ -3723,57 +3808,55 @@ update_frame_tool_bar (f) if (img->load_failed_p || img->pixmap == None) { - if (wicon) - gtk_widget_hide (wicon); + if (ti) + gtk_widget_hide_all (GTK_WIDGET (ti)); else - /* Insert an empty (non-image) button */ - gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), - gtk_tool_button_new (NULL, ""), - i); + { + /* Insert an empty (non-image) button */ + weventbox = gtk_event_box_new (); + wbutton = gtk_button_new (); + gtk_button_set_focus_on_click (GTK_BUTTON (wbutton), FALSE); + gtk_button_set_relief (GTK_BUTTON (wbutton), GTK_RELIEF_NONE); + gtk_container_add (GTK_CONTAINER (weventbox), wbutton); + ti = gtk_tool_item_new (); + gtk_container_add (GTK_CONTAINER (ti), weventbox); + gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), ti, i); + } continue; } - if (wicon) - { - /* The child of the tool bar is a button. Inside that button - is a vbox. Inside that vbox is the GtkImage. */ - wvbox = gtk_bin_get_child (GTK_BIN (wicon)); - chlist = gtk_container_get_children (GTK_CONTAINER (wvbox)); - if (chlist == NULL) - /* In this case, we inserted an empty button (above) with no image */ - ti = GTK_TOOL_ITEM (wicon); - } - - if (! wicon || ti != NULL) + if (ti == NULL) { GtkWidget *w = xg_get_image_for_pixmap (f, img, x->widget, NULL); gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin); - - - if (ti == NULL) - { - ti = gtk_tool_button_new (w, ""); - - gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), ti, i); - } - else - gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (ti), w); + wbutton = gtk_button_new (); + gtk_button_set_focus_on_click (GTK_BUTTON (wbutton), FALSE); + gtk_button_set_relief (GTK_BUTTON (wbutton), GTK_RELIEF_NONE); + gtk_container_add (GTK_CONTAINER (wbutton), w); + weventbox = gtk_event_box_new (); + gtk_container_add (GTK_CONTAINER (weventbox), wbutton); + ti = gtk_tool_item_new (); + gtk_container_add (GTK_CONTAINER (ti), weventbox); + gtk_toolbar_insert (GTK_TOOLBAR (x->toolbar_widget), ti, i); /* The EMACS_INT cast avoids a warning. */ - g_signal_connect (GTK_WIDGET (ti), "clicked", + g_signal_connect (G_OBJECT (ti), "create-menu-proxy", + GTK_SIGNAL_FUNC (xg_tool_bar_menu_proxy), + (gpointer) (EMACS_INT) i); + + g_signal_connect (G_OBJECT (wbutton), "clicked", GTK_SIGNAL_FUNC (xg_tool_bar_callback), (gpointer) (EMACS_INT) i); - gtk_widget_show (GTK_WIDGET (ti)); - gtk_widget_show (GTK_WIDGET (w)); + gtk_widget_show_all (GTK_WIDGET (ti)); /* Save the image so we can see if an update is needed when this function is called again. */ g_object_set_data (G_OBJECT (w), XG_TOOL_BAR_IMAGE_DATA, (gpointer)img->pixmap); - g_object_set_data (G_OBJECT (ti), XG_FRAME_DATA, (gpointer)f); + g_object_set_data (G_OBJECT (weventbox), XG_FRAME_DATA, (gpointer)f); /* Catch expose events to overcome an annoying redraw bug, see comment for xg_tool_bar_item_expose_callback. */ @@ -3782,46 +3865,37 @@ update_frame_tool_bar (f) G_CALLBACK (xg_tool_bar_item_expose_callback), 0); - gtk_widget_set_sensitive (GTK_WIDGET (ti), enabled_p); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (ti), FALSE); + gtk_widget_set_sensitive (wbutton, enabled_p); + gtk_tool_item_set_homogeneous (ti, FALSE); - while (! GTK_IS_BUTTON (w)) - w = gtk_widget_get_parent (w); - /* Callback to save modifyer mask (Shift/Control, etc). GTK makes no distinction based on modifiers in the activate callback, so we have to do it ourselves. */ - g_signal_connect (w, "button-release-event", + g_signal_connect (wbutton, "button-release-event", GTK_SIGNAL_FUNC (xg_tool_bar_button_cb), - ti); + NULL); - g_object_set_data (G_OBJECT (w), XG_FRAME_DATA, (gpointer)f); + g_object_set_data (G_OBJECT (wbutton), XG_FRAME_DATA, (gpointer)f); /* Use enter/leave notify to show help. We use the events rather than the GtkButton specific signals "enter" and "leave", so we can have only one callback. The event will tell us what kind of event it is. */ /* The EMACS_INT cast avoids a warning. */ - g_signal_connect (G_OBJECT (w), + g_signal_connect (G_OBJECT (weventbox), "enter-notify-event", G_CALLBACK (xg_tool_bar_help_callback), (gpointer) (EMACS_INT) i); - g_signal_connect (G_OBJECT (w), + g_signal_connect (G_OBJECT (weventbox), "leave-notify-event", G_CALLBACK (xg_tool_bar_help_callback), (gpointer) (EMACS_INT) i); } else { - /* The child of the tool bar is a button. Inside that button - is a vbox. Inside that vbox is the GtkImage. */ - GtkWidget *wvbox = gtk_bin_get_child (GTK_BIN (wicon)); - GList *chlist = gtk_container_get_children (GTK_CONTAINER (wvbox)); - GtkImage *wimage = GTK_IMAGE (chlist->data); + GtkWidget *wimage = gtk_bin_get_child (GTK_BIN (wbutton)); Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA); - g_list_free (chlist); - gtk_misc_set_padding (GTK_MISC (wimage), hmargin, vmargin); if (old_img != img->pixmap) @@ -3830,21 +3904,20 @@ update_frame_tool_bar (f) g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA, (gpointer)img->pixmap); - gtk_widget_set_sensitive (wicon, enabled_p); - gtk_widget_show (wicon); - } + gtk_widget_set_sensitive (wbutton, enabled_p); + gtk_widget_show_all (GTK_WIDGET (ti)); + } #undef PROP } /* Remove buttons not longer needed. We just hide them so they can be reused later on. */ - while (iter) + do { - GtkWidget *w = GTK_WIDGET (iter->data); - gtk_widget_hide (w); - iter = g_list_next (iter); - } + ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i++); + if (ti) gtk_widget_hide_all (GTK_WIDGET (ti)); + } while (ti != NULL); gtk_widget_size_request (x->toolbar_widget, &new_req); if (old_req.height != new_req.height @@ -3854,8 +3927,6 @@ update_frame_tool_bar (f) xg_resize_outer_widget (f, FRAME_COLS (f), FRAME_LINES (f)); } - if (icon_list) g_list_free (icon_list); - UNBLOCK_INPUT; } diff --git a/src/keyboard.c b/src/keyboard.c index ef8107b2ce3..75b78d63d19 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1453,7 +1453,7 @@ some_mouse_moved () if (ignore_mouse_drag_p) { - //ignore_mouse_drag_p = 0; + /* ignore_mouse_drag_p = 0; */ return 0; } @@ -3799,8 +3799,7 @@ kbd_buffer_store_event_hold (event, hold_quit) if (!NILP (Vthrow_on_input) && event->kind != FOCUS_IN_EVENT && event->kind != HELP_EVENT - && event->kind != DEICONIFY_EVENT - && !(event->kind == USER_SIGNAL_EVENT && event->code == 0)) + && event->kind != DEICONIFY_EVENT) { Vquit_flag = Vthrow_on_input; /* If we're inside a function that wants immediate quits, @@ -5088,9 +5087,6 @@ Lisp_Object *scroll_bar_parts[] = { &Qup, &Qdown, &Qtop, &Qbottom, &Qend_scroll, &Qratio }; -/* User signal events. */ -Lisp_Object Qsignal; - /* A vector, indexed by button number, giving the down-going location of currently depressed buttons, both scroll bar and non-scroll bar. @@ -5969,17 +5965,12 @@ make_lispy_event (event) case USER_SIGNAL_EVENT: /* A user signal. */ - if (event->code == 0) - return Qsignal; - else - { - char *name = find_user_signal_name (event->code); - - if (name) - return intern (name); - else - return make_number (event->code); - } + { + char *name = find_user_signal_name (event->code); + if (!name) + abort (); + return intern (name); + } case SAVE_SESSION_EVENT: return Qsave_session; @@ -7156,8 +7147,6 @@ store_user_signal_events () mask = sigblock (sigmask (p->sig)); do { - buf.code = 0; - kbd_buffer_store_event (&buf); buf.code = p->sig; kbd_buffer_store_event (&buf); p->npending--; @@ -11182,9 +11171,6 @@ syms_of_keyboard () staticpro (&Qmac_apple_event); #endif - Qsignal = intern ("signal"); - staticpro (&Qsignal); - Qmenu_enable = intern ("menu-enable"); staticpro (&Qmenu_enable); Qmenu_alias = intern ("menu-alias"); @@ -11475,8 +11461,8 @@ Polling is automatically disabled in all other cases. */); DEFVAR_LISP ("double-click-time", &Vdouble_click_time, doc: /* *Maximum time between mouse clicks to make a double-click. -Measured in milliseconds. nil means disable double-click recognition; -t means double-clicks have no time limit and are detected +Measured in milliseconds. The value nil means disable double-click +recognition; t means double-clicks have no time limit and are detected by position only. */); Vdouble_click_time = make_number (500); diff --git a/src/keymap.c b/src/keymap.c index 176b6760e36..3fd81effb04 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -1147,7 +1147,8 @@ DEF is anything that can be a key's definition: or another symbol whose function definition is used, etc.), a cons (STRING . DEFN), meaning that DEFN is the definition (DEFN should be a valid definition in its own right), - or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP. + or a cons (MAP . CHAR), meaning use definition of CHAR in keymap MAP, + or an extended menu item definition. (See info node `Extended Menu Items'.) If KEYMAP is a sparse keymap with a binding for KEY, the existing binding is altered. If there is no binding for KEY, the new pair diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 670360336a8..36e62ef6166 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -125,12 +125,16 @@ Boston, MA 02110-1301, USA. */ #undef LIB_STANDARD #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o +#elif defined(__NetBSD__) + +/* LIB_STANDARD and START_FILES set correctly in s/netbsd.h */ + #elif defined(sun) #undef START_FILES #undef LIB_STANDARD -#else /* !__OpenBSD__ && !__FreeBSD__ && !sun */ +#else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !sun */ #undef START_FILES #ifdef HAVE_X86_64_LIB64_DIR diff --git a/src/m/hp800.h b/src/m/hp800.h index 01146e52359..1630a0bc883 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h @@ -174,6 +174,14 @@ Boston, MA 02110-1301, USA. */ #define rindex strrchr #endif /* __hpux */ + +/* Systems with GCC don't need to lose. */ +#ifdef __NetBSD__ +# ifdef __GNUC__ +# define alloca __builtin_alloca +# define HAVE_ALLOCA +# endif /* __GNUC__ */ +#endif /* __NetBSD__ */ /* arch-tag: 809436e6-1645-4b92-b40d-2de5d6e7227c (do not change this comment) */ diff --git a/src/m/sh3el.h b/src/m/sh3el.h new file mode 100644 index 00000000000..0854ecd1b25 --- /dev/null +++ b/src/m/sh3el.h @@ -0,0 +1,109 @@ +/* machine description file for sh3el + Copyright (C) 1985, 1986 Free Software Foundation, Inc. + +This file is part of GNU Emacs. + +GNU Emacs 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. + +GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to +the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + + +/* The following line tells the configuration script what sort of + operating system this machine is likely to run. + USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ + +/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word + is the most significant byte. */ + +#undef WORDS_BIG_ENDIAN + +/* Define NO_ARG_ARRAY if you cannot take the address of the first of a + * group of arguments and treat it as an array of the arguments. */ + +#define NO_ARG_ARRAY + +/* Define WORD_MACHINE if addresses and such have + * to be corrected before they can be used as byte counts. */ + +#undef WORD_MACHINE + +/* Now define a symbol for the cpu type, if your compiler + does not define it automatically: + Ones defined so far include vax, m68000, ns16000, pyramid, + orion, tahoe, APOLLO and many others */ + +/* Use type int rather than a union, to represent Lisp_Object */ +/* This is desirable for most machines. */ + +#define NO_UNION_TYPE + +/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend + the 24-bit bit field into an int. In other words, if bit fields + are always unsigned. + + If you use NO_UNION_TYPE, this flag does not matter. */ + +#define EXPLICIT_SIGN_EXTEND + +/* Data type of load average, as read out of kmem. */ + +#define LOAD_AVE_TYPE long + +/* Convert that into an integer that is 100 for a load average of 1.0 */ + +#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) + +/* Define CANNOT_DUMP on machines where unexec does not work. + Then the function dump-emacs will not be defined + and temacs will do (load "loadup") automatically unless told otherwise. */ + +#undef CANNOT_DUMP + +/* Define VIRT_ADDR_VARIES if the virtual addresses of + pure and impure space as loaded can vary, and even their + relative order cannot be relied on. + + Otherwise Emacs assumes that text space precedes data space, + numerically. */ + +#define VIRT_ADDR_VARIES + +/* Define C_ALLOCA if this machine does not support a true alloca + and the one written in C should be used instead. + Define HAVE_ALLOCA to say that the system provides a properly + working alloca function and it should be used. + Define neither one if an assembler-language alloca + in the file alloca.s should be used. */ + +/* #define C_ALLOCA */ +#define HAVE_ALLOCA + +/* Define NO_REMAP if memory segmentation makes it not work well + to change the boundary between the text section and data section + when Emacs is dumped. If you define this, the preloaded Lisp + code will not be sharable; but that's better than failing completely. */ + +#define NO_REMAP + +/* After adding support for a new system, modify the large case + statement in the `configure' script to recognize reasonable + configuration names, and add a description of the system to + `etc/MACHINES'. + + If you've just fixed a problem in an existing configuration file, + you should also check `etc/MACHINES' to make sure its descriptions + of known problems in that configuration should be updated. */ + +/* arch-tag: ee325990-6f40-47a2-b9df-60ecf3599899 + (do not change this comment) */ diff --git a/src/mac.c b/src/mac.c index e79bd775fda..7a08d828725 100644 --- a/src/mac.c +++ b/src/mac.c @@ -4852,8 +4852,8 @@ DEFUN ("mac-code-convert-string", Fmac_code_convert_string, Smac_code_convert_st doc: /* Convert STRING from SOURCE encoding to TARGET encoding. The conversion is performed using the converter provided by the system. Each encoding is specified by either a coding system symbol, a mime -charset string, or an integer as a CFStringEncoding value. Nil for -encoding means UTF-16 in native byte order, no byte order mark. +charset string, or an integer as a CFStringEncoding value. An encoding +of nil means UTF-16 in native byte order, no byte order mark. On Mac OS X 10.2 and later, you can do Unicode Normalization by specifying the optional argument NORMALIZATION-FORM with a symbol NFD, NFKD, NFC, NFKC, HFS+D, or HFS+C. diff --git a/src/macfns.c b/src/macfns.c index a5de3edeec6..962f837c152 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -1969,9 +1969,9 @@ mac_update_proxy_icon (f) { AEDesc desc; #ifdef MAC_OSX - FSRef fref; + FSRef fref, fref_proxy; #else - FSSpec fss; + FSSpec fss, fss_proxy; #endif Boolean changed; Lisp_Object encoded_file_name = ENCODE_FILE (file_name); @@ -1997,10 +1997,19 @@ mac_update_proxy_icon (f) { if (alias) { + /* (FS)ResolveAlias never sets `changed' to true if + `alias' is minimal. */ #ifdef MAC_OSX - err = FSUpdateAlias (NULL, &fref, alias, &changed); + err = FSResolveAlias (NULL, alias, &fref_proxy, &changed); + if (err == noErr) + err = FSCompareFSRefs (&fref, &fref_proxy); #else - err = UpdateAlias (NULL, &fss, alias, &changed); + err = ResolveAlias (NULL, alias, &fss_proxy, &changed); + if (err == noErr) + err = !(fss.vRefNum == fss_proxy.vRefNum + && fss.parID == fss_proxy.parID + && EqualString (fss.name, fss_proxy.name, + false, true)); #endif } if (err != noErr || alias == NULL) @@ -2051,11 +2060,11 @@ mac_update_title_bar (f, save_match_data) confusing. */ || (!MINI_WINDOW_P (w) && (modified_p != !NILP (w->last_had_star)))) - SetWindowModified (FRAME_MAC_WINDOW (f), - !MINI_WINDOW_P (w) && modified_p); - - if (windows_or_buffers_changed) - mac_update_proxy_icon (f); + { + SetWindowModified (FRAME_MAC_WINDOW (f), + !MINI_WINDOW_P (w) && modified_p); + mac_update_proxy_icon (f); + } #endif } diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 98ecc759034..e9aac2fb5a6 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -159,7 +159,7 @@ all: $(ALL) # # The dumped executable # -emacs: $(BLD) $(EMACS) +emacs: stamp_BLD $(EMACS) $(EMACS): $(DOC) $(TEMACS) "$(THISDIR)/$(BLD)/temacs.exe" -batch -l loadup dump -"$(THISDIR)/$(BLD)/emacs.exe" -q -batch -f list-load-path-shadows @@ -170,7 +170,7 @@ $(EMACS): $(DOC) $(TEMACS) # If preload runs out of memory, increase the last argument to addsection # (it is the preload heap size in MB). # -temacs: $(BLD) $(TEMACS) +temacs: stamp_BLD $(TEMACS) $(TEMACS): $(TLIB0) $(TLIB1) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES) \ ../nt/$(BLD)/addsection.exe $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS) @@ -188,7 +188,7 @@ bootstrap: bootstrap-emacs # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as # this can break with GNU Make 3.81 and later if sh.exe is used. bootstrap-temacs: - $(MAKE) $(MFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE) + $(MAKE) $(MFLAGS) $(XMFLAGS) temacs CFLAGS=$(ARGQUOTE)$(CFLAGS) -DPURESIZE=5000000$(ARGQUOTE) # # Dump an Emacs executable named bootstrap-emacs containing the @@ -253,6 +253,7 @@ clean: - $(DEL) *~ "s/*~" "m/*~" - $(DEL) $(COMPILER_TEMP_FILES) - $(DEL_TREE) $(OBJDIR) + - $(DEL) stamp_BLD distclean: clean - $(DEL) config.h epaths.h @@ -1552,3 +1553,8 @@ $(BLD)/w32bdf.$(O): \ $(SRC)/w32bdf.h \ $(SRC)/w32gui.h \ $(SRC)/w32term.h + +# Each object file depends on stamp_BLD, because in parallel builds we must +# make sure $(BLD) exists before starting compilations. +# +$(OBJ0) $(OBJ1) $(WIN32OBJ) $(BLD)/lastfile.$(O) $(BLD)/firstfile.$(O): stamp_BLD diff --git a/src/minibuf.c b/src/minibuf.c index 2397ea4b085..85a0169e10a 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -1287,6 +1287,7 @@ is used to further constrain the set of candidates. */) tail = alist; if (type == 2) { + alist = check_obarray (alist); obsize = XVECTOR (alist)->size; bucket = XVECTOR (alist)->contents[index]; } @@ -1310,6 +1311,8 @@ is used to further constrain the set of candidates. */) { if (!EQ (bucket, zero)) { + if (!SYMBOLP (bucket)) + error ("Bad data in guts of obarray"); elt = bucket; eltstring = elt; if (XSYMBOL (bucket)->next) diff --git a/src/prefix-args.c b/src/prefix-args.c index 1a855e0e34b..5580d176bcf 100644 --- a/src/prefix-args.c +++ b/src/prefix-args.c @@ -44,6 +44,14 @@ Boston, MA 02110-1301, USA. */ If I can't write a completely portable program to do this in C, I'm quitting and taking up gardening. */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#if STDC_HEADERS +# include <stdlib.h> /* for proper declaration of `exit' */ +#endif + #include <stdio.h> int diff --git a/src/process.c b/src/process.c index 663170e685e..6dc5a88944c 100644 --- a/src/process.c +++ b/src/process.c @@ -149,8 +149,7 @@ Boston, MA 02110-1301, USA. */ #include "atimer.h" Lisp_Object Qprocessp; -Lisp_Object Qrun, Qstop; -extern Lisp_Object Qsignal; +Lisp_Object Qrun, Qstop, Qsignal; Lisp_Object Qopen, Qclosed, Qconnect, Qfailed, Qlisten; Lisp_Object Qlocal, Qipv4, Qdatagram; #ifdef AF_INET6 @@ -2900,7 +2899,7 @@ usage: (make-network-process &rest ARGS) */) /* Make QCaddress an alias for :local (server) or :remote (client). */ QCaddress = is_server ? QClocal : QCremote; - /* :wait BOOL */ + /* :nowait BOOL */ if (!is_server && socktype == SOCK_STREAM && (tem = Fplist_get (contact, QCnowait), !NILP (tem))) { @@ -6986,6 +6985,8 @@ syms_of_process () staticpro (&Qrun); Qstop = intern ("stop"); staticpro (&Qstop); + Qsignal = intern ("signal"); + staticpro (&Qsignal); /* Qexit is already staticpro'd by syms_of_eval; don't staticpro it here again. diff --git a/src/regex.c b/src/regex.c index 4b011634ae1..396e55c6404 100644 --- a/src/regex.c +++ b/src/regex.c @@ -67,8 +67,8 @@ # define regfree(preg) __regfree (preg) # define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef) # define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags) -# define regerror(errcode, preg, errbuf, errbuf_size) \ - __regerror(errcode, preg, errbuf, errbuf_size) +# define regerror(err_code, preg, errbuf, errbuf_size) \ + __regerror(err_code, preg, errbuf, errbuf_size) # define re_set_registers(bu, re, nu, st, en) \ __re_set_registers (bu, re, nu, st, en) # define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \ @@ -6625,12 +6625,15 @@ regexec (preg, string, nmatch, pmatch, eflags) WEAK_ALIAS (__regexec, regexec) -/* Returns a message corresponding to an error code, ERRCODE, returned - from either regcomp or regexec. We don't use PREG here. */ +/* Returns a message corresponding to an error code, ERR_CODE, returned + from either regcomp or regexec. We don't use PREG here. + + ERR_CODE was previously called ERRCODE, but that name causes an + error with msvc8 compiler. */ size_t -regerror (errcode, preg, errbuf, errbuf_size) - int errcode; +regerror (err_code, preg, errbuf, errbuf_size) + int err_code; const regex_t *preg; char *errbuf; size_t errbuf_size; @@ -6638,15 +6641,15 @@ regerror (errcode, preg, errbuf, errbuf_size) const char *msg; size_t msg_size; - if (errcode < 0 - || errcode >= (sizeof (re_error_msgid) / sizeof (re_error_msgid[0]))) + if (err_code < 0 + || err_code >= (sizeof (re_error_msgid) / sizeof (re_error_msgid[0]))) /* Only error codes returned by the rest of the code should be passed to this routine. If we are given anything else, or if other regex code generates an invalid error code, then the program has a bug. Dump core so we can fix it. */ abort (); - msg = gettext (re_error_msgid[errcode]); + msg = gettext (re_error_msgid[err_code]); msg_size = strlen (msg) + 1; /* Includes the null. */ diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 461df7acfba..06b1f8960f0 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -137,6 +137,16 @@ Boston, MA 02110-1301, USA. */ #define HAVE_SOCKETS 1 +/* But our select implementation doesn't allow us to make non-blocking + connects. So until that is fixed, this is necessary: */ + +#define BROKEN_NON_BLOCKING_CONNECT 1 + +/* And the select implementation does 1-byte read-ahead waiting + for received packets, so datagrams are broken too. */ + +#define BROKEN_DATAGRAM_SOCKETS 1 + /* Define this symbol if your system has the functions bcopy, etc. */ #define BSTRING @@ -376,7 +386,6 @@ typedef int pid_t; #define pclose _pclose #define putw _putw #define umask _umask -#define utime _utime #define utimbuf _utimbuf #define index strchr #define rindex strrchr @@ -385,7 +394,11 @@ typedef int pid_t; #define strnicmp _strnicmp #define stricmp _stricmp #define tzset _tzset + +#if !defined (_MSC_VER) || (_MSC_VER < 1400) #define tzname _tzname +#define utime _utime +#endif #ifdef HAVE_NTGUI #define abort w32_abort diff --git a/src/search.c b/src/search.c index 9aa49af665f..4c4fa7931a1 100644 --- a/src/search.c +++ b/src/search.c @@ -2144,8 +2144,8 @@ DEFUN ("search-forward", Fsearch_forward, Ssearch_forward, 1, 4, "MSearch: ", doc: /* Search forward from point for STRING. Set point to the end of the occurrence found, and return point. An optional second argument bounds the search; it is a buffer position. -The match found must not extend after that position. nil is equivalent - to (point-max). +The match found must not extend after that position. A value of nil is + equivalent to (point-max). Optional third argument, if t, means if fail just return nil (no error). If not nil and not t, move to limit of search and return nil. Optional fourth argument is repeat count--search for successive occurrences. diff --git a/src/sound.c b/src/sound.c index 6f8e3ecb308..b6f5ff513ee 100644 --- a/src/sound.c +++ b/src/sound.c @@ -74,8 +74,12 @@ Boston, MA 02110-1301, USA. */ #include <soundcard.h> #endif #ifdef HAVE_ALSA +#ifdef ALSA_SUBDIR_INCLUDE +#include <alsa/asoundlib.h> +#else #include <asoundlib.h> -#endif +#endif /* ALSA_SUBDIR_INCLUDE */ +#endif /* HAVE_ALSA */ /* END: Non Windows Includes */ diff --git a/src/w32.c b/src/w32.c index cbc78f8a5d5..9fe88833b4f 100644 --- a/src/w32.c +++ b/src/w32.c @@ -153,7 +153,8 @@ typedef PSID_IDENTIFIER_AUTHORITY (WINAPI * GetSidIdentifierAuthority_Proc) ( PSID pSid); /* ** A utility function ** */ -static BOOL is_windows_9x () +static BOOL +is_windows_9x () { static BOOL s_b_ret=0; OSVERSIONINFO os_ver; @@ -2871,7 +2872,8 @@ int h_errno = 0; /* function to set h_errno for compatability; map winsock error codes to normal system codes where they overlap (non-overlapping definitions are already in <sys/socket.h> */ -static void set_errno () +static void +set_errno () { if (winsock_lib == NULL) h_errno = EINVAL; @@ -2892,7 +2894,8 @@ static void set_errno () errno = h_errno; } -static void check_errno () +static void +check_errno () { if (h_errno == 0 && winsock_lib != NULL) pfn_WSASetLastError (0); @@ -3676,7 +3679,8 @@ _sys_read_ahead (int fd) return cp->status; } -int _sys_wait_accept (int fd) +int +_sys_wait_accept (int fd) { HANDLE hEv; child_process * cp; @@ -3698,10 +3702,10 @@ int _sys_wait_accept (int fd) { rc = WaitForSingleObject (hEv, INFINITE); pfn_WSAEventSelect (SOCK_HANDLE (fd), NULL, 0); - pfn_WSACloseEvent (hEv); if (rc == WAIT_OBJECT_0) cp->status = STATUS_READ_SUCCEEDED; } + pfn_WSACloseEvent (hEv); return cp->status; } @@ -4127,7 +4131,7 @@ BOOL WINAPI shutdown_handler(DWORD type) shut_down_emacs (0, 0, Qnil); } - /* Allow other handlers to handle this signal. */ + /* Allow other handlers to handle this signal. */ return FALSE; } @@ -4136,7 +4140,8 @@ BOOL WINAPI shutdown_handler(DWORD type) must always be initialized on startup even when the global variable initialized is non zero (see the function main in emacs.c). */ -void globals_of_w32 () +void +globals_of_w32 () { g_b_init_is_windows_9x = 0; g_b_init_open_process_token = 0; diff --git a/src/w32fns.c b/src/w32fns.c index 65362099bf9..29157dc356f 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -8411,6 +8411,30 @@ is set to off if the low bit of NEW-STATE is zero, otherwise on. */) } return Qnil; } + +DEFUN ("w32-window-exists-p", Fw32_window_exists_p, Sw32_window_exists_p, + 2, 2, 0, + doc: /* Return non-nil if a window exists with the specified CLASS and NAME. + +This is a direct interface to the Windows API FindWindow function. */) + (class, name) +Lisp_Object class, name; +{ + HWND hnd; + + if (!NILP (class)) + CHECK_STRING (class); + if (!NILP (name)) + CHECK_STRING (name); + + hnd = FindWindow (STRINGP (class) ? ((LPCTSTR) SDATA (class)) : NULL, + STRINGP (name) ? ((LPCTSTR) SDATA (name)) : NULL); + if (!hnd) + return Qnil; + return Qt; +} + + DEFUN ("file-system-info", Ffile_system_info, Sfile_system_info, 1, 1, 0, doc: /* Return storage information about the file system FILENAME is on. @@ -8977,6 +9001,7 @@ versions of Windows) characters. */); staticpro (&Qw32_charset_unicode); Qw32_charset_unicode = intern ("w32-charset-unicode"); + } #endif #if 0 /* TODO: Port to W32 */ @@ -9021,6 +9046,7 @@ versions of Windows) characters. */); defsubr (&Sw32_registered_hot_keys); defsubr (&Sw32_reconstruct_hot_key); defsubr (&Sw32_toggle_lock_key); + defsubr (&Sw32_window_exists_p); defsubr (&Sw32_find_bdf_fonts); defsubr (&Sfile_system_info); diff --git a/src/window.c b/src/window.c index d687c831ef6..5bd57496180 100644 --- a/src/window.c +++ b/src/window.c @@ -5727,8 +5727,10 @@ With prefix argument ARG, recenter putting point on screen line ARG relative to the current window. If ARG is negative, it counts up from the bottom of the window. (ARG should be less than the height of the window.) -If ARG is omitted or nil, erase the entire frame and then -redraw with point in the center of the current window. +If ARG is omitted or nil, erase the entire frame and then redraw with point +in the center of the current window. If `auto-resize-tool-bars' is set to +`grow-only', this resets the tool-bar's height to the minimum height needed. + Just C-u as prefix means put point in the center of the window and redisplay normally--don't erase and redraw the frame. */) (arg) @@ -5753,8 +5755,10 @@ and redisplay normally--don't erase and redraw the frame. */) for (i = 0; i < n_compositions; i++) composition_table[i]->font = NULL; - Fredraw_frame (w->frame); - SET_FRAME_GARBAGED (XFRAME (WINDOW_FRAME (w))); + WINDOW_XFRAME (w)->minimize_tool_bar_window_p = 1; + + Fredraw_frame (WINDOW_FRAME (w)); + SET_FRAME_GARBAGED (WINDOW_XFRAME (w)); center_p = 1; } else if (CONSP (arg)) /* Just C-u. */ diff --git a/src/xdisp.c b/src/xdisp.c index 63998ddf8f7..07df06785ad 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -290,10 +290,12 @@ Lisp_Object Vtool_bar_button_margin; EMACS_INT tool_bar_button_relief; -/* Non-zero means automatically resize tool-bars so that all tool-bar - items are visible, and no blank lines remain. */ +/* Non-nil means automatically resize tool-bars so that all tool-bar + items are visible, and no blank lines remain. -int auto_resize_tool_bars_p; + If value is `grow-only', only make tool-bar bigger. */ + +Lisp_Object Vauto_resize_tool_bars; /* Non-zero means draw block and hollow cursor as wide as the glyph under it. For example, if a block cursor is over a tab, it will be @@ -9854,9 +9856,16 @@ display_tool_bar_line (it, height) out:; row->displays_text_p = row->used[TEXT_AREA] != 0; - /* Use default face for the border below the tool bar. */ - if (!row->displays_text_p) + + /* Use default face for the border below the tool bar. + + FIXME: When auto-resize-tool-bars is grow-only, there is + no additional border below the possibly empty tool-bar lines. + So to make the extra empty lines look "normal", we have to + use the tool-bar face for the border too. */ + if (!row->displays_text_p && !EQ (Vauto_resize_tool_bars, Qgrow_only)) it->face_id = DEFAULT_FACE_ID; + extend_face_to_end_of_line (it); last = row->glyphs[TEXT_AREA] + row->used[TEXT_AREA] - 1; last->right_box_line_p = 1; @@ -9878,6 +9887,7 @@ display_tool_bar_line (it, height) if (!row->displays_text_p) { row->height = row->phys_height = it->last_visible_y - row->y; + row->visible_height = row->height; row->ascent = row->phys_ascent = 0; row->extra_line_spacing = 0; } @@ -9980,7 +9990,6 @@ redisplay_tool_bar (f) struct window *w; struct it it; struct glyph_row *row; - int change_height_p = 0; #ifdef USE_GTK if (FRAME_EXTERNAL_TOOL_BAR (f)) @@ -10075,10 +10084,10 @@ redisplay_tool_bar (f) w->desired_matrix->no_scrolling_p = 1; w->must_be_updated_p = 1; - if (auto_resize_tool_bars_p) + if (!NILP (Vauto_resize_tool_bars)) { - int nlines, nrows; int max_tool_bar_height = MAX_FRAME_TOOL_BAR_HEIGHT (f); + int change_height_p = 0; /* If we couldn't display everything, change the tool-bar's height if there is room for more. */ @@ -10104,29 +10113,40 @@ redisplay_tool_bar (f) /* Resize windows as needed by changing the `tool-bar-lines' frame parameter. */ - if (change_height_p - && (nlines = tool_bar_lines_needed (f, &nrows), - nlines != WINDOW_TOTAL_LINES (w))) + if (change_height_p) { extern Lisp_Object Qtool_bar_lines; Lisp_Object frame; int old_height = WINDOW_TOTAL_LINES (w); + int nrows; + int nlines = tool_bar_lines_needed (f, &nrows); - XSETFRAME (frame, f); - Fmodify_frame_parameters (frame, - Fcons (Fcons (Qtool_bar_lines, - make_number (nlines)), - Qnil)); - if (WINDOW_TOTAL_LINES (w) != old_height) + change_height_p = ((EQ (Vauto_resize_tool_bars, Qgrow_only) + && !f->minimize_tool_bar_window_p) + ? (nlines > old_height) + : (nlines != old_height)); + f->minimize_tool_bar_window_p = 0; + + if (change_height_p) { - clear_glyph_matrix (w->desired_matrix); - f->n_tool_bar_rows = nrows; - fonts_changed_p = 1; + XSETFRAME (frame, f); + Fmodify_frame_parameters (frame, + Fcons (Fcons (Qtool_bar_lines, + make_number (nlines)), + Qnil)); + if (WINDOW_TOTAL_LINES (w) != old_height) + { + clear_glyph_matrix (w->desired_matrix); + f->n_tool_bar_rows = nrows; + fonts_changed_p = 1; + return 1; + } } } } - return change_height_p; + f->minimize_tool_bar_window_p = 0; + return 0; } @@ -13596,7 +13616,7 @@ redisplay_window (window, just_this_one_p) #else redisplay_tool_bar_p = WINDOWP (f->tool_bar_window) && (FRAME_TOOL_BAR_LINES (f) > 0 - || auto_resize_tool_bars_p); + || !NILP (Vauto_resize_tool_bars)); #endif @@ -24376,12 +24396,13 @@ Autoselection selects the minibuffer only if it is active, and never unselects the minibuffer if it is active. */); Vmouse_autoselect_window = Qnil; - DEFVAR_BOOL ("auto-resize-tool-bars", &auto_resize_tool_bars_p, + DEFVAR_LISP ("auto-resize-tool-bars", &Vauto_resize_tool_bars, doc: /* *Non-nil means automatically resize tool-bars. -This increases a tool-bar's height if not all tool-bar items are visible. -It decreases a tool-bar's height when it would display blank lines -otherwise. */); - auto_resize_tool_bars_p = 1; +This dynamically changes the tool-bar's height to the minimum height +that is needed to make all tool-bar items visible. +If value is `grow-only', the tool-bar's height is only increased +automatically; to decreace the tool-bar height, use \\[recenter]. */); + Vauto_resize_tool_bars = Qt; DEFVAR_BOOL ("auto-raise-tool-bar-buttons", &auto_raise_tool_bar_buttons_p, doc: /* *Non-nil means raise tool-bar buttons when the mouse moves over them. */); |