error compiling substring.c because of error in system.h

[Gerrit P. Haase]

Hello bug-texinfo,

getting this when compiling texinfo-4.7 from the release tarball on
Cygwin:

gcc -v -DHAVE_CONFIG_H -I. -I/libmatheval/texinfo-4.7/lib -I.. -I../intl -O2 
-MT substring.o -MD -MP -MF ".deps/substring.Tpo" -c -o substring.o 
/libmatheval/texinfo-4.7/lib/substring.c
Reading specs from /bin/../lib/gcc-lib/i686-pc-cygwin/3.3.1/specs
Configured with: /GCC/gcc-3.3.1-3/configure --with-gcc --with-gnu-ld 
--with-gnu-as --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc 
--libdir=/usr/lib --libexecdir=/usr/sbin --mandir=/usr/share/man 
--infodir=/usr/share/info --enable-languages=c,ada,c++,f77,pascal,java,objc 
--enable-libgcj --enable-threads=posix --with-system-zlib --enable-nls 
--without-included-gettext --enable-interpreter --enable-sjlj-exceptions 
--disable-version-specific-runtime-libs --enable-shared 
--disable-win32-registry --enable-java-gc=boehm --disable-hash-synchronization 
--verbose --target=i686-pc-cygwin --host=i686-pc-cygwin --build=i686-pc-cygwin
Thread model: posix
gcc version 3.3.1 (cygming special)
 /bin/../lib/gcc-lib/i686-pc-cygwin/3.3.1/cc1.exe -E -quiet -v -I. 
-I/libmatheval/texinfo-4.7/lib -I.. -I../intl -iprefix 
/bin/../lib/gcc-lib/i686-pc-cygwin/3.3.1/ -MD substring.d -MF 
.deps/substring.Tpo -MP -MT substring.o -MQ substring.o -D__GNUC__=3 
-D__GNUC_MINOR__=3 -D__GNUC_PATCHLEVEL__=1 -D__CYGWIN32__ -D__CYGWIN__ -Dunix 
-D__unix__ -D__unix -idirafter 
/usr/lib/gcc-lib/i686-pc-cygwin/3.3.1/../../../../include/w32api -idirafter 
/usr/lib/gcc-lib/i686-pc-cygwin/3.3.1/../../../../i686-pc-cygwin/lib/../../include/w32api
 -DHAVE_CONFIG_H /libmatheval/texinfo-4.7/lib/substring.c -O2 substring.i
ignoring nonexistent directory "../intl"
ignoring nonexistent directory "/i686-pc-cygwin/include"
ignoring nonexistent directory "/usr/i686-pc-cygwin/include"
ignoring duplicate directory "/usr/lib/gcc-lib/i686-pc-cygwin/3.3.1/include"
ignoring duplicate directory "/usr/i686-pc-cygwin/lib/../../include/w32api"
#include "..." search starts here:
#include <...> search starts here:
 .
 /libmatheval/texinfo-4.7/lib
 ..
 /lib/gcc-lib/i686-pc-cygwin/3.3.1/include
 /usr/local/include
 /usr/include
 /usr/include/w32api
End of search list.
In file included from /libmatheval/texinfo-4.7/lib/substring.c:21:
/libmatheval/texinfo-4.7/lib/system.h:85:22: strcase.h: No such file or 
directory

The obvious fix is to change this in system.h:
--- texinfo-4.7/lib/system.h~   2004-05-15 21:43:25.038889600 +0200
+++ texinfo-4.7/lib/system.h    2004-05-15 21:33:58.073633600 +0200
@@ -81,7 +81,7 @@
 # include <strings.h>
 #endif
 
-#if !HAVE_STRNCASECMP || !HAVE_STRCASECMP
+#if !HAVE_STRNCASECMP && !HAVE_STRCASECMP
 # include "strcase.h"
 #endif
 


Thanks,
Gerrit
-- 
=^..^=

system.h.patch
Description: Binary data