diff options
Diffstat (limited to 'Build/source/utils/texinfo/djgpp')
-rwxr-xr-x | Build/source/utils/texinfo/djgpp/config.bat | 31 | ||||
-rw-r--r-- | Build/source/utils/texinfo/djgpp/config.sed | 95 | ||||
-rw-r--r-- | Build/source/utils/texinfo/djgpp/config.site | 9 |
3 files changed, 89 insertions, 46 deletions
diff --git a/Build/source/utils/texinfo/djgpp/config.bat b/Build/source/utils/texinfo/djgpp/config.bat index 3b000ee6dc2..f5dffc454c4 100755 --- a/Build/source/utils/texinfo/djgpp/config.bat +++ b/Build/source/utils/texinfo/djgpp/config.bat @@ -76,11 +76,11 @@ if not "%1" == "" goto arg_loop set SPECARG=
Rem Create a response file for the configure script.
-echo --srcdir=%XSRC% > arguments
-if "%CACHE%" == "enabled" echo --config-cache >>arguments
-if "%DEPTRAK%" == "enabled" echo --enable-dependency-tracking >>arguments
-if "%DEPTRAK%" == "disabled" echo --disable-dependency-tracking >>arguments
-if not "%ARGS%" == "" echo %ARGS% >>arguments
+echo --srcdir=%XSRC% > args
+if "%CACHE%" == "enabled" echo --config-cache >> args
+if "%DEPTRAK%" == "enabled" echo --enable-dependency-tracking >> args
+if "%DEPTRAK%" == "disabled" echo --disable-dependency-tracking >> args
+if not "%ARGS%" == "" echo %ARGS% >> args
set ARGS=
set CACHE=
set DEPTRAK=
@@ -88,16 +88,16 @@ set DEPTRAK= if "%XSRC%" == "." goto in_place
:not_in_place
-redir -e /dev/null update %XSRC%/configure.orig ./configure
+redir -e /dev/null update %XSRC%/configure.org ./configure
test -f ./configure
if errorlevel 1 update %XSRC%/configure ./configure
:in_place
Rem Update configuration files
echo Updating configuration scripts...
-test -f ./configure.orig
-if errorlevel 1 update configure configure.orig
-sed -f %XSRC%/djgpp/config.sed configure.orig > configure
+test -f ./configure.org
+if errorlevel 1 update configure configure.org
+sed -f %XSRC%/djgpp/config.sed configure.org > configure
if errorlevel 1 goto sed_error
Rem Make sure they have a config.site file
@@ -185,30 +185,27 @@ if not errorlevel 0 goto missing_NLS_tools Rem Recreate the files in the %XSRC%/po subdir with our ported tools.
redir -e /dev/null rm %XSRC%/po/*.gmo
-redir -e /dev/null rm %XSRC%/po/diffutil*.pot
+redir -e /dev/null rm %XSRC%/po/texinfo*.pot
redir -e /dev/null rm %XSRC%/po/cat-id-tbl.c
redir -e /dev/null rm %XSRC%/po/stamp-cat-id
Rem Update the arguments file for the configure script.
Rem We prefer without-included-gettext because libintl.a from gettext package
Rem is the only one that is guaranteed to have been ported to DJGPP.
-echo --enable-nls --without-included-gettext >> arguments
+echo --enable-nls --without-included-gettext >> args
goto configure_package
:missing_NLS_tools
echo Needed libs/tools for NLS not found. Configuring without NLS.
:without_NLS
Rem Update the arguments file for the configure script.
-echo --disable-nls >> arguments
+echo --disable-nls >> args
:configure_package
echo Running the ./configure script...
-sh ./configure @arguments
+sh ./configure @args
if errorlevel 1 goto cfg_error
-rm arguments
-
-Rem Remove files created by the gl_FUNC_MKSTEMP test.
-rm co*.tmp
+rm args
echo Done.
goto End
diff --git a/Build/source/utils/texinfo/djgpp/config.sed b/Build/source/utils/texinfo/djgpp/config.sed index c4193df0fbd..965e31ca48e 100644 --- a/Build/source/utils/texinfo/djgpp/config.sed +++ b/Build/source/utils/texinfo/djgpp/config.sed @@ -1,25 +1,37 @@ -# Additional editing of configure and Makefiles for DJGPP +# DJGPP specific configuration file. +# Sed script for additional DJGPP specific editing +# of the configure script generated by autoconf 2.62. -/(echo[ ]*':t/ a\ + +# Additional editing of Makefiles +/^eval sed.*ac_file_inputs.*tmp\/out \\$/ { +:loop +n +/^$/!b loop +a\ +cat > "$tmp/subs-djgpp.sed" << eof_djgpp\ # DJGPP specific Makefile changes.\ - /^aliaspath * *=/s,:,";",g;t t\ - /TEXINPUTS=/s,:,";",g;t t\ - /PATH=/s,:,";",g;t t\ - s,\\.deps,_deps,g;t t\ - s,\\.new\\.,_new.,g;t t\ - s,\\.old\\.,_old.,g;t t\ - s,\\.tab\\.,_tab.,g;t t\ - s,Makefile\\.in\\.in,Makefile.in-in,g;t t\ - s,Makefile\\.am\\.in,Makefile.am-in,g;t t\ - /^install-info-am:/,/^$/ {\ - /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\ - s,\\(\\\$\\\$d/\\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$d/\\$\\$file[0-9] \\$\\$d/\\$\\$file[0-9][0-9]\\2,\ - s,\\( \\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\ - }\ - /^uninstall-info-am:/,/^$/ {\ - /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\ - s,\\(file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\ - } +s,\\.deps,_deps,g\ +s,\\.libs,_libs,g\ +s,\\.new\\.,_new.,g\ +s,\\.old\\.,_old.,g\ +s,\\.tab\\.,_tab.,g\ +s,Makefile\\.am\\.in,Makefile.am-in,g\ +s,Makefile\\.in\\.in,Makefile.in-in,g\ +/^install-info-am:/,/^$/ {\ + /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\ + s,\\(\\\$\\\$d/\\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$d/\\$\\$file[0-9] \\$\\$d/\\$\\$file[0-9][0-9]\\2,\ + s,\\( \\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\ +}\ +/^uninstall-info-am:/,/^$/ {\ + /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\ + s,\\(file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\ +}\ +eof_djgpp\ +sed -f "\$tmp/subs-djgpp.sed" \$tmp/out > \$tmp/out.djgpp\ +mv -f \$tmp/out.djgpp \$tmp/out +} + # Makefile.in.in is renamed to Makefile.in-in. /ac_config_files=/,/_ACEOF/ { @@ -27,18 +39,19 @@ } /CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2 -# We always use _deps instead of .deps, because the latter is an -# invalid name on 8+3 MS-DOS filesystem. 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 +# We always use _deps and _libs instead of .deps and .libs, because +# the latter is an invalid name on 8+3 MS-DOS file system. This makes +# the generated Makefiles good for every DJGPP installation, not only +# the one where the package was configured (which could happen to be +# a Windows box, where leading dots in file names are allowed). +/^rmdir[ ]*\.tst/ i\ +am__leading_dot=_ # The following two items are changes needed for configuring # and compiling across partitions. # The given srcdir value is always translated from the # "x:" syntax into "/dev/x" syntax while we run configure. -/^[ ]*-srcdir=\*.*$/ a\ +/^[ ]*-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\ @@ -51,10 +64,28 @@ s,\.deps,_deps,g # the package has not been configured for. /MISSING=/,/^$/ { /^fi$/ a\ -am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'` +am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%'` } /^install_sh=/a\ -install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'` +install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%;s%.:.*/texinfo-\\{0,1\\}4\\.[0-9][0-9]\\{0,1\\}\\.\\{0,1\\}[0-9]\\{0,2\\}[a-z]\\{0,1\\}%${top_srcdir}%'` + +# On DOS/WIN systems every partition has its own root directory, +# so do not make any assumptions about absolute paths or the +# configure script and the generated Makefiles will only be +# good for the system where the package has been configured for. +/^ac_abs_srcdir=/ i\ +ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`\ +ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`\ +ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"` +#ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"` +/^ac_abs_srcdir=/ a\ +for dj_dir in $ac_abs_builddir $ac_abs_top_builddir $ac_abs_top_srcdir $ac_abs_srcdir\ +do\ + ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%//%/%g"`\ + ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%//%/%g"`\ + ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%//%/%g"`\ + ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%//%/%g"`\ +done # The following makes sure we are not going to remove a directory # which is the cwd on its drive (DOS doesn't allow to remove such @@ -65,3 +96,9 @@ install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\ # AC_CONFIG_LINKS fails if the source and destination are on # different file systems and symlinks don't work. /^ ln \$srcdir/s%||%|| cp -pf $srcdir/$ac_source $ac_dest ||% + +# The CR test for awk does not work for DJGPP. +/^ac_cs_awk_cr=/,/^$/ { + /^fi$/ a\ +ac_cs_awk_cr=$ac_cr +} diff --git a/Build/source/utils/texinfo/djgpp/config.site b/Build/source/utils/texinfo/djgpp/config.site index c7768b11f06..c8a112360ec 100644 --- a/Build/source/utils/texinfo/djgpp/config.site +++ b/Build/source/utils/texinfo/djgpp/config.site @@ -44,6 +44,15 @@ NM=${NM='nm'} LD=${LD='ld'} MAKEINFO=${MAKEINFO='makeinfo'} +# A sane default for mkdir. +ac_cv_path_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'} + +# A sane default for grep. +ac_cv_path_GREP=${GREP='/dev/env/DJDIR/bin/grep'} + +# A sane default for egrep. +ac_cv_path_EGREP=${EGREP='/dev/env/DJDIR/bin/egrep'} + # Force the test for 'ln -s' to report 'cp -pf'. ac_cv_prog_LN_S='cp -pf' |