2010-01-09  Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	* djgpp/subpipe.c: Exit/termination logic changed.
	(end_of_output_subpipe): If spawn returns -1 or m4 is interrupted
	by user, then exit.  If m4 returns with exit code greater 0 continue.
	(reap_subpipe): If m4's exit code is greater than 0, then exit.
	(remove_remaining_tmp_files): Remove tmp files at exit.


2010-01-08  Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	* djgpp/README.in: Documentation updated.

	* djgpp/config.sed: Entry for scan-code-c.c added.
	Do not run AUTOM4TE to regenerate testsuite.

	* djgpp/fnchange.lst: Entry for scan-code-c.c added.








diff -aprNU5 bison-2.4.1.orig/djgpp/README.in bison-2.4.1/djgpp/README.in
--- bison-2.4.1.orig/djgpp/README.in	2008-11-03 18:54:12 +0000
+++ bison-2.4.1/djgpp/README.in	2010-01-09 00:26:18 +0000
@@ -108,30 +108,30 @@ along with this program.  If not, see <h
 
 	If the distribution comes as a .tar.bz2 archive, and your version of
 	`djtar' doesn't support bzip2 decompression, you need to unpack it as
 	follows:
 
-	  bnzip2 bison-@VERSION@.tar.bz2
+	  bunzip2 bison-@VERSION@.tar.bz2
 	  djtar -x -p -o bison-@VERSION@/djgpp/djunpack.bat bison-@VERSION@.tar > djunpack.bat
 	  djunpack bison-@VERSION@.tar
 
 3.3.:   To build the binaries you will need the following binary packages:
 	  djdev203.zip (or a later but NOT a prior version)
-	  bsh204b.zip  (or a later but NOT a prior version)
+	  bsh205bbr3.zip  (or a later but NOT a prior version)
           gccNNNb.zip, gppNNN.zip, bnuNNNb.zip, makNNNb.zip, filNNNb.zip,
           perlNNNb.zip, shlNNNb.zip, txtNNNb.zip, txiNNNb.zip, grepNNNb.zip,
           sedNNNb.zip and m4NNN.zip
 
 	If you want to run the check you will need also:
 	  difNNNb.zip
 
 	NNN represents the latest version number of the binary packages. All
 	this packages can be found in the /v2gnu directory of any
 	ftp.delorie.com mirror.
-	You will need bsh204b.zip or later and *NOT* a prior version or
+	You will need bsh205bbr3.zip or later and *NOT* a prior version or
 	the build will fail.  The same applies to djdev203.zip.  Please note
-	that Bison requires m4-144b.zip or later to work properly.
+	that Bison requires m4-1413b.zip or later to work properly.
 
 3.4.:   If for some reason you want to reconfigure the package cd into the top
 	srcdir (bison-@TREE_VERSION@) and run the following commands:
 	  del djgpp\config.cache
 	  make clean
diff -aprNU5 bison-2.4.1.orig/djgpp/config.sed bison-2.4.1/djgpp/config.sed
--- bison-2.4.1.orig/djgpp/config.sed	2008-11-03 18:54:12 +0000
+++ bison-2.4.1/djgpp/config.sed	2010-01-10 02:39:04 +0000
@@ -34,10 +34,11 @@ s,\\.old\\.,_old.,g\
 s,\\.tab\\.,_tab.,g\
 s,c++\\.at,cxx.at,g\
 s,c++\\.m4,cxx.m4,g\
 s,c++-skel\\.m4,cxx-skel.m4,g\
 s,calc++,calcxx,g\
+s,scan-code-c,c-scan-code,g\
 s,scan-gram-c,c-scan-gram,g\
 s,scan-skel-c,c-scan-skel,g\
 s,inttypes_,_inttypes,g\
 s,javacomp\\.sh\\.in,javacomp.sh-in,g\
 s,javaexec\\.sh\\.in,javaexec.sh-in,g\
@@ -61,10 +62,16 @@ yacc.bat:\\\\\
 	echo "bison\\$(EXEEXT) -y %1 %2 %3 %4 %5 %6 %7 %8 %9" >\\$@\
 /^bin_SCRIPTS =/s/$/ yacc.bat/\
 /^MOSTLYCLEANFILES = yacc/s/$/ yacc.bat/\
 /cross-options.texi:/,/^$/ s|bison|&.exe|g\
 /^\\.x\\.1:/,/^$/ s|\\$program|&.exe|g\
+/^\\$(TESTSUITE)[ 	]*:/,/^$/ {\
+  s/^	/#&/\
+}\
+/^\.x\.1[	 ]*:/,/^$/ {\
+  s/^	/#&/\
+}\
 eof_djgpp\
 sed -f "\$tmp/subs-djgpp.sed" \$tmp/out > \$tmp/out.djgpp\
 mv -f \$tmp/out.djgpp \$tmp/out
 }
 
diff -aprNU5 bison-2.4.1.orig/djgpp/fnchange.lst bison-2.4.1/djgpp/fnchange.lst
--- bison-2.4.1.orig/djgpp/fnchange.lst	2008-11-03 18:54:12 +0000
+++ bison-2.4.1/djgpp/fnchange.lst	2010-01-09 00:26:18 +0000
@@ -20,8 +20,9 @@
 @V@/examples/calc++/calc++-parser.stamp   @V@/examples/calcxx/calcxx-parser.stamp
 @V@/examples/calc++/calc++-parser.yy      @V@/examples/calcxx/calcxx-parser.yy
 @V@/examples/calc++/test                  @V@/examples/calcxx/test
 @V@/po/Makefile.in.in                     @V@/po/Makefile.in-in
 @V@/runtime-po/Makefile.in.in             @V@/runtime-po/Makefile.in-in
+@V@/src/scan-code-c.c                     @V@/src/c-scan-code.c
 @V@/src/scan-gram-c.c                     @V@/src/c-scan-gram.c
 @V@/src/scan-skel-c.c                     @V@/src/c-scan-skel.c
 @V@/tests/c++.at                          @V@/tests/cxx.at
diff -aprNU5 bison-2.4.1.orig/djgpp/subpipe.c bison-2.4.1/djgpp/subpipe.c
--- bison-2.4.1.orig/djgpp/subpipe.c	2008-11-03 18:54:12 +0000
+++ bison-2.4.1/djgpp/subpipe.c	2010-01-10 00:56:44 +0000
@@ -1,8 +1,8 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program 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 3 of the License, or
    (at your option) any later version.
@@ -29,10 +29,11 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/wait.h>
 #include "xalloc.h"
 
 
 #ifndef STDIN_FILENO
 # define STDIN_FILENO 0
@@ -53,19 +54,40 @@
 
 static int old_stdin;
 static int old_stdout;
 static char **arguments;
 static char tmp_file_name[2][L_tmpnam];
+static int spawn_status;
 
-#define remove_tmp_file(fd, name)                                     \
-  do {                                                                \
-    close ((fd));                                                     \
-    if (unlink ((name)))                                              \
-      error (EXIT_FAILURE, 0, _("removing of `%s' failed"), (name));  \
+
+#define remove_tmp_file(fd, name)                                       \
+  do {                                                                  \
+    if (!close((fd)))                                                   \
+    {                                                                   \
+      if (unlink ((name)))                                              \
+        error (EXIT_FAILURE, 0, _("removing of `%s' failed"), (name));  \
+      (name)[0] = '\0';                                                 \
+    }                                                                   \
   } while (0)
 
 
