rem ----------------------------------------------------------------------\r
set X11=\r
set nodebug=\r
-set djgpp-ver=\r
+set djgpp_ver=\r
:again\r
if "%1" == "" goto usage\r
if "%1" == "--with-x" goto withx\r
rm -f junk.c\r
Goto End\r
:gccOk\r
-rm -f junk.c junk.o\r
+rm -f junk.c junk.o junk junk.exe\r
Echo Checking what version of DJGPP is installed...\r
If Not "%DJGPP%" == "" goto djgppOk\r
Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!\r
echo {return 0;} >>junk.c\r
echo #endif >>junk.c\r
echo #endif >>junk.c\r
-gcc -o junk.exe junk.c\r
+gcc -o junk junk.c\r
+if not exist junk.exe coff2exe junk\r
junk\r
If ErrorLevel 10 Goto go32Ok\r
rm -f junk.c junk junk.exe\r
Echo To compile 'Emacs' under MS-DOS you MUST have DJGPP installed!\r
Goto End\r
:go32Ok\r
-set djgpp-ver=1\r
-If ErrorLevel 20 set djgpp-ver=2\r
+set djgpp_ver=1\r
+If ErrorLevel 20 set djgpp_ver=2\r
rm -f junk.c junk junk.exe\r
-Echo Configuring for DJGPP Version %DJGPP-VER% ...\r
+Echo Configuring for DJGPP Version %DJGPP_VER% ...\r
Rem ----------------------------------------------------------------------\r
Echo Configuring the source directory...\r
cd src\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
-If "%DJGPP-VER%" == "1" Goto mfV1\r
+If "%DJGPP_VER%" == "1" Goto mfV1\r
gcc -E junk.c | sed -f ../msdos/sed1v2.inp >makefile\r
goto mfDone\r
:mfV1\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
-If "%DJGPP-VER%" == "2" goto libsrc-v2\r
+If "%DJGPP_VER%" == "2" goto libsrc-v2\r
sed -f ../msdos/sed3.inp <makefile.new >makefile\r
Goto libsrc2\r
:libsrc-v2\r
:oldx1\r
rem ----------------------------------------------------------------------\r
Echo Configuring the main directory...\r
-If "%DJGPP-VER%" == "2" copy msdos\mainmake.v2 makefile >nul\r
-If "%DJGPP-VER%" == "1" copy msdos\mainmake makefile >nul\r
+If "%DJGPP_VER%" == "1" goto mainv1\r
+Echo Looking for the GDB init file...\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
+Echo the Emacs distribution, but was probably renamed to some other\r
+Echo name without the leading dot when you untarred the archive.\r
+Echo It should be in the "src/" subdirectory. Please make sure this\r
+Echo file exists and is called "_gdbinit" with a leading underscore.\r
+Echo Then run CONFIG.BAT again with the same arguments you did now.\r
+goto End\r
+:gdbinitOk\r
+Echo Looking for the GDB init file...found\r
+copy msdos\mainmake.v2 makefile >nul\r
+:mainv1\r
+If "%DJGPP_VER%" == "1" copy msdos\mainmake makefile >nul\r
rem ----------------------------------------------------------------------\r
:end\r
set X11=\r
set nodebug=\r
-set djgpp-ver=\r
+set djgpp_ver=\r