DJGPP specific adjustments

[Juan Manuel Guerrero]

I submite a patch that will adjust the DJGPP specific files 
config.{bat|sed|site}
 for the use with autoconf 2.61

Regards,
Juan M. Guerrero


2007-07-29  Juan Manuel Guerrero  <address@hidden>

        * djgpp/config.bat: replace the string diffutil*.pot by
        the correct one texinfo*.pot

        * djgpp/config.sed: adjust for the use with autoconf 2.61

        * djgpp/config.site: adjust for the use with autoconf 2.61



diff -aprNU5 texinfo-4.9.orig/djgpp/config.bat texinfo-4.9/djgpp/config.bat
--- texinfo-4.9.orig/djgpp/config.bat   2004-12-17 22:49:24 +0000
+++ texinfo-4.9/djgpp/config.bat        2007-07-29 16:51:48 +0000
@@ -183,11 +183,11 @@ if not errorlevel 0 goto missing_NLS_too
 test -f /dev/env/DJDIR/lib/libintl.a
 if not errorlevel 0 goto missing_NLS_tools
 
 Rem Recreate the files in the %XSRC%/po subdir with our ported tools.
 redir -e /dev/null rm %XSRC%/po/*.gmo
-redir -e /dev/null rm %XSRC%/po/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
diff -aprNU5 texinfo-4.9.orig/djgpp/config.sed texinfo-4.9/djgpp/config.sed
--- texinfo-4.9.orig/djgpp/config.sed   2004-12-15 15:12:58 +0000
+++ texinfo-4.9/djgpp/config.sed        2007-07-29 16:55:50 +0000
@@ -1,46 +1,54 @@
-# 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.61.
 
-/(echo[        ]*':t/ a\
+
+# Additional editing of Makefiles
+/^".*ac_file_inputs.*tmp\/out$/ 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/ {
   s|po/Makefile\.in|&:po/Makefile.in-in|
 }
 /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\
      srcdir=`echo "$srcdir" | sed -e "s%^/dev/%%" -e "s%/%:/%"`\
    fi
@@ -54,10 +62,28 @@ s,\.deps,_deps,g
 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}%'`
 }
 /^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}%'`
 
+# On DOS/WIN systems every partition has its own root directory,
+# so do not make any assumptions about absolute paths or the
+# configure script and the generated Makefiles will only be
+# good for the system where the package has been configured for.
+/^ac_abs_srcdir=/ i\
+ac_abs_builddir=`echo "$ac_abs_builddir" | sed 
"s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`\
+ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed 
"s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`\
+ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed 
"s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../..%"`
+#ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed 
"s%/dev/.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%;s%.:.*/texinfo[-_0-9]\\{1,1\\}[-.0-9A-Za-z+]*%../../.%"`
+/^ac_abs_srcdir=/ a\
+for dj_dir in $ac_abs_builddir $ac_abs_top_builddir $ac_abs_top_srcdir 
$ac_abs_srcdir\
+do\
+  ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%//%/%g"`\
+  ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%//%/%g"`\
+  ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%//%/%g"`\
+  ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%//%/%g"`\
+done
+
 # The following makes sure we are not going to remove a directory
 # which is the cwd on its drive (DOS doesn't allow to remove such
 # a directory).  The trick is to chdir to the root directory on
 # temp directory's drive before removing $tmp.
 /^ *trap 'exit_status=\$\?; rm -rf/s%rm -rf%cd $tmp; cd /; &%
diff -aprNU5 texinfo-4.9.orig/djgpp/config.site texinfo-4.9/djgpp/config.site
--- texinfo-4.9.orig/djgpp/config.site  2002-09-26 22:01:10 +0000
+++ texinfo-4.9/djgpp/config.site       2007-07-29 16:42:44 +0000
@@ -42,10 +42,19 @@ ac_cv_prog_CC=${CC='gcc'}
 # the package was configured.
 NM=${NM='nm'}
 LD=${LD='ld'}
 MAKEINFO=${MAKEINFO='makeinfo'}
 
+# A sane default for mkdir.
+ac_cv_path_mkdir=${MKDIR_P='/dev/env/DJDIR/bin/mkdir -p'}
+
+# A sane default for grep.
+ac_cv_path_GREP=${GREP='/dev/env/DJDIR/bin/grep'}
+
+# A sane default for egrep.
+ac_cv_path_EGREP=${EGREP='/dev/env/DJDIR/bin/egrep'}
+
 # Force the test for 'ln -s' to report 'cp -pf'.
 ac_cv_prog_LN_S='cp -pf'
 
 # We have `fork', but it always fails.  Don't trust Autoconf to be
 # smart enough to detect that...