diff --git a/ChangeLog b/ChangeLog
index e0642db..a2b9963 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2018-10-23  Bruno Haible  <bruno@clisp.org>
 
+	Remove outdated DJGPP build infrastructure.
+	Approved by Juan Manuel Guerrero <juan.guerrero@gmx.de>.
+	* djgpp: Remove directory.
+	* INSTALL.djgpp: Remove file.
+	* Makefile.in (SOURCE_FILES): Remove them.
+
+2018-10-23  Bruno Haible  <bruno@clisp.org>
+
 	Update after gnulib changed.
 	* configure.ac (AC_PREREQ): Bump minimum Autoconf version to 2.63.
 
diff --git a/INSTALL.djgpp b/INSTALL.djgpp
deleted file mode 100644
index aa8c420..0000000
--- a/INSTALL.djgpp
+++ /dev/null
@@ -1,3 +0,0 @@
-Installation on DJGPP:
-
-See the file djgpp/README.
diff --git a/Makefile.in b/Makefile.in
index 8ab9b3e..b486848 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -169,11 +169,6 @@
   windows/iconv.rc windows/libiconv.rc windows/windres-options \
   woe32dll/export.h woe32dll/iconv-exports.c \
   os2/iconv.def \
-  INSTALL.djgpp \
-  djgpp/config.bat djgpp/config.sed djgpp/config.site djgpp/edtest.bat \
-  djgpp/fnchange.in djgpp/fnchange.lst djgpp/Makefile.maint djgpp/makefile.sed \
-  djgpp/README djgpp/README.in djgpp/sources.sed \
-  djgpp/stateful-check.sed djgpp/stateless-check.sed djgpp/translit-check.sed \
   extras/ChangeLog extras/iconv_string.h extras/iconv_string.c \
   tools/Makefile \
   tools/8bit_tab_to_h.c tools/cjk_tab_to_h.c tools/cjk_variants.c \
