texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[no subject]


From: Gavin D. Smith
Date: Sat, 28 Dec 2024 14:13:39 -0500 (EST)

branch: master
commit 3c3709f9b1d0bb67c44dba23edb717012eed71f1
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sat Dec 28 15:52:33 2024 +0000

    Remove DJGPP support
    
    * configure.ac,
    * tp/Texinfo/XS/configure.ac:
    Do not check for "msdosdjgpp" in $host.  Comments changed.
    
    * tp/Texinfo/XS/main/utils.c (null_device_names),
    * tp/Texinfo/Common.pm (%null_device_file):
    Remove special case for djgpp for checking for name of null
    device.
    
    * INSTALL,
    * README,
    * Makefile.am (EXTRA_DIST, po-check, po_document-check):
    Remove djgpp subdirectory.
    
    * djgpp/config.sed: deleted
    * djgpp/README: deleted
    * djgpp/config.bat: deleted
    * djgpp/config.site: deleted
---
 ChangeLog                  |  23 +++
 INSTALL                    |   3 -
 Makefile.am                |   7 +-
 README                     |   1 -
 configure.ac               |   8 +-
 djgpp/README               | 431 ---------------------------------------------
 djgpp/config.bat           | 237 -------------------------
 djgpp/config.sed           | 104 -----------
 djgpp/config.site          |  62 -------
 tp/Texinfo/Common.pm       |   7 +-
 tp/Texinfo/XS/configure.ac |   2 +-
 tp/Texinfo/XS/main/utils.c |   8 +-
 12 files changed, 31 insertions(+), 862 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83df13c830..f5d5b638ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2024-12-28  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Remove DJGPP support
+
+       * configure.ac,
+       * tp/Texinfo/XS/configure.ac:
+       Do not check for "msdosdjgpp" in $host.  Comments changed.
+
+       * tp/Texinfo/XS/main/utils.c (null_device_names),
+       * tp/Texinfo/Common.pm (%null_device_file):
+       Remove special case for djgpp for checking for name of null
+       device.
+
+       * INSTALL,
+       * README,
+       * Makefile.am (EXTRA_DIST, po-check, po_document-check):
+       Remove djgpp subdirectory.
+
+       * djgpp/config.sed: deleted
+       * djgpp/README: deleted
+       * djgpp/config.bat: deleted
+       * djgpp/config.site: deleted
+
 2024-12-27  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/XS/texi2any.c (main): add set_message_encoding and set
diff --git a/INSTALL b/INSTALL
index a8ec9222d3..d8d348c6d7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -100,9 +100,6 @@ Installation notes specific to Texinfo:
   translation method is activated where XS code calls back into the Perl
   interpreter to get translations, which does work.
 
-* For instructions on compiling this distribution with DJGPP tools
-  for MS-DOS and MS-Windows, see the file djgpp/README.
-
 * The Info tree uses a file `dir' as its root node; the `dir-example'
   file in this distribution is included as a possible starting point.
   Use it, modify it, or ignore it just as you like.
diff --git a/Makefile.am b/Makefile.am
index bdfe19a0cc..4466d80255 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,7 @@ noinst_SCRIPTS = pre-inst-env
 # Additional files to distribute.
 EXTRA_DIST = ChangeLog.46 ChangeLog.65 ChangeLog.70 \
   INSTALL.generic README-hacking \
-  system.h gnulib/m4/gnulib-cache.m4 \
-  djgpp
+  system.h gnulib/m4/gnulib-cache.m4
 
 # This is to prevent texinfo.tex from being included in the top-level
 # distribution directory.
