X-Authentication-Warning: delorie.com: mail set sender to djgpp-workers-bounces using -f
From: "Juan Manuel Guerrero" <st001906 AT hrz1 DOT hrz DOT tu-darmstadt DOT de>
Organization: Darmstadt University of Technology
To: djgpp-workers AT delorie DOT com
Date: Tue, 14 Dec 2004 20:58:38 +0200
MIME-Version: 1.0
Subject: Re: [karl AT gnu DOT org: [texinfo-pretest] texinfo 4.7.91 pretest available]
CC: texinfo-pretest AT texinfo DOT org
Message-ID: <41BF53FE.2348.9A1210@localhost>
In-reply-to: <01c4deb8$Blat.v2.2.2$28ddf4c0@zahav.net.il>
X-mailer: Pegasus Mail for Windows (4.21c, DE v4.21c R1)
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7BIT
Content-description: Mail message body
X-TUD-HRZ-MailScanner: Found to be clean
X-TUD-HRZ-MailScanner-SpamCheck: 
X-MailScanner-From: st001906 AT hrz1 DOT hrz DOT tu-darmstadt DOT de
Reply-To: djgpp-workers AT delorie DOT com
Errors-To: nobody AT delorie DOT com
X-Mailing-List: djgpp-workers AT delorie DOT com
X-Unsubscribes-To: listserv AT delorie DOT com
Precedence: bulk

Datum:   	Fri, 10 Dec 2004 14:58:58 +0200
Von:            	"Eli Zaretskii" <eliz AT gnu DOT org>
An:             	djgpp-workers AT delorie DOT com
Betreff:        	[karl AT gnu DOT org: [texinfo-pretest] texinfo 4.7.91 pretest available]
Antwort an:     	djgpp-workers AT delorie DOT com

> FYI.
>
> If there are some outstanding problems with the DJGPP support in
> Texinfo, now is the time to submit patches.  So please try to build
> this and report any problems.
>
> TIA


There are at least two djgpp specific issues:
1) makeinfo/node.c:
   The variable dos_file_names is defined as static but it is initialized by a
   function call to patchconf() (through the macro HAVE_LONG_FILENAMES) making
   the compilation break.
2) djgpp/config.bat:
   Due to the use of a new autoconf package some modifications ar needed.
   See patch.

This will make the package compile out-of-the-box if and only if long file
name support is available.


Regards,
Juan M. Guerrero

diff -apruNU5 texinfo-4.7.91.orig/djgpp/config.sed texinfo-4.7.91/djgpp/config.sed
--- texinfo-4.7.91.orig/djgpp/config.sed	2002-09-26 22:01:10.000000000 +0000
+++ texinfo-4.7.91/djgpp/config.sed	2004-12-11 22:57:40.000000000 +0000
@@ -20,11 +20,11 @@
     /@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,\
   }
 
 # Makefile.in.in is renamed to Makefile.in-in.
-/^ac_config_files=/,/_ACEOF/ {
+/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
@@ -49,14 +49,14 @@ s,\.deps,_deps,g
 # write absolute paths into Makefiles making
 # them useless for DJGPP installations for which
 # the package has not been configured for.
 /MISSING=/,/^$/ {
   /^fi$/ a\
-am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'`
+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}%'`
+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}%'`
 
 # 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.
diff -apruNU5 texinfo-4.7.91.orig/makeinfo/node.c texinfo-4.7.91/makeinfo/node.c
--- texinfo-4.7.91.orig/makeinfo/node.c	2004-11-30 13:26:50.000000000 +0000
+++ texinfo-4.7.91/makeinfo/node.c	2004-12-11 23:00:24.000000000 +0000
@@ -1664,11 +1664,11 @@ last_node_p (TAG_ENTRY *tags)
 
 static char *
 enumerate_filename (char *pathname, char *basename, int number)
 {
   /* Do we need to generate names of subfiles which don't exceed 8+3 limits? */
-  static const int dos_file_names = !HAVE_LONG_FILENAMES (pathname ? pathname : ".");
+  const int dos_file_names = !HAVE_LONG_FILENAMES (pathname ? pathname : ".");
   unsigned name_len = strlen (basename);
   char *filename = xmalloc (10 + strlen (pathname) + name_len);
   char *base_filename = xmalloc (10 + name_len);
 
   sprintf (base_filename, "%s-%d", basename, number);