Mercurial > emacs
view config.bat @ 111789:f97704487fb3
Merge changes made in Gnus trunk.
nnir.el: Batch header retrieval.
proto-stream.el: New library to provide protocol-specific TLS/STARTTLS connections for IMAP, NNTP, SMTP, POP3 and similar protocols.
nnimap.el (nnimap-open-connection): Use it.
proto-stream.el (open-proto-stream): Complete the documentation.
nnimap.el (nnimap-open-connection): Check for "OK" from the greeting.
nntp.el: Use proto-streams for the relevant connections types.
nntp.el (nntp-open-connection): Switch on STARTTLS on supported servers.
proto-stream.el (open-proto-stream): Add a way to specify what the end of a command is.
proto-stream.el (proto-stream-open-tls): Delete output from openssl if we're using tls.el.
proto-stream.el (proto-stream-open-network): If we don't have gnutls-cli or gnutls built in, then don't try to establish a STARTTLS connection.
color.el (color-lab->srgb): Fix function call name.
proto-stream.el: Fix the syntax in the comment.
nntp.el (nntp-open-connection): Fix the STARTTLS command syntax.
proto-stream.el (proto-stream-open-starttls): Actually implement the starttls.el STARTTLS.
proto-stream.el (proto-stream-always-use-starttls): New variable.
proto-stream.el (proto-stream-open-starttls): De-duplicate the starttls code.
proto-stream.el (proto-stream-open-starttls): Folded back into the main function.
proto-stream.el (proto-stream-command): Refactor out.
nnimap.el (nnimap-stream): Change default to `undecided'.
nnimap.el (nnimap-open-connection): If `nnimap-stream' is `undecided', try ssl first, and then network.
nnimap.el (nnimap-open-connection-1): Respect nnimap-server-port.
nnimap.el (nnimap-open-connection): Be more backwards-compatible.
proto-stream.el (open-protocol-stream): Renamed from open-proto-stream.
proto-stream.el (proto-stream-open-network): When doing opportunistic TLS upgrades we don't really care about the identity of the peer.
gnus.texi (Customizing the IMAP Connection): Note the new defaults.
gnus.texi (Direct Functions): Note the STARTTLS upgrade.
proto-stream.el (proto-stream-open-network): Force starttls.el to use gnutls-cli, since that what we've checked for.
proto-stream.el (proto-stream-always-use-starttls): Only default to t if open-gnutls-stream exists.
proto-stream.el (proto-stream-open-network): If STARTTLS failed, then just open a normal connection.
proto-stream.el (proto-stream-open-network): Wait until the greeting before doing STARTTLS.
nnimap.el (nnimap-open-connection-1): Always upgrade to STARTTLS (for backwards compatibility).
nnimap.el (nnimap-open-connection-1): Really respect nnimap-server-port.
nntp.el (nntp-open-connection): Provide a :success condition.
nnimap.el (nnimap-open-connection-1): Ditto.
proto-stream.el (proto-stream-open-network): See what the response to the STARTTLS command is.
proto-stream.el (proto-stream-open-network): Add some comments.
proto-stream.el: Fix example.
proto-stream.el (open-protocol-stream): Actually mention the STARTTLS upgrade.
nnir.el (nnir-get-active): Skip nnir-ignored-newsgroups when searching.
nnir.el (nnir-ignore-newsgroups): Fix default value.
nnir.el (nnir-run-gmane): Use mm-delete-duplicates instead of delete-dups that is not available in XEmacs 21.4.
mm-util.el (mm-delete-duplicates): Add comment.
gnus-sum.el (gnus-summary-delete-article): If delete fails don't change the registry.
nnimap.el (nnimap-open-connection-1): w32 open-network-stream doesn't seem to accept strings-with-numbers as port numbers.
color.el: fix docstring to use English rather than math notation for intervals.
shr.el (shr-find-fill-point): Don't break before apostrophes.
nnir.el (nnir-request-move-article): Bail out if no move support in group.
color.el (color-rgb->hsv): Fix docstring.
nnir.el (nnir-get-active): Improve active list retrieval.
shr.el (shr-find-fill-point): Work better for kinsoku chars and apostrophes.
gnus-gravatar.el (gnus-gravatar-size): Set gnus-gravatar-size to nil.
nnimap.el (nnimap-open-connection-1): Use gnus-string-match-p.
nnimap.el (nnimap-open-connection-1): Fix PREAUTH.
proto-stream.el (open-protocol-stream): All starttls connections are handled by the network handler.
gnus-gravatar.el (gnus-gravatar-insert): Delete unnecessary binding to t of inhibit-read-only since it is inside gnus-with-article-headers.
gnus-gravatar.el (gnus-gravatar-transform-address): Use mail-extract-address-components that supports non-ASCII names rather than mail-header-parse-addresses.
shr.el (shr-find-fill-point): Don't break line between kinsoku-bol characters.
gnus-gravatar.el (gnus-gravatar-insert): Allow LWSP in the middle of names.
nnmaildir.el (nnmaildir-request-set-mark): Add article to add-mark funcall.
gnus-msg.el: Remove nastygram thing.
message.el (message-from-style): Fix comment.
message.el (message-user-organization): Do not use gnus-local-organization.
gnus.el: Remove gnus-local-organization.
rtree.el: New file to handle range trees.
nnir.el, gnus-sum.el: Redo the way nnir handles registry updates.
rtree.el (rtree-extract): Simplify.
gnus-win.el (gnus-configure-windows): Remove Gnus 3.x setting support.
gnus-msg.el: Mark gnus-outgoing-message-group as obsolete.
gnus.texi (Archived Messages): Remove gnus-outgoing-message-group.
gnus-win.el (gnus-configure-frame): Remove old compatibility code.
rtree.el (rtree-memq): Rewrite it as a non-recursive function.
rtree.el (rtree-add, rtree-delq, rtree-length): Implement.
rtree.el (rtree-add): Make code slightly faster.
nnir.el: Allow modified summary-line-format in nnir summary buffers.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Thu, 02 Dec 2010 22:21:31 +0000 |
parents | 6efe51a23a50 |
children |
line wrap: on
line source
@echo off rem ---------------------------------------------------------------------- rem Configuration script for MSDOS rem Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003 rem 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. rem This file is part of GNU Emacs. rem GNU Emacs is free software: you can redistribute it and/or modify rem it under the terms of the GNU General Public License as published by rem the Free Software Foundation, either version 3 of the License, or rem (at your option) any later version. rem GNU Emacs is distributed in the hope that it will be useful, rem but WITHOUT ANY WARRANTY; without even the implied warranty of rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the rem GNU General Public License for more details. rem You should have received a copy of the GNU General Public License rem along with GNU Emacs. If not, see http://www.gnu.org/licenses/. rem ---------------------------------------------------------------------- rem YOU'LL NEED THE FOLLOWING UTILITIES TO MAKE EMACS: rem rem + msdos version 3 or better. rem + DJGPP version 2.0 or later (version 2.03 or later recommended). rem + make utility that allows breaking of the 128 chars limit on rem command lines. ndmake (as of version 4.5) won't work due to a rem line length limit. The make that comes with DJGPP does work (and is rem recommended). rem + rm, mv, and cp (from GNU file utilities). rem + sed (you can use the port that comes with DJGPP). rem rem You should be able to get all the above utilities from the DJGPP FTP rem site, ftp.delorie.com, in the directory "pub/djgpp/current/v2gnu". rem ---------------------------------------------------------------------- set X11= set nodebug= set djgpp_ver= set sys_malloc= set libxml= if "%1" == "" goto usage rem ---------------------------------------------------------------------- rem See if their environment is large enough. We need 28 bytes. set $foo$=789012345678901234567 if not "%$foo$%" == "789012345678901234567" goto SmallEnv set $foo$= :again if "%1" == "" goto usage if "%1" == "--with-x" goto withx if "%1" == "--no-debug" goto nodebug if "%1" == "msdos" goto msdos if "%1" == "--with-system-malloc" goto sysmalloc :usage echo Usage: config [--no-debug] [--with-system-malloc] [--with-x] msdos echo [Read the script before you run it.] goto end rem ---------------------------------------------------------------------- :withx set X11=Y shift goto again rem ---------------------------------------------------------------------- :nodebug set nodebug=Y shift goto again rem ---------------------------------------------------------------------- :sysmalloc set sys_malloc=Y shift goto again rem ---------------------------------------------------------------------- :msdos Echo Checking whether 'sed' is available... sed -e "w junk.$$$" <Nul If Exist junk.$$$ Goto sedOk Echo To configure 'Emacs' you need to have 'sed'! Goto End :sedOk Echo Checking whether 'rm' is available... rm -f junk.$$$ If Not Exist junk.$$$ Goto rmOk Echo To configure 'Emacs' you need to have 'rm'! Goto End :rmOk Echo Checking whether 'mv' is available... rm -f junk.1 junk.2 echo foo >junk.1 mv junk.1 ./junk.2 If Exist junk.2 Goto mvOk Echo To configure 'Emacs' you need to have 'mv'! rm -f junk.1 Goto End :mvOk rm -f junk.2 Echo Checking whether 'gcc' is available... echo main(){} >junk.c gcc -c junk.c if exist junk.o goto gccOk Echo To configure 'Emacs' you need to have 'gcc'! rm -f junk.c Goto End :gccOk rm -f junk.c junk.o junk junk.exe Echo Checking what version of DJGPP is installed... If Not "%DJGPP%" == "" goto djgppOk Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed! Goto End :djgppOk echo int main() >junk.c echo #ifdef __DJGPP__ >>junk.c echo {return (__DJGPP__)*10;} >>junk.c echo #else >>junk.c echo #ifdef __GO32__ >>junk.c echo {return 10;} >>junk.c echo #else >>junk.c echo {return 0;} >>junk.c echo #endif >>junk.c echo #endif >>junk.c gcc -o junk junk.c if not exist junk.exe coff2exe junk junk If ErrorLevel 10 Goto go32Ok rm -f junk.c junk junk.exe Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed! Goto End :go32Ok set djgpp_ver=2 If Not ErrorLevel 20 Echo To build 'Emacs' you need DJGPP v2.0 or later! If Not ErrorLevel 20 Goto End rm -f junk.c junk junk.exe rem DJECHO is used by the top-level Makefile in the v2.x build Echo Checking whether 'djecho' is available... redir -o Nul -eo djecho -o junk.$$$ foo If Exist junk.$$$ Goto djechoOk Echo To build 'Emacs' you need the 'djecho.exe' program! Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit. Echo Versions of DJGPP before 2.02 called this program 'echo.exe'. Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive, Echo or, if you have 'echo.exe', copy it to 'djecho.exe'. Echo Then run CONFIG.BAT again with the same arguments you did now. Goto End :djechoOk rm -f junk.$$$ Echo Configuring for DJGPP Version %DJGPP_VER% ... Rem ---------------------------------------------------------------------- Echo Configuring the source directory... cd src rem Create "epaths.h" sed -f ../msdos/sed4.inp <epaths.in >epaths.tmp update epaths.tmp epaths.h >nul rm -f epaths.tmp rem Create "config.h" rm -f config.h2 config.tmp sed -e '' config.in > config.tmp if "%X11%" == "" goto src4 sed -f ../msdos/sed2x.inp <config.in >config.tmp :src4 sed -f ../msdos/sed2v2.inp <config.tmp >config.h2 Rem See if DECL_ALIGN can be supported with this GCC rm -f junk.c junk.o junk junk.exe echo struct { int i; char *p; } __attribute__((__aligned__(8))) foo; >junk.c rem Two percent signs because it is a special character for COMMAND.COM/CMD rem Filter thru Sed because "&" is special for CMD.EXE echo int main(void) { return (unsigned long)"&"foo %% 8; } | sed "s/.&./\&/" >>junk.c gcc -o junk junk.c if not exist junk.exe coff2exe junk junk If Not ErrorLevel 1 Goto alignOk Echo WARNING: Your GCC does not support 8-byte aligned variables. Echo WARNING: Therefore Emacs cannot support buffers larger than 128MB. rem The following line disables DECL_ALIGN which in turn disables USE_LSB_TAG rem For details see lisp.h where it defines USE_LSB_TAG echo #define NO_DECL_ALIGN >>config.h2 :alignOk Rem See if they have libxml2 later than v2.2.0 installed Echo Checking whether libxml2 v2.2.1 or later is installed ... rm -f junk.c junk.o junk junk.exe rem Use djecho here because we need to quote brackets djecho "#include <libxml/xmlversion.h>" >junk.c djecho "int main()" >>junk.c djecho "{return (LIBXML_VERSION > 20200 ? 0 : 1);}" >>junk.c redir -o Nul -eo gcc -I/dev/env/DJDIR/include/libxml2 -o junk junk.c if not exist junk Goto xmlDone if not exist junk.exe coff2exe junk junk If ErrorLevel 1 Goto xmlDone Echo Configuring with libxml2 ... sed -e "/#undef HAVE_LIBXML2/s/^.*$/#define HAVE_LIBXML2 1/" <config.h2 >config.h3 mv config.h3 config.h2 set libxml=1 :xmlDone rm -f junk.c junk junk.exe Rem See if they requested a SYSTEM_MALLOC build if "%sys_malloc%" == "" Goto cfgDone rm -f config.tmp ren config.h2 config.tmp sed -f ../msdos/sedalloc.inp <config.tmp >config.h2 :cfgDone rm -f junk.c junk junk.exe update config.h2 config.h >nul rm -f config.tmp config.h2 rem On my system dir.h gets in the way. It's a VMS file so who cares. if exist dir.h ren dir.h vmsdir.h rem Create "makefile" from "makefile.in". rm -f Makefile makefile.tmp copy Makefile.in+deps.mk makefile.tmp sed -f ../msdos/sed1v2.inp <makefile.tmp >Makefile rm -f makefile.tmp if "%X11%" == "" goto src5 mv Makefile makefile.tmp sed -f ../msdos/sed1x.inp <makefile.tmp >Makefile rm -f makefile.tmp :src5 if "%sys_malloc%" == "" goto src5a sed -e "/^GMALLOC_OBJ *=/s/gmalloc.o//" <Makefile >makefile.tmp sed -e "/^VMLIMIT_OBJ *=/s/vm-limit.o//" <makefile.tmp >makefile.tmp2 sed -e "/^RALLOC_OBJ *=/s/ralloc.o//" <makefile.tmp2 >Makefile rm -f makefile.tmp makefile.tmp2 :src5a if "%nodebug%" == "" goto src6 sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >Makefile rm -f makefile.tmp :src6 if "%libxml%" == "" goto src7 sed -e "/^LIBXML2_LIBS *=/s/=/= -lxml2 -lz -liconv/" <Makefile >makefile.tmp sed -e "/^LIBXML2_CFLAGS *=/s|=|= -I/dev/env/DJDIR/include/libxml2|" <makefile.tmp >Makefile rm -f makefile.tmp :src7 cd .. rem ---------------------------------------------------------------------- Echo Configuring the library source directory... cd lib-src sed -f ../msdos/sed3v2.inp <Makefile.in >Makefile if "%X11%" == "" goto libsrc2a mv Makefile makefile.tmp sed -f ../msdos/sed3x.inp <makefile.tmp >Makefile rm -f makefile.tmp :libsrc2a if "%nodebug%" == "" goto libsrc3 sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile rm -f makefile.tmp :libsrc3 cd .. rem ---------------------------------------------------------------------- if "%X11%" == "" goto oldx1 Echo Configuring the oldxmenu directory... cd oldxmenu sed -f ../msdos/sed5x.inp <Makefile.in >Makefile if "%nodebug%" == "" goto oldx2 sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp mv -f makefile.tmp Makefile :oldx2 cd .. :oldx1 rem ---------------------------------------------------------------------- Echo Configuring the doc directory, expect one "File not found" message... cd doc Rem The two variants for lispintro below is for when the shell Rem supports long file names but DJGPP does not for %%d in (emacs lispref lispintro lispintr misc) do sed -f ../msdos/sed6.inp < %%d\Makefile.in > %%d\Makefile cd .. rem ---------------------------------------------------------------------- Echo Configuring the lisp directory... cd lisp If Exist gnus\.dir-locals.el update gnus/.dir-locals.el gnus/_dir-locals.el sed -f ../msdos/sedlisp.inp < Makefile.in > Makefile cd .. rem ---------------------------------------------------------------------- If not Exist leim\quail\latin-pre.el goto maindir Echo Configuring the leim directory... cd leim sed -f ../msdos/sedleim.inp < Makefile.in > Makefile cd .. rem ---------------------------------------------------------------------- :maindir Echo Configuring the main directory... If Exist .dir-locals.el update .dir-locals.el _dir-locals.el If Exist src\.dbxinit update src/.dbxinit src/_dbxinit Echo Looking for the GDB init file... If Exist src\.gdbinit update src/.gdbinit src/_gdbinit If Exist src\_gdbinit goto gdbinitOk Echo ERROR: Echo I cannot find the GDB init file. It was called ".gdbinit" in Echo the Emacs distribution, but was probably renamed to some other Echo name without the leading dot when you untarred the archive. Echo It should be in the "src/" subdirectory. Please make sure this Echo file exists and is called "_gdbinit" with a leading underscore. Echo Then run CONFIG.BAT again with the same arguments you did now. goto End :gdbinitOk Echo Looking for the GDB init file...found copy msdos\mainmake.v2 Makefile >nul rem ---------------------------------------------------------------------- goto End :SmallEnv echo Your environment size is too small. Please enlarge it and run me again. echo For example, type "command.com /e:2048" to have 2048 bytes available. set $foo$= :end set X11= set nodebug= set djgpp_ver= set sys_malloc= set libxml= goto skipArchTag arch-tag: 2d2fed23-4dc6-4006-a2e4-49daf0031f33 :skipArchTag