+static void
+remove_remaining_tmp_files(void)
+{
+  /*
+   *  On MSDOS/Windows it is always necessary to close()
+   *  a file before remove() or unlink() it.  The tmp files
+   *  used to simulate the pipe are always connected to STDIN
+   *  and STDOUT.
+   */
+  close(STDIN_FILENO);
+  close(STDOUT_FILENO);
+  unlink(tmp_file_name[0]);
+  unlink(tmp_file_name[1]);
+}
+
+
 void
 init_subpipe(void)
 {
   char *tmpdir;
   int fd;
@@ -89,10 +111,12 @@ init_subpipe(void)
   strcat(tmp_file_name[1], "/bnXXXXXX");
   fd = mkstemp(tmp_file_name[1]);
   if (fd < 0)
     error(EXIT_FAILURE, 0, _("creation of a temporary file failed"));
   close (fd);
+
+  atexit(remove_remaining_tmp_files);
 }
 
 
 /* Create a subprocess that is run as a filter.  ARGV is the
    NULL-terminated argument vector for the subprocess.  Store read and
@@ -225,25 +249,35 @@ end_of_output_subpipe(pid_t pid, int fd[
   child_interrupted = 0;
   errno = 0;
   previous_handler = signal(SIGINT, signal_catcher);
   status = spawnvp(P_WAIT, program, arguments);
   signal(SIGINT, previous_handler);
+
+  spawn_status = WIFEXITED(status) ? WEXITSTATUS(status) : -1;
   if (child_interrupted)
   {
     remove_tmp_file(STDIN_FILENO, tmp_file_name[0]);
     remove_tmp_file(STDOUT_FILENO, tmp_file_name[1]);
     error(EXIT_FAILURE, 0, _("subsidiary program `%s' interrupted"), program);
   }
-  if (status)
+  if (spawn_status == -1)
   {
+    /*
+     *  - spawn returns -1 if m4 can not be invoked or executed.
+     *  - If m4 could be executed, then spawn returns m4's exit
+     *    code in the lower 8 bits of status.
+     *  - m4's exit codes are at least: 0, 1 and 63.
+     *
+     *  If m4 returns with exit code greater than 0 bison will
+     *  get the chance to examinate m4's output and terminated
+     *  itself in reap_subpipe() if necessary.
+     */
     remove_tmp_file(STDIN_FILENO, tmp_file_name[0]);
     remove_tmp_file(STDOUT_FILENO, tmp_file_name[1]);
     error(EXIT_FAILURE, 0, _(errno == ENOENT
-			     ? "subsidiary program `%s' not found"
-			     : status < 1
-			     ? "subsidiary program `%s' failed"
-			     : "subsidiary program `%s' failed (status=%i, errno=%i)"), program, status, errno);
+                             ? "subsidiary program `%s' not found"
+                             : "subsidiary program `%s' could not be invoked (status=%i, errno=%i)"), program, spawn_status, errno);
   }
 
 
   /*
    *  Redirect m4's output to bison's stdin.
@@ -274,20 +308,28 @@ end_of_output_subpipe(pid_t pid, int fd[
 /* Free resources, unlink temporary files and restore stdin and stdout. */
 
 void
 reap_subpipe(pid_t pid, char const *program)
 {
-  int argc;
+  if (spawn_status)
+  {
+    /*  m4 returned with exit code > 0.  Terminate bison.   */
+    error(EXIT_FAILURE, 0, _("subsidiary program `%s' failed (status=%i, errno=%i)"), program, spawn_status, errno);
+  }
+  else
+  {
+    int argc;
 
-  for (argc = 0; arguments[argc]; argc++)
-    free(arguments[argc]);
-  free(arguments);
-
-  if (unlink(tmp_file_name[0]))
-    error(EXIT_FAILURE, 0, _("removing of `%s' failed"), tmp_file_name[0]);
-  if (unlink(tmp_file_name[1]))
-    error(EXIT_FAILURE, 0, _("removing of `%s' failed"), tmp_file_name[1]);
-
-  if (dup2(old_stdin, STDIN_FILENO) < 0)
-    error(EXIT_FAILURE, 0, "restore of bison's stdin failed");
-  close(old_stdin);
+    for (argc = 0; arguments[argc]; argc++)
+      free(arguments[argc]);
+    free(arguments);
+
+    if (unlink(tmp_file_name[0]))
+      error(EXIT_FAILURE, 0, _("removing of `%s' failed"), tmp_file_name[0]);
+    if (unlink(tmp_file_name[1]))
+      error(EXIT_FAILURE, 0, _("removing of `%s' failed"), tmp_file_name[1]);
+
+    if (dup2(old_stdin, STDIN_FILENO) < 0)
+      error(EXIT_FAILURE, 0, "restore of bison's stdin failed");
+    close(old_stdin);
+  }
 }


