Commit 7be1c21a authored by Miles Bader's avatar Miles Bader

Merged from emacs--devo--0

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-744
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-745
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-746
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-747
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-748
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-749
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-750
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-751
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-752
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-753
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-754
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-755
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-756
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-757
   Update from CVS: lisp/textmodes/sgml-mode.el: Revert last change.

 * emacs@sv.gnu.org/emacs--devo--0--patch-758
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-759
   Merge from emacs--rel--22

 * emacs@sv.gnu.org/emacs--devo--0--patch-760
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-761
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-14
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-15
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-16
   Update from CVS: src/xterm.c (XTread_socket): Revert last change.

 * emacs@sv.gnu.org/emacs--rel--22--patch-17
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-18
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-19
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-20
   Update from CVS

 * emacs@sv.gnu.org/emacs--rel--22--patch-21
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-221
   Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-12
Creator:  Karoly Lorentey <karoly@lorentey.hu>
parents 3c28868a 26114bc0
......@@ -334,9 +334,9 @@ Cheng Gao: changed MORE.STUFF flymake.el tips.texi url-dired.el
Chong Yidong: changed cus-edit.el simple.el files.el custom.el
display.texi longlines.el xdisp.c files.texi info.el keyboard.c
compile.el custom.texi text.texi frames.texi image-mode.el mouse.el
misc.texi startup.el wid-edit.el xterm.c cus-theme.el
and 295 other files
compile.el custom.texi text.texi xterm.c frames.texi image-mode.el
mouse.el misc.texi startup.el wid-edit.el cus-theme.el
and 296 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
......@@ -456,10 +456,10 @@ Dave Lambert: changed sol2-5.h xfns.c xterm.c xterm.h
Dave Love: wrote autoarg.el autoconf.el benchmark.el cfengine.el
code-pages.el elide-head.el georgian.el hl-line.el latin-8.el
latin-9.el latin1-disp.el python.el refill.el rfc1345.el
sgml-input.el smiley.el subst-big5.el subst-gb2312.el subst-jis.el
subst-ksc.el tool-bar.el ucs-tables.el uni-input.el utf-16.el
utf-7.el utf-8-lang.el welsh.el
latin-9.el latin1-disp.el python.el refill.el rfc1345.el sgml-input.el
smiley.el subst-big5.el subst-gb2312.el subst-jis.el subst-ksc.el
tool-bar.el ucs-tables.el uni-input.el utf-16.el utf-7.el utf-8-lang.el
welsh.el
and changed configure.in Makefile.in help.el fortran.el browse-url.el
mule-cmds.el simple.el xterm.c cus-edit.el files.el info.el mule.el
wid-edit.el fns.c vc.el rfc2047.el bindings.el cus-start.el buffer.c
......@@ -550,8 +550,8 @@ and changed w32menu.c w32term.c close.png close.xpm empty.png empty.xpm
David Reitter: wrote mailclient.el
and changed commands.h cus-edit.el easy-mmode.el emacsbug.el
emacsclient.c keymap.c macterm.c menu-bar.el minibuf.c sendmail.el
url-http.el
emacsclient.c keymap.c macterm.c menu-bar.el minibuf.c python.el
sendmail.el url-http.el
David Robinson: changed menu-bar.el x-win.el
......@@ -561,6 +561,8 @@ David Vazquez: changed m4-mode.el
David Z. Maze: changed nnml.el nnrss.el
Davis Herring: changed timeclock.el
Deanna Phillips: changed configure.in
Decklin Foster: changed nngateway.el
......@@ -597,7 +599,7 @@ Didier Verna: wrote gnus-diary.el nndiary.el
and changed nntp.el gnus-art.el gnus-msg.el gnus-group.el gnus-start.el
gnus-sum.el gnus-xmas.el gnus-picon.el gnus-salt.el cus-edit.el rect.el
dgnushack.el gnus-agent.el gnus-ems.el gnus-fun.el gnus-topic.el
message.el nnmail.el nnmbox.el smiley.el
gnus.texi message.el nnmail.el nnmbox.el smiley.el
Dirk Herrmann: changed bibtex.el
......@@ -634,7 +636,7 @@ and changed diary.el tex-mode.el cal-tex.el cal-mayan.el holiday.el
Edward O'connor: changed erc.el erc-viper.el erc-log.el erc-track.el
viper.el erc-backend.el erc-chess.el erc-dcc.el erc-ezbounce.el
erc-goodies.el erc-list.el erc-macs.el erc-match.el erc-ring.el
erc-stamp.el goto-addr.el
erc-stamp.el goto-addr.el python.el
Edwin Steiner: changed gnus-nocem.el
......@@ -649,9 +651,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
startup.el mainmake.v2 config.bat rmail.el menu-bar.el pc-win.el
simple.el msdos.h internal.el xfaces.c emacs.c frame.c dosfns.c
faces.el frame.el and 531 other files
faces.el frame.el and 532 other files
Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el
sh-script.el text.texi
......@@ -746,8 +748,8 @@ Francesc Rocher: changed cus-start.el macterm.c w32term.c xdisp.c xterm.c
Francesco Potort,Al(B: wrote cmacexp.el
and changed etags.c man.el delta.h undigest.el etags.1 comint.el
configure.in uniquify.el latin-post.el rmail.el Makefile.in etags.el
latin-alt.el maintaining.texi sgml-mode.el data.c european.el
configure.in uniquify.el latin-post.el maintaining.texi rmail.el
Makefile.in etags.el latin-alt.el sgml-mode.el data.c european.el
filelock.c files.el generic-x.el gud.el and 43 other files
Francis J. Wright: wrote woman.el
......@@ -852,9 +854,9 @@ Giuseppe Scrivano: changed buffer.c configure.in sysdep.c xsmfns.c
Glenn Morris: changed f90.el diary-lib.el calendar.el fortran.el
calendar.texi appt.el sh-script.el Makefile.in timeclock.el cal-menu.el
files.el complete.el configure.in startup.el MACHINES abbrevs.texi
cal-hebrew.el cal-islam.el emacs.texi fr-refcard.tex holidays.el
and 145 other files
files.el complete.el configure.in programs.texi startup.el MACHINES
abbrevs.texi cal-hebrew.el cal-islam.el emacs.texi faq.texi
and 151 other files
Glynn Clements: wrote gamegrid.el snake.el tetris.el
......@@ -996,8 +998,8 @@ Ivar Rummelhoff: wrote winner.el
Iwamuro Motonori: changed gnus-kill.el
J.D. Smith: changed idlwave.el idlw-shell.el idlw-help.el idlw-rinfo.el
idlw-toolbar.el comint.el vc.el bibtex.el files.texi hideshow.el
idlw-complete-structtag.el idlwave.texi misc.texi mouse.el
idlw-toolbar.el comint.el idlwave.texi vc.el bibtex.el files.texi
hideshow.el idlw-complete-structtag.el misc.texi mouse.el
Jaap-Henk Hoepman: changed mm-decode.el
......@@ -1175,8 +1177,8 @@ Joel Ray Holveck: changed gnus-sum.el info.el
Joev Dubach: changed nntp.el
Johan Bockg,Ae(Brd: changed erc.el erc-backend.el cl-macs.el erc-match.el
erc-nickserv.el erc-ring.el erc-speak.el erc-track.el simple.el
align.el bytecomp.el calendar.el cl.texi custom.el dired-aux.el
custom.el erc-nickserv.el erc-ring.el erc-speak.el erc-track.el
simple.el align.el bytecomp.el calendar.el cl.texi dired-aux.el
dired-x.el display.texi erc-bbdb.el erc-button.el erc-compat.el
erc-dcc.el and 16 other files
......@@ -1281,9 +1283,9 @@ Juan Le,As(Bn Lahoz Garc,Am(Ba: wrote wdired.el
and changed files.el perl-mode.el
Juanma Barranquero: changed makefile.w32-in subr.el faces.el help-fns.el
files.el buffer.c simple.el w32fns.c emacsclient.c replace.el
files.el simple.el buffer.c w32fns.c emacsclient.c replace.el
vhdl-mode.el bs.el cperl-mode.el eval.c org.el process.c xdisp.c
idlwave.el sh-script.el window.c ada-mode.el and 628 other files
idlwave.el sh-script.el window.c ada-mode.el and 629 other files
Juergen Hoetzel: changed url-handlers.el
......@@ -1328,11 +1330,11 @@ Kailash C. Chowksey: changed HELLO Makefile.in ind-util.el kannada.el
Kanematsu Daiji: changed nnimap.el
Karl Berry: changed info.texi emacs.texi elisp.texi anti.texi
display.texi emacs-xtra.texi filelock.c gnu.texi mule.texi text.texi
building.texi cmdargs.texi copyright.el custom.texi customize.texi
dired.c faq.texi frames.texi help.texi lists.texi loading.texi
and 71 other files
Karl Berry: changed emacs.texi info.texi elisp.texi anti.texi
display.texi emacs-xtra.texi filelock.c gnu.texi mule.texi texinfo.tex
text.texi building.texi cmdargs.texi control.texi copyright.el
custom.texi customize.texi dired.c dired.texi faq.texi frames.texi
and 72 other files
Karl Chen: changed files.el align.el cc-vars.el gnus-art.el help-mode.el
jka-cmpr-hook.el make-mode.el perl-mode.el python.el tex-mode.el
......@@ -1696,10 +1698,9 @@ Martin Lorentzon: changed vc.el vc-cvs.el vc-hooks.el vc-rcs.el
Martin Neitzel: changed sc.el
Martin Rudalics: changed cus-edit.el wid-edit.el cus-start.el files.el
flyspell.el font-lock.el complete.el insdel.c macmenu.c syntax.c
w32menu.c wdired.el whitespace.el window.el xdisp.c xmenu.c
backups.texi buffer.c buffer.h casefiddle.c cc-mode.el
and 36 other files
flyspell.el font-lock.el complete.el insdel.c ispell.el macmenu.c
syntax.c w32menu.c wdired.el whitespace.el window.el xdisp.c xmenu.c
backups.texi buffer.c buffer.h casefiddle.c and 36 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
......@@ -1838,10 +1839,10 @@ Michal Jankowski: changed insdel.c keyboard.c
Michal Nazarewicz: changed ispell.el
Micha,Ak(Bl Cadilhac: changed ido.el fill.el ispell.el anti.texi battery.el
blackbox.el bs.el cmuscheme.el complete.el cus-edit.el dispnew.c
faq.texi flyspell.el footnote.el glasses.el info.el life.el lpr.el
make-mode.el misc.texi pong.el and 9 other files
Micha,Ak(Bl Cadilhac: changed ido.el fill.el ispell.el Makefile anti.texi
battery.el blackbox.el bs.el cmuscheme.el complete.el cus-edit.el
dispnew.c faq.texi flyspell.el footnote.el fr-refcard.ps fr-refcard.tex
glasses.el info.el life.el lpr.el and 12 other files
Michelangelo Grigni: wrote ffap.el
and changed gnus-score.el
......@@ -1941,6 +1942,8 @@ Niimi Satoshi: changed pp.el search.c
Niklas Morberg: changed nnweb.el gnus-art.el nnimap.el spam.el
Nikolaj Schumacher: changed compile.el
Noah Friedman: wrote eldoc.el rlogin.el rsz-mini.el type-break.el
and changed comint.el emacs-buffer.gdb files.el mailabbrev.el sendmail.el
subr.el timer.el yow.el battery.el complete.el config.in configure.in
......@@ -2062,7 +2065,7 @@ and changed iso-acc.el process.c sysdep.c
Per Cederqvist: wrote ewoc.el
and changed vc.el vc-hooks.el diff-mode.el etags.c etags.el forms.el
hexl.el
hexl.el process.c
Per Persson: wrote gnus-vm.el
......@@ -2399,8 +2402,8 @@ and changed comint.el font-lock.el shell.el rmail.el fortran.el
Skip Collins: changed w32fns.c w32term.c w32term.h
Slawomir Nowaczyk: changed python.el TUTORIAL.pl flyspell.el ls-lisp.el
w32proc.c
Slawomir Nowaczyk: changed emacs.py python.el TUTORIAL.pl flyspell.el
ls-lisp.el w32proc.c
Spencer Thomas: changed dabbrev.el emacsclient.c emacsserver.c gnus.texi
server.el tcp.c unexec.c
......@@ -2414,7 +2417,7 @@ Stefan Monnier: wrote bibtex.el cvs-status.el diff-mode.el log-edit.el
reveal.el smerge-mode.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 simple.el easy-mmode.el info.el syntax.c vc-hooks.el xdisp.c
regex.c simple.el easy-mmode.el vc-hooks.el info.el syntax.c xdisp.c
sh-script.el and 518 other files
Steinar Bang: changed imap.el
......@@ -2424,7 +2427,7 @@ Stephan Stahl: changed which-func.el buff-menu.el buffer.c dired-x.texi
Stephen A. Wood: changed fortran.el
Stephen Berman: changed allout.el recentf.el
Stephen Berman: changed allout.el find-dired.el recentf.el
Stephen C. Gilardi: changed configure.in
......@@ -2460,7 +2463,7 @@ Steve Youngs: changed mh-utils.el mh-xemacs-compat.el dgnushack.el
Steven E. Harris: changed nnheader.el
Steven Huwig: changed python.el
Steven Huwig: changed emacs.py python.el
Steven L. Baur: wrote earcon.el footnote.el gnus-audio.el gnus-setup.el
and changed gnus-xmas.el gnus-msg.el add-log.el dgnushack.el edebug.el
......@@ -2680,7 +2683,7 @@ Werner Lemberg: wrote sisheng.el vntelex.el
and changed TUTORIAL.de Makefile.in calc.texi chinese.el czech.el
european.el idlwave.el reftex-vars.el reftex.el reftex.texi slovak.el
supercite.el .cvsignore advice.el calc-forms.el calc-sel.el calendar.el
china-util.el cl-macs.el cl.texi complete.el and 43 other files
china-util.el cl-macs.el cl.texi complete.el and 44 other files
Wes Hardaker: changed gnus-score.el gnus-art.el gnus-sum.el gnus-win.el
......@@ -2731,11 +2734,13 @@ Yagi Tatsuya: changed gnus-art.el gnus-start.el
Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h
macmenu.c macgui.h image.c macselect.c keyboard.c xdisp.c makefile.MPW
config.h emacs.c Makefile.in macos.texi darwin.h xfaces.c INSTALL
config.h emacs.c Makefile.in macos.texi INSTALL darwin.h xfaces.c
dispnew.c alloc.c and 77 other files
Yann Dirson: changed imenu.el
Yavor Doganov: changed emacs.1 etags.1
Yoichi Nakayama: changed browse-url.el finder.el man.el rfc2368.el
Yoni Rabkin Katzenell: changed faces.el whitespace.el
......
2007-05-20 Nick Roberts <nickrob@snap.net.nz>
* configure.in: Use HAVE_GPM instead of HAVE_GPM_H and implement
it like others.
* configure: Regenerate.
2007-05-20 Nick Roberts <nickrob@snap.net.nz>
* configure.in (AC_CHECK_HEADERS) Add gpm.h.
(AC_CHECK_LIB): Add -lgpm.
* configure: Regenerate.
2007-05-03 Glenn Morris <rgm@gnu.org>
* configure: Tweak message about the absence of shell functions.
......
......@@ -112,6 +112,12 @@ Miles Bader
Thien-Thi Nguyen
VMS
Juanma Barranquero
lisp/bs.el
lisp/server.el
lib-src/emacsclient.c
lib-src/grep-changelog
==============================================================================
3.
==============================================================================
......@@ -149,13 +155,16 @@ src/filelock.c
src/filemode.c
src/firstfile.c
src/floatfns.c
src/fringe.c
src/fns.c
src/fontset.c
src/getloadavg.c
src/gmalloc.c
src/gtkutil.c
src/hftctl.c
src/indent.c
src/insdel.c
src/image.c
src/lastfile.c
src/lread.c
src/m/
......
......@@ -53,12 +53,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00732.html
** michael.ewe@arcor.de, Apr 24: 22.0.98 not starting on Solaris 10/I386
http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01113.html
** Takaaki.Ota@am.sony.com, May 2: table cell menu does not appear at the menubar
Bug is intermittent.
** Install python.el `with' patch from trunk.
** Install vc-hooks.el patch from trunk.
** coldwell@redhat.com, May 18: 22.0.99 emacs dumper (?) problem
* DOCUMENTATION
......
......@@ -427,6 +427,14 @@ http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg00257.html
http://lists.gnu.org/archive/html/emacs-devel/2007-04/msg01427.html
lisp/progmodes/python.el
Dave Love alerted us to a potential legal problem:
http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
On consultation with a lawyer, we found there was no problem:
http://lists.gnu.org/archive/html/emacs-devel/2007-05/msg00466.html
** Issues that are "fixed" for the release of Emacs 22, but we may
wish to revisit later in more detail
......@@ -587,8 +595,9 @@ Done: TUTORIAL.eo
*** These are copyright issues still to be addressed:
python.el potential legal problem
http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-04/msg00459.html
None known.
This file is part of GNU Emacs.
......
......@@ -412,10 +412,10 @@ else
fi
test \$exitcode = 0") || {
echo Please tell bug-autoconf@gnu.org about your system,
echo including any error possibly output before this message.
echo This can help us improve future autoconf versions.
echo Configuration will now proceed without shell functions.
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
}
......@@ -683,7 +683,6 @@ LIBSOUND
PKG_CONFIG
ALSA_CFLAGS
ALSA_LIBS
CFLAGS_SOUND
SET_MAKE
XMKMF
......@@ -1340,6 +1339,7 @@ Optional Packages:
--with-tiff use -ltiff for displaying TIFF images
--with-gif use -lungif for displaying GIF images
--with-png use -lpng for displaying PNG images
--with-gpm use -lgpm for mouse support on a GNU/Linux console
--with-gtk use GTK (same as --with-x-toolkit=gtk)
--with-pkg-config-prog Path to pkg-config to use for finding GTK
--without-toolkit-scroll-bars
......@@ -1942,6 +1942,12 @@ if test "${with_png+set}" = set; then
fi
# Check whether --with-gpm was given.
if test "${with_gpm+set}" = set; then
withval=$with_gpm;
fi
# Check whether --with-gtk was given.
if test "${with_gtk+set}" = set; then
withval=$with_gtk;
......@@ -6492,7 +6498,6 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_ALSA 1
_ACEOF
fi
fi
......@@ -13937,6 +13942,213 @@ _ACEOF
fi
fi
### Use -lgpm if available, unless `--with-gpm=no'.
HAVE_GPM=no
if test "${with_gpm}" != "no"; then
if test "${ac_cv_header_gpm_h+set}" = set; then
{ echo "$as_me:$LINENO: checking for gpm.h" >&5
echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6; }
if test "${ac_cv_header_gpm_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_gpm_h" >&5
echo "${ECHO_T}$ac_cv_header_gpm_h" >&6; }
else
# Is the header compilable?
{ echo "$as_me:$LINENO: checking gpm.h usability" >&5
echo $ECHO_N "checking gpm.h usability... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <gpm.h>
_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_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
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 gpm.h presence" >&5
echo $ECHO_N "checking gpm.h presence... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <gpm.h>
_ACEOF
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 && {
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
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; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ echo "$as_me:$LINENO: WARNING: gpm.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: gpm.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ echo "$as_me:$LINENO: WARNING: gpm.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: gpm.h: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ echo "$as_me:$LINENO: WARNING: gpm.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: gpm.h: present but cannot be compiled" >&2;}
{ echo "$as_me:$LINENO: WARNING: gpm.h: check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: gpm.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: gpm.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: gpm.h: see the Autoconf documentation" >&2;}
{ echo "$as_me:$LINENO: WARNING: gpm.h: section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: gpm.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: gpm.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: gpm.h: proceeding with the preprocessor's result" >&2;}
{ echo "$as_me:$LINENO: WARNING: gpm.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: gpm.h: in the future, the compiler will take precedence" >&2;}
;;
esac
{ echo "$as_me:$LINENO: checking for gpm.h" >&5
echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6; }
if test "${ac_cv_header_gpm_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_cv_header_gpm_h=$ac_header_preproc
fi
{ echo "$as_me:$LINENO: result: $ac_cv_header_gpm_h" >&5
echo "${ECHO_T}$ac_cv_header_gpm_h" >&6; }
fi
if test $ac_cv_header_gpm_h = yes; then
{ echo "$as_me:$LINENO: checking for Gpm_Open in -lgpm" >&5
echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6; }
if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgpm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* 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 Gpm_Open ();
int
main ()
{
return Gpm_Open ();
;
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
ac_cv_lib_gpm_Gpm_Open=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_gpm_Gpm_Open=no
fi
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_gpm_Gpm_Open" >&5
echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6; }
if test $ac_cv_lib_gpm_Gpm_Open = yes; then
HAVE_GPM=yes
fi
fi
fi
if test "${HAVE_GPM}" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_GPM 1
_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; }
......@@ -23111,6 +23323,7 @@ echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
echo " Does Emacs use -lungif? ${HAVE_GIF}"
echo " Does Emacs use -lpng? ${HAVE_PNG}"
echo " Does Emacs use -lgpm? ${HAVE_GPM}"
echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
echo
......
......@@ -113,6 +113,8 @@ AC_ARG_WITH(gif,
[ --with-gif use -lungif for displaying GIF images])
AC_ARG_WITH(png,
[ --with-png use -lpng for displaying PNG images])
AC_ARG_WITH(gpm,
[ --with-gpm use -lgpm for mouse support on a GNU/Linux console])
AC_ARG_WITH(gtk,
[ --with-gtk use GTK (same as --with-x-toolkit=gtk)])
AC_ARG_WITH(pkg-config-prog,
......@@ -1620,7 +1622,6 @@ if test "${with_sound}" != "no"; then
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
......@@ -2507,6 +2508,17 @@ if test "${HAVE_X11}" = "yes"; then
fi
fi
### Use -lgpm if available, unless `--with-gpm=no'.
HAVE_GPM=no
if test "${with_gpm}" != "no"; then
AC_CHECK_HEADER(gpm.h,
AC_CHECK_LIB(gpm, Gpm_Open, HAVE_GPM=yes))
fi
if test "${HAVE_GPM}" = "yes"; then
AC_DEFINE(HAVE_GPM, 1, [Define to 1 if you have the gpm library (-lgpm).])
fi
dnl Check for malloc/malloc.h on darwin
AC_CHECK_HEADER(malloc/malloc.h, AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1 if you have the <malloc/malloc.h> header file.]))
......@@ -3267,6 +3279,7 @@ echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
echo " Does Emacs use -lungif? ${HAVE_GIF}"
echo " Does Emacs use -lpng? ${HAVE_PNG}"
echo " Does Emacs use -lgpm? ${HAVE_GPM}"
echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
echo
......
2007-05-19 Glenn Morris <rgm@gnu.org>
* images/cancel.pbm: Convert from PGM to PBM.
* images/copy.pbm, images/next-node.pbm, images/prev-node.pbm:
* images/save.pbm, images/up-node.pbm: Convert from PPM to PBM.
2007-05-17 Glenn Morris <rgm@gnu.org>
* PROBLEMS (Dumping): Mention OpenBSD macppc problem.
2007-05-15 Micha,Ak(Bl Cadilhac <michael@cadilhac.name>