@@ -130,7 +129,7 @@ po-check:
            # don't look at sources from some subdirs.                  \
            case $$file in                                              \
              contrib/* ) continue;;                                    \
-             djgpp/* | man/* ) continue;;      \
+             man/* ) continue;;        \
              gnulib/lib/*) continue;;                                  \
              texinfo-*/*) continue;;                                   \
               tp/maintain/* ) continue;;                               \
@@ -158,7 +157,7 @@ po_document-check:
            # don't look at sources from some subdirs.                  \
            case $$file in                                              \
              contrib/* ) continue;;                                    \
-             djgpp/* | man/* ) continue;;      \
+             man/* ) continue;;        \
              texinfo-*/*) continue;;                                   \
              tp/maintain/*) continue;;                                 \
              tp/init/documentation_examples.pm) continue;;             \
diff --git a/README b/README
index 94a0b2b257..3f45d462aa 100644
--- a/README
+++ b/README
@@ -89,7 +89,6 @@ Printing-related files:
     util/texi2pdf          Generate PDF (wrapper for texi2dvi).
 
 Source directories: 
-  djgpp/                   Support for compiling under DJGPP.
   gnulib/                  Support files from Gnulib.
   info/                    Standalone Info reader.
   install-info/            Maintain the Info dir file.
diff --git a/configure.ac b/configure.ac
index e1ceb8d843..00699f7f1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,9 +21,6 @@ AC_CONFIG_MACRO_DIRS([build-aux/m4 gnulib/m4])
 
 # Where to generate output; srcdir location.
 AC_CONFIG_HEADERS([config.h:config.in])
-# We keep filename to 8.3 for MS-DOS, as long as it is possible that
-# we still support DJGPP.  Generating config.h would likely clobber
-# config.h.in even if filename truncation was otherwise unproblematic.
 
 AC_CONFIG_SRCDIR([info/info.c])
 
@@ -277,8 +274,7 @@ AC_MSG_CHECKING([pseudottys tests requirements])
 AC_MSG_RESULT([$ptys_tests])
 AM_CONDITIONAL([PTYS_TESTS], [test "z$ptys_tests" = 'zyes'])
 
-# We want to recognize djgpp to avoid the useless warning about no
-# term library.
+# Set $build to canonical build-system type
 AC_CANONICAL_BUILD
 
 # We need to run some of our own binaries, most notably makedoc, but as
@@ -631,7 +627,7 @@ AM_CONDITIONAL([BUILD_PERL_API_TEXI], [test 
"z$build_perl_api_texi" = 'zyes'])
 
 host_is_windows=no
 case "$host" in
-   *-mingw32 | *-mingw64 | *-msdosdjgpp )  host_is_windows=yes ;;
+   *-mingw32 | *-mingw64 )  host_is_windows=yes ;;
 esac
 AM_CONDITIONAL([HOST_IS_WINDOWS], [test "x$host_is_windows" = "xyes"])
 HOST_IS_WINDOWS_VARIABLE=
diff --git a/djgpp/README b/djgpp/README
deleted file mode 100644
index bfe96551e9..0000000000
--- a/djgpp/README
+++ /dev/null
@@ -1,431 +0,0 @@
-Building and installing GNU Texinfo with DJGPP v2.x
-===================================================
-
-This directory holds files required for building Texinfo with DJGPP
-tools for MS-DOS and MS-Windows.  If you got this file with a binary
-distribution, look for the "Installation" section below.
-
-
-1. Building Texinfo
-   ----------------
-
-   a. To compile Texinfo, you will need the following tools:
-
-      - basic DJGPP development environment: GCC, Binutils and djdev;
-      - a DJGPP port of GNU Make version 3.78 or later;
-      - a DJGPP port of Bash 2.04 or later;
-      - a port of GNU Sed 3.02 or later;
-      - DJGPP ports of Fileutils, Textutils, Sh-utils, Diffutils,
-        Gawk and Grep;
-      - etags (from the Emacs distribution) and mkid (from ID-utils)
-        if you need the TAGS and ID targets of the Makefile's.
-
-      All of the above are available from the DJGPP ftp sites on
-      SimTel.NET mirrors, in the v2gnu directory.
-
-   b. From the root of your DJGPP installation, unzip the source package:
-
-      - if you are unpacking the official GNU source distribution:
-
-        tar -xvzf texinfo-X.YZ.tar.gz
-
-        or
-
-        djtar -x texinfo-X.YZ.tar.gz
-
-        where X.YZ is the version number.  (Users of MS-DOS and
-        MS-Windows 3.X, which don't support long file names, will need
-        to rename the archive to something like texi-XYZ.tgz.)
-
-      - if you are unpacking a source distribution from a DJGPP ftp
-        site:
-
-         unzip txiXYZs
-
-        or
-
-        pkunzip -d txiXYZs
-
-      If you build Texinfo on Windows 9X, Windows ME, Windows 2000 or
-      Windows XP, you are advised to use a version of Unzip which
-      supports long filenames, so that the original long filenames of
-      the source files will be preserved.  Otherwise, the build
-      procedure will most probably fail.
-
-      Do NOT use an unzip program which supports long file names on
-      Windows NT 4, as DJGPP doesn't support long names there.
-
-      The program unzip32.exe, available from the SimTel.NET site,
-      will deal correctly with long file names on any platform, so it
-      is the recommended way of unzipping txiXYZs.zip archives.
-
-   c. If the source distribution comes with a ready Makefile (this is
-      usually the case with archives downloaded from the DJGPP sites),
-      and all you need is to build Texinfo, you may skip the configure
-      step below and go directly to step e.
-
-   d. To build the official GNU distribution, or to configure Texinfo
-      for any environment but stock DJGPP v2.x, run djgpp\config.bat
-      first, like this:
-
-       SRCDIR\djgpp\config SRCDIR
-
-      Here SRCDIR is the directory where you unpacked the sources.  If
-      you are configuring from the source directory itself, you may
-      omit the argument to the config.bat file.  If you do supply the
-      argument, you MUST use forward slashes in it, or else the batch
-      file might fail.
-
-      config.bat sets some environment variables, then invokes the
-      configure script.  The script will run for a few minutes and
-      create Makefile's in all the directories, and the config.h file.
-
-   e. Run `Make'.  This builds the programs and the Info files.
-
-
-
-2. Installation
-   ------------
-
-   a. If you are installing the binary distribution, then go to your
-      main DJGPP directory and unzip the files.  For instance, if your
-      DJGPP installation is rooted on C:\DJGPP, then type this (XYZ is
-      the version number):
-
-        cd c:\djgpp
-        unzip txiXYZb
-
-      or, if you prefer `pkunzip':
-
-        pkunzip -d txiXYZb
-
-   b. If you downloaded and built Texinfo from sources, install by
-      invoking Make:
-
-        make install
-
-      This requires a port of Unix-like program `install.exe'.  It is
-      available from the DJGPP port of GNU Fileutils on SimTel.NET.
-
-   c. Info needs a file named DIR with the top-level menu of all the
-      Info files installed on your system.  If you installed the DJGPP
-      development environment (djdevNN.zip), then you already have
-      this file in the info/ subdirectory of your DJGPP installation.
-      Otherwise, you will need to create it.  A minimal DIR file is
-      available in this distribution under the name `dir-example', 
-      which you can use as a starting point.  Copy it to the directory
-      where you install the Info files from this distribution.
-
-      Even if you already have a DIR file, you should review it to
-      make sure it is consistent with the names of the Info file you
-      are installing.  Here's how your Texinfo-related entries in DIR
-      should look like:
-
-      * Info: (info).
-             Documentation browsing system.  This topic teaches you about
-             how to use the online help information.
-
-      * Info-Standalone: (info-stnd).
-             This topic helps you use the standalone Info-Program (info.exe)
-
-      * infokey: (info-stnd)Invoking infokey.
-             Compile Info key customizations.
-
-      * Makeinfo: (texinfo)Invoking makeinfo.
-             Convert a .texinfo file (.txi) to an info file suitable for the
-             info reader or Emacs, into plain ASCII, into HTML, into XML,
-             or into DocBook.
-
-      * Texinfo: (texinfo).
-             With one source file, make either a printed manual (through TeX)
-             or an on-line manual (through makeinfo).  This topic includes
-             a full description of the Texinfo language and related
-             facilities, including Emacs commands to work with Texinfo files.
-
-      * install-info: (texinfo)Invoking install-info. 
-             How to update info/dir entries when installing GNU packages.
-
-      * texi2dvi: (texinfo)Format with texi2dvi.
-             Printing Texinfo documentation with TeX.
-
-      * texindex: (texinfo)Format with tex/texindex.   
-             Sorting Texinfo index files automatically.
-
-
-      Note that the asterisk `*' should be flushed all the way to the
-      left, it is indented here just to make reading more convenient.
-
-      If your DIR file entries differ from these, I suggest to edit them
-      so they are as shown above.  Otherwise, Info might not be able to
-      find some of the files.  You HAVE been warned!
-
-   d. Optionally, set up environment variables for Info.  These are:
-
-       * INFO_LINES   -- screen size for Info.
-       * INFO_COLORS  -- screen colors for Info.
-
-      (If you have DJGPP installed on your system, the file djgpp.env
-      which comes with it already has entries for Info, see the [info]
-      section there.)
-
-      INFO_LINES can be one of 25 (the default), 28, 35, 40, 43, or 50
-      (that's if you have a VGA; EGAs only support 25, 35 and 43 lines).
-      I recommend 40 if your monitor is 17" or larger, and at least 28
-      lines for smaller monitors (I work with 40 lines even on 14"
-      monitors).
-
-      INFO_COLORS should have the following syntax:
-
-               set INFO_COLORS=XX.YY
-
-      where XX is the text attribute for text displayed in the text
-      windows and the echo area, and YY is the text attribute for the
-      modeline (aka the status line).  Each attribute is a numeric
-      value of a byte which describes the desired combination of
-      foreground and background colors.  The individual bits in the
-      attribute byte are defined as follows:
-
-                       bBBBFFFF
-
-      where `b' is the blink bit, `BBB' are the 3 bits for background
-      color and `FFFF' are the 4 bits for the foreground color.  This is
-      the usual PC text attribute byte structure, and is further explained
-      in any standard reference on text-mode programming for the PC.
-
-      My favorite setting for INFO_COLORS is `0x1e.0x31'.  This makes
-      Info use yellow foreground on blue background for the text and
-      blue foreground on cyan background for the modelines.
-
-      After you've played with these variables and have chosen the values
-      you like, it's a good idea to put them on the DJGPP.ENV file, in the
-      [info] section.
-
-   e. Beginning with version 3.6, GNU Info can read Unix man pages.  If
-      you have a `man' clone on your system and would like to be able to
-      read man pages with Info, read the chapter ``Reading Man Pages''
-      below.  One such clone is available as v2apps/manXYb.zip from
-      the DJGPP sites (XY is the version number).
-
-   f. This port supports compressed Info files, like what Info under Unix
-      gives you.  For this to work, you will need to install a DOS port of
-      GNU `Gzip' package and to observe certain rules of file naming, so
-      that Info will find the compressed files working around the DOS 8.3
-      filename restriction.  The chapter ``Compressed Info Files'' below
-      explains the details of this.
-
-   g. If you need to use the `print-node' command, read the chapter
-      ``Printing Nodes'' below.
-
-   h. That's it!  You are now ready to use Info, Makeinfo, and Texindex.
-      To learn about them, type `Info' and press [Enter].  You will be
-      presented with the top-level menu of GNU/DJGPP hypertext
-      documentation.  If you are unfamiliar with Info, press `?' to see
-      the available commands.  Pressing `h' will cause Info to take you on
-      a guided tour through its features (recommended for first-time
-      users).
-
-   i. If you are used to Info ports of versions before 3.6, you should
-      know that the command bindings to PC-specific keys has changed: the
-      numeric keypad keys invoke the same commands as their extended
-      namesakes.  That is, e.g., the key `PgUp' on the numeric keypad
-      invokes the same command as the grey `PgUp' key on the extended
-      keypad.  This was done at DJ's request, because laptop machines
-      don't have extended keys.  Commands to move between nodes
-      (previously bound to numeric keypad) are now bound to Ctrl-
-      varieties of numeric keypad keys (e.g., `next-node' is on
-      `Ctrl-PgDn', `prev-node' is on `Ctrl-PgUp', etc.).  You can use
-      the `Alt-x describe-key' command to see which command is invoked
-      by a particular key.
-
-   j. There are several MSDOS-specific changes in Texinfo, relative to
-      previous Texinfo ports (for other changes, see the file NEWS):
-
-        * Full support for both forward and backslashes in all file
-          names.  Previously, Info was sensitive to the style of
-          slashes in directories mentioned in the INFOPATH environment
-          variable.
-
-        * The default operation of the `print-node' command has been
-          changed so that it automatically prints to the local printer
-          device connected to the PRN port.  (If your printer is
-          connected to another port, set the INFO_PRINT_COMMAND
-          environment variable like this:
-
-               set INFO_PRINT_COMMAND=>LPT2
-
-          In other words, if the value of INFO_PRINT_COMMAND begins
-          wih a `>' character, Info will write to the file or device
-          whose name follows the `>' character.  (Don't leave any
-          blanks between `>' and the device name!).
-
-         Note that some old versions of stock DOS shell won't let you
-         use the `>' character in environment variables set from the
-         DOS prompt or batch files, but you can set it in the [info]
-         section of your DJGPP.ENV file.
-
-        * The `set-screen-height' command now actually changes the
-          screen dimensions from within Info if you specify one of the
-          sizes supported by your video hardware.
-
-        * If you don't have a `man' clone installed, and you invoke
-          Info with a name of a document which Info cannot find, it
-          will no longer wait for 15 seconds.
-
-        * Several bugs in handling of man pages were corrected.
-
-        * Info opens the dribble and input files in BINARY mode.  This
-         allows to record keystrokes and restore them in another Info
-         session, thus using dribble files as a startup or init file
-         which changes default behavior, binds keys, etc.
-
-       * Info recognizes a new DOS-specific command-line option `-b'
-         or `--speech-friendly'.  This option causes Info to use DOS
-         I/O functions (`printf', `puts', etc.) instead of direct
-         screen writes, which is required to enable speech
-         synthesizer software (used by visually-impaired people) to
-         grab the output.  When this option is given, the screen
-         colors defined by the `INFO_COLORS' environment variable and
-         the visible-bell feature will be disabled, because stdio
-         functions don't support neither color text nor inverting
-         screen colors.  This improvement was suggested and
-         originally implemented by Hans-Bernhard Broeker
-         <Broeker@physik.rwth-aachen.de>.
-
-        * Makeinfo now generates full .info-NN filenames when long
-         filenames are supported (e.g. on Win9x) and short .iNN
-         filenames otherwise.  When the Texinfo source or the
-         command-line parameter -o specify an output file with no
-         extension (like `texinfo'), and long filenames aren't
-         supported, Makeinfo will make sure the generated names will
-         be unique (it will create e.g. `texinf-1', `texin-10' etc.).
-
-        * The texi2dvi script is now fully compatible with
-          MS-DOS/MS-Windows and with the DJGPP port of TeX.
-
-
-3. Reading Man Pages
-   -----------------
-
-   Yes, Info can now read man pages!  This port supports that feature,
-   but for it to work, you will have to make sure your `man' clone is
-   set up correctly:
-
-   a. You should have an executable file named `man.exe', `man.com'
-      etc. somewhere on your PATH.
-
-   b. When invoked with redirected stdout, that executable should
-      print the contents of the file it gets as its argument to stdout
-      and exit.  If your man command calls some pager, that pager
-      should have this behavior (various ports of Unix command `more'
-      and the DJGPP port of GNU Less behave that way).
-
-   One `man' clone is available as v2apps/manNNb.zip from the DJGPP
-   sites on SimTel.NET.
-
-
-4. Compressed Info Files
-   ---------------------
-
-   Info allows you to hold your Info files in compressed form, to save
-   disk space.  When a file Info wants cannot be found, it will
-   automatically try to find that file in compressed form.  Info does
-   this by trying to find the original file with specific extensions.
-   Each extension tells Info which program should be called to
-   decompress the file.
-
-   This port supports compression by the GNU Gzip program.  When Info
-   cannot find a file `foo', it will first try to find `foo.z' or
-   `foo.gz'.  If this fails, and the file has an extension, the last
-   one or two characters of the extension are replaced by `z' and `gz'
-   respectively, and Info tries again.  If it finds any of these, it
-   will call the `GUnzip' program to decompress the file, catch its
-   output and display it.  (The original compressed file stays
-   intact.)
-
-   So, to use this feature, compress your files with Gzip and call the
-   compressed files using the following as guidelines:
-
-               foo       -->    foo.gz
-               foo.inf   -->    foo.igz
-               foo.i5    -->    foo.i5z
-               foo.25    -->    foo.25z
-
-   If you have a package whose Info docs are split into more than 9
-   sub-files and you need to compress those files, you will have to
-   rename the sub-files from `foo.iNN' to `foo.NN' so that there will
-   be place for the trailing `z' in the compressed names.  Don't
-   forget to edit the indirect file table in the main Info file and
-   change the sub-file filenames there too!
-
-   An alternative for those packages which have more than 99 Info
-   sub-files is to generate them from the Texinfo sources and force
-   Makeinfo to produce files without the .iNN extensions, like this:
-
-               makeinfo -o foo foo.txi
-
-   This causes Makeinfo to generate file names like foo-1, foo-2,
-   etc., which leave more place for the numeric index.  If necessary,
-   Makeinfo will automatically remove characters from the end of the
-   argument to `-o'.  For example, "-o texinfo" produces files
-   texinf-1, ..., texin-10, ..., texi-100, etc. on platforms which
-   only support 8+3 file names.
-
-   Saying "@setfilename foo" near the beginning of the Texinfo source
-   file is another way of forcing Makeinfo to produce files without
-   the .iNN extensions.
-
-   Using Makeinfo to produce files whose names are "compression-ready"
-   is more convenient, since you don't need to edit the the indirect
-   file table to reflect the changes in file names.
-
-   On platforms which support long filenames, the usual Info behavior
-   of appending `.gz' or `.Z' to the original filename also works;
-   this is done *before* Info checks the above butchered names.
-
-   Special considerations apply if you are installing Info on dual
-   DOS/Windows 9X/ME/2K/XP system, where you'd like Info to work with
-   the same files both in plain DOS and from the Windows DOS box.  In
-   this case, you should make sure your compressed Info files follow
-   the 8+3 DOS naming conventions outlined above, even though Info
-   supports long file names on Windows 9X.  Also, you need to turn off
-   the generation of numeric tails in short 8+3 aliases Windows
-   creates for long names (if you don't know how, the DJGPP FAQ list
-   explains it).
-
-   Please note: for the automatic decompression to work, Info must be
-   able to find the file it looks for with an extension which
-   indicates that the file is compressed.  Do NOT call the compressed
-   files as the original uncompressed files were called, or Info
-   won't be able to find them!  File names like bison-1, gcc.i10 or
-   make.info-3 have nothing in them to suggest that they are
-   compressed, so don't expect Info to uncompress them.
-
-
-5. Printing Nodes
-   --------------
-      
-   Info has a `print-node' command.  It works by piping the contents of
-   the current node through a program which is named by the environment
-   variable INFO_PRINT_COMMAND.  That command should read its standard
-   input and write it to your printer.  Find any such program, put its
-   name into the above environment variable, and you can print nodes from
-   within Info.
-
-   If the value of INFO_PRINT_COMMAND begins with a redirection
-   character `>', Info will write the contents of the node to the file
-   whose name follows the `>' character.
-
-   If INFO_PRINT_COMMAND is not defined, the DJGPP port will use
-   ">PRN" as the default, which causes it to print to the local printer
-   device, PRN.
-
-6. Bug Reports
-   -----------
-
-   If you see any bugs which seem specific to this DOS port, please tell
-   me about them.
-
-
-   Enjoy,
-
-                               Eli Zaretskii <eliz@is.elta.co.il>
diff --git a/djgpp/config.bat b/djgpp/config.bat
deleted file mode 100755
index f5dffc454c..0000000000
--- a/djgpp/config.bat
+++ /dev/null
@@ -1,237 +0,0 @@
-@echo off
-
-echo Configuring GNU Texinfo for DJGPP v2.x...
-
-Rem The small_env tests protect against fixed and too small size
-Rem of the environment in stock DOS shell.
-
-Rem Find out if NLS is wanted or not, if dependency-tracking is
-Rem wanted or not, if cache is wanted or not, and where the sources are.
-set ARGS=
-set NLS=disabled
-if not "%NLS%" == "disabled" goto small_env
-set CACHE=enabled
-if not "%CACHE%" == "enabled" goto small_env
-set DEPTRAK=disabled
-if not "%DEPTRAK%" == "disabled" goto small_env
-set XSRC=.
-if not "%XSRC%" == "." goto small_env
-
-Rem Loop over all arguments.
-Rem Special arguments are: NLS, XSRC CACHE and DEPS.
-Rem All other arguments are stored into ARGS.
-:arg_loop
-set SPECARG=0
-if not "%SPECARG%" == "0" goto small_env
-if not "%1" == "NLS" if not "%1" == "nls" goto cache_opt
-if "%1" == "nls" set NLS=enabled
-if "%1" == "NLS" set NLS=enabled
-if not "%NLS%" == "enabled" goto small_env
-set SPECARG=1
-if not "%SPECARG%" == "1" goto small_env
-shift
-:cache_opt
-set SPECARG=0
-if not "%SPECARG%" == "0" goto small_env
-if "%1" == "no-cache" goto cache_off
-if "%1" == "no-CACHE" goto cache_off
-if not "%1" == "NO-CACHE" goto dependency_opt
-:cache_off
-if "%1" == "no-cache" set CACHE=disabled
-if "%1" == "no-CACHE" set CACHE=disabled
-if "%1" == "NO-CACHE" set CACHE=disabled
-if not "%CACHE%" == "disabled" goto small_env
-set SPECARG=1
-if not "%SPECARG%" == "1" goto small_env
-shift
-:dependency_opt
-set SPECARG=0
-if not "%SPECARG%" == "0" goto small_env
-if "%1" == "dep" goto dep_off
-if not "%1" == "DEP" goto src_dir_opt
-:dep_off
-if "%1" == "dep" set DEPTRAK=enabled
-if "%1" == "DEP" set DEPTRAK=enabled
-if not "%DEPTRAK%" == "enabled" goto small_env
-set SPECARG=1
-if not "%SPECARG%" == "1" goto small_env
-shift
-:src_dir_opt
-set SPECARG=0
-if not "%SPECARG%" == "0" goto small_env
-echo %1 | grep -q "/"
-if errorlevel 1 goto collect_arg
-set XSRC=%1
-if not "%XSRC%" == "%1" goto small_env
-set SPECARG=1
-if not "%SPECARG%" == "1" goto small_env
-:collect_arg
-if "%SPECARG%" == "0" set _ARGS=%ARGS% %1
-if "%SPECARG%" == "0" if not "%_ARGS%" == "%ARGS% %1" goto small_env
-echo %_ARGS% | grep -q "[^ ]"
-if not errorlevel 0 set ARGS=%_ARGS%
-set _ARGS=
-shift
-if not "%1" == "" goto arg_loop
-set SPECARG=
-
-Rem Create a response file for the configure script.
-echo --srcdir=%XSRC% > args
-if "%CACHE%" == "enabled"    echo --config-cache >> args
-if "%DEPTRAK%" == "enabled"  echo --enable-dependency-tracking >> args
-if "%DEPTRAK%" == "disabled" echo --disable-dependency-tracking >> args
-if not "%ARGS%" == ""        echo %ARGS% >> args
-set ARGS=
-set CACHE=
-set DEPTRAK=
-
-if "%XSRC%" == "." goto in_place
-
-:not_in_place
-redir -e /dev/null update %XSRC%/configure.org ./configure
-test -f ./configure
-if errorlevel 1 update %XSRC%/configure ./configure
-
-:in_place
-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
-if errorlevel 1 goto sed_error
-
-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 small_env
-
-Rem Make sure crucial file names are not munged by unpacking
-test -f %XSRC%/po/Makefile.in.in
-if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in
-test -f %XSRC%/po/Makefile.am.in
-if not errorlevel 1 mv -f %XSRC%/po/Makefile.am.in %XSRC%/po/Makefile.am-in
-
-Rem This is required because DOS/Windows are case-insensitive
-Rem to file names, and "make install" will do nothing if Make
-Rem finds a file called `install'.
-if exist INSTALL ren INSTALL INSTALL.txt
-
-Rem Set HOME to a sane default so configure stops complaining.
-if not "%HOME%" == "" goto host_name
-set HOME=%XSRC%/djgpp
-if not "%HOME%" == "%XSRC%/djgpp" goto small_env
-echo No HOME found in the environment, using default value
-
-:host_name
-Rem Set HOSTNAME so it shows in config.status
-if not "%HOSTNAME%" == "" goto hostdone
-if "%windir%" == "" goto msdos
-set OS=MS-Windows
-if not "%OS%" == "MS-Windows" goto small_env
-goto haveos
-:msdos
-set OS=MS-DOS
-if not "%OS%" == "MS-DOS" goto small_env
-:haveos
-if not "%USERNAME%" == "" goto haveuname
-if not "%USER%" == "" goto haveuser
-echo No USERNAME and no USER found in the environment, using default values
-set HOSTNAME=Unknown PC
-if not "%HOSTNAME%" == "Unknown PC" goto small_env
-goto userdone
-:haveuser
-set HOSTNAME=%USER%'s PC
-if not "%HOSTNAME%" == "%USER%'s PC" goto small_env
-goto userdone
-:haveuname
-set HOSTNAME=%USERNAME%'s PC
-if not "%HOSTNAME%" == "%USERNAME%'s PC" goto small_env
-:userdone
-set _HOSTNAME=%HOSTNAME%, %OS%
-if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto small_env
-set HOSTNAME=%_HOSTNAME%
-:hostdone
-set _HOSTNAME=
-set OS=
-
-Rem install-sh is required by the configure script but clashes with the
-Rem various Makefile install-foo targets, so we MUST have it before the
-Rem script runs and rename it afterwards
-test -f %XSRC%/install-sh
-if not errorlevel 1 goto no_ren0
-test -f %XSRC%/install-sh.sh
-if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh
-:no_ren0
-
-if "%NLS%" == "disabled" goto without_NLS
-
-:with_NLS
-Rem Check for the needed libraries and binaries.
-test -x /dev/env/DJDIR/bin/msgfmt.exe
-if not errorlevel 0 goto missing_NLS_tools
-test -x /dev/env/DJDIR/bin/xgettext.exe
-if not errorlevel 0 goto missing_NLS_tools
-test -f /dev/env/DJDIR/include/libcharset.h
-if not errorlevel 0 goto missing_NLS_tools
-test -f /dev/env/DJDIR/lib/libcharset.a
-if not errorlevel 0 goto missing_NLS_tools
-test -f /dev/env/DJDIR/include/iconv.h
-if not errorlevel 0 goto missing_NLS_tools
-test -f /dev/env/DJDIR/lib/libiconv.a
-if not errorlevel 0 goto missing_NLS_tools
-test -f /dev/env/DJDIR/include/libintl.h
-if not errorlevel 0 goto missing_NLS_tools
-test -f /dev/env/DJDIR/lib/libintl.a
-if not errorlevel 0 goto missing_NLS_tools
-
-Rem Recreate the files in the %XSRC%/po subdir with our ported tools.
-redir -e /dev/null rm %XSRC%/po/*.gmo
-redir -e /dev/null rm %XSRC%/po/texinfo*.pot
-redir -e /dev/null rm %XSRC%/po/cat-id-tbl.c
-redir -e /dev/null rm %XSRC%/po/stamp-cat-id
-
-Rem Update the arguments file for the configure script.
-Rem We prefer without-included-gettext because libintl.a from gettext package
-Rem is the only one that is guaranteed to have been ported to DJGPP.
-echo --enable-nls --without-included-gettext >> args
-goto configure_package
-
-:missing_NLS_tools
-echo Needed libs/tools for NLS not found.  Configuring without NLS.
-:without_NLS
-Rem Update the arguments file for the configure script.
-echo --disable-nls >> args
-
-:configure_package
-echo Running the ./configure script...
-sh ./configure @args
-if errorlevel 1 goto cfg_error
-rm args
-echo Done.
-goto End
-
-:sed_error
-echo ./configure script editing failed!
-goto End
-
-:cfg_error
-echo ./configure script exited abnormally!
-goto End
-
-:small_env
-echo Your environment size is too small.  Enlarge it and run me again.
-echo Configuration NOT done!
-
-:End
-test -f %XSRC%/install-sh.sh
-if not errorlevel 1 goto no_ren1
-test -f %XSRC%/install-sh
-if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh
-:no_ren1
-if "%HOME%" == "%XSRC%/djgpp" set HOME=
-set ARGS=
-set CONFIG_SITE=
-set HOSTNAME=
-set NLS=
-set CACHE=
-set DEPTRAK=
-set XSRC=
diff --git a/djgpp/config.sed b/djgpp/config.sed
deleted file mode 100644
index 965e31ca48..0000000000
--- a/djgpp/config.sed
+++ /dev/null
@@ -1,104 +0,0 @@
-# DJGPP specific configuration file.
-# Sed script for additional DJGPP specific editing
-# of the configure script generated by autoconf 2.62.
-
-
-# Additional editing of Makefiles
-/^eval sed.*ac_file_inputs.*tmp\/out \\$/ {
-:loop
-n
-/^$/!b loop
-a\
-cat > "$tmp/subs-djgpp.sed" << eof_djgpp\
-# DJGPP specific Makefile changes.\
-s,\\.deps,_deps,g\
-s,\\.libs,_libs,g\
-s,\\.new\\.,_new.,g\
-s,\\.old\\.,_old.,g\
-s,\\.tab\\.,_tab.,g\
-s,Makefile\\.am\\.in,Makefile.am-in,g\
-s,Makefile\\.in\\.in,Makefile.in-in,g\
-/^install-info-am:/,/^$/ {\
-  /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
-  s,\\(\\\$\\\$d/\\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 
\\$\\$d/\\$\\$file[0-9] \\$\\$d/\\$\\$file[0-9][0-9]\\2,\
-  s,\\( \\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] 
\\$\\$file[0-9][0-9]\\2,\
-}\
-/^uninstall-info-am:/,/^$/ {\
-  /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\
-  s,\\(file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] 
\\$\\$file[0-9][0-9]\\2,\
-}\
-eof_djgpp\
-sed -f "\$tmp/subs-djgpp.sed" \$tmp/out > \$tmp/out.djgpp\
-mv -f \$tmp/out.djgpp \$tmp/out
-}
-
-
-# Makefile.in.in is renamed to Makefile.in-in.
-/ac_config_files=/,/_ACEOF/ {
-  s|po/Makefile\.in|&:po/Makefile.in-in|
-}
-/CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2
-
-# We always use _deps and _libs instead of .deps and .libs, because
-# the latter is an invalid name on 8+3 MS-DOS file system.  This makes
-# the generated Makefiles good for every DJGPP installation, not only
-# the one where the package was configured (which could happen to be
-# a Windows box, where leading dots in file names are allowed).
-/^rmdir[        ]*\.tst/ i\
-am__leading_dot=_
-
-# The following two items are changes needed for configuring
-# and compiling across partitions.
-# The given srcdir value is always translated from the
-# "x:" syntax into "/dev/x" syntax while we run configure.
-/^[     ]*-srcdir=\*.*$/ a\
-    ac_optarg=`echo "$ac_optarg" | sed "s,^\\([A-Za-z]\\):,/dev/\\1,"`
-/set X `ls -Lt \$srcdir/ i\
-   if `echo $srcdir | grep "^/dev/" - > /dev/null`; then\
-     srcdir=`echo "$srcdir" | sed -e "s%^/dev/%%" -e "s%/%:/%"`\
-   fi
-
-# Autoconf 2.52e generated configure scripts
-# write absolute paths into Makefiles making
-# them useless for DJGPP installations for which
-# the package has not been configured for.
-/MISSING=/,/^$/ {
-  /^fi$/ a\
-am_missing_run=`echo "$am_missing_run" | sed 
's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%'`
-}
-/^install_sh=/a\
-install_sh=`echo "$install_sh" | sed 
's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%'`
-
-# On DOS/WIN systems every partition has its own root directory,
-# so do not make any assumptions about absolute paths or the
-# configure script and the generated Makefiles will only be
-# good for the system where the package has been configured for.
-/^ac_abs_srcdir=/ i\
-ac_abs_builddir=`echo "$ac_abs_builddir" | sed 
"s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`\
-ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed 
"s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`\
-ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed 
"s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`
-#ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed 
"s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/texinfo[-_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"`\
-  ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%//%/%g"`\
-  ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%//%/%g"`\
-done
-
-# The following makes sure we are not going to remove a directory
-# which is the cwd on its drive (DOS doesn't allow to remove such
-# a directory).  The trick is to chdir to the root directory on
-# temp directory's drive before removing $tmp.
-/^ *trap 'exit_status=\$\?; rm -rf/s%rm -rf%cd $tmp; cd /; &%
-
-# AC_CONFIG_LINKS fails if the source and destination are on
-# different file systems and symlinks don't work.
-/^    ln \$srcdir/s%||%|| cp -pf $srcdir/$ac_source $ac_dest ||%
-
-# The CR test for awk does not work for DJGPP.
-/^ac_cs_awk_cr=/,/^$/ {
-  /^fi$/ a\
-ac_cs_awk_cr=$ac_cr
-}
diff --git a/djgpp/config.site b/djgpp/config.site
deleted file mode 100755
index c8a112360e..0000000000
--- a/djgpp/config.site
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Site defaults for the DJGPP configuration
-
-# These two variables are required, otherwise looking for
-# programs along the PATH will not work.
-PATH_SEPARATOR=:
-PATH_EXPAND=y
-
-# This is required in for "test -f foo" to find foo.exe.
-export TEST_FINDS_EXE=y
-
-# The root of the DJGPP tree serves as the default prefix
-# for all paths that are hardcoded in the binaries.
-# When installing the installation prefix must be supplied.
-test "x$prefix" = xNONE && prefix='/dev/env/DJDIR'
-
-# This is required for config.status script to be run, since
-# ./configure runs it by invoking ${CONFIG_SHELL-/bin/sh}
-# CONFIG_SHELL=${CONFIG_SHELL='sh'}
-
-# These are set here so the generated Makefile's will be good
-# 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'}
-XGETTEXT=${XGETTEXT='/dev/env/DJDIR/bin/xgettext'}
-
-# Sane defaults for standard programs used by the build process.
-# We force the values of these variables so that the resultant
-# Makefile's will work on any DJGPP platform, not only on the
-# machine where the package was configured.
-ac_cv_prog_AWK=${AWK='gawk'}
-ac_cv_prog_INTLBISON=${INTLBISON='bison'}
-ac_cv_prog_CC=${CC='gcc'}
-
-# These are set here so the generated libtool/Makefile's will
-# be good for every DJGPP installation, not only the one where
-# the package was configured.
-NM=${NM='nm'}
-LD=${LD='ld'}
-MAKEINFO=${MAKEINFO='makeinfo'}
-
-# A sane default for mkdir.
-ac_cv_path_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'}
-
-# A sane default for grep.
-ac_cv_path_GREP=${GREP='/dev/env/DJDIR/bin/grep'}
-
-# A sane default for egrep.
-ac_cv_path_EGREP=${EGREP='/dev/env/DJDIR/bin/egrep'}
-
-# Force the test for 'ln -s' to report 'cp -pf'.
-ac_cv_prog_LN_S='cp -pf'
-
-# We have `fork', but it always fails.  Don't trust Autoconf to be
-# smart enough to detect that...
-ac_cv_func_fork=no
-ac_cv_func_vfork=no
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 808b7a0dce..6bfd593d10 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -105,16 +105,11 @@ sub pgdt_context($$)
 }
 
 
-# determine the null devices
+# determine the null device
 my $default_null_device = File::Spec->devnull();
 our %null_device_file = (
   $default_null_device => 1
 );
-# special case, djgpp recognizes both null devices
-if ($Config{osname} eq 'dos' and $Config{osvers} eq 'djgpp') {
-  $null_device_file{'/dev/null'} = 1;
-  $null_device_file{'NUL'} = 1;
-}
 
 
 # Customization options
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index 5aa46dbfd6..dee72c793f 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -241,7 +241,7 @@ PERL_LIBS="-L$PERL_INC $PERL_CONF_libperl"
 # `(gnulib)Libtool and Windows'.  The -L and -l options in
 # platform_PERL_LIBADD show where to find the undefined symbols when
 # linking against Perl.
-case "$host" in *-mingw32 | *-mingw64 | *-msdosdjgpp | *-cygwin )
+case "$host" in *-mingw32 | *-mingw64 | *-cygwin )
   perl_conf_LDFLAGS="$perl_conf_LDFLAGS -no-undefined"
   platform_PERL_LIBADD=$PERL_LIBS
   # to be used for shared libraries not linked against Perl.
diff --git a/tp/Texinfo/XS/main/utils.c b/tp/Texinfo/XS/main/utils.c
index 93e1c7565d..03a2621966 100644
--- a/tp/Texinfo/XS/main/utils.c
+++ b/tp/Texinfo/XS/main/utils.c
@@ -64,13 +64,7 @@
 
 /* FIXME not sure if __CYGWIN__ is correctly handled here, like a UNIX. */
 const char *null_device_names[] = {
-#ifdef __MSDOS__
-# ifdef __DJGPP__
- "NUL", "/dev/null",
-# else
- "NUL",
-# endif
-#elif _WIN32
+#ifdef _WIN32
  "NUL",
 #else
  "/dev/null",



reply via email to

[Prev in Thread] Current Thread [Next in Thread]