2015-07-29  Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	* djgpp/config.bat: Update to current version of config.bat.

	* djgpp/config.sed: Adjust various builddir path pattern.

	* djgpp/config.site: Update to current version of config.site.








diff -aprNU5 bison-2.4.1.orig/djgpp/config.bat bison-2.4.1/djgpp/config.bat
--- bison-2.4.1.orig/djgpp/config.bat	2008-11-03 18:49:52 -0502
+++ bison-2.4.1/djgpp/config.bat	2015-07-30 00:19:36 -0502
@@ -42,10 +42,13 @@ set LIBICONV_PREFIX=disabled
 if not "%LIBICONV_PREFIX%" == "disabled" goto SmallEnv
 set LIBINTL_PREFIX=disabled
 if not "%LIBINTL_PREFIX%" == "disabled" goto SmallEnv
 set HTML=enabled
 if not "%HTML%" == "enabled" goto SmallEnv
+set SILENT=enabled
+if not "%SILENT%" == "enabled" goto SmallEnv
+:<#neue option teil 1#>
 set XSRC=.
 if not "%XSRC%" == "." goto SmallEnv
 
 Rem Loop over all arguments.
 Rem Special arguments are: NLS, XSRC, CACHE, STATIC_LIBS, LIBICONV_PREFIX, LIBINTL_PREFIX and DEPS.