diff --git a/djgpp/Makefile.maint b/djgpp/Makefile.maint
deleted file mode 100644
index 4f67bf1..0000000
--- a/djgpp/Makefile.maint
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer's Makefile                                         -*-Makefile-*-
-
-top_srcdir = ..
-srcdir = .
-
-SHELL = /bin/sh
-
-all: README fnchange.lst
-
-fnchange.lst: fnchange.in $(top_srcdir)/configure.ac
-	rm -f $@; \
-	PACKAGE=`grep "^AM_INIT_AUTOMAKE(" $(top_srcdir)/configure.ac | sed -e 's/^.*(\([A-Za-z]*\),.*$$/\1/'`; \
-	VERSION=`grep "^AM_INIT_AUTOMAKE(" $(top_srcdir)/configure.ac | sed -e 's/^.*,[ 	]\([0-9.]*\).*$$/\1/'`; \
-	sed \
-	    -e '/^#/d' \
-	    -e "s/@V@/$${PACKAGE}-$${VERSION}/g" \
-	  $(srcdir)/fnchange.in > t-$@
-	mv t-$@ $@
-
-README: README.in $(top_srcdir)/configure.ac
-	rm -f $@; \
-	PACKAGE=`grep "^AM_INIT_AUTOMAKE(" $(top_srcdir)/configure.ac | sed -e 's/^.*(\([A-Za-z]*\),.*$$/\1/'`; \
-	VERSION=`grep "^AM_INIT_AUTOMAKE(" $(top_srcdir)/configure.ac | sed -e 's/^.*,[ 	]\([0-9.]*\).*$$/\1/'`; \
-	packageversion=`echo "$${VERSION}" | sed 's/\.//g'`; \
-	treeversion=`echo "$${VERSION}" | sed 's/\.//g'`; \
-	sed \
-	    -e "s/@V@/$${PACKAGE}-$${VERSION}/g" \
-	    -e "s/@VER@/$${VERSION}/g" \
-	    -e "s/@packageversion@/$$packageversion/g" \
-	    -e "s/@treeversion@/$$treeversion/g" \
-	  $(srcdir)/README.in > t-$@
-	mv t-$@ $@
diff --git a/djgpp/README b/djgpp/README
deleted file mode 100644
index 6245667..0000000
--- a/djgpp/README
+++ /dev/null
@@ -1,122 +0,0 @@
-This is a port of GNU Libiconv 1.11 to MSDOS/DJGPP.
-
-1.:     DJGPP specific changes.
-        =======================
-        There are no DJGPP specific changes. This package should
-        configure and compile out-of-the-box.
-        Please read the documentation to become familiar with this
-        product.
-
-
-2.:     Installing the binary package.
-        ==============================
-
-2.1.:   Copy the binary distribution into the top DJGPP installation
-        directory and unzip the binary distribution running *ONE* of
-        the following commands:
-          unzip32 licv111b.zip      or
-          djtarx licv111b.zip       or
-          pkunzip -d licv111b.zip
-
-
-
-3.:     Building the binaries from sources.
-        ===================================
-
-3.1.:   To build the binaries you will need the following binary packages:
-          djdev203.zip, bsh204b.zip, gcc2952b.zip,
-          bnu210b.zip, mak3791b.zip, fil316b.zip,
-          shl112b.zip, txt20b.zip, txi40b.zip,
-          grep24b.zip and sed302b.zip
-
-
-        All this packages can be found in the v2gnu directory of any
-        Simtel.NET mirror.
-        You will need bsh204b.zip and *NOT* a prior version or the build will fail.
-        The same applies to djdev203.zip. You *MUST* use the updated versions of
-        fil316b.zip (date: 2000-05-30) and shl112b.zip (date: 2000-08-11). This
-        updated versions have been recompiled with djdev203.zip and know about
-        the "/dev/env" functionality introduced with djdev203.zip. All the other
-        packages are the ones I have used to build the binaries from this sources.
-        Previuos and/or later versions of this packages may do the job as well but
-        I have not tested this.
-
-3.2.:   Create a temporary directory and copy the source package: licv111s.zip
-        into the temporary directory. If you download the source distribution
-        from one of the DJGPP archives, just unzip it preserving the directory
-        structure, runnig ONE of the following commands:
-          unzip32 licv111s.zip      or
-          djtarx licv111s.zip       or
-          pkunzip -d licv111s.zip
-
-        Source distributions downloaded from one of the GNU FTP sites need
-        some more work to unpack.  First, you MUST use the `djtar' program to
-        unzip the package.  That's because some file names in the official
-        distributions need to be changed to avoid problems on the various
-        platforms supported by DJGPP.  `djtar' can rename files on the fly
-        given a file with name mappings.  The distribution includes a file
-        `djgpp/fnchange.lst' with the necessary mappings.  So you need first
-        to retrieve that file, and then invoke `djtar' to unpack the
-        distribution.  Here's how:
-
-          djtar -x -p -o libiconv-1.7/djgpp/fnchange.lst libiconv-1.7.tar.gz > lst
-          djtar -x -n lst libiconv-1.7.tar.gz
-
-        (The name of the distribution archive and the top-level directory will
-        be different for versions other than 1.7.)
-
-3.3.:   The package is preconfigured for djdev203. To build the products you
-        should run the following command:
-          make
-
-        After the compilation has finished, you can check the products
-        running the command:
-          make check
-
-        To install the products run the command:
-          make install
-
-        This will install the products (iconv.exe iconv.h localcharset.h libconv.a
-        libcharset.a iconv.1 iconv.3 iconv_open.3 iconv_close.3) into your DJGPP
-        installation tree. As usual, prefix is defined as "/dev/env/DJDIR".
-        If you prefer to install into same other directory run the command:
-          make install prefix=z:/some/other/dir
-
-        Of course, you should replace "z:/some/other/dir" by an appropriate path
-        that will meet your requeriments.
-
-3.4.:   If you need/want to reconfigure the package you will have to run the
-        following commands:
-          make distclean
-          djgpp\config
-
-        Please note that you *MUST* use the "distclean" option or the config.cache
-        file will *NOT* be deleted. In this case you are *NOT* reconfiguring
-        because the configuration informations is read from the cache file instead
-        of being newly computed.
-        To build the programs in a directory other than where the sources are,
-        you must add the parameter that specifies the source directory,
-        e.g:
-          x:\src\gnu\libiconv.111\djgpp\config x:/src/gnu/libiconv.111
-
-        Lets assume you want to build the binaries in a directory placed on a 
-        different drive (z:\build in this case) from where the sources are,
-        then you will run the following commands:
-          z:
-          md \build
-          cd \build
-          x:\src\gnu\libiconv.111\djgpp\config x:/src/gnu/libiconv.111
-
-        You *MUST* use forward slashes to specify the source directory.
-        After having configured the package run the folowing commands to create
-        the binaries and docs and install them:
-          make
-          make check
-          make install
-
-        Send suggestions and bug reports concerning the DJGPP port to
-        comp.os.msdos.djgpp or djgpp@delorie.com. Libiconv specific bugs
-        must be reported to Bruno Haible <haible@clisp.cons.org>.
-
-
-          Guerrero, Juan Manuel <st001906@hrz1.hrz.tu-darmstadt.de>
diff --git a/djgpp/README.in b/djgpp/README.in
deleted file mode 100644
index 2e775a5..0000000
--- a/djgpp/README.in
+++ /dev/null
@@ -1,120 +0,0 @@
-This is a port of GNU Libiconv @VER@ to MSDOS/DJGPP.
-
-1.:     DJGPP specific changes.
-        =======================
-        There are no DJGPP specific changes. This package should
-        configure and compile out-of-the-box.
-        Please read the documentation to become familiar with this
-        product.
-
-
-2.:     Installing the binary package.
-        ==============================
-
-2.1.:   Copy the binary distribution into the top DJGPP installation
-        directory and unzip the binary distribution running *ONE* of
-        the following commands:
-          unzip32 licv@packageversion@b.zip      or
-          djtarx licv@packageversion@b.zip       or
-          pkunzip -d licv@packageversion@b.zip
-
-
-
-3.:     Building the binaries from sources.
-        ===================================
-
-3.1.:   To build the binaries you will need the following binary packages:
-          djdev203.zip (patchlevel 2),
-          bshNNNb.zip, gccNNNb.zip, bnuNNNb.zip, makNNNb.zip, filNNNb.zip,
-          shlNNNb.zip, txtNNNb.zip, txiNNNb.zip, grepNNNb.zip, sedNNNb.zip,
-          and difNNN.zip
-
-        NNN represents the latest version number of the binary packages. All
-        this packages can be found in the current/v2gnu/ directory of any
-        ftp.delorie.com mirror.
-
-3.2.:   Create a temporary directory and copy the source package: licv@packageversion@s.zip
-        into the temporary directory. If you download the source distribution
-        from one of the DJGPP archives, just unzip it preserving the directory
-        structure, runnig ONE of the following commands:
-          unzip32 licv@packageversion@s.zip      or
-          djtarx licv@packageversion@s.zip       or
-          pkunzip -d licv@packageversion@s.zip
-
-        Source distributions downloaded from one of the GNU FTP sites need
-        some more work to unpack. First, you MUST use the `djtar' program
-        to unzip the package. That's because some file names in the official
-        distributions need to be changed to avoid problems on the various
-        platforms supported by DJGPP. `djtar' can rename files on the fly
-        given a file with name mappings. The distribution includes a file
-        `djgpp/fnchange.lst' with the necessary mappings. So you need first
-        to retrieve that file, and then invoke `djtar' to unpack the
-        distribution. Here's how:
-
-          djtar -x -p -o @V@/djgpp/fnchange.lst @V@.tar.gz > lst
-          djtar -x -n lst @V@.tar.gz
-
-        (The name of the distribution archive and the top-level directory will
-        be different for versions other than @VER@.)
-
-3.3.:   If you have downloaded the source package from one of the GNU FTP sites
-        you will have to configure the package running the command:
-          djgpp\config.bat
-
-3.4.:   If you have downloaded the source package from one of the delorie FTP
-        sites the package is already preconfigured for djdev203 or later. In
-        any case, to build the products you must run the following command:
-          make
-
-        After the compilation has finished, you can check the products
-        running the command:
-          make check
-
-        To install the products run the command:
-          make install
-
-        This will install the products (iconv.exe iconv.h localcharset.h libconv.a
-        libcharset.a iconv.1 iconv.3 iconv_open.3 iconv_close.3) into your DJGPP
-        installation tree. As usual, prefix is defined as "/dev/env/DJDIR".
-        If you prefer to install into same other directory run the command:
-          make install prefix=z:/some/other/dir
-
-        Of course, you should replace "z:/some/other/dir" by an appropriate path
-        that will meet your requeriments.
-
-3.5.:   If for some reason you want to reconfigure the package cd into the top
-        srcdir (libiconv.@treeversion@) and run the following commands:
-          del djgpp\config.cache
-          make distclean
-          djgpp\config
-
-        Please note that you *MUST* delete the config.cache file in the djgpp
-        subdir or you will not really reconfigure the sources because the
-        configuration informations will be read from the cache file instead
-        of being newly computed.
-        To build the programs in a directory other than where the sources are,
-        you must add the parameter that specifies the source directory,
-        e.g:
-          x:\src\gnu\libiconv.@treeversion@\djgpp\config x:/src/gnu/libiconv.@treeversion@
-
-        Lets assume you want to build the binaries in a directory placed on a 
-        different drive (z:\build in this case) from where the sources are,
-        then you will run the following commands:
-          z:
-          md \build
-          cd \build
-          x:\src\gnu\libiconv.@treeversion@\djgpp\config x:/src/gnu/libiconv.@treeversion@
-
-        You *MUST* use forward slashes to specify the source directory.
-        After having configured the package run the folowing commands to create
-        the binaries and docs and install them:
-          make
-          make check
-          make install
-
-        Send suggestions and bug reports concerning the DJGPP port to
-        comp.os.msdos.djgpp or djgpp@delorie.com. Libiconv specific bugs
-        must be reported to <bug-gnu-libiconv@gnu.org>.
-
-
-          Guerrero, Juan Manuel <juan.guerrero@gmx.de>
diff --git a/djgpp/config.bat b/djgpp/config.bat
deleted file mode 100644
index 56b5ee6..0000000
--- a/djgpp/config.bat
+++ /dev/null
@@ -1,482 +0,0 @@
-@echo off
-Rem Configure libiconv for DJGPP.
-
-Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line
-Rem format, or else stock DOS/Windows shells will refuse to run it.
-
-echo Configuring GNU libiconv for DJGPP v2.x...
-Rem The SmallEnv 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,
-Rem if dependency-tracking is wanted or not,
-Rem if caching is wanted or not
-Rem and where the sources are.
-Rem We always default to NLS support,
-Rem no dependency tracking
-Rem and to in place configuration.
-set ARGS=
-set NLS=disabled
-if not "%NLS%" == "disabled" goto SmallEnv
-set CACHING=enabled
-if not "%CACHING%" == "enabled" goto SmallEnv
-set DEPENDENCY_TRACKING=disabled
-if not "%DEPENDENCY_TRACKING%" == "disabled" goto SmallEnv
-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 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.
-Rem All other arguments are stored into ARGS.
-:ArgLoop
-if "%1" == "nls" goto NextArgument
-if "%1" == "NLS" goto NextArgument
-if "%1" == "no-nls" goto NoNLS
-if "%1" == "no-NLS" goto NoNLS
-if "%1" == "NO-NLS" goto NoNLS
-goto CachingOption
-:NoNLS
-if "%1" == "no-nls" set NLS=disabled
-if "%1" == "no-NLS" set NLS=disabled
-if "%1" == "NO-NLS" set NLS=disabled
-if not "%NLS%" == "disabled" goto SmallEnv
-goto NextArgument
-:CachingOption
-if "%1" == "cache" goto NextArgument
-if "%1" == "CACHE" goto NextArgument
-if "%1" == "no-cache" goto NoCaching
-if "%1" == "no-CACHE" goto NoCaching
-if "%1" == "NO-CACHE" goto NoCaching
-goto DependencyOption
-:NoCaching
-if "%1" == "no-cache" set CACHING=disabled
-if "%1" == "no-CACHE" set CACHING=disabled
-if "%1" == "NO-CACHE" set CACHING=disabled
-if not "%CACHING%" == "disabled" goto SmallEnv
-goto NextArgument
-:DependencyOption
-if "%1" == "no-dep" goto NextArgument
-if "%1" == "no-DEP" goto NextArgument
-if "%1" == "NO-DEP" goto NextArgument
-if "%1" == "dep" goto DependecyTraking
-if "%1" == "DEP" goto DependecyTraking
-goto LibiconvPrefixOption
-:DependecyTraking
-if "%1" == "dep" set DEPENDENCY_TRACKING=enabled
-if "%1" == "DEP" set DEPENDENCY_TRACKING=enabled
-if not "%DEPENDENCY_TRACKING%" == "enabled" goto SmallEnv
-goto NextArgument
-:LibiconvPrefixOption
-if "%1" == "no-libiconvprefix" goto NextArgument
-if "%1" == "no-LIBICONVPREFIX" goto NextArgument
-if "%1" == "NO-LIBICONVPREFIX" goto NextArgument
-if "%1" == "libiconvprefix" goto WithLibiconvPrefix
-if "%1" == "LIBICONVPREFIX" goto WithLibiconvPrefix
-goto LibintlPrefixOption
-:WithLibiconvPrefix
-if "%1" == "libiconvprefix" set LIBICONV_PREFIX=enabled
-if "%1" == "LIBICONVPREFIX" set LIBICONV_PREFIX=enabled
-if not "%LIBICONV_PREFIX%" == "enabled" goto SmallEnv
-goto NextArgument
-:LibintlPrefixOption
-if "%1" == "no-libiconvprefix" goto NextArgument
-if "%1" == "no-LIBICONVPREFIX" goto NextArgument
-if "%1" == "NO-LIBICONVPREFIX" goto NextArgument
-if "%1" == "libintlprefix" goto _WithLibintlPrefix
-if "%1" == "LIBINTLPREFIX" goto _WithLibintlPrefix
-goto HTMLOption
-:_WithLibintlPrefix
-if "%1" == "libintlprefix" set LIBINTL_PREFIX=enabled
-if "%1" == "LIBINTLPREFIX" set LIBINTL_PREFIX=enabled
-if not "%LIBINTL_PREFIX%" == "enabled" goto SmallEnv
-:HTMLOption
-if "%1" == "withhtml" goto NextArgument
-if "%1" == "withHTML" goto NextArgument
-if "%1" == "WITHHTML" goto NextArgument
-if "%1" == "withouthtml" goto _WithoutHTML
-if "%1" == "withoutHTML" goto _WithoutHTML
-if "%1" == "WITHOUTHTML" goto _WithoutHTML
-goto SrcDirOption
-:_WithoutHTML
-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
-:SrcDirOption
-echo %1 | grep -q "/"
-if errorlevel 1 goto CollectArgument
-set XSRC=%1
-if not "%XSRC%" == "%1" goto SmallEnv
-goto NextArgument
-:CollectArgument
-set _ARGS=%ARGS% %1
-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% > arguments
-if "%CACHING%" == "enabled"              echo --cache-file=%XSRC%/djgpp/config.cache >> arguments
-if "%DEPENDENCY_TRACKING%" == "enabled"  echo --enable-dependency-tracking >> arguments
-if "%DEPENDENCY_TRACKING%" == "disabled" echo --disable-dependency-tracking >> arguments
-if "%LIBICONV_PREFIX%" == "enabled"      echo --with-libiconv-prefix >> arguments
-if "%LIBICONV_PREFIX%" == "disabled"     echo --without-libiconv-prefix >> arguments
-if "%LIBINTL_PREFIX%" == "enabled"       echo --with-libintl-prefix >> arguments
-if "%LIBINTL_PREFIX%" == "disabled"      echo --without-libintl-prefix >> arguments
-if "%HTML%" == "enabled"                 echo --enable-html >> arguments
-if "%HTML%" == "disabled"                echo --disable-html >> arguments
-if not "%ARGS%" == ""                    echo %ARGS% >> arguments
-set ARGS=
-set CACHING=
-set DEPENDENCY_TRACKING=
-set LIBICONV_PREFIX=
-set LIBINTL_PREFIX=
-set HTML=
-
-Rem Find out where the sources are
-if "%XSRC%" == "." goto InPlace
-
-:NotInPlace
-redir -e /dev/null update %XSRC%/configure.org ./configure
-test -f ./configure
-if errorlevel 1 update %XSRC%/configure ./configure
-test -d ./libcharset
-if errorlevel 1 md libcharset
-redir -e /dev/null update %XSRC%/libcharset/configure.org ./libcharset/configure
-test -f ./libcharset/configure
-if errorlevel 1 update %XSRC%/libcharset/configure ./libcharset/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
-if errorlevel 1 goto SedError
-test -f ./libcharset/configure.org
-if errorlevel 1 update ./libcharset/configure ./libcharset/configure.org
-sed -f %XSRC%/djgpp/config.sed ./libcharset/configure.org > configure.tmp
-if errorlevel 1 goto SedError
-Rem The following is needed because the toplevel configure script calls the
-Rem %XSRC%/libcharset/configure script instead of ./libcharset/configure.
-test -f %XSRC%/libcharset/configure.org
-if errorlevel 1 update %XSRC%/libcharset/configure %XSRC%/libcharset/configure.org
-update configure.tmp %XSRC%/libcharset/configure
-rm ./configure.tmp
-
-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
-
-Rem Make sure crucial file names are not munged by unpacking
-test -f %XSRC%/config.h.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/config.h.in %XSRC%/config.h-in
-test -f %XSRC%/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/config.h %XSRC%/config.h-in
-test -f %XSRC%/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/configh.in %XSRC%/config.h-in
-test -f %XSRC%/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/config_h.in %XSRC%/config.h-in
-test -f %XSRC%/lib/config.h.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/lib/config.h.in %XSRC%/lib/config.h-in
-test -f %XSRC%/lib/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/lib/config.h %XSRC%/lib/config.h-in
-test -f %XSRC%/lib/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/lib/configh.in %XSRC%/lib/config.h-in
-test -f %XSRC%/lib/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/lib/config_h.in %XSRC%/lib/config.h-in
-test -f %XSRC%/include/iconv.h.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/iconv.h.in %XSRC%/include/iconv.h-in
-test -f %XSRC%/include/iconv.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/iconv.h %XSRC%/include/iconv.h-in
-test -f %XSRC%/include/iconv.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/iconvh.in %XSRC%/include/iconv.h-in
-test -f %XSRC%/include/iconv.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/iconv_h.in %XSRC%/include/iconv.h-in
-test -f %XSRC%/include/iconv.h.build.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/iconv.h.build.in %XSRC%/include/iconv.h-build-in
-test -f %XSRC%/include/iconv.h-build-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/iconv.h %XSRC%/include/iconv.h-build-in
-test -f %XSRC%/include/iconv.h-build-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/iconvh.build %XSRC%/include/iconv.h-build-in
-test -f %XSRC%/include/iconv.h-build-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/iconv_h.build %XSRC%/include/iconv.h-build-in
-test -f %XSRC%/libcharset/config.h.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/config.h.in %XSRC%/libcharset/config.h-in
-test -f %XSRC%/libcharset/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/config.h %XSRC%/libcharset/config.h-in
-test -f %XSRC%/libcharset/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/configh.in %XSRC%/libcharset/config.h-in
-test -f %XSRC%/libcharset/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/config_h.in %XSRC%/libcharset/config.h-in
-test -f %XSRC%/libcharset/include/libcharset.h.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/libcharset.h.in %XSRC%/libcharset/include/libcharset.h-in
-test -f %XSRC%/libcharset/include/libcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/libcharset.h %XSRC%/libcharset/include/libcharset.h-in
-test -f %XSRC%/libcharset/include/libcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/libcharseth.in %XSRC%/libcharset/include/libcharset.h-in
-test -f %XSRC%/libcharset/include/libcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/libcharset_h.in %XSRC%/libcharset/include/libcharset.h-in
-test -f %XSRC%/libcharset/include/localcharset.h.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/localcharset.h.in %XSRC%/libcharset/include/localcharset.h-in
-test -f %XSRC%/libcharset/include/localcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/localcharset.h %XSRC%/libcharset/include/localcharset.h-in
-test -f %XSRC%/libcharset/include/localcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/localcharseth.in %XSRC%/libcharset/include/localcharset.h-in
-test -f %XSRC%/libcharset/include/localcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/localcharset_h.in %XSRC%/libcharset/include/localcharset.h-in
-test -f %XSRC%/libcharset/include/localcharset.h.build.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/localcharset.h.build.in %XSRC%/libcharset/include/localcharset.h-build-in
-test -f %XSRC%/libcharset/include/localcharset.h-build-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/localcharset.h %XSRC%/libcharset/include/localcharset.h-build-in
-test -f %XSRC%/libcharset/include/localcharset.h-build-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/localcharseth.build %XSRC%/libcharset/include/localcharset.h-build-in
-test -f %XSRC%/libcharset/include/localcharset.h-build-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/libcharset/include/localcharset_h.build %XSRC%/libcharset/include/localcharset.h-build-in
-
-Rem DJGPP needs ICONV_CONST set to const.
-sed "s/^#undef ICONV_CONST/#define ICONV_CONST const/" %XSRC%/config.h-in > config.tmp
-mv -f config.tmp %XSRC%/config.h-in
-
-Rem All fixes needed to get the package configured, compiled and tested.
-Rem 1:  Change the stateless-check script so it knowns about the
-Rem     new filenames.
-Rem 2:  Ditto for Makefile.in
-Rem 3:  Ditto for source files.
-
-:test -f %XSRC%/stamp-djgppfixes
-:if not errorlevel 1 goto TestsuitFixed
-Rem Fix the Makefile.ins.
-test -f %XSRC%/lib/Makefile.org
-if errorlevel 1 update %XSRC%/lib/Makefile.in %XSRC%/lib/Makefile.org
-sed -f %XSRC%/djgpp/makefile.sed %XSRC%/lib/Makefile.org > Makefile.tmp
-if errorlevel 1 goto SedError
-update Makefile.tmp %XSRC%/lib/Makefile.in
-rm Makefile.tmp
-test -f %XSRC%/tests/Makefile.org
-if errorlevel 1 update %XSRC%/tests/Makefile.in %XSRC%/tests/Makefile.org
-sed -f %XSRC%/djgpp/makefile.sed %XSRC%/tests/Makefile.org > Makefile.tmp
-if errorlevel 1 goto SedError
-update Makefile.tmp %XSRC%/tests/Makefile.in
-rm Makefile.tmp
-
-Rem Fix the source files.
-test -f %XSRC%/lib/aliases/aliases2.org
-if errorlevel 1 update %XSRC%/lib/aliases/aliases2.h %XSRC%/lib/aliases/aliases2.org
-sed -f %XSRC%/djgpp/sources.sed %XSRC%/lib/aliases/aliases2.org > aliases2.tmp
-if errorlevel 1 goto SedError
-update aliases2.tmp %XSRC%/lib/aliases/aliases2.h
-rm aliases2.tmp
-test -f %XSRC%/lib/iconv.org
-if errorlevel 1 update %XSRC%/lib/iconv.c %XSRC%/lib/iconv.org
-sed -f %XSRC%/djgpp/sources.sed %XSRC%/lib/iconv.org > iconv.tmp
-if errorlevel 1 goto SedError
-update iconv.tmp %XSRC%/lib/iconv.c
-rm iconv.tmp
-test -f %XSRC%/lib/converters.org
-if errorlevel 1 update %XSRC%/lib/converters.h %XSRC%/lib/converters.org
-sed -f %XSRC%/djgpp/sources.sed %XSRC%/lib/converters.org > converters.tmp
-if errorlevel 1 goto SedError
-update converters.tmp %XSRC%/lib/converters.h
-rm converters.tmp
-test -f %XSRC%/lib/cns/11643.org
-if errorlevel 1 update %XSRC%/lib/cns/11643.h %XSRC%/lib/cns/11643.org
-sed -f %XSRC%/djgpp/sources.sed %XSRC%/lib/cns/11643.org > 11643.tmp
-if errorlevel 1 goto SedError
-update 11643.tmp %XSRC%/lib/cns/11643.h
-rm 11643.tmp
-test -f %XSRC%/lib/cns/11643_4.org
-if errorlevel 1 update %XSRC%/lib/cns/11643_4.h %XSRC%/lib/cns/11643_4.org
-sed -f %XSRC%/djgpp/sources.sed %XSRC%/lib/cns/11643_4.org > 11643_4.tmp
-if errorlevel 1 goto SedError
-update 11643_4.tmp %XSRC%/lib/cns/11643_4.h
-rm 11643_4.tmp
-test -f %XSRC%/lib/iso/ir165.org
-if errorlevel 1 update %XSRC%/lib/iso/ir165.h %XSRC%/lib/iso/ir165.org
-sed -f %XSRC%/djgpp/sources.sed %XSRC%/lib/iso/ir165.org > ir165.tmp
-if errorlevel 1 goto SedError
-update ir165.tmp %XSRC%/lib/iso/ir165.h
-rm ir165.tmp
-test -f %XSRC%/lib/big5hkscs/1999.org
-if errorlevel 1 update %XSRC%/lib/big5hkscs/1999.h %XSRC%/lib/big5hkscs/1999.org
-sed -f %XSRC%/djgpp/sources.sed %XSRC%/lib/big5hkscs/1999.org > 1999.tmp
-if errorlevel 1 goto SedError
-update 1999.tmp %XSRC%/lib/big5hkscs/1999.h
-rm 1999.tmp
-test -f %XSRC%/lib/big5hkscs/2001.org
-if errorlevel 1 update %XSRC%/lib/big5hkscs/2001.h %XSRC%/lib/big5hkscs/2001.org
-sed -f %XSRC%/djgpp/sources.sed %XSRC%/lib/big5hkscs/2001.org > 2001.tmp
-if errorlevel 1 goto SedError
-update 2001.tmp %XSRC%/lib/big5hkscs/2001.h
-rm 2001.tmp
-test -f %XSRC%/lib/big5hkscs/2004.org
-if errorlevel 1 update %XSRC%/lib/big5hkscs/2004.h %XSRC%/lib/big5hkscs/2004.org
-sed -f %XSRC%/djgpp/sources.sed %XSRC%/lib/big5hkscs/2004.org > 2004.tmp
-if errorlevel 1 goto SedError
-update 2004.tmp %XSRC%/lib/big5hkscs/2004.h
-rm 2004.tmp
-
-Rem Fix the test scripts.
-if "%XSRC%" == "." goto NoDirChange
-cd | sed "s|:.*$|:|" > cd_BuildDir.bat
-cd | sed "s|^.:|cd |" >> cd_BuildDir.bat
-mv -f cd_BuildDir.bat %XSRC%/cd_BuildDir.bat
-echo %XSRC% | sed -e "s|^/dev/||" -e "s|/|:|" -e "s|:.*$|:|g" > cd_SrcDir.bat
-echo %XSRC% | sed -e "s|^/dev/||" -e "s|/|:/|" -e "s|^.*:|cd |" -e "s|^\.\.|cd &|" -e "s|/|\\|g" >> cd_SrcDir.bat
-call cd_SrcDir.bat
-call djgpp\edtest.bat
-call cd_BuildDir.bat
-rm -f cd_SrcDir.bat cd_BuildDir.bat %XSRC%/cd_BuildDir.bat
-goto TestsuitFixed
-:NoDirChange
-call djgpp\edtest.bat
-::TestsuitFixed
-:touch %XSRC%/stamp-djgppfixes
-
-Rem /include/wchar.h from DJGPP 2.03 does not work.
-Rem Replace it with the one of DJGPP 2.04.
-test -f %XSRC%/srclib/wchar.h
-if errorlevel 1 update %XSRC%/djgpp/wchar.h %XSRC%/srclib/wchar.h
-
-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 mv -f INSTALL INSTALL.txt
-
-Rem Set SHELL to a sane default or some configure tests stop working
-Rem if the package is configured across partitions.
-if not "%SHELL%" == "" goto HomeName
-set SHELL=/bin/sh
-if not "%SHELL%" == "/bin/sh" goto SmallEnv
-echo No SHELL found in the environment, using default value
-
-:HomeName
-Rem Set HOME to a sane default so configure stops complaining.
-if not "%HOME%" == "" goto HostName
-set HOME=%XSRC%/djgpp
-if not "%HOME%" == "%XSRC%/djgpp" goto SmallEnv
-echo No HOME found in the environment, using default value
-
-:HostName
-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 SmallEnv
-goto haveos
-:msdos
-set OS=MS-DOS
-if not "%OS%" == "MS-DOS" goto SmallEnv
-: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 SmallEnv
-goto userdone
-:haveuser
-set HOSTNAME=%USER%'s PC
-if not "%HOSTNAME%" == "%USER%'s PC" goto SmallEnv
-goto userdone
-:haveuname
-set HOSTNAME=%USERNAME%'s PC
-if not "%HOSTNAME%" == "%USERNAME%'s PC" goto SmallEnv
-:userdone
-set _HOSTNAME=%HOSTNAME%, %OS%
-if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto SmallEnv
-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 NoRen0
-test -f %XSRC%/install-sh.sh
-if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh
-: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 not errorlevel 0 goto MissingNLSTools
-test -x /dev/env/DJDIR/bin/xgettext.exe
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/include/libcharset.h
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/lib/libcharset.a
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/include/iconv.h
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/lib/libiconv.a
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/include/libintl.h
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/lib/libintl.a
-if not errorlevel 0 goto MissingNLSTools
-
-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/libiconv.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 garanteed to have been ported to DJGPP.
-echo --enable-nls --without-included-gettext >> arguments
-goto ConfigurePackage
-
-:MissingNLSTools
-echo Needed libs/tools for NLS not found. Configuring without NLS.
-:WithoutNLS
-Rem Update the arguments file for the configure script.
-echo --disable-nls >> arguments
-
-:ConfigurePackage
-echo Running the ./configure script...
-sh ./configure @arguments
-if errorlevel 1 goto CfgError
-rm arguments
-echo Done.
-goto End
-
-:SedError
-echo ./configure script editing failed!
-goto End
-
-:CfgError
-echo ./configure script exited abnormally!
-goto End
-
-:SmallEnv
-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 NoRen1
-test -f %XSRC%/install-sh
-if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh
-:NoRen1
-set CONFIG_SITE=
-set HOSTNAME=
-set XSRC=
diff --git a/djgpp/config.sed b/djgpp/config.sed
deleted file mode 100644
index 8d33f98..0000000
--- a/djgpp/config.sed
+++ /dev/null
@@ -1,162 +0,0 @@
-# DJGPP specific configuration file.
-# Sed script for additional DJGPP specific editing
-# of the configure script generated by autoconf 2.60.
-
-
-# Additional editing of Makefiles
-/^".*ac_file_inputs.*tmp\/out$/ 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,config\\.h\\.in,config.h-in,g\
-s,\\.\\([1-9]\\)\\.html,_\\1.html,g\
-s,iconv\\.h\\.inst,iconv_h.ins,g\
-s,iconv\\.h\\.in,iconv.h-in,g\
-s,iconv\\.h\\.build\\.in,iconv.h-build-in,g\
-s,libcharset\\.h\\.in,libcharset.h-in,g\
-s,localcharset\\.h\\.inst,localcharset_h.ins,g\
-s,localcharset\\.h\\.in,localcharset.h-in,g\
-s,localcharset\\.h\\.build\\.in,localcharset.h-build-in,g\
-s,Makefile\\.am\\.in,Makefile.am-in,g\
-s,Makefile\\.in\\.in,Makefile.in-in,g\
-/^\\.y\\.c:/,/^$/ {\
-  /\\\$(YACCCOMPILE)/ {\
-    a\\\\\
-	-@test -f y.tab.c && mv -f y.tab.c y_tab.c\\\\\
-	-@test -f y.tab.h && mv -f y.tab.h y_tab.h\
-  }\
-}\
-eof_djgpp\
-sed -f "\$tmp/subs-djgpp.sed" \$tmp/out > \$tmp/out.djgpp\
-mv -f \$tmp/out.djgpp \$tmp/out
-
-
-# Rename config.h.in into config.h-in
-/ac_config_headers=/s|config\.h|&:config.h-in|g
-/CONFIG_HEADERS=/ s|config\.h\.in|&:config.h-in|2
-
-# Rename iconv.h.build.in, iconv.h.inst, iconv.h.in and Makefile.in.in into iconv.h-build-in, iconv_h.ins, iconv.h-in and Makefile.in-in
-/ac_config_files=/ {
-  s|iconv\.h\.build\.in|iconv.h-build-in|
-  s|iconv\.h\.inst|iconv_h.ins|
-  s|iconv\.h\.in|iconv.h-in|
-  s|po/Makefile\.in|&:po/Makefile.in-in|
-}
-/CONFIG_FILES=/ {
-  s|iconv\.h\.build\.in|iconv.h-build-in|
-  s|iconv\.h\.inst|iconv_h.ins|
-  s|iconv\.h\.in|iconv.h-in|
-  s|po/Makefile\.in|&:po/Makefile.in-in|2
-}
-
-# Rename localcharset.h.build.in, localcharset.h.inst, localcharset.h.in and Makefile.in.in into localcharset.h-build-in, localcharset_h.ins, localcharset.h-in and Makefile.in-in
-/ac_config_files=/ {
-  s|localcharset\.h\.build\.in|localcharset.h-build-in|
-  s|localcharset\.h\.inst|localcharset_h.ins|
-  s|localcharset\.h\.in|localcharset.h-in|
-}
-/CONFIG_FILES=/ {
-  s|localcharset\.h\.build\.in|localcharset.h-build-in|
-  s|localcharset\.h\.inst|localcharset_h.ins|
-  s|localcharset\.h\.in|localcharset.h-in|
-}
-
-# 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).
-s,\.deps,_deps,g
-s,\.libs,_libs,g
-/^rmdir[	 ]*\.tst/ i\
-am__leading_dot=_
-
-# Replace (command) > /dev/null with `command > /dev/null`, since
-# parenthesized commands always return zero status in the ported Bash,
-# even if the named command doesn't exist
-/if ([^|;`]*null/{
-  s,(,`,
-  s,),,
-  /null[	 ]*2>&1/ s,2>&1,&`,
-  /null.*null/ s,null.*null,&`,
-  /null.*null/ !{
-    /null[	 ]*2>&1/ !s,null,&`,
-  }
-}
-
-# DOS-style absolute file names should be supported as well
-/\*) top_srcdir=/s,/\*,[\\\\/]* | ?:[\\\\/]*,
-
-# The following two items are changes needed for configuring
-# and compiling across partitions.
-# 1) 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 and bison.in
-# 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/.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%;s%.:.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%'`
-}
-/^install_sh=/a\
-install_sh=`echo "$install_sh" | sed 's%/dev/.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%;s%.:.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%'`
-
-# This will only work if the assumption that the
-# testsuite is ran from the following path:
-#   ${top_srcdir}/tests/testsuite.dir
-# holds. The explicit names are of no importance.
-#   ../../. == ${top_srcdir}
-#/^esac$/,/^ac_abs_srcdir=/ {
-/^ac_abs_srcdir=/ i\
-ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%/dev/.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`\
-ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%/dev/.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`\
-ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev/.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`
-#ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%/dev/.*/libiconv[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/libiconv[-_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
-
-# Add DJGPP version information.
-/^#define VERSION/ s/\$VERSION/&  (DJGPP port (r1))/
-
-# We need makeinfo to make the html formated docs.
-/\$am_missing_run[	 ]*makeinfo/ s,\$am_missing_run,,
-
-# The path to the FORTRAN compiler and libraries
-# shall contain no absolute path reference so it
-# will be good for all djgpp installations.
-/^FLIBS="\$ac_cv_flibs"/ i\
-ac_djgpp_path=`echo "$DJDIR" | sed 's%\\\\\\%/%g' | tr $as_cr_LETTERS $as_cr_letters`\
-ac_cv_flibs=`echo "$ac_cv_flibs" | sed "s%-L$ac_djgpp_path%-L/dev/env/DJDIR%g"`
-
-# Autoconf generated configure scripts write absolute
-# paths of certain header files into Makefiles making
-# them useless for DJGPP installations for which the
-# package has not been configured for.
-/^.*echo "\$as_me:\$LINENO: result: \$gl_cv_absolute_.*$/ {
-h
-s,^.*\(gl_cv_absolute_\)\([a-z0-9_]*\)\(_h\).*$,\1\2\3=`echo $\1\2\3 | sed "s%[^:]:.*/include/%/dev/env/DJDIR/include/%"`,
-G
-}
-/^.*echo "\$as_me:\$LINENO: result: \$gl_cv_full_.*$/ {
-h
-s,^.*\(gl_cv_full_\)\([a-z0-9_]*\)\(_h\).*$,\1\2\3=`echo $\1\2\3 | sed "s%[^:]:.*/include/%/dev/env/DJDIR/include/%"`,
-G
-}
diff --git a/djgpp/config.site b/djgpp/config.site
deleted file mode 100644
index 66cd725..0000000
--- a/djgpp/config.site
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-
-# This is the config.site file for configuring GNU packages
-# which are to be built with DJGPP tools.
-
-
-# Include the djgpp subdirectory in PATH, so that getconf is found
-PATH="$srcdir/djgpp:$PATH"
-
-# 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
-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'}
-AWK=${AWK='gawk'}
-
-# A sane default for emacs.
-ac_cv_path_EMACS=${EMACS='/dev/env/DJDIR/gnu/emacs/bin/emacs'}
-
-# A sane default for m4.
-ac_cv_path_M4=${M4='/dev/env/DJDIR/bin/m4'}
-
-# 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'}
-
-# A sane default for fgrep.
-ac_cv_path_FGREP=${FGREP='/dev/env/DJDIR/bin/fgrep'}
-
-# A sane default for sed.
-lt_cv_path_SED=${SED='/dev/env/DJDIR/bin/sed'}
-
-# A sane default for mkdir.
-ac_cv_path_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'}
-
-# 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'}
-
-# 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_vfork=no
-ac_cv_func_pipe=no
-
-# DJGPP needs ICONV_CONST set to const
-am_cv_proto_iconv_arg1="const"
diff --git a/djgpp/edtest.bat b/djgpp/edtest.bat
deleted file mode 100644
index 890ade3..0000000
--- a/djgpp/edtest.bat
+++ /dev/null
@@ -1,35 +0,0 @@
-@echo off
-if "%XSRC%" == "" set XSRC=.
-test -f %XSRC%/tests/stateful-check.org
-if errorlevel 1 update %XSRC%/tests/stateful-check %XSRC%/tests/stateful-check.org
-sed -f %XSRC%/djgpp/stateful-check.sed %XSRC%/tests/stateful-check.org > stateful-check
-if errorlevel 1 goto SedError
-update ./stateful-check %XSRC%/tests/stateful-check
-rm -f ./stateful-check
-
-test -f %XSRC%/tests/stateless-check.org
-if errorlevel 1 update %XSRC%/tests/stateless-check %XSRC%/tests/stateless-check.org
-sed -f %XSRC%/djgpp/stateless-check.sed %XSRC%/tests/stateless-check.org > stateless-check
-if errorlevel 1 goto SedError
-update ./stateless-check %XSRC%/tests/stateless-check
-rm -f ./stateless-check
-
-test -f %XSRC%/tests/failuretranslit-check.org
-if errorlevel 1 update %XSRC%/tests/failuretranslit-check %XSRC%/tests/failuretranslit-check.org
-sed -f %XSRC%/djgpp/translit-check.sed %XSRC%/tests/failuretranslit-check.org > failuretranslit-check
-if errorlevel 1 goto SedError
-update ./failuretranslit-check %XSRC%/tests/failuretranslit-check
-rm -f ./failuretranslit-check
-
-test -f %XSRC%/tests/translit-check.org
-if errorlevel 1 update %XSRC%/tests/translit-check %XSRC%/tests/translit-check.org
-sed -f %XSRC%/djgpp/translit-check.sed %XSRC%/tests/translit-check.org > translit-check
-if errorlevel 1 goto SedError
-update ./translit-check %XSRC%/tests/translit-check
-rm -f ./translit-check
-goto End
-
-:SedError
-echo test script editing failed!
-
-:End
diff --git a/djgpp/fnchange.in b/djgpp/fnchange.in
deleted file mode 100644
index 62ebbdf..0000000
--- a/djgpp/fnchange.in
+++ /dev/null
@@ -1,204 +0,0 @@
-@V@/config.h.in                                   @V@/config.h-in
-@V@/config.h.msvc                                 @V@/config.h-msvc
-@V@/build-aux/install-reloc                       @V@/build-aux/install.reloc
-@V@/build-aux/install-sh                          @V@/build-aux/install.sh
-@V@/m4/strerror_r.m4                              @V@/m4/strerr_r.m4
-@V@/include/iconv.h.in                            @V@/include/iconv.h-in
-@V@/include/iconv.h.build.in                      @V@/include/iconv.h-build-in
-@V@/include/iconv.h.msvc-static                   @V@/include/iconv_h.static-msvc
-@V@/include/iconv.h.msvc-shared                   @V@/include/iconv_h.shared-msvc
-@V@/man/iconv.1.html                              @V@/man/iconv_1.html
-@V@/man/iconv.3.html                              @V@/man/iconv_3.html
-@V@/man/iconv_close.3.html                        @V@/man/iconv_close_3.html
-@V@/man/iconv_open.3.html                         @V@/man/iconv_open_3.html
-@V@/libcharset/config.h.in                        @V@/libcharset/config.h-in
-@V@/libcharset/config.h.msvc                      @V@/libcharset/config.h-msvc
-@V@/libcharset/include/libcharset.h.in            @V@/libcharset/include/libcharset.h-in
-@V@/libcharset/include/libcharset.h.msvc-shared   @V@/libcharset/include/libcharset.h-msvc-shared
-@V@/libcharset/include/localcharset.h.in          @V@/libcharset/include/localcharset.h-in
-@V@/libcharset/include/localcharset.h.build.in    @V@/libcharset/include/localcharset.h-build-in
-@V@/libcharset/include/localcharset.h.msvc-shared @V@/libcharset/include/localcharset.h-msvc-shared
-@V@/libcharset/tools/aix-3.2.5                    @V@/libcharset/tools/aix-3.2-5
-@V@/libcharset/tools/aix-4.1.5                    @V@/libcharset/tools/aix-4.1-5
-@V@/libcharset/tools/aix-4.2.0                    @V@/libcharset/tools/aix-4.2-0
-@V@/libcharset/tools/aix-4.3.2                    @V@/libcharset/tools/aix-4.3-2
-@V@/libcharset/tools/glibc-2.1.3                  @V@/libcharset/tools/glibc-2.1-3
-@V@/libcharset/tools/glibc-2.1.90                 @V@/libcharset/tools/glibc-2.1-90
-@V@/libcharset/tools/locale_charmap               @V@/libcharset/tools/locale_charmap
-@V@/libcharset/tools/locale_charset.c             @V@/libcharset/tools/charset_locale.c
-@V@/libcharset/tools/locale_codeset.c             @V@/libcharset/tools/codeset_locale.c
-@V@/libcharset/tools/solaris-2.5.1                @V@/libcharset/tools/solaris-2.5-1
-@V@/libcharset/tools/sunos-4.1.4                  @V@/libcharset/tools/sunos-4.1-4
-@V@/libcharset/tools/all-charsets-X11             @V@/libcharset/tools/all-charsets.X11
-@V@/libcharset/tools/glibc-2.2-XF86-3.3.6         @V@/libcharset/tools/glibc22XF86-3.3-6
-@V@/libcharset/tools/glibc-2.2-XF86-4.0.1f        @V@/libcharset/tools/glibc22XF86-4.0-1f
-@V@/libcharset/tools/locale_x11encoding.c         @V@/libcharset/tools/x11encoding_locale.c
-@V@/lib/aliases.gperf                             @V@/lib/aliases/aliases.gperf
-@V@/lib/aliases.h                                 @V@/lib/aliases/aliases.h
-@V@/lib/aliases2.h                                @V@/lib/aliases/aliases2.h
-@V@/lib/aliases_aix.h                             @V@/lib/aliases/aix.h
-@V@/lib/aliases_dos.h                             @V@/lib/aliases/dos.h
-@V@/lib/aliases_extra.h                           @V@/lib/aliases/extra.h
-@V@/lib/aliases_osf1.h                            @V@/lib/aliases/osf1.h
-@V@/lib/big5hkscs1999.h                           @V@/lib/big5hkscs/1999.h
-@V@/lib/big5hkscs2001.h                           @V@/lib/big5hkscs/2001.h
-@V@/lib/big5hkscs2004.h                           @V@/lib/big5hkscs/2004.h
-@V@/lib/cns11643.h                                @V@/lib/cns/11643.h
-@V@/lib/cns11643_1.h                              @V@/lib/cns/11643_1.h
-@V@/lib/cns11643_2.h                              @V@/lib/cns/11643_2.h
-@V@/lib/cns11643_3.h                              @V@/lib/cns/11643_3.h
-@V@/lib/cns11643_4.h                              @V@/lib/cns/11643_4.h
-@V@/lib/cns11643_4a.h                             @V@/lib/cns/11643_4a.h
-@V@/lib/cns11643_4b.h                             @V@/lib/cns/11643_4b.h
-@V@/lib/cns11643_5.h                              @V@/lib/cns/11643_5.h
-@V@/lib/cns11643_6.h                              @V@/lib/cns/11643_6.h
-@V@/lib/cns11643_7.h                              @V@/lib/cns/11643_7.h
-@V@/lib/cns11643_15.h                             @V@/lib/cns/11643_15.h
-@V@/lib/cns11643_inv.h                            @V@/lib/cns/11643_inv.h
-@V@/lib/config.h.in                               @V@/lib/config.h-in
-@V@/lib/config.h.msvc                             @V@/lib/config.h-msvc
-@V@/lib/canonical.h                               @V@/lib/canonical/canonical.h
-@V@/lib/canonical.h                               @V@/lib/canonical/canonical.h
-@V@/lib/canonical.h                               @V@/lib/canonical/canonical.h
-@V@/lib/canonical.h                               @V@/lib/canonical/canonical.h
-@V@/lib/canonical_aix.h                           @V@/lib/canonical/aix.h
-@V@/lib/canonical_dos.h                           @V@/lib/canonical/dos.h
-@V@/lib/canonical_extra.h                         @V@/lib/canonical/extra.h
-@V@/lib/canonical_osf1.h                          @V@/lib/canonical/osf1.h
-@V@/lib/canonical_local.h                         @V@/lib/canonical/local.h
-@V@/lib/encodings.def                             @V@/lib/encodings/encodings.def
-@V@/lib/encodings_aix.def                         @V@/lib/encodings/aix.def
-@V@/lib/encodings_dos.def                         @V@/lib/encodings/dos.def
-@V@/lib/encodings_extra.def                       @V@/lib/encodings/extra.def
-@V@/lib/encodings_local.def                       @V@/lib/encodings/local.def
-@V@/lib/encodings_osf1.def                        @V@/lib/encodings/osf1.def
-@V@/lib/genaliases2.c                             @V@/lib/2genaliases.c
-@V@/lib/georgian_academy.h                        @V@/lib/georgian/academy.h
-@V@/lib/georgian_ps.h                             @V@/lib/georgian/ps.h
-@V@/lib/hkscs1999.h                               @V@/lib/hkscs/1999.h
-@V@/lib/hkscs2001.h                               @V@/lib/hkscs/2001.h
-@V@/lib/hkscs2004.h                               @V@/lib/hkscs/2004.h
-@V@/lib/iso2022_cn.h                              @V@/lib/iso/2022_cn.h
-@V@/lib/iso2022_cnext.h                           @V@/lib/iso/2022_cnext.h
-@V@/lib/iso2022_jp.h                              @V@/lib/iso/2022_jp.h
-@V@/lib/iso2022_jp1.h                             @V@/lib/iso/2022_jp1.h
-@V@/lib/iso2022_jp2.h                             @V@/lib/iso/2022_jp2.h
-@V@/lib/iso2022_jp3.h                             @V@/lib/iso/2022_jp3.h
-@V@/lib/iso2022_kr.h                              @V@/lib/iso/2022_kr.h
-@V@/lib/iso646_cn.h                               @V@/lib/iso/646_cn.h
-@V@/lib/iso646_jp.h                               @V@/lib/iso/646_jp.h
-@V@/lib/iso8859_1.h                               @V@/lib/iso/8859_1.h
-@V@/lib/iso8859_10.h                              @V@/lib/iso/8859_10.h
-@V@/lib/iso8859_11.h                              @V@/lib/iso/8859_11.h
-@V@/lib/iso8859_13.h                              @V@/lib/iso/8859_13.h
-@V@/lib/iso8859_14.h                              @V@/lib/iso/8859_14.h
-@V@/lib/iso8859_15.h                              @V@/lib/iso/8859_15.h
-@V@/lib/iso8859_16.h                              @V@/lib/iso/8859_16.h
-@V@/lib/iso8859_2.h                               @V@/lib/iso/8859_2.h
-@V@/lib/iso8859_3.h                               @V@/lib/iso/8859_3.h
-@V@/lib/iso8859_4.h                               @V@/lib/iso/8859_4.h
-@V@/lib/iso8859_5.h                               @V@/lib/iso/8859_5.h
-@V@/lib/iso8859_6.h                               @V@/lib/iso/8859_6.h
-@V@/lib/iso8859_7.h                               @V@/lib/iso/8859_7.h
-@V@/lib/iso8859_8.h                               @V@/lib/iso/8859_8.h
-@V@/lib/iso8859_9.h                               @V@/lib/iso/8859_9.h
-@V@/lib/isoir165.h                                @V@/lib/iso/ir165.h
-@V@/lib/isoir165ext.h                             @V@/lib/iso/ir165ext.h
-@V@/lib/mac_arabic.h                              @V@/lib/mac/arabic.h
-@V@/lib/mac_centraleurope.h                       @V@/lib/mac/centraleurope.h
-@V@/lib/mac_croatian.h                            @V@/lib/mac/croatian.h
-@V@/lib/mac_cyrillic.h                            @V@/lib/mac/cyrillic.h
-@V@/lib/mac_greek.h                               @V@/lib/mac/greek.h
-@V@/lib/mac_hebrew.h                              @V@/lib/mac/hebrew.h
-@V@/lib/mac_iceland.h                             @V@/lib/mac/iceland.h
-@V@/lib/mac_roman.h                               @V@/lib/mac/roman.h
-@V@/lib/mac_romania.h                             @V@/lib/mac/romania.h
-@V@/lib/mac_thai.h                                @V@/lib/mac/thai.h
-@V@/lib/mac_turkish.h                             @V@/lib/mac/turkish.h
-@V@/lib/mac_ukraine.h                             @V@/lib/mac/ukraine.h
-@V@/po/Makefile.in.in                             @V@/po/Makefile.in-in
-@V@/po/Makefile.msvc.sh                           @V@/po/Makefile-msvc.sh
-@V@/tests/ARMSCII-8.IRREVERSIBLE.TXT              @V@/tests/ARMSCII-8.IRREVERSIBLE-TXT
-@V@/tests/CP932.IRREVERSIBLE.TXT                  @V@/tests/CP932.IRREVERSIBLE-TXT
-@V@/tests/CP950.IRREVERSIBLE.TXT                  @V@/tests/CP950.IRREVERSIBLE-TXT
-@V@/tests/CP1161.IRREVERSIBLE.TXT                 @V@/tests/CP1161.IRREVERSIBLE-TXT
-@V@/tests/CP1163.IRREVERSIBLE.TXT                 @V@/tests/CP1163.IRREVERSIBLE-TXT
-@V@/tests/DEC-HANYU.IRREVERSIBLE.TXT              @V@/tests/DEC-HANYU.IRREVERSIBLE-TXT
-@V@/tests/EUC-JP.IRREVERSIBLE.TXT                 @V@/tests/EUC-JP.IRREVERSIBLE-TXT
-@V@/tests/EUC-TW.IRREVERSIBLE.TXT                 @V@/tests/EUC-TW.IRREVERSIBLE-TXT
-@V@/tests/Georgian-PS.TXT                         @V@/tests/Georgian/PS.TXT
-@V@/tests/Georgian-Academy.TXT                    @V@/tests/Georgian/Academy.TXT
-@V@/tests/ISO-2022-CN-EXT-snippet                 @V@/tests/ISO/2022CN-EXT-snippet
-@V@/tests/ISO-2022-CN-EXT-snippet.UTF-8           @V@/tests/ISO/2022CN-EXT-snippet.UTF-8
-@V@/tests/ISO-2022-CN-snippet                     @V@/tests/ISO/2022CN-snippet
-@V@/tests/ISO-2022-CN-snippet.UTF-8               @V@/tests/ISO/2022CN-snippet.UTF-8
-@V@/tests/ISO-2022-JP-1-snippet                   @V@/tests/ISO/2022JP-1-snippet
-@V@/tests/ISO-2022-JP-1-snippet.UTF-8             @V@/tests/ISO/2022JP-1-snippet.UTF-8
-@V@/tests/ISO-2022-JP-2-snippet                   @V@/tests/ISO/2022JP-2-snippet
-@V@/tests/ISO-2022-JP-2-snippet.UTF-8             @V@/tests/ISO/2022JP-2-snippet.UTF-8
-@V@/tests/ISO-2022-JP-3-snippet                   @V@/tests/ISO/2022JP-3-snippet
-@V@/tests/ISO-2022-JP-3-snippet.UTF-8             @V@/tests/ISO/2022JP-3-snippet.UTF-8
-@V@/tests/ISO-2022-JP-snippet                     @V@/tests/ISO/2022JP-snippet
-@V@/tests/ISO-2022-JP-snippet.UTF-8               @V@/tests/ISO/2022JP-snippet.UTF-8
-@V@/tests/ISO-2022-KR-snippet                     @V@/tests/ISO/2022KR-snippet
-@V@/tests/ISO-2022-KR-snippet.UTF-8               @V@/tests/ISO/2022KR-snippet.UTF-8
-@V@/tests/ISO-8859-1.TXT                          @V@/tests/ISO/8859-1.TXT
-@V@/tests/ISO-8859-10.TXT                         @V@/tests/ISO/8859-10.TXT
-@V@/tests/ISO-8859-11.TXT                         @V@/tests/ISO/8859-11.TXT
-@V@/tests/ISO-8859-13.TXT                         @V@/tests/ISO/8859-13.TXT
-@V@/tests/ISO-8859-14.TXT                         @V@/tests/ISO/8859-14.TXT
-@V@/tests/ISO-8859-15.TXT                         @V@/tests/ISO/8859-15.TXT
-@V@/tests/ISO-8859-16.TXT                         @V@/tests/ISO/8859-16.TXT
-@V@/tests/ISO-8859-2.TXT                          @V@/tests/ISO/8859-2.TXT
-@V@/tests/ISO-8859-3.TXT                          @V@/tests/ISO/8859-3.TXT
-@V@/tests/ISO-8859-4.TXT                          @V@/tests/ISO/8859-4.TXT
-@V@/tests/ISO-8859-5.TXT                          @V@/tests/ISO/8859-5.TXT
-@V@/tests/ISO-8859-6.TXT                          @V@/tests/ISO/8859-6.TXT
-@V@/tests/ISO-8859-7.TXT                          @V@/tests/ISO/8859-7.TXT
-@V@/tests/ISO-8859-8.TXT                          @V@/tests/ISO/8859-8.TXT
-@V@/tests/ISO-8859-9.TXT                          @V@/tests/ISO/8859-9.TXT
-@V@/tests/ISO-IR-165.IRREVERSIBLE.TXT             @V@/tests/ISO/IR-165.IRREVERSIBLE-TXT
-@V@/tests/ISO-IR-165.TXT                          @V@/tests/ISO/IR-165.TXT
-@V@/tests/MacArabic.TXT                           @V@/tests/Mac/Arabic.TXT
-@V@/tests/MacCentralEurope.TXT                    @V@/tests/Mac/CentralEurope.TXT
-@V@/tests/MacCroatian.TXT                         @V@/tests/Mac/Croatian.TXT
-@V@/tests/MacCyrillic.TXT                         @V@/tests/Mac/Cyrillic.TXT
-@V@/tests/MacGreek.TXT                            @V@/tests/Mac/Greek.TXT
-@V@/tests/MacHebrew.TXT                           @V@/tests/Mac/Hebrew.TXT
-@V@/tests/MacIceland.TXT                          @V@/tests/Mac/Iceland.TXT
-@V@/tests/MacRoman.TXT                            @V@/tests/Mac/Roman.TXT
-@V@/tests/MacRomania.TXT                          @V@/tests/Mac/Romania.TXT
-@V@/tests/MacThai.TXT                             @V@/tests/Mac/Thai.TXT
-@V@/tests/MacTurkish.TXT                          @V@/tests/Mac/Turkish.TXT
-@V@/tests/MacUkraine.TXT                          @V@/tests/Mac/Ukraine.TXT
-@V@/tests/check-stateful                          @V@/tests/stateful-check
-@V@/tests/check-stateful.bat                      @V@/tests/stateful-check.bat
-@V@/tests/check-stateful.cmd                      @V@/tests/stateful-check.cmd
-@V@/tests/check-stateless                         @V@/tests/stateless-check
-@V@/tests/check-stateless.bat                     @V@/tests/stateless-check.bat
-@V@/tests/check-stateless.cmd                     @V@/tests/stateless-check.cmd
-@V@/tests/check-translit                          @V@/tests/translit-check
-@V@/tests/check-translit.bat                      @V@/tests/translit-check.bat
-@V@/tests/check-translit.cmd                      @V@/tests/translit-check.cmd
-@V@/tests/check-translitfailure                   @V@/tests/failuretranslit-check
-@V@/tests/BIG5-HKSCS.IRREVERSIBLE.TXT             @V@/tests/BIG5-HKSCS.IRREVERSIBLE-TXT
-@V@/tests/CP1258.IRREVERSIBLE.TXT                 @V@/tests/CP1258.IRREVERSIBLE-TXT
-@V@/tests/TCVN.IRREVERSIBLE.TXT                   @V@/tests/TCVN.IRREVERSIBLE-TXT
-@V@/tests/CP1255.IRREVERSIBLE.TXT                 @V@/tests/CP1255.IRREVERSIBLE-TXT
-@V@/tests/TranslitFail1.ISO-8859-1                @V@/tests/_Translit/Fail1.ISO-8859-1
-@V@/tests/Translit1.ISO-8859-1                    @V@/tests/_Translit/1.ISO-8859-1
-@V@/tests/Translit1.ASCII                         @V@/tests/_Translit/1.ASCII
-@V@/tests/SHIFT_JIS.TXT                           @V@/tests/SHIFT/JIS.TXT
-@V@/tests/SHIFT_JISX0213.TXT                      @V@/tests/SHIFT/JISX0213.TXT
-@V@/tests/BIG5-HKSCS-1999.IRREVERSIBLE.TXT        @V@/tests/BIG5-HKSCS/1999.IRREVERSIBLE-TXT
-@V@/tests/BIG5-HKSCS-1999.TXT                     @V@/tests/BIG5-HKSCS/1999.TXT
-@V@/tests/BIG5-HKSCS-2001.IRREVERSIBLE.TXT        @V@/tests/BIG5-HKSCS/2001.IRREVERSIBLE-TXT
-@V@/tests/BIG5-HKSCS-2001.TXT                     @V@/tests/BIG5-HKSCS/2001.TXT
-@V@/tests/BIG5-HKSCS-2004.IRREVERSIBLE.TXT        @V@/tests/BIG5-HKSCS/2004.IRREVERSIBLE-TXT
-@V@/tests/BIG5-HKSCS-2004.TXT                     @V@/tests/BIG5-HKSCS/2004.TXT
-@V@/tests/BIG5-HKSCS-1999-snippet                 @V@/tests/BIG5-HKSCS/1999-snippet
-@V@/tests/BIG5-HKSCS-1999-snippet.UTF-8           @V@/tests/BIG5-HKSCS/1999-snippet.UTF-8
-@V@/tests/BIG5-HKSCS-2001-snippet                 @V@/tests/BIG5-HKSCS/2001-snippet
-@V@/tests/BIG5-HKSCS-2001-snippet.UTF-8           @V@/tests/BIG5-HKSCS/2001-snippet.UTF-8
-@V@/tests/BIG5-HKSCS-2004-snippet                 @V@/tests/BIG5-HKSCS/2004-snippet
-@V@/tests/BIG5-HKSCS-2004-snippet.UTF-8           @V@/tests/BIG5-HKSCS/2004-snippet.UTF-8
diff --git a/djgpp/fnchange.lst b/djgpp/fnchange.lst
deleted file mode 100644
index b51cfd1..0000000
--- a/djgpp/fnchange.lst
+++ /dev/null
@@ -1,217 +0,0 @@
-libiconv-1.11/include/iconv.h.msvc-static                  libiconv-1.11/include/iconv_h.static-msvc
-libiconv-1.11/include/iconv.h.msvc-shared                  libiconv-1.11/include/iconv_h.shared-msvc
-libiconv-1.11/tests/Georgian-PS.TXT                        libiconv-1.11/tests/Georgian/PS.TXT
-libiconv-1.11/tests/ARMSCII-8.IRREVERSIBLE.TXT             libiconv-1.11/tests/ARMSCII-8.IRREVERSIBLE-TXT
-libiconv-1.11/tests/CP932.IRREVERSIBLE.TXT                 libiconv-1.11/tests/CP932.IRREVERSIBLE-TXT
-libiconv-1.11/tests/CP950.IRREVERSIBLE.TXT                 libiconv-1.11/tests/CP950.IRREVERSIBLE-TXT
-libiconv-1.11/tests/EUC-TW.IRREVERSIBLE.TXT                libiconv-1.11/tests/EUC-TW.IRREVERSIBLE-TXT
-libiconv-1.11/tests/ISO-2022-CN-EXT-snippet                libiconv-1.11/tests/ISO/2022CN-EXT-snippet
-libiconv-1.11/tests/Georgian-Academy.TXT                   libiconv-1.11/tests/Georgian/Academy.TXT
-libiconv-1.11/tests/ISO-2022-CN-EXT-snippet.UTF-8          libiconv-1.11/tests/ISO/2022CN-EXT-snippet.UTF-8
-libiconv-1.11/tests/ISO-2022-CN-snippet                    libiconv-1.11/tests/ISO/2022CN-snippet
-libiconv-1.11/tests/ISO-2022-CN-snippet.UTF-8              libiconv-1.11/tests/ISO/2022CN-snippet.UTF-8
-libiconv-1.11/tests/ISO-2022-JP-1-snippet                  libiconv-1.11/tests/ISO/2022JP-1-snippet
-libiconv-1.11/tests/ISO-2022-JP-1-snippet.UTF-8            libiconv-1.11/tests/ISO/2022JP-1-snippet.UTF-8
-libiconv-1.11/tests/ISO-2022-JP-2-snippet                  libiconv-1.11/tests/ISO/2022JP-2-snippet
-libiconv-1.11/tests/ISO-2022-JP-2-snippet.UTF-8            libiconv-1.11/tests/ISO/2022JP-2-snippet.UTF-8
-libiconv-1.11/tests/ISO-2022-JP-snippet                    libiconv-1.11/tests/ISO/2022JP-snippet
-libiconv-1.11/tests/ISO-2022-JP-snippet.UTF-8              libiconv-1.11/tests/ISO/2022JP-snippet.UTF-8
-libiconv-1.11/tests/ISO-2022-KR-snippet                    libiconv-1.11/tests/ISO/2022KR-snippet
-libiconv-1.11/tests/ISO-2022-KR-snippet.UTF-8              libiconv-1.11/tests/ISO/2022KR-snippet.UTF-8
-libiconv-1.11/tests/ISO-8859-1.TXT                         libiconv-1.11/tests/ISO/8859-1.TXT
-libiconv-1.11/tests/ISO-8859-10.TXT                        libiconv-1.11/tests/ISO/8859-10.TXT
-libiconv-1.11/tests/ISO-8859-13.TXT                        libiconv-1.11/tests/ISO/8859-13.TXT
-libiconv-1.11/tests/ISO-8859-14.TXT                        libiconv-1.11/tests/ISO/8859-14.TXT
-libiconv-1.11/tests/ISO-8859-15.TXT                        libiconv-1.11/tests/ISO/8859-15.TXT
-libiconv-1.11/tests/ISO-8859-16.TXT                        libiconv-1.11/tests/ISO/8859-16.TXT
-libiconv-1.11/tests/ISO-8859-2.TXT                         libiconv-1.11/tests/ISO/8859-2.TXT
-libiconv-1.11/tests/ISO-8859-3.TXT                         libiconv-1.11/tests/ISO/8859-3.TXT
-libiconv-1.11/tests/ISO-8859-4.TXT                         libiconv-1.11/tests/ISO/8859-4.TXT
-libiconv-1.11/tests/ISO-8859-5.TXT                         libiconv-1.11/tests/ISO/8859-5.TXT
-libiconv-1.11/tests/ISO-8859-6.TXT                         libiconv-1.11/tests/ISO/8859-6.TXT
-libiconv-1.11/tests/ISO-8859-7.TXT                         libiconv-1.11/tests/ISO/8859-7.TXT
-libiconv-1.11/tests/ISO-8859-8.TXT                         libiconv-1.11/tests/ISO/8859-8.TXT
-libiconv-1.11/tests/ISO-8859-9.TXT                         libiconv-1.11/tests/ISO/8859-9.TXT
-libiconv-1.11/tests/ISO-IR-165.IRREVERSIBLE.TXT            libiconv-1.11/tests/ISO/IR-165.IRREVERSIBLE-TXT
-libiconv-1.11/tests/ISO-IR-165.TXT                         libiconv-1.11/tests/ISO/IR-165.TXT
-libiconv-1.11/tests/ISO646-CN.TXT                          libiconv-1.11/tests/ISO646-CN.TXT
-libiconv-1.11/tests/ISO646-JP.TXT                          libiconv-1.11/tests/ISO646-JP.TXT
-libiconv-1.11/tests/MacArabic.TXT                          libiconv-1.11/tests/Mac/Arabic.TXT
-libiconv-1.11/tests/MacCentralEurope.TXT                   libiconv-1.11/tests/Mac/CentralEurope.TXT
-libiconv-1.11/tests/MacCroatian.TXT                        libiconv-1.11/tests/Mac/Croatian.TXT
-libiconv-1.11/tests/MacCyrillic.TXT                        libiconv-1.11/tests/Mac/Cyrillic.TXT
-libiconv-1.11/tests/MacGreek.TXT                           libiconv-1.11/tests/Mac/Greek.TXT
-libiconv-1.11/tests/MacHebrew.TXT                          libiconv-1.11/tests/Mac/Hebrew.TXT
-libiconv-1.11/tests/MacIceland.TXT                         libiconv-1.11/tests/Mac/Iceland.TXT
-libiconv-1.11/tests/MacRoman.TXT                           libiconv-1.11/tests/Mac/Roman.TXT
-libiconv-1.11/tests/MacRomania.TXT                         libiconv-1.11/tests/Mac/Romania.TXT
-libiconv-1.11/tests/MacThai.TXT                            libiconv-1.11/tests/Mac/Thai.TXT
-libiconv-1.11/tests/MacTurkish.TXT                         libiconv-1.11/tests/Mac/Turkish.TXT
-libiconv-1.11/tests/MacUkraine.TXT                         libiconv-1.11/tests/Mac/Ukraine.TXT
-libiconv-1.11/tests/Makefile.in                            libiconv-1.11/tests/Makefile.in
-libiconv-1.11/tests/MuleLao-1.TXT                          libiconv-1.11/tests/MuleLao-1.TXT
-libiconv-1.11/tests/NEXTSTEP.TXT                           libiconv-1.11/tests/NEXTSTEP.TXT
-libiconv-1.11/tests/Quotes.ASCII                           libiconv-1.11/tests/Quotes.ASCII
-libiconv-1.11/tests/Quotes.ISO-8859-1                      libiconv-1.11/tests/Quotes.ISO-8859-1
-libiconv-1.11/tests/Quotes.UTF-8                           libiconv-1.11/tests/Quotes.UTF-8
-libiconv-1.11/tests/SHIFT-JIS.TXT                          libiconv-1.11/tests/SHIFT-JIS.TXT
-libiconv-1.11/tests/TCVN.TXT                               libiconv-1.11/tests/TCVN.TXT
-libiconv-1.11/tests/TIS-620.TXT                            libiconv-1.11/tests/TIS-620.TXT
-libiconv-1.11/tests/UTF-7-snippet                          libiconv-1.11/tests/UTF-7-snippet
-libiconv-1.11/tests/UTF-7-snippet.UTF-8                    libiconv-1.11/tests/UTF-7-snippet.UTF-8
-libiconv-1.11/tests/VISCII.TXT                             libiconv-1.11/tests/VISCII.TXT
-libiconv-1.11/tests/check-stateful                         libiconv-1.11/tests/stateful-check
-libiconv-1.11/tests/check-stateless                        libiconv-1.11/tests/stateless-check
-libiconv-1.11/tests/check-translit                         libiconv-1.11/tests/translit-check
-libiconv-1.11/tests/check-translit.bat                     libiconv-1.11/tests/translit-check.bat
-libiconv-1.11/tests/check-stateless.bat                    libiconv-1.11/tests/stateless-check.bat
-libiconv-1.11/tests/check-stateful.bat                     libiconv-1.11/tests/stateful-check.bat
-libiconv-1.11/tests/check-stateful.cmd                     libiconv-1.11/tests/stateful-check.cmd
-libiconv-1.11/tests/check-stateless.cmd                    libiconv-1.11/tests/stateless-check.cmd
-libiconv-1.11/tests/check-translit.cmd                     libiconv-1.11/tests/translit-check.cmd
-libiconv-1.11/tests/BIG5-HKSCS.IRREVERSIBLE.TXT            libiconv-1.11/tests/BIG5-HKSCS.IRREVERSIBLE-TXT
-libiconv-1.11/libcharset/tools/README                      libiconv-1.11/libcharset/tools/README
-libiconv-1.11/libcharset/tools/aix-3.2.5                   libiconv-1.11/libcharset/tools/aix-3.2.5
-libiconv-1.11/libcharset/tools/aix-4.1.5                   libiconv-1.11/libcharset/tools/aix-4.1.5
-libiconv-1.11/libcharset/tools/aix-4.2.0                   libiconv-1.11/libcharset/tools/aix-4.2.0
-libiconv-1.11/libcharset/tools/aix-4.3.2                   libiconv-1.11/libcharset/tools/aix-4.3.2
-libiconv-1.11/libcharset/tools/all-charsets                libiconv-1.11/libcharset/tools/all-charsets
-libiconv-1.11/libcharset/tools/all-locales                 libiconv-1.11/libcharset/tools/all-locales
-libiconv-1.11/libcharset/tools/freebsd-3.3                 libiconv-1.11/libcharset/tools/freebsd-3.3
-libiconv-1.11/libcharset/tools/glibc-2.1.3                 libiconv-1.11/libcharset/tools/glibc-2.1.3
-libiconv-1.11/libcharset/tools/glibc-2.1.90                libiconv-1.11/libcharset/tools/glibc-2.1.90
-libiconv-1.11/libcharset/tools/hpux-10.01                  libiconv-1.11/libcharset/tools/hpux-10.01
-libiconv-1.11/libcharset/tools/hpux-10.20                  libiconv-1.11/libcharset/tools/hpux-10.20
-libiconv-1.11/libcharset/tools/hpux-11.00                  libiconv-1.11/libcharset/tools/hpux-11.00
-libiconv-1.11/libcharset/tools/irix-6.5                    libiconv-1.11/libcharset/tools/irix-6.5
-libiconv-1.11/libcharset/tools/locale_charmap              libiconv-1.11/libcharset/tools/locale_charmap
-libiconv-1.11/libcharset/tools/locale_charset.c            libiconv-1.11/libcharset/tools/locale_charset.c
-libiconv-1.11/libcharset/tools/locale_codeset.c            libiconv-1.11/libcharset/tools/localecodeset.c
-libiconv-1.11/libcharset/tools/osf1-4.0a                   libiconv-1.11/libcharset/tools/osf1-4.0a
-libiconv-1.11/libcharset/tools/osf1-4.0d                   libiconv-1.11/libcharset/tools/osf1-4.0d
-libiconv-1.11/libcharset/tools/osf1-5.1                    libiconv-1.11/libcharset/tools/osf1-5.1
-libiconv-1.11/libcharset/tools/solaris-2.4                 libiconv-1.11/libcharset/tools/solaris-2.4
-libiconv-1.11/libcharset/tools/solaris-2.5.1               libiconv-1.11/libcharset/tools/solaris-2.5.1
-libiconv-1.11/libcharset/tools/solaris-2.6                 libiconv-1.11/libcharset/tools/solaris-2.6
-libiconv-1.11/libcharset/tools/solaris-2.6-cjk             libiconv-1.11/libcharset/tools/solaris-2.6-cjk
-libiconv-1.11/libcharset/tools/solaris-2.7                 libiconv-1.11/libcharset/tools/solaris-2.7
-libiconv-1.11/libcharset/tools/sunos-4.1.4                 libiconv-1.11/libcharset/tools/sunos-4.1.4
-libiconv-1.11/libcharset/tools/win32                       libiconv-1.11/libcharset/tools/win32
-libiconv-1.11/libcharset/tools/glibc-2.2                   libiconv-1.11/libcharset/tools/glibc-2.2
-libiconv-1.11/libcharset/tools/all-charsets-X11            libiconv-1.11/libcharset/tools/all-charsets.X11
-libiconv-1.11/libcharset/tools/glibc-2.2-XF86-3.3.6        libiconv-1.11/libcharset/tools/glibc-2.2-XF86-3.3.6
-libiconv-1.11/libcharset/tools/glibc-2.2-XF86-4.0.1f       libiconv-1.11/libcharset/tools/glibc-2.2XF86-4.0.1f
-libiconv-1.11/libcharset/tools/locale_x11encoding.c        libiconv-1.11/libcharset/tools/locale_x11encoding.c
-libiconv-1.11/libcharset/tools/beos-5                      libiconv-1.11/libcharset/tools/beos-5
-libiconv-1.11/libcharset/m4/ChangeLog                      libiconv-1.11/libcharset/m4/ChangeLog
-libiconv-1.11/libcharset/m4/codeset.m4                     libiconv-1.11/libcharset/m4/codeset.m4
-libiconv-1.11/libcharset/m4/glibc21.m4                     libiconv-1.11/libcharset/m4/glibc21.m4
-libiconv-1.11/libcharset/m4/libtool.m4                     libiconv-1.11/libcharset/m4/libtool.m4
-libiconv-1.11/libcharset/lib/localcharset.c                libiconv-1.11/libcharset/lib/localcharset.c
-libiconv-1.11/libcharset/lib/ChangeLog                     libiconv-1.11/libcharset/lib/ChangeLog
-libiconv-1.11/libcharset/lib/Makefile.in                   libiconv-1.11/libcharset/lib/Makefile.in
-libiconv-1.11/libcharset/lib/Makefile.msvc                 libiconv-1.11/libcharset/lib/Makefile.msvc
-libiconv-1.11/libcharset/AUTHORS                           libiconv-1.11/libcharset/AUTHORS
-libiconv-1.11/libcharset/COPYING.LIB                       libiconv-1.11/libcharset/COPYING.LIB
-libiconv-1.11/libcharset/INSTALL.generic                   libiconv-1.11/libcharset/INSTALL.generic
-libiconv-1.11/libcharset/README                            libiconv-1.11/libcharset/README
-libiconv-1.11/libcharset/Makefile.devel                    libiconv-1.11/libcharset/Makefile.devel
-libiconv-1.11/libcharset/Makefile.in                       libiconv-1.11/libcharset/Makefile.in
-libiconv-1.11/libcharset/configure.ac                      libiconv-1.11/libcharset/configure.ac
-libiconv-1.11/libcharset/configure                         libiconv-1.11/libcharset/configure
-libiconv-1.11/libcharset/INTEGRATE                         libiconv-1.11/libcharset/INTEGRATE
-libiconv-1.11/libcharset/include/localcharset.h.in         libiconv-1.11/libcharset/include/localcharset.h.in
-libiconv-1.11/libcharset/include/localcharset.h.msvc-shared libiconv-1.11/libcharset/include/localcharset_h.shared-msvc
-libiconv-1.11/libcharset/autoconf/config.guess             libiconv-1.11/libcharset/autoconf/config.guess
-libiconv-1.11/libcharset/autoconf/config.sub               libiconv-1.11/libcharset/autoconf/config.sub
-libiconv-1.11/libcharset/autoconf/ltmain.sh                libiconv-1.11/libcharset/autoconf/ltmain.sh
-libiconv-1.11/libcharset/autoconf/install-sh               libiconv-1.11/libcharset/autoconf/install-sh
-libiconv-1.11/libcharset/autoconf/aclocal.m4               libiconv-1.11/libcharset/autoconf/aclocal.m4
-libiconv-1.11/libcharset/autoconf/mkinstalldirs            libiconv-1.11/libcharset/autoconf/mkinstalldirs
-libiconv-1.11/libcharset/config.h.in                       libiconv-1.11/libcharset/config.h.in
-libiconv-1.11/libcharset/windows/dllexport.h               libiconv-1.11/libcharset/windows/dllexport.h
-libiconv-1.11/libcharset/ChangeLog                         libiconv-1.11/libcharset/ChangeLog
-libiconv-1.11/libcharset/Makefile.msvc                     libiconv-1.11/libcharset/Makefile.msvc
-libiconv-1.11/libcharset/README.win32                      libiconv-1.11/libcharset/README.win32
-libiconv-1.11/libcharset/config.h.msvc                     libiconv-1.11/libcharset/config.h.msvc
-libiconv-1.11/lib/aliases.gperf                            libiconv-1.11/lib/aliases/aliases.gperf
-libiconv-1.11/lib/aliases.h                                libiconv-1.11/lib/aliases/aliases.h
-libiconv-1.11/lib/aliases_aix.h                            libiconv-1.11/lib/aliases/aix.h
-libiconv-1.11/lib/aliases_dos.h                            libiconv-1.11/lib/aliases/dos.h
-libiconv-1.11/lib/aliases_osf1.h                           libiconv-1.11/lib/aliases/osf1.h
-libiconv-1.11/lib/cns11643.h                               libiconv-1.11/lib/cns/11643.h
-libiconv-1.11/lib/cns11643_1.h                             libiconv-1.11/lib/cns/11643_1.h
-libiconv-1.11/lib/cns11643_2.h                             libiconv-1.11/lib/cns/11643_2.h
-libiconv-1.11/lib/cns11643_3.h                             libiconv-1.11/lib/cns/11643_3.h
-libiconv-1.11/lib/cns11643_inv.h                           libiconv-1.11/lib/cns/11643_inv.h
-libiconv-1.11/lib/encodings.def                            libiconv-1.11/lib/encodings/encodings.def
-libiconv-1.11/lib/encodings_aix.def                        libiconv-1.11/lib/encodings/aix.def
-libiconv-1.11/lib/encodings_dos.def                        libiconv-1.11/lib/encodings/dos.def
-libiconv-1.11/lib/encodings_osf1.def                       libiconv-1.11/lib/encodings/osf1.def
-libiconv-1.11/lib/encodings_local.def                      libiconv-1.11/lib/encodings/local.def
-libiconv-1.11/lib/genaliases2.c                            libiconv-1.11/lib/2genaliases.c
-libiconv-1.11/lib/georgian_academy.h                       libiconv-1.11/lib/georgian/academy.h
-libiconv-1.11/lib/georgian_ps.h                            libiconv-1.11/lib/georgian/ps.h
-libiconv-1.11/lib/iso2022_cn.h                             libiconv-1.11/lib/iso/2022_cn.h
-libiconv-1.11/lib/iso2022_cnext.h                          libiconv-1.11/lib/iso/2022_cnext.h
-libiconv-1.11/lib/iso2022_jp.h                             libiconv-1.11/lib/iso/2022_jp.h
-libiconv-1.11/lib/iso2022_jp1.h                            libiconv-1.11/lib/iso/2022_jp1.h
-libiconv-1.11/lib/iso2022_jp2.h                            libiconv-1.11/lib/iso/2022_jp2.h
-libiconv-1.11/lib/iso2022_kr.h                             libiconv-1.11/lib/iso/2022_kr.h
-libiconv-1.11/lib/iso646_cn.h                              libiconv-1.11/lib/iso/646_cn.h
-libiconv-1.11/lib/iso646_jp.h                              libiconv-1.11/lib/iso/646_jp.h
-libiconv-1.11/lib/iso8859_1.h                              libiconv-1.11/lib/iso/8859_1.h
-libiconv-1.11/lib/iso8859_10.h                             libiconv-1.11/lib/iso/8859_10.h
-libiconv-1.11/lib/iso8859_13.h                             libiconv-1.11/lib/iso/8859_13.h
-libiconv-1.11/lib/iso8859_14.h                             libiconv-1.11/lib/iso/8859_14.h
-libiconv-1.11/lib/iso8859_15.h                             libiconv-1.11/lib/iso/8859_15.h
-libiconv-1.11/lib/iso8859_16.h                             libiconv-1.11/lib/iso/8859_16.h
-libiconv-1.11/lib/iso8859_2.h                              libiconv-1.11/lib/iso/8859_2.h
-libiconv-1.11/lib/iso8859_3.h                              libiconv-1.11/lib/iso/8859_3.h
-libiconv-1.11/lib/iso8859_4.h                              libiconv-1.11/lib/iso/8859_4.h
-libiconv-1.11/lib/iso8859_5.h                              libiconv-1.11/lib/iso/8859_5.h
-libiconv-1.11/lib/iso8859_6.h                              libiconv-1.11/lib/iso/8859_6.h
-libiconv-1.11/lib/iso8859_7.h                              libiconv-1.11/lib/iso/8859_7.h
-libiconv-1.11/lib/iso8859_8.h                              libiconv-1.11/lib/iso/8859_8.h
-libiconv-1.11/lib/iso8859_9.h                              libiconv-1.11/lib/iso/8859_9.h
-libiconv-1.11/lib/isoir165.h                               libiconv-1.11/lib/iso/ir165.h
-libiconv-1.11/lib/isoir165ext.h                            libiconv-1.11/lib/iso/ir165ext.h
-libiconv-1.11/lib/mac_arabic.h                             libiconv-1.11/lib/mac/arabic.h
-libiconv-1.11/lib/mac_centraleurope.h                      libiconv-1.11/lib/mac/centraleurope.h
-libiconv-1.11/lib/mac_croatian.h                           libiconv-1.11/lib/mac/croatian.h
-libiconv-1.11/lib/mac_cyrillic.h                           libiconv-1.11/lib/mac/cyrillic.h
-libiconv-1.11/lib/mac_greek.h                              libiconv-1.11/lib/mac/greek.h
-libiconv-1.11/lib/mac_hebrew.h                             libiconv-1.11/lib/mac/hebrew.h
-libiconv-1.11/lib/mac_iceland.h                            libiconv-1.11/lib/mac/iceland.h
-libiconv-1.11/lib/mac_roman.h                              libiconv-1.11/lib/mac/roman.h
-libiconv-1.11/lib/mac_romania.h                            libiconv-1.11/lib/mac/romania.h
-libiconv-1.11/lib/mac_thai.h                               libiconv-1.11/lib/mac/thai.h
-libiconv-1.11/lib/mac_turkish.h                            libiconv-1.11/lib/mac/turkish.h
-libiconv-1.11/lib/mac_ukraine.h                            libiconv-1.11/lib/mac/ukraine.h
-libiconv-1.11/lib/mulelao.h                                libiconv-1.11/lib/mulelao.h
-libiconv-1.11/lib/nextstep.h                               libiconv-1.11/lib/nextstep.h
-libiconv-1.11/lib/sjis.h                                   libiconv-1.11/lib/sjis.h
-libiconv-1.11/lib/tcvn.h                                   libiconv-1.11/lib/tcvn.h
-libiconv-1.11/lib/tis620.h                                 libiconv-1.11/lib/tis620.h
-libiconv-1.11/lib/translit.def                             libiconv-1.11/lib/translit.def
-libiconv-1.11/lib/translit.h                               libiconv-1.11/lib/translit.h
-libiconv-1.11/lib/ucs2.h                                   libiconv-1.11/lib/ucs2.h
-libiconv-1.11/lib/ucs2be.h                                 libiconv-1.11/lib/ucs2be.h
-libiconv-1.11/lib/ucs2internal.h                           libiconv-1.11/lib/ucs2internal.h
-libiconv-1.11/lib/ucs2le.h                                 libiconv-1.11/lib/ucs2le.h
-libiconv-1.11/lib/ucs2swapped.h                            libiconv-1.11/lib/ucs2swapped.h
-libiconv-1.11/lib/ucs4.h                                   libiconv-1.11/lib/ucs4.h
-libiconv-1.11/lib/ucs4be.h                                 libiconv-1.11/lib/ucs4be.h
-libiconv-1.11/lib/ucs4internal.h                           libiconv-1.11/lib/ucs4internal.h
-libiconv-1.11/lib/ucs4le.h                                 libiconv-1.11/lib/ucs4le.h
-libiconv-1.11/lib/ucs4swapped.h                            libiconv-1.11/lib/ucs4swapped.h
-libiconv-1.11/lib/uhc_1.h                                  libiconv-1.11/lib/uhc_1.h
-libiconv-1.11/lib/uhc_2.h                                  libiconv-1.11/lib/uhc_2.h
-libiconv-1.11/lib/utf16.h                                  libiconv-1.11/lib/utf16.h
-libiconv-1.11/lib/utf16be.h                                libiconv-1.11/lib/utf16be.h
-libiconv-1.11/lib/utf16le.h                                libiconv-1.11/lib/utf16le.h
-libiconv-1.11/lib/utf7.h                                   libiconv-1.11/lib/utf7.h
-libiconv-1.11/lib/utf8.h                                   libiconv-1.11/lib/utf8.h
-libiconv-1.11/lib/viscii.h                                 libiconv-1.11/lib/viscii.h
-libiconv-1.11/lib/encodings_dos.def                        libiconv-1.11/lib/encodings/dos.def
-libiconv-1.11/lib/aliases_dos.h                            libiconv-1.11/lib/aliases/dos.h
diff --git a/djgpp/makefile.sed b/djgpp/makefile.sed
deleted file mode 100644
index db2ec0e..0000000
--- a/djgpp/makefile.sed
+++ /dev/null
@@ -1,21 +0,0 @@
-# Fixes for lib/Makefile.in
-s|encodings\.def|encodings/&|g
-s|encodings_aix\.def|encodings/aix.def|g
-s|encodings_dos\.def|encodings/dos\.def|g
-s|encodings_extra\.def|encodings/extra\.def|g
-s|encodings_osf1\.def|encodings/osf1\.def|g
-s|encodings_local\.def|encodings/local\.def|g
-s|aliases\.h|aliases/&|g
-s|aliases2\.h|aliases/aliases2.h|g
-s|aliases_aix\.h|aliases/aix.h|g
-s|aliases_dos\.h|aliases/dos\.h|g
-s|aliases_extra\.h|aliases/extra\.h|g
-s|aliases_osf1\.h|aliases/osf1\.h|g
-s|aliases_local\.h|aliases/local\.h|g
-
-
-# Fixes for tests/Makefile.in
-s|\$(srcdir)/check-translitfailure|$(SHELL) $(srcdir)/failuretranslit-check|
-s|\$(srcdir)/check-stateless|$(SHELL) $(srcdir)/stateless-check|
-s|\$(srcdir)/check-stateful|$(SHELL) $(srcdir)/stateful-check|
-s|\$(srcdir)/check-translit|$(SHELL) $(srcdir)/translit-check|
diff --git a/djgpp/sources.sed b/djgpp/sources.sed
deleted file mode 100644
index 01c1bc8..0000000
--- a/djgpp/sources.sed
+++ /dev/null
@@ -1,36 +0,0 @@
-# Fixes for lib/iconv.c.
-# All encodings files recide in encdings dir now.
-/^#[ 	]*include/ s|"canonical\.h|"canonical/canonical.h|
-/^#[ 	]*include/ s|"canonical_aix\.h|"canonical/aix.h|
-/^#[ 	]*include/ s|"canonical_dos\.h|"canonical/dos.h|
-/^#[ 	]*include/ s|"canonical_osf1\.h|"canonical/osf1.h|
-/^#[ 	]*include/ s|"canonical_local\.h|"canonical/local.h|
-/^#[ 	]*include/ s|"canonical_extra\.h|"canonical/extra.h|
-/^#[ 	]*include/ s|"encodings\.def|"encodings/encodings.def|
-/^#[ 	]*include/ s|"encodings_aix\.def|"encodings/aix.def|
-/^#[ 	]*include/ s|"encodings_dos\.def|"encodings/dos.def|
-/^#[ 	]*include/ s|"encodings_osf1\.def|"encodings/osf1.def|
-/^#[ 	]*include/ s|"encodings_local\.def|"encodings/local.def|
-/^#[ 	]*include/ s|"encodings_extra\.def|"encodings/extra.def|
-/^#[ 	]*include/ s|"aliases\.h|"aliases/aliases.h|
-/^#[ 	]*include/ s|"aliases2\.h|"aliases/aliases2.h|
-
-# Fixes for lib/iconv.c, lib/aliases/aliases2.h and lib/big5hkscs/1999, 2001, 2004.h
-# All encodings files recide in encdings dir now.
-/^#[ 	]*include/ s|"aliases_aix\.h|"aliases/aix.h|
-/^#[ 	]*include/ s|"aliases_dos\.h|"aliases/dos.h|
-/^#[ 	]*include/ s|"aliases_osf1\.h|"aliases/osf1.h|
-/^#[ 	]*include/ s|"aliases_local\.h|"aliases/local.h|
-/^#[ 	]*include/ s|"aliases_extra\.h|"aliases/extra.h|
-/^#[ 	]*include/ s|"hkscs1999\.h|"hkscs/1999.h|
-/^#[ 	]*include/ s|"hkscs2001\.h|"hkscs/2001.h|
-/^#[ 	]*include/ s|"hkscs2004\.h|"hkscs/2004.h|
-
-# Fixes for lib/converters.h, cns11643??.h and iso?????.h files.
-# All cns, iso, georgian and mac files recide in their respective dirs now.
-/^#[ 	]*include/ s|"cns|&/|
-/^#[ 	]*include/ s|"iso|&/|
-/^#[ 	]*include/ s|"georgian_|"georgian/|
-/^#[ 	]*include/ s|"mac_|"mac/|
-/^#[ 	]*include/ s|"big5hkscs|&/|
-/^#[ 	]*include/ s|"hkscs|&/|
diff --git a/djgpp/stateful-check.sed b/djgpp/stateful-check.sed
deleted file mode 100644
index eaeed64..0000000
--- a/djgpp/stateful-check.sed
+++ /dev/null
@@ -1,12 +0,0 @@
-# Sed script for tests/stateful-check editing.
-
-/charsetf=/ a\
-\
-# For systems with severe filename restrictions allow for\
-# an alternate filename.\
-UNAME=${UNAME-`uname 2>/dev/null`}\
-case X$UNAME in\
-  *-DOS) filename=`echo "$charsetf" | sed "s|ISO-|ISO/|;s|2022-|2022|;s|BIG5-HKSCS-|BIG5-HKSCS/|"` ;;\
-  *)     filename="$charsetf" ;;\
-esac
-s/\$charsetf"-snippet/$filename"-snippet/g
diff --git a/djgpp/stateless-check.sed b/djgpp/stateless-check.sed
deleted file mode 100644
index ba741df..0000000
--- a/djgpp/stateless-check.sed
+++ /dev/null
@@ -1,23 +0,0 @@
-# Sed script for tests/stateless-check editing.
-
-/charsetf=/ a\
-\
-# For systems with severe filename restrictions\
-# allow for an alternate filename.\
-UNAME=${UNAME-`uname 2>/dev/null`}\
-case X$UNAME in\
-  *-DOS) filename=`echo "$charsetf" | sed "s|ISO-|ISO/|; \\\
-                                           s|Mac|Mac/|; \\\
-                                           s|BIG5-HKSCS-|BIG5-HKSCS/|; \\\
-                                           s|Georgian-|Georgian/|"`\
-         tmp_filename=`echo "$filename" | sed "s|/|/tmp-|"`\
-         tmp_orig_filename=`echo "$filename" | sed "s|/|/tmp-orig-|"` ;;\
-  *)     filename="$charsetf"\
-         tmp_filename="$charsetf"\
-         tmp_orig_filename="$charsetf" ;;\
-esac
-s|/"\$charsetf"|/"$filename"|g
-s|tmp-"\$charsetf"|"${srcdir}"/"$tmp_filename"|g
-s|tmp-orig"\$charsetf"|"${srcdir}"/"$tmp_orig_filename"|g
-s|\.INVERSE\.|.INVERSE-|g
-s|\.IRREVERSIBLE\.|.IRREVERSIBLE-|g
diff --git a/djgpp/translit-check.sed b/djgpp/translit-check.sed
deleted file mode 100644
index 8c7e35b..0000000
--- a/djgpp/translit-check.sed
+++ /dev/null
@@ -1,11 +0,0 @@
-# Sed script for tests/translit-check editing.
-
-/\.\./ i\
-# For systems with severe filename restrictions allow for\
-# an alternate filename.\
-UNAME=${UNAME-`uname 2>/dev/null`}\
-case X$UNAME in\
-  *-DOS) file=`echo "$file" | sed "s|TranslitFail1|_Translit/Fail1|; \\\
-                                   s|Translit1|_Translit/1|"`;;\
-  *)     file="$file" ;;\
-esac
diff --git a/libcharset/ChangeLog b/libcharset/ChangeLog
index 6fb53c0..02378cd 100644
--- a/libcharset/ChangeLog
+++ b/libcharset/ChangeLog
@@ -1,5 +1,13 @@
 2018-10-23  Bruno Haible  <bruno@clisp.org>
 
+	Remove outdated DJGPP build infrastructure.
+	Approved by Juan Manuel Guerrero <juan.guerrero@gmx.de>.
+	* djgpp: Remove directory.
+	* INSTALL.djgpp: Remove file.
+	* Makefile.in (SOURCE_FILES): Remove them.
+
+2018-10-23  Bruno Haible  <bruno@clisp.org>
+
 	Update after gnulib changed.
 	* configure.ac (AC_PREREQ): Bump minimum Autoconf version to 2.63.
 
diff --git a/libcharset/INSTALL.djgpp b/libcharset/INSTALL.djgpp
deleted file mode 100644
index aa8c420..0000000
--- a/libcharset/INSTALL.djgpp
+++ /dev/null
@@ -1,3 +0,0 @@
-Installation on DJGPP:
-
-See the file djgpp/README.
diff --git a/libcharset/Makefile.in b/libcharset/Makefile.in
index 8058686..82ab05a 100644
--- a/libcharset/Makefile.in
+++ b/libcharset/Makefile.in
@@ -107,12 +107,7 @@
   tools/osf1-4.0a tools/osf1-4.0d tools/osf1-5.1 \
   tools/solaris-2.4 tools/solaris-2.5.1 tools/solaris-2.6 tools/solaris-2.6-cjk tools/solaris-2.7 \
   tools/sunos-4.1.4 \
-  tools/win32 \
-  INSTALL.djgpp \
-  djgpp/config.bat djgpp/config.sed djgpp/config.site \
-  djgpp/fnchange.in djgpp/fnchange.lst \
-  djgpp/Makefile.maint \
-  djgpp/README djgpp/README.in
+  tools/win32
 # List of distributed files imported from other packages.
 LIBTOOL_IMPORTED_FILES = \
   build-aux/ltmain.sh \
diff --git a/libcharset/djgpp/Makefile.maint b/libcharset/djgpp/Makefile.maint
deleted file mode 100644
index 30ae168..0000000
--- a/libcharset/djgpp/Makefile.maint
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer's Makefile                                         -*-Makefile-*-
-
-top_srcdir = ..
-srcdir = .
-
-SHELL = /bin/sh
-
-all: README fnchange.lst
-
-fnchange.lst: fnchange.in $(top_srcdir)/configure.ac
-	rm -f $@; \
-	PACKAGE=`grep "^PACKAGE=" $(top_srcdir)/configure.ac | sed -e 's/^PACKAGE=//'`; \
-	VERSION=`grep "^VERSION=" $(top_srcdir)/configure.ac | sed -e 's/^VERSION=//'`; \
-	sed \
-	    -e '/^#/d' \
-	    -e "s/@V@/$${PACKAGE}-$${VERSION}/g" \
-	  $(srcdir)/fnchange.in > t-$@
-	mv t-$@ $@
-
-README: README.in $(top_srcdir)/configure.ac
-	rm -f $@; \
-	PACKAGE=`grep "^PACKAGE=" $(top_srcdir)/configure.ac | sed -e 's/^PACKAGE=//'`; \
-	VERSION=`grep "^VERSION=" $(top_srcdir)/configure.ac | sed -e 's/^VERSION=//'`; \
-	packageversion=`echo "$${VERSION}" | sed 's/\.//g'`; \
-	treeversion=`echo "$${VERSION}" | sed 's/\.//g'`; \
-	sed \
-	    -e "s/@V@/$${PACKAGE}-$${VERSION}/g" \
-	    -e "s/@VER@/$${VERSION}/g" \
-	    -e "s/@packageversion@/$$packageversion/g" \
-	    -e "s/@treeversion@/$$treeversion/g" \
-	  $(srcdir)/README.in > t-$@
-	mv t-$@ $@
diff --git a/libcharset/djgpp/README b/libcharset/djgpp/README
deleted file mode 100644
index 7680fb0..0000000
--- a/libcharset/djgpp/README
+++ /dev/null
@@ -1,123 +0,0 @@
-This is a port of GNU Libiconv 1.11 to MSDOS/DJGPP.
-
-1.:     DJGPP specific changes.
-        =======================
-        There are no DJGPP specific changes. This package should
-        configure and compile out-of-the-box.
-        Please read the documentation to become familiar with this
-        product.
-
-
-2.:     Installing the binary package.
-        ==============================
-
-2.1.:   Copy the binary distribution into the top DJGPP installation
-        directory and unzip the binary distribution running *ONE* of
-        the following commands:
-          unzip32 licv111b.zip      or
-          djtarx licv111b.zip       or
-          pkunzip -d licv111b.zip
-
-
-
-3.:     Building the binaries from sources.
-        ===================================
-
-3.1.:   To build the binaries you will need the following binary packages:
-          djdev203.zip, bsh204b.zip, gcc2952b.zip,
-          bnu210b.zip, mak3791b.zip, fil316b.zip,
-          shl112b.zip, txt20b.zip, txi40b.zip,
-          grep24b.zip and sed302b.zip
-
-
-        All this packages can be found in the v2gnu directory of any
-        Simtel.NET mirror.
-        You will need bsh204b.zip and *NOT* a prior version or the build will fail.
-        The same applies to djdev203.zip. You *MUST* use the updated versions of
-        fil316b.zip (date: 2000-05-30) and shl112b.zip (date: 2000-08-11). This
-        updated versions have been recompiled with djdev203.zip and know about
-        the "/dev/env" functionality introduced with djdev203.zip. All the other
-        packages are the ones I have used to build the binaries from this sources.
-        Previuos and/or later versions of this packages may do the job as well but
-        I have not tested this.
-
-3.2.:   Create a temporary directory and copy the source package: licv111s.zip
-        into the temporary directory. If you download the source distribution
-        from one of the DJGPP archives, just unzip it preserving the directory
-        structure, runnig ONE of the following commands:
-          unzip32 licv111s.zip      or
-          djtarx licv111s.zip       or
-          pkunzip -d licv111s.zip
-
-        Source distributions downloaded from one of the GNU FTP sites need
-        some more work to unpack.  First, you MUST use the `djtar' program to
-        unzip the package.  That's because some file names in the official
-        distributions need to be changed to avoid problems on the various
-        platforms supported by DJGPP.  `djtar' can rename files on the fly
-        given a file with name mappings.  The distribution includes a file
-        `djgpp/fnchange.lst' with the necessary mappings.  So you need first
-        to retrieve that file, and then invoke `djtar' to unpack the
-        distribution.  Here's how:
-
-          djtar -x -p -o libiconv-1.11/djgpp/fnchange.lst libiconv-1.11.tar.gz > lst
-          djtar -x -n lst libiconv-1.11.tar.gz
-
-        (The name of the distribution archive and the top-level directory will
-        be different for versions other than 1.11.)
-
-
-3.3.:   The package is preconfigured for djdev203. To build the products you
-        should run the following command:
-          make
-
-        After the compilation has finished, you can check the products
-        running the command:
-          make check
-
-        To install the products run the command:
-          make install
-
-        This will install the products (iconv.exe iconv.h localcharset.h libconv.a
-        libcharset.a iconv.1 iconv.3 iconv_open.3 iconv_close.3) into your DJGPP
-        installation tree. As usual, prefix is defined as "/dev/env/DJDIR".
-        If you prefer to install into same other directory run the command:
-          make install prefix=z:/some/other/dir
-
-        Of course, you should replace "z:/some/other/dir" by an appropriate path
-        that will meet your requeriments.
-
-3.4.:   If you need/want to reconfigure the package you will have to run the
-        following commands:
-          make distclean
-          djgpp\config
-
-        Please note that you *MUST* use the "distclean" option or the config.cache
-        file will *NOT* be deleted. In this case you are *NOT* reconfiguring
-        because the configuration informations is read from the cache file instead
-        of being newly computed.
-        To build the programs in a directory other than where the sources are,
-        you must add the parameter that specifies the source directory,
-        e.g:
-          x:\src\gnu\libiconv.16\djgpp\config x:/src/gnu/libiconv.16
-
-        Lets assume you want to build the binaries in a directory placed on a 
-        different drive (z:\build in this case) from where the sources are,
-        then you will run the following commands:
-          z:
-          md \build
-          cd \build
-          x:\src\gnu\libiconv.16\djgpp\config x:/src/gnu/libiconv.16
-
-        You *MUST* use forward slashes to specify the source directory.
-        After having configured the package run the folowing commands to create
-        the binaries and docs and install them:
-          make
-          make check
-          make install
-
-        Send suggestions and bug reports concerning the DJGPP port to
-        comp.os.msdos.djgpp or djgpp@delorie.com. Libiconv specific bugs
-        must be reported to Bruno Haible <haible@clisp.cons.org>.
-
-
-          Guerrero, Juan Manuel <st001906@hrz1.hrz.tu-darmstadt.de>
diff --git a/libcharset/djgpp/README.in b/libcharset/djgpp/README.in
deleted file mode 100644
index f0bf77e..0000000
--- a/libcharset/djgpp/README.in
+++ /dev/null
@@ -1,120 +0,0 @@
-This is a port of GNU Libcharset @VER@ to MSDOS/DJGPP.
-
-1.:     DJGPP specific changes.
-        =======================
-        There are no DJGPP specific changes. This package should
-        configure and compile out-of-the-box.
-        Please read the documentation to become familiar with this
-        product.
-
-
-2.:     Installing the binary package.
-        ==============================
-
-2.1.:   Copy the binary distribution into the top DJGPP installation
-        directory and unzip the binary distribution running *ONE* of
-        the following commands:
-          unzip32 lcset@packageversion@b.zip      or
-          djtarx lcset@packageversion@b.zip       or
-          pkunzip -d lcset@packageversion@b.zip
-
-
-
-3.:     Building the binaries from sources.
-        ===================================
-
-3.1.:   To build the binaries you will need the following binary packages:
-          djdev203.zip (patchlevel 2),
-          bshNNNb.zip, gccNNNb.zip, bnuNNNb.zip, makNNNb.zip, filNNNb.zip,
-          shlNNNb.zip, txtNNNb.zip, txiNNNb.zip, grepNNNb.zip and sedNNNb.zip
-
-        NNN represents the latest version number of the binary packages. All
-        this packages can be found in the current/v2gnu/ directory of any
-        ftp.delorie.com mirror.
-
-3.2.:   Create a temporary directory and copy the source package: lcset@packageversion@s.zip
-        into the temporary directory. If you download the source distribution
-        from one of the DJGPP archives, just unzip it preserving the directory
-        structure, runnig ONE of the following commands:
-          unzip32 lcset@packageversion@s.zip      or
-          djtarx lcset@packageversion@s.zip       or
-          pkunzip -d lcset@packageversion@s.zip
-
-        Source distributions downloaded from one of the GNU FTP sites need
-        some more work to unpack. First, you MUST use the `djtar' program
-        to unzip the package. That's because some file names in the official
-        distributions need to be changed to avoid problems on the various
-        platforms supported by DJGPP. `djtar' can rename files on the fly
-        given a file with name mappings. The distribution includes a file
-        `djgpp/fnchange.lst' with the necessary mappings. So you need first
-        to retrieve that file, and then invoke `djtar' to unpack the
-        distribution. Here's how:
-
-          djtar -x -p -o @V@/djgpp/fnchange.lst @V@.tar.gz > lst
-          djtar -x -n lst @V@.tar.gz
-
-        (The name of the distribution archive and the top-level directory will
-        be different for versions other than @VER@.)
-
-
-3.3.:   If you have downloaded the source package from one of the GNU FTP sites
-        you will have to configure the package running the command:
-          djgpp\config.bat
-
-3.4.:   If you have downloaded the source package from one of the delorie FTP
-        sites the package is already preconfigured for djdev203 or later. In
-        any case, to build the products you must run the following command:
-          make
-
-        After the compilation has finished, you can check the products
-        running the command:
-          make check
-
-        To install the products run the command:
-          make install
-
-        This will install the products (localcharset.h, libcharset.a) into your
-        DJGPP installation tree. As usual, prefix is defined as "/dev/env/DJDIR".
-        If you prefer to install into same other directory, run the command:
-          make install prefix=z:/some/other/dir
-
-        Of course, you should replace "z:/some/other/dir" by an appropriate path
-        that will meet your requeriments.
-
-
-3.5.:   If for some reason you want to reconfigure the package cd into the top
-        srcdir (libchset.@treeversion@) and run the following commands:
-          del djgpp\config.cache
-          make distclean
-          djgpp\config
-
-        Please note that you *MUST* delete the config.cache file in the djgpp
-        subdir or you will not really reconfigure the sources because the
-        configuration informations will be read from the cache file instead
-        of being newly computed.
-        To build the programs in a directory other than where the sources are,
-        you must add the parameter that specifies the source directory,
-        e.g:
-          x:\src\gnu\libchset.@treeversion@\djgpp\config x:/src/gnu/libchset.@treeversion@
-
-        Lets assume you want to build the binaries in a directory placed on a 
-        different drive (z:\build in this case) from where the sources are,
-        then you will run the following commands:
-          z:
-          md \build
-          cd \build
-          x:\src\gnu\libchset.@treeversion@\djgpp\config x:/src/gnu/libchset.@treeversion@
-
-        You *MUST* use forward slashes to specify the source directory.
-        After having configured the package run the folowing commands to create
-        the binaries and docs and install them:
-          make
-          make check
-          make install
-
-        Send suggestions and bug reports concerning the DJGPP port to
-        comp.os.msdos.djgpp or djgpp@delorie.com. Libcharset specific
-        bugs must be reported to <bug-gnu-libiconv@gnu.org>.
-
-
-          Guerrero, Juan Manuel <juan.guerrero@gmx.de>
diff --git a/libcharset/djgpp/config.bat b/libcharset/djgpp/config.bat
deleted file mode 100644
index 1910ca7..0000000
--- a/libcharset/djgpp/config.bat
+++ /dev/null
@@ -1,326 +0,0 @@
-@echo off
-echo Configuring GNU libcharset for DJGPP v2.x...
-Rem The SmallEnv 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,
-Rem if dependency-tracking is wanted or not,
-Rem if caching is wanted or not
-Rem and where the sources are.
-Rem We always default to NLS support,
-Rem no dependency tracking
-Rem and to in place configuration.
-set ARGS=
-set NLS=disabled
-if not "%NLS%" == "disabled" goto SmallEnv
-set CACHING=enabled
-if not "%CACHING%" == "enabled" goto SmallEnv
-set DEPENDENCY_TRACKING=disabled
-if not "%DEPENDENCY_TRACKING%" == "disabled" goto SmallEnv
-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 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.
-Rem All other arguments are stored into ARGS.
-:ArgLoop
-if "%1" == "nls" goto NextArgument
-if "%1" == "NLS" goto NextArgument
-if "%1" == "no-nls" goto NoNLS
-if "%1" == "no-NLS" goto NoNLS
-if "%1" == "NO-NLS" goto NoNLS
-goto CachingOption
-:NoNLS
-if "%1" == "no-nls" set NLS=disabled
-if "%1" == "no-NLS" set NLS=disabled
-if "%1" == "NO-NLS" set NLS=disabled
-if not "%NLS%" == "disabled" goto SmallEnv
-goto NextArgument
-:CachingOption
-if "%1" == "cache" goto NextArgument
-if "%1" == "CACHE" goto NextArgument
-if "%1" == "no-cache" goto NoCaching
-if "%1" == "no-CACHE" goto NoCaching
-if "%1" == "NO-CACHE" goto NoCaching
-goto DependencyOption
-:NoCaching
-if "%1" == "no-cache" set CACHING=disabled
-if "%1" == "no-CACHE" set CACHING=disabled
-if "%1" == "NO-CACHE" set CACHING=disabled
-if not "%CACHING%" == "disabled" goto SmallEnv
-goto NextArgument
-:DependencyOption
-if "%1" == "no-dep" goto NextArgument
-if "%1" == "no-DEP" goto NextArgument
-if "%1" == "NO-DEP" goto NextArgument
-if "%1" == "dep" goto DependecyTraking
-if "%1" == "DEP" goto DependecyTraking
-goto LibiconvPrefixOption
-:DependecyTraking
-if "%1" == "dep" set DEPENDENCY_TRACKING=enabled
-if "%1" == "DEP" set DEPENDENCY_TRACKING=enabled
-if not "%DEPENDENCY_TRACKING%" == "enabled" goto SmallEnv
-goto NextArgument
-:LibiconvPrefixOption
-if "%1" == "no-libiconvprefix" goto NextArgument
-if "%1" == "no-LIBICONVPREFIX" goto NextArgument
-if "%1" == "NO-LIBICONVPREFIX" goto NextArgument
-if "%1" == "libiconvprefix" goto WithLibiconvPrefix
-if "%1" == "LIBICONVPREFIX" goto WithLibiconvPrefix
-goto LibintlPrefixOption
-:WithLibiconvPrefix
-if "%1" == "libiconvprefix" set LIBICONV_PREFIX=enabled
-if "%1" == "LIBICONVPREFIX" set LIBICONV_PREFIX=enabled
-if not "%LIBICONV_PREFIX%" == "enabled" goto SmallEnv
-goto NextArgument
-:LibintlPrefixOption
-if "%1" == "no-libiconvprefix" goto NextArgument
-if "%1" == "no-LIBICONVPREFIX" goto NextArgument
-if "%1" == "NO-LIBICONVPREFIX" goto NextArgument
-if "%1" == "libintlprefix" goto _WithLibintlPrefix
-if "%1" == "LIBINTLPREFIX" goto _WithLibintlPrefix
-goto HTMLOption
-:_WithLibintlPrefix
-if "%1" == "libintlprefix" set LIBINTL_PREFIX=enabled
-if "%1" == "LIBINTLPREFIX" set LIBINTL_PREFIX=enabled
-if not "%LIBINTL_PREFIX%" == "enabled" goto SmallEnv
-:HTMLOption
-if "%1" == "withhtml" goto NextArgument
-if "%1" == "withHTML" goto NextArgument
-if "%1" == "WITHHTML" goto NextArgument
-if "%1" == "withouthtml" goto _WithoutHTML
-if "%1" == "withoutHTML" goto _WithoutHTML
-if "%1" == "WITHOUTHTML" goto _WithoutHTML
-goto SrcDirOption
-:_WithoutHTML
-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
-:SrcDirOption
-echo %1 | grep -q "/"
-if errorlevel 1 goto CollectArgument
-set XSRC=%1
-if not "%XSRC%" == "%1" goto SmallEnv
-goto NextArgument
-:CollectArgument
-set _ARGS=#%ARGS%#%1#
-if not "%_ARGS%" == "#%ARGS%#%1#" goto SmallEnv
-echo %_ARGS% | grep -q "###"
-if errorlevel 1 set ARGS=%ARGS% %1
-set _ARGS=
-:NextArgument
-shift
-if not "%1" == "" goto ArgLoop
-
-Rem Create an arguments file for the configure script.
-echo --srcdir=%XSRC% > arguments
-if "%CACHING%" == "enabled"              echo --cache-file=%XSRC%/djgpp/config.cache >> arguments
-if "%DEPENDENCY_TRACKING%" == "enabled"  echo --enable-dependency-tracking >> arguments
-if "%DEPENDENCY_TRACKING%" == "disabled" echo --disable-dependency-tracking >> arguments
-if "%LIBICONV_PREFIX%" == "enabled"      echo --with-libiconv-prefix >> arguments
-if "%LIBICONV_PREFIX%" == "disabled"     echo --without-libiconv-prefix >> arguments
-if "%LIBINTL_PREFIX%" == "enabled"       echo --with-libintl-prefix >> arguments
-if "%LIBINTL_PREFIX%" == "disabled"      echo --without-libintl-prefix >> arguments
-if "%HTML%" == "enabled"                 echo --enable-html >> arguments
-if "%HTML%" == "disabled"                echo --disable-html >> arguments
-if not "%ARGS%" == ""                    echo %ARGS% >> arguments
-set ARGS=
-set CACHING=
-set DEPENDENCY_TRACKING=
-set LIBICONV_PREFIX=
-set LIBINTL_PREFIX=
-set HTML=
-
-Rem Find out where the sources are
-if "%XSRC%" == "." goto InPlace
-
-:NotInPlace
-redir -e /dev/null update %XSRC%/configure.org ./configure
-test -f ./configure
-if errorlevel 1 update %XSRC%/configure ./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
-if errorlevel 1 goto SedError
-
-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
-
-Rem Make sure crucial file names are not munged by unpacking
-test -f %XSRC%/config.h.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/config.h.in %XSRC%/config.h-in
-test -f %XSRC%/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/config.h %XSRC%/config.h-in
-test -f %XSRC%/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/configh.in %XSRC%/config.h-in
-test -f %XSRC%/config.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/config_h.in %XSRC%/config.h-in
-test -f %XSRC%/include/libcharset.h-in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/libcharset.h-in %XSRC%/include/libcharset.h-in
-test -f %XSRC%/include/libcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/libcharset.h %XSRC%/include/libcharset.h-in
-test -f %XSRC%/include/libcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/libcharseth.in %XSRC%/include/libcharset.h-in
-test -f %XSRC%/include/libcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/libcharset_h.in %XSRC%/include/libcharset.h-in
-test -f %XSRC%/include/localcharset.h-in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/localcharset.h-in %XSRC%/include/localcharset.h-in
-test -f %XSRC%/include/localcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/localcharset.h %XSRC%/include/localcharset.h-in
-test -f %XSRC%/include/localcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/localcharseth.in %XSRC%/include/localcharset.h-in
-test -f %XSRC%/include/localcharset.h-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/localcharset_h.in %XSRC%/include/localcharset.h-in
-test -f %XSRC%/include/localcharset.h.build.in
-if not errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/localcharset.h.build.in %XSRC%/include/localcharset.h-build-in
-test -f %XSRC%/include/localcharset.h-build-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/localcharset.h %XSRC%/include/localcharset.h-build-in
-test -f %XSRC%/include/localcharset.h-build-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/localcharseth.build %XSRC%/include/localcharset.h-build-in
-test -f %XSRC%/include/localcharset.h-build-in
-if errorlevel 1 redir -e /dev/null mv -f %XSRC%/include/localcharset_h.build %XSRC%/include/localcharset.h-build-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 mv -f INSTALL INSTALL.txt
-
-Rem Set SHELL to a sane default or some configure tests stop working
-Rem if the package is configured across partitions.
-if not "%SHELL%" == "" goto HomeName
-set SHELL=/bin/sh
-if not "%SHELL%" == "/bin/sh" goto SmallEnv
-echo No SHELL found in the environment, using default value
-
-:HomeName
-Rem Set HOME to a sane default so configure stops complaining.
-if not "%HOME%" == "" goto HostName
-set HOME=%XSRC%/djgpp
-if not "%HOME%" == "%XSRC%/djgpp" goto SmallEnv
-echo No HOME found in the environment, using default value
-
-:HostName
-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 SmallEnv
-goto haveos
-:msdos
-set OS=MS-DOS
-if not "%OS%" == "MS-DOS" goto SmallEnv
-: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 SmallEnv
-goto userdone
-:haveuser
-set HOSTNAME=%USER%'s PC
-if not "%HOSTNAME%" == "%USER%'s PC" goto SmallEnv
-goto userdone
-:haveuname
-set HOSTNAME=%USERNAME%'s PC
-if not "%HOSTNAME%" == "%USERNAME%'s PC" goto SmallEnv
-:userdone
-set _HOSTNAME=%HOSTNAME%, %OS%
-if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto SmallEnv
-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 NoRen0
-test -f %XSRC%/install-sh.sh
-if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh
-: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 not errorlevel 0 goto MissingNLSTools
-test -x /dev/env/DJDIR/bin/xgettext.exe
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/include/libcharset.h
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/lib/libcharset.a
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/include/iconv.h
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/lib/libiconv.a
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/include/libintl.h
-if not errorlevel 0 goto MissingNLSTools
-test -f /dev/env/DJDIR/lib/libintl.a
-if not errorlevel 0 goto MissingNLSTools
-
-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/libcharset.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 garanteed to have been ported to DJGPP.
-echo --enable-nls --without-included-gettext >> arguments
-goto ConfigurePackage
-
-:MissingNLSTools
-echo Needed libs/tools for NLS not found. Configuring without NLS.
-:WithoutNLS
-Rem Update the arguments file for the configure script.
-echo --disable-nls >> arguments
-
-:ConfigurePackage
-echo Running the ./configure script...
-sh ./configure @arguments
-if errorlevel 1 goto CfgError
-rm arguments
-echo Done.
-goto End
-
-:SedError
-echo ./configure script editing failed!
-goto End
-
-:CfgError
-echo ./configure script exited abnormally!
-goto End
-
-:SmallEnv
-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 NoRen1
-test -f %XSRC%/install-sh
-if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh
-:NoRen1
-set CONFIG_SITE=
-set HOSTNAME=
-set XSRC=
diff --git a/libcharset/djgpp/config.sed b/libcharset/djgpp/config.sed
deleted file mode 100644
index 18496e2..0000000
--- a/libcharset/djgpp/config.sed
+++ /dev/null
@@ -1,149 +0,0 @@
-# DJGPP specific configuration file.
-# Sed script for additional DJGPP specific editing
-# of the configure script generated by autoconf 2.60.
-
-
-# Additional editing of Makefiles
-/^".*ac_file_inputs.*tmp\/out$/ a\
-cat > "$tmp/subs-3.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,config\\.h\\.in,config.h-in,g\
-s,\\.\\([1-9]\\)\\.html,.\\1-html,g\
-s,\\.html,-html,g\
-s,libcharset\\.h\\.in,libcharset.h-in,g\
-s,localcharset\\.h\\.inst,localcharset_h.ins,g\
-s,localcharset\\.h\\.in,localcharset.h-in,g\
-s,localcharset\\.h\\.build\\.in,localcharset.h-build-in,g\
-s,Makefile\\.am\\.in,Makefile.am-in,g\
-s,Makefile\\.in\\.in,Makefile.in-in,g\
-/^\\.y\\.c:/,/^$/ {\
-  /\\\$(YACCCOMPILE)/ {\
-    a\\\\\
-	-@test -f y.tab.c && mv -f y.tab.c y_tab.c\\\\\
-	-@test -f y.tab.h && mv -f y.tab.h y_tab.h\
-  }\
-}\
-eof_djgpp\
-sed -f "\$tmp/subs-3.sed" \$tmp/out > \$tmp/out.djgpp\
-mv -f \$tmp/out.djgpp \$tmp/out
-
-
-# Rename config.h.in into config.h-in
-/ac_config_headers=/s|config\.h|&:config.h-in|g
-/CONFIG_HEADERS=/ s|config\.h\.in|&:config.h-in|2
-
-# Rename localcharset.h.build.in, localcharset.h.inst, localcharset.h.in and Makefile.in.in into localcharset.h-build-in, localcharset_h.ins, localcharset.h-in and Makefile.in-in
-/ac_config_files=/ {
-  s|localcharset\.h\.build\.in|localcharset.h-build-in|
-  s|localcharset\.h\.inst|localcharset_h.ins|
-  s|localcharset\.h\.in|localcharset.h-in|
-  s|po/Makefile\.in|&:po/Makefile.in-in|
-}
-/CONFIG_FILES=/ {
-  s|localcharset\.h\.build\.in|localcharset.h-build-in|
-  s|localcharset\.h\.inst|localcharset_h.ins|
-  s|localcharset\.h\.in|localcharset.h-in|
-  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).
-s,\.deps,_deps,g
-s,\.libs,_libs,g
-/^rmdir[	 ]*\.tst/ i\
-am__leading_dot=_
-
-# Replace (command) > /dev/null with `command > /dev/null`, since
-# parenthesized commands always return zero status in the ported Bash,
-# even if the named command doesn't exist
-/if ([^|;`]*null/{
-  s,(,`,
-  s,),,
-  /null[	 ]*2>&1/ s,2>&1,&`,
-  /null.*null/ s,null.*null,&`,
-  /null.*null/ !{
-    /null[	 ]*2>&1/ !s,null,&`,
-  }
-}
-
-# DOS-style absolute file names should be supported as well
-/\*) top_srcdir=/s,/\*,[\\\\/]* | ?:[\\\\/]*,
-
-# The following two items are changes needed for configuring
-# and compiling across partitions.
-# 1) 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 and bison.in
-# 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/.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%;s%.:.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%'`
-}
-/^install_sh=/a\
-install_sh=`echo "$install_sh" | sed 's%/dev/.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%;s%.:.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%${top_srcdir}%'`
-
-# This will only work if the assumption that the
-# testsuite is ran from the following path:
-#   ${top_srcdir}/tests/testsuite.dir
-# holds. The explicit names are of no importance.
-#   ../../. == ${top_srcdir}
-#/^esac$/,/^ac_abs_srcdir=/ {
-/^ac_abs_srcdir=/ i\
-ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%/dev/.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`\
-ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%/dev/.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`\
-ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev/.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`
-#ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%/dev/.*/libcharset[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/libcharset[-_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
-
-# Add DJGPP version information.
-/^#define VERSION/ s/\$VERSION/&  (DJGPP port (r1))/
-
-# We need makeinfo to make the html formated docs.
-/\$am_missing_run[	 ]*makeinfo/ s,\$am_missing_run,,
-
-# The path to the FORTRAN compiler and libraries
-# shall contain no absolute path reference so it
-# will be good for all djgpp installations.
-/^FLIBS="\$ac_cv_flibs"/ i\
-ac_djgpp_path=`echo "$DJDIR" | sed 's%\\\\\\%/%g' | tr $as_cr_LETTERS $as_cr_letters`\
-ac_cv_flibs=`echo "$ac_cv_flibs" | sed "s%-L$ac_djgpp_path%-L/dev/env/DJDIR%g"`
-
-# Autoconf generated configure scripts write absolute
-# paths of certain header files into Makefiles making
-# them useless for DJGPP installations for which the
-# package has not been configured for.
-/^.*echo "\$as_me:\$LINENO: result: \$gl_cv_absolute_.*$/ {
-h
-s,^.*\(gl_cv_absolute_\)\([a-z0-9_]*\)\(_h\).*$,\1\2\3=`echo $\1\2\3 | sed "s%[^:]:.*/include/%/dev/env/DJDIR/include/%"`,
-G
-}
-/^.*echo "\$as_me:\$LINENO: result: \$gl_cv_full_.*$/ {
-h
-s,^.*\(gl_cv_full_\)\([a-z0-9_]*\)\(_h\).*$,\1\2\3=`echo $\1\2\3 | sed "s%[^:]:.*/include/%/dev/env/DJDIR/include/%"`,
-G
-}
diff --git a/libcharset/djgpp/config.site b/libcharset/djgpp/config.site
deleted file mode 100644
index 66cd725..0000000
--- a/libcharset/djgpp/config.site
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/sh
-
-# This is the config.site file for configuring GNU packages
-# which are to be built with DJGPP tools.
-
-
-# Include the djgpp subdirectory in PATH, so that getconf is found
-PATH="$srcdir/djgpp:$PATH"
-
-# 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
-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'}
-AWK=${AWK='gawk'}
-
-# A sane default for emacs.
-ac_cv_path_EMACS=${EMACS='/dev/env/DJDIR/gnu/emacs/bin/emacs'}
-
-# A sane default for m4.
-ac_cv_path_M4=${M4='/dev/env/DJDIR/bin/m4'}
-
-# 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'}
-
-# A sane default for fgrep.
-ac_cv_path_FGREP=${FGREP='/dev/env/DJDIR/bin/fgrep'}
-
-# A sane default for sed.
-lt_cv_path_SED=${SED='/dev/env/DJDIR/bin/sed'}
-
-# A sane default for mkdir.
-ac_cv_path_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'}
-
-# 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'}
-
-# 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_vfork=no
-ac_cv_func_pipe=no
-
-# DJGPP needs ICONV_CONST set to const
-am_cv_proto_iconv_arg1="const"
diff --git a/libcharset/djgpp/fnchange.in b/libcharset/djgpp/fnchange.in
deleted file mode 100644
index c43d25b..0000000
--- a/libcharset/djgpp/fnchange.in
+++ /dev/null
@@ -1,22 +0,0 @@
-@V@/tools/aix-3.2.5                    @V@/tools/aix-3.2-5
-@V@/tools/aix-4.1.5                    @V@/tools/aix-4.1-5
-@V@/tools/aix-4.2.0                    @V@/tools/aix-4.2-0
-@V@/tools/aix-4.3.2                    @V@/tools/aix-4.3-2
-@V@/tools/glibc-2.1.3                  @V@/tools/glibc-2.1-3
-@V@/tools/glibc-2.1.90                 @V@/tools/glibc-2.1-90
-@V@/tools/locale_charmap               @V@/tools/locale_charmap
-@V@/tools/locale_charset.c             @V@/tools/charset_locale.c
-@V@/tools/locale_codeset.c             @V@/tools/codeset_locale.c
-@V@/tools/solaris-2.5.1                @V@/tools/solaris-2.5-1
-@V@/tools/sunos-4.1.4                  @V@/tools/sunos-4.1-4
-@V@/tools/all-charsets-X11             @V@/tools/all-charsets.X11
-@V@/tools/glibc-2.2-XF86-3.3.6         @V@/tools/glibc22XF86-3.3-6
-@V@/tools/glibc-2.2-XF86-4.0.1f        @V@/tools/glibc22XF86-4.0-1f
-@V@/tools/locale_x11encoding.c         @V@/tools/x11encoding_locale.c
-@V@/include/libcharset.h.in            @V@/include/libcharset.h-in
-@V@/include/libcharset.h.msvc-shared   @V@/include/libcharset.h-msvc-shared
-@V@/include/localcharset.h.in          @V@/include/localcharset.h-in
-@V@/include/localcharset.h.build.in    @V@/include/localcharset.h-build-in
-@V@/include/localcharset.h.msvc-shared @V@/include/localcharset.h-msvc-shared
-@V@/config.h.in                        @V@/config.h-in
-@V@/config.h.msvc                      @V@/config.h-msvc
diff --git a/libcharset/djgpp/fnchange.lst b/libcharset/djgpp/fnchange.lst
deleted file mode 100644
index 29adc78..0000000
--- a/libcharset/djgpp/fnchange.lst
+++ /dev/null
@@ -1,64 +0,0 @@
-libcharset-1.1/tools/README                      libcharset-1.1/tools/README
-libcharset-1.1/tools/aix-3.2.5                   libcharset-1.1/tools/aix-3.2.5
-libcharset-1.1/tools/aix-4.1.5                   libcharset-1.1/tools/aix-4.1.5
-libcharset-1.1/tools/aix-4.2.0                   libcharset-1.1/tools/aix-4.2.0
-libcharset-1.1/tools/aix-4.3.2                   libcharset-1.1/tools/aix-4.3.2
-libcharset-1.1/tools/all-charsets                libcharset-1.1/tools/all-charsets
-libcharset-1.1/tools/all-locales                 libcharset-1.1/tools/all-locales
-libcharset-1.1/tools/freebsd-3.3                 libcharset-1.1/tools/freebsd-3.3
-libcharset-1.1/tools/glibc-2.1.3                 libcharset-1.1/tools/glibc-2.1.3
-libcharset-1.1/tools/glibc-2.1.90                libcharset-1.1/tools/glibc-2.1.90
-libcharset-1.1/tools/hpux-10.01                  libcharset-1.1/tools/hpux-10.01
-libcharset-1.1/tools/hpux-10.20                  libcharset-1.1/tools/hpux-10.20
-libcharset-1.1/tools/hpux-11.00                  libcharset-1.1/tools/hpux-11.00
-libcharset-1.1/tools/irix-6.5                    libcharset-1.1/tools/irix-6.5
-libcharset-1.1/tools/locale_charmap              libcharset-1.1/tools/locale_charmap
-libcharset-1.1/tools/locale_charset.c            libcharset-1.1/tools/locale_charset.c
-libcharset-1.1/tools/locale_codeset.c            libcharset-1.1/tools/localecodeset.c
-libcharset-1.1/tools/osf1-4.0a                   libcharset-1.1/tools/osf1-4.0a
-libcharset-1.1/tools/osf1-4.0d                   libcharset-1.1/tools/osf1-4.0d
-libcharset-1.1/tools/osf1-5.1                    libcharset-1.1/tools/osf1-5.1
-libcharset-1.1/tools/solaris-2.4                 libcharset-1.1/tools/solaris-2.4
-libcharset-1.1/tools/solaris-2.5.1               libcharset-1.1/tools/solaris-2.5.1
-libcharset-1.1/tools/solaris-2.6                 libcharset-1.1/tools/solaris-2.6
-libcharset-1.1/tools/solaris-2.6-cjk             libcharset-1.1/tools/solaris-2.6-cjk
-libcharset-1.1/tools/solaris-2.7                 libcharset-1.1/tools/solaris-2.7
-libcharset-1.1/tools/sunos-4.1.4                 libcharset-1.1/tools/sunos-4.1.4
-libcharset-1.1/tools/win32                       libcharset-1.1/tools/win32
-libcharset-1.1/tools/glibc-2.2                   libcharset-1.1/tools/glibc-2.2
-libcharset-1.1/tools/all-charsets-X11            libcharset-1.1/tools/all-charsets.X11
-libcharset-1.1/tools/glibc-2.2-XF86-3.3.6        libcharset-1.1/tools/glibc-2.2-XF86-3.3.6
-libcharset-1.1/tools/glibc-2.2-XF86-4.0.1f       libcharset-1.1/tools/glibc-2.2XF86-4.0.1f
-libcharset-1.1/tools/locale_x11encoding.c        libcharset-1.1/tools/locale_x11encoding.c
-libcharset-1.1/tools/beos-5                      libcharset-1.1/tools/beos-5
-libcharset-1.1/m4/ChangeLog                      libcharset-1.1/m4/ChangeLog
-libcharset-1.1/m4/codeset.m4                     libcharset-1.1/m4/codeset.m4
-libcharset-1.1/m4/glibc21.m4                     libcharset-1.1/m4/glibc21.m4
-libcharset-1.1/m4/libtool.m4                     libcharset-1.1/m4/libtool.m4
-libcharset-1.1/lib/localcharset.c                libcharset-1.1/lib/localcharset.c
-libcharset-1.1/lib/ChangeLog                     libcharset-1.1/lib/ChangeLog
-libcharset-1.1/lib/Makefile.in                   libcharset-1.1/lib/Makefile.in
-libcharset-1.1/lib/Makefile.msvc                 libcharset-1.1/lib/Makefile.msvc
-libcharset-1.1/AUTHORS                           libcharset-1.1/AUTHORS
-libcharset-1.1/COPYING.LIB                       libcharset-1.1/COPYING.LIB
-libcharset-1.1/INSTALL.generic                   libcharset-1.1/INSTALL.generic
-libcharset-1.1/README                            libcharset-1.1/README
-libcharset-1.1/Makefile.devel                    libcharset-1.1/Makefile.devel
-libcharset-1.1/Makefile.in                       libcharset-1.1/Makefile.in
-libcharset-1.1/configure.ac                      libcharset-1.1/configure.ac
-libcharset-1.1/configure                         libcharset-1.1/configure
-libcharset-1.1/INTEGRATE                         libcharset-1.1/INTEGRATE
-libcharset-1.1/include/localcharset.h.in         libcharset-1.1/include/localcharset.h.in
-libcharset-1.1/include/localcharset.h.msvc-shared libcharset-1.1/include/localcharset_h.shared-msvc
-libcharset-1.1/autoconf/config.guess             libcharset-1.1/autoconf/config.guess
-libcharset-1.1/autoconf/config.sub               libcharset-1.1/autoconf/config.sub
-libcharset-1.1/autoconf/ltmain.sh                libcharset-1.1/autoconf/ltmain.sh
-libcharset-1.1/autoconf/install-sh               libcharset-1.1/autoconf/install-sh
-libcharset-1.1/autoconf/aclocal.m4               libcharset-1.1/autoconf/aclocal.m4
-libcharset-1.1/autoconf/mkinstalldirs            libcharset-1.1/autoconf/mkinstalldirs
-libcharset-1.1/config.h.in                       libcharset-1.1/config.h.in
-libcharset-1.1/windows/dllexport.h               libcharset-1.1/windows/dllexport.h
-libcharset-1.1/ChangeLog                         libcharset-1.1/ChangeLog
-libcharset-1.1/Makefile.msvc                     libcharset-1.1/Makefile.msvc
-libcharset-1.1/README.win32                      libcharset-1.1/README.win32
-libcharset-1.1/config.h.msvc                     libcharset-1.1/config.h.msvc