(init_jpeg_functions, jpeg_resync_to_restart_wrapper):

[bpt/emacs.git] / config.bat

diff --git a/config.bat b/config.bat
index f5e7392..5d9f771 100644 (file)
--- a/config.bat
+++ b/config.bat
@@ -1,7 +1,8 @@
 @echo off\r
 rem   ----------------------------------------------------------------------\r
 rem   Configuration script for MSDOS\r
-rem   Copyright (C) 1994 Free Software Foundation, Inc.\r
+rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001\r
+rem   Free Software Foundation, Inc.\r
 \r
 rem   This file is part of GNU Emacs.\r
 \r
@@ -122,6 +123,19 @@ Goto End
 set djgpp_ver=1\r
 If ErrorLevel 20 set djgpp_ver=2\r
 rm -f junk.c junk junk.exe\r
+rem DJECHO is used by the top-level Makefile\r
+Echo Checking whether 'djecho' is available...\r
+redir -o Nul -eo djecho -o junk.$$$ foo\r
+If Exist junk.$$$ Goto djechoOk\r
+Echo To build 'Emacs' you need the 'djecho.exe' program!\r
+Echo 'djecho.exe' is part of 'djdevNNN.zip' basic DJGPP development kit.\r
+Echo Versions of DJGPP before 2.02 called this program 'echo.exe'.\r
+Echo Either unpack 'djecho.exe' from the 'djdevNNN.zip' archive,\r
+Echo or, if you have 'echo.exe', copy it to 'djecho.exe'.\r
+Echo Then run CONFIG.BAT again with the same arguments you did now.\r
+Goto End\r
+:djechoOk\r
+rm -f junk.$$$\r
 Echo Configuring for DJGPP Version %DJGPP_VER% ...\r
 Rem   ----------------------------------------------------------------------\r
 Echo Configuring the source directory...\r
@@ -138,7 +152,12 @@ sed -e '' config.in > config.tmp
 if "%X11%" == "" goto src4\r
 sed -f ../msdos/sed2x.inp <config.in >config.tmp\r
 :src4\r
+if "%DJGPP_VER%" == "2" Goto src41\r
 sed -f ../msdos/sed2.inp <config.tmp >config.h2\r
+goto src42\r
+:src41\r
+sed -f ../msdos/sed2v2.inp <config.tmp >config.h2\r
+:src42\r
 update config.h2 config.h >nul\r
 rm -f config.tmp config.h2\r
 \r
@@ -147,12 +166,12 @@ if exist dir.h ren dir.h vmsdir.h
 \r
 rem   Create "makefile" from "makefile.in".\r
 rm -f Makefile junk.c\r
-sed -e "1,/cpp stuff/s@^# .*$@@" <Makefile.in >junk.c\r
+sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c\r
 If "%DJGPP_VER%" == "1" Goto mfV1\r
-gcc -E junk.c | sed -f ../msdos/sed1v2.inp >Makefile\r
+gcc -E -traditional junk.c | sed -f ../msdos/sed1v2.inp >Makefile\r
 goto mfDone\r
 :mfV1\r
-gcc -E junk.c | sed -f ../msdos/sed1.inp >Makefile\r
+gcc -E -traditional junk.c | sed -f ../msdos/sed1.inp >Makefile\r
 :mfDone\r
 rm -f junk.c\r
 \r
@@ -163,7 +182,7 @@ rm -f makefile.tmp
 :src5\r
 \r
 if "%nodebug%" == "" goto src6\r
-sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp\r
+sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp\r
 sed -e "/^LDFLAGS *=/s/=/=-s/" <makefile.tmp >Makefile\r
 rm -f makefile.tmp\r
 :src6\r
@@ -172,8 +191,8 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the library source directory...\r
 cd lib-src\r
 rem   Create "makefile" from "makefile.in".\r
-sed -e "1,/cpp stuff/s@^# .*$@@" <Makefile.in >junk.c\r
-gcc -E -I. -I../src junk.c | sed -e "s/^ /     /" -e "/^#/d" -e "/^[   \f]*$/d" >makefile.new\r
+sed -e "1,/== start of cpp stuff ==/s@^# .*$@@" <Makefile.in >junk.c\r
+gcc -E -traditional -I. -I../src junk.c | sed -e "s/^ /        /" -e "/^#/d" -e "/^[   \f]*$/d" >makefile.new\r
 If "%DJGPP_VER%" == "2" goto libsrc-v2\r
 sed -f ../msdos/sed3.inp <makefile.new >Makefile\r
 Goto libsrc2\r
@@ -182,7 +201,7 @@ sed -f ../msdos/sed3v2.inp <makefile.new >Makefile
 :libsrc2\r
 rm -f makefile.new junk.c\r
 if "%nodebug%" == "" goto libsrc3\r
-sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp\r
+sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp\r
 sed -e "/^ALL_CFLAGS *=/s/=/= -s/" <makefile.tmp >Makefile\r
 rm -f makefile.tmp\r
 :libsrc3\r
@@ -193,7 +212,7 @@ Echo Configuring the oldxmenu directory...
 cd oldxmenu\r
 sed -f ../msdos/sed5x.inp <Makefile.in >Makefile\r
 if "%nodebug%" == "" goto oldx2\r
-sed -e "/^CFLAGS *=/s/ *-g//" <Makefile >makefile.tmp\r
+sed -e "/^CFLAGS *=/s/ *-gcoff//" <Makefile >makefile.tmp\r
 mv -f makefile.tmp Makefile\r
 :oldx2\r
 cd ..\r
@@ -204,6 +223,24 @@ cd man
 sed -f ../msdos/sed6.inp < Makefile.in > Makefile\r
 cd ..\r
 rem   ----------------------------------------------------------------------\r
+Echo Configuring the ELisp manual directory...\r
+cd lispref\r
+sed -f ../msdos/sed6.inp < Makefile.in > Makefile\r
+cd ..\r
+rem   ----------------------------------------------------------------------\r
+Echo Configuring the ELisp Introduction manual directory...\r
+Rem The two variants for the line below is for when the shell\r
+Rem supports long file names but DJGPP does not\r
+if exist lispintro\Makefile.in cd lispintro\r
+if exist lispintr\Makefile.in cd lispintr\r
+sed -f ../msdos/sed6.inp < Makefile.in > Makefile\r
+cd ..\r
+rem   ----------------------------------------------------------------------\r
+Echo Configuring the lisp directory...\r
+cd lisp\r
+sed -f ../msdos/sedlisp.inp < Makefile.in > Makefile\r
+cd ..\r
+rem   ----------------------------------------------------------------------\r
 If not Exist leim\quail\latin-pre.el goto maindir\r
 Echo Configuring the leim directory...\r
 cd leim\r
@@ -214,7 +251,7 @@ rem   ----------------------------------------------------------------------
 Echo Configuring the main directory...\r
 If "%DJGPP_VER%" == "1" goto mainv1\r
 Echo Looking for the GDB init file...\r
-If not Exist src\_gdbinit If Exist src\.gdbinit update src/.gdbinit src/_gdbinit\r
+If Exist src\.gdbinit update src/.gdbinit src/_gdbinit\r
 If Exist src\_gdbinit goto gdbinitOk\r
 Echo ERROR:\r
 Echo I cannot find the GDB init file.  It was called ".gdbinit" in\r