@@ -123,44 +126,72 @@ goto SrcDirOption
 if "%1" == "withouthtml" set HTML=disabled
 if "%1" == "withoutHTML" set HTML=disabled
 if "%1" == "WITHOUTHTML" set HTML=disabled
 if not "%HTML%" == "disabled" goto SmallEnv
 goto NextArgument
+:SilentOption
+if "%1" == "silent" goto NextArgument
+if "%1" == "SILENT" goto NextArgument
+if "%1" == "no-silent" goto NoSILENT
+if "%1" == "no-SILENT" goto NoSILENT
+if "%1" == "NO-SILENT" goto NoSILENT
+goto SrcDirOption
+:NoSILENT
+if "%1" == "no-silent" set SILENT=disabled
+if "%1" == "no-SILENT" set SILENT=disabled
+if "%1" == "NO-SILENT" set SILENT=disabled
+if not "%SILENT%" == "disabled" goto SmallEnv
+goto NextArgument
+:<#neue option teil 2#>
 :SrcDirOption
 echo %1 | grep -q "/"
 if errorlevel 1 goto CollectArgument
 set XSRC=%1
 if not "%XSRC%" == "%1" goto SmallEnv
 goto NextArgument
 :CollectArgument
+if "%ARGS%" == "" goto AddFirstArgToList
 set _ARGS=%ARGS% %1
+goto AddArgToList
+:AddFirstArgToList
+set _ARGS=%1
+:AddArgToList
 if not "%_ARGS%" == "%ARGS% %1" if not "%_ARGS%" == "%ARGS%%1" goto SmallEnv
 echo %_ARGS% | grep -q "[^ ]"
 if not errorlevel 0 set ARGS=%_ARGS%
 set _ARGS=
 :NextArgument
 shift
 if not "%1" == "" goto ArgLoop
 
 Rem Create an arguments file for the configure script.
 echo --srcdir=%XSRC% > args
-if "%CACHING%" == "enabled"              echo --cache-file=%XSRC%/djgpp/config.cache >> args
+:if "%CACHING%" == "enabled"              echo --cache-file=%XSRC%/djgpp/config.cache >> args
+if "%CACHING%" == "enabled"              echo --cache-file=./config.cache >> args
 if "%DEPENDENCY_TRACKING%" == "enabled"  echo --enable-dependency-tracking >> args
 if "%DEPENDENCY_TRACKING%" == "disabled" echo --disable-dependency-tracking >> args
 if "%LIBICONV_PREFIX%" == "enabled"      echo --with-libiconv-prefix >> args
 if "%LIBICONV_PREFIX%" == "disabled"     echo --without-libiconv-prefix >> args
 if "%LIBINTL_PREFIX%" == "enabled"       echo --with-libintl-prefix >> args
 if "%LIBINTL_PREFIX%" == "disabled"      echo --without-libintl-prefix >> args
 if "%HTML%" == "enabled"                 echo --enable-html >> args
 if "%HTML%" == "disabled"                echo --disable-html >> args
+if "%SILENT%" == "enabled"               echo --enable-silent-rules >> args
+if "%SILENT%" == "disabled"              echo --disable-silent-rules >> args
+:<#neue option teil 3#>
 if not "%ARGS%" == ""                    echo %ARGS% >> args
+
+echo --prefix=/dev/env/DJDIR >> args
+
 set ARGS=
 set CACHING=
 set DEPENDENCY_TRACKING=
 set LIBICONV_PREFIX=
 set LIBINTL_PREFIX=
 set HTML=
+set SILENT=
+:<#neue option teil 4#>
 
 if "%XSRC%" == "." goto InPlace
 
 :NotInPlace
 redir -e /dev/null update %XSRC%/configure.org ./configure
@@ -170,12 +201,16 @@ if errorlevel 1 update %XSRC%/configure
 :InPlace
 Rem Update configuration files
 echo Updating configuration scripts...
 test -f ./configure.org
 if errorlevel 1 update configure configure.org
-sed -f %XSRC%/djgpp/config.sed configure.org > configure
+sed -f %XSRC%/djgpp/config.sed configure.org > filename.ext
 if errorlevel 1 goto SedError
+sed "/symlink /s/`//g" ./filename.ext > configure
+dtou ./configure
+touch -r configure.org ./configure
+rm -f ./filename.ext
 
 Rem Make sure they have a config.site file
 set CONFIG_SITE=%XSRC%/djgpp/config.site
 if not "%CONFIG_SITE%" == "%XSRC%/djgpp/config.site" goto SmallEnv
 
@@ -443,10 +478,13 @@ if not errorlevel 1 mv -f %XSRC%/install
 :NoRen0
 
 if "%NLS%" == "disabled" goto WithoutNLS
 
 :WithNLS
+test -d %XSRC%/po
+if errorlevel 1 goto WithoutNLS
+
 Rem Check for the needed libraries and binaries.
 test -x /dev/env/DJDIR/bin/msgfmt.exe
 if errorlevel 1 goto MissingNLSTools
 test -x /dev/env/DJDIR/bin/xgettext.exe
 if errorlevel 1 goto MissingNLSTools
@@ -474,11 +512,12 @@ Rem We prefer without-included-gettext b
 Rem is the only one that is garanteed to have been ported to DJGPP.
 echo --enable-nls --without-included-gettext >> args
 goto ConfigurePackage
 
 :MissingNLSTools
-echo Needed libs/tools for NLS not found. Configuring without NLS.
+echo Needed DJGPP ports of the required libs/tools for NLS support not found.
+echo Configuring without NLS.
 :WithoutNLS
 Rem Update the arguments file for the configure script.
 echo --disable-nls >> args
 
 :ConfigurePackage
diff -aprNU5 bison-2.4.1.orig/djgpp/config.sed bison-2.4.1/djgpp/config.sed
--- bison-2.4.1.orig/djgpp/config.sed	2015-07-29 23:35:04 -0502
+++ bison-2.4.1/djgpp/config.sed	2015-07-31 19:58:04 -0502
@@ -149,10 +149,13 @@ install_sh=`echo "$install_sh" | sed 's%
 /^ac_abs_srcdir=/ i\
 ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`\
 ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`\
 ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`
 #ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`
+# Configuring from another directory than from the top sirdir does not work
+#ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../../..%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../../..%"`\
+#ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev/.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../../..%;s%.:.*/bison[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../../..%"`
 /^ac_abs_srcdir=/ a\
 for dj_dir in $ac_abs_builddir $ac_abs_top_builddir $ac_abs_top_srcdir $ac_abs_srcdir\
 do\
   ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%//%/%g"`\
   ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%//%/%g"`\
@@ -194,5 +197,8 @@ s/calc++/calcxx/g
 # The CR test for awk does not work for DJGPP.
 /^ac_cs_awk_cr=/,/^$/ {
   /^fi$/ a\
 ac_cs_awk_cr=$ac_cr
 }
+
+# Remove LINGUAS from dependecy list in ./po/Makefile
+/POMAKEFILEDEPS=/ s/POMAKEFILEDEPS LINGUAS/POMAKEFILEDEPS #LINGUAS/
diff -aprNU5 bison-2.4.1.orig/djgpp/config.site bison-2.4.1/djgpp/config.site
--- bison-2.4.1.orig/djgpp/config.site	2008-11-03 18:49:52 -0502
+++ bison-2.4.1/djgpp/config.site	2015-07-30 00:19:36 -0502
@@ -41,13 +41,13 @@ CONFIG_SHELL=${CONFIG_SHELL='sh'}
 # for every DJGPP installation, not only the one where the
 # package was configured.
 # $INSTALL must be an absolute path name, otherwise config.status
 # will try to prepend ./ and ../ to it when it goes into subdirs.
 INSTALL=${INSTALL='/dev/env/DJDIR/bin/ginstall -c'}
-RANLIB=${RANLIB='ranlib'}
 GMSGFMT=${GMSGFMT='/dev/env/DJDIR/bin/msgfmt'}
 MSGFMT=${MSGFMT='/dev/env/DJDIR/bin/msgfmt'}
+MSGMERGE=${MSGMERGE='/dev/env/DJDIR/bin/msgmerge'}
 XGETTEXT=${XGETTEXT='/dev/env/DJDIR/bin/xgettext'}
 AWK=${AWK='gawk'}
 
 # A sane default for emacs.
 ac_cv_path_EMACS=${EMACS='/dev/env/DJDIR/gnu/emacs/bin/emacs'}
@@ -65,21 +65,102 @@ ac_cv_path_EGREP=${EGREP='/dev/env/DJDIR
 ac_cv_path_FGREP=${FGREP='/dev/env/DJDIR/bin/fgrep'}
 
 # A sane default for sed.
 ac_cv_path_SED=${SED='/dev/env/DJDIR/bin/sed'}
 
+# A sane default for makeinfo.
+ac_cv_path_MAKEINFO=${MAKEINFO='/dev/env/DJDIR/bin/makeinfo'}
+
+# A sane default for makeinfo.
+ac_cv_path_INSTALL_INFO=${INSTALL_INFO='/dev/env/DJDIR/bin/install-info'}
+
+# A sane default for roff.
+ac_cv_path_ROFF=${ROFF='/dev/env/DJDIR/bin/groff'}
+
+# A sane default for groff.
+ac_cv_path_GROFF=${GROFF='/dev/env/DJDIR/bin/groff'}
+
+# A sane default for nroff.
+ac_cv_path_NROFF=${NROFF='/dev/env/DJDIR/bin/nroff'}
+
+# A sane default for perl.
+ac_cv_path_PERL=${PERL='/dev/env/DJDIR/bin/perl'}
+
 # A sane default for mkdir.
 ac_cv_path_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'}
 
+# A sane default for rm.
+ac_cv_path_RM=${RM='/dev/env/DJDIR/bin/rm'}
+
+# A sane default for mv.
+ac_cv_path_MV=${MV='/dev/env/DJDIR/bin/mv'}
+
+# A sane default for sort.
+ac_cv_path_SORT=${SORT='/dev/env/DJDIR/bin/sort'}
+
+# A sane default for tar.
+ac_cv_path_TAR=${TAR='/dev/env/DJDIR/bin/tar'}
+
+# A sane default for pr.
+ac_cv_path_PR_PROGRAM=${PR='/dev/env/DJDIR/bin/pr'}
+
+# A sane default for ed.
+ac_cv_path_ed_PROGRAM=${ED='/dev/env/DJDIR/bin/ed'}
+
+# A sane default for texi2dvi.
+ac_cv_path_TEXI2DVI=${TEXI2DVI='texi2dvi'}
+
+# A sane default for texi2pdf.
+ac_cv_path_TEXI2PDF=${TEXI2PDF='texi2pdf'}
+
+# A sane default for dvips.
+ac_cv_path_DVIPS=${DVIPS='dvips'}
+
+# A sane default for ps2pdf.
+ac_cv_path_PS2PDF=${PS2PDF='ps2pdf'}
+
+# A sane default for bash.
+ac_cv_path_TEST_SHELL=${TEST_SHELL='/dev/env/DJDIR/bin/bash'}
+
+# A sane default for mktemp.
+ac_cv_path_MKTEMP=${MKTEMP='/dev/env/DJDIR/bin/mktemp'}
+
 # These are set here so the generated libtool will be good
 # for every DJGPP installation, not only the one where the
 # package was configured.
-NM=${NM='nm'}
-LD=${LD='ld'}
+AR=${AR='/dev/env/DJDIR/bin/ar'}
+LD=${LD='/dev/env/DJDIR/bin/ld'}
+NM=${NM='/dev/env/DJDIR/bin/nm'}
+STRIP=${STRIP='/dev/env/DJDIR/bin/strip'}
+RANLIB=${RANLIB='/dev/env/DJDIR/bin/ranlib'}
+
+# These are set here so the generated config.h will be good
+# for every DJGPP installation, not only the one where the
+# package was configured.
+gl_cv_absolute_stdint_h=${gl_cv_absolute_stdint_h='/dev/env/DJDIR/include/stdint.h'}
+gl_cv_absolute_string_h=${gl_cv_absolute_string_h='/dev/env/DJDIR/include/string.h'}
+gl_cv_absolute_sys_stat_h=${gl_cv_absolute_sys_stat_h='/dev/env/DJDIR/include/sys/stat.h'}
+gl_cv_absolute_sys_time_h=${gl_cv_absolute_sys_time_h='/dev/env/DJDIR/include/sys/time.h'}
+gl_cv_absolute_inttypes_h=${gl_cv_absolute_inttypes_h='/dev/env/DJDIR/include/inttypes.h'}
+gl_cv_absolute_unistd_h=${gl_cv_absolute_unistd_h='/dev/env/DJDIR/include/unistd.h'}
+gl_cv_absolute_wchar_h=${gl_cv_absolute_wchar_h='/dev/env/DJDIR/include/wchar.h'}
+gl_cv_absolute_wctype_h=${gl_cv_absolute_wctype_h='/dev/env/DJDIR/include/wctype.h'}
+gl_cv_absolute_stdlib_h=${gl_cv_absolute_stdlib_h='/dev/env/DJDIR/include/stdlib.h'}
 
 # Force the test for 'ln -s' to report 'cp -pf'.
 ac_cv_prog_LN_S='cp -pf'
 
 # There is no fork and vfork functionality.
 ac_cv_func_fork=no
+ac_cv_func_fork_works=no
 ac_cv_func_vfork=no
-ac_cv_func_pipe=no
+ac_cv_func_vfork_works=no
+
+# Ensure that always old GNU extern inline semantics is used
+# (aka -fgnu89-inline) even if ISO C99 semantics has been specified.
+CFLAGS=${CFLAGS='-g2 -O2 -fgnu89-inline -march=i386 -mtune=i586'}
+
+# DJGPP's implementation of printf survives out-of-memory conditions.
+gl_cv_func_printf_enomem=yes
+
+# The test for a working sleep seems not to work for DJGPP.
+gl_cv_func_sleep_works=yes
