grep 2.5.4 configure -disable-nls (on Interix)

[Jay]

grep configure -disable-nls on Interix
and I had /usr/include/libintl.h from building/installing something, such as 
maybe gettext
 

gcc  -g -O2   -o grep grep.o search.o kwset.o dfa.o ../lib/libgreputils.a
../lib/libgreputils.a(getopt.o)(.text+0x479): In function `_getopt_initialize':
/src/grep-2.5.4/lib/getopt.c:408: undefined reference to `_libintl_gettext'
../lib/libgreputils.a(getopt.o)(.text+0x4cf):/src/grep-2.5.4/lib/getopt.c:408: 
undefined reference to `_libintl_gettext'
../lib/libgreputils.a(getopt.o)(.text+0x56e):/src/grep-2.5.4/lib/getopt.c:408: 
undefined reference to `_libintl_gettext'
../lib/libgreputils.a(getopt.o)(.text+0x5f3):/src/grep-2.5.4/lib/getopt.c:408: 
undefined reference to `_libintl_gettext'
../lib/libgreputils.a(getopt.o)(.text+0x63e):/src/grep-2.5.4/lib/getopt.c:408: 
undefined reference to `_libintl_gettext'
../lib/libgreputils.a(getopt.o)(.text+0x738):/src/grep-2.5.4/lib/getopt.c:408: 
more undefined references to `_libintl_gettext' follow
 

../lib/libgreputils.a(regex.o)(.text+0x6035): In function `bcmp_translate':
/src/grep-2.5.4/lib/regex.c:7517: undefined reference to `_libintl_gettext'
../lib/libgreputils.a(regex.o)(.text+0x5d42):/src/grep-2.5.4/lib/regex.c:7517: 
undefined reference to `_libintl_gettext'

 
../lib/libgreputils.a(obstack.o)(.text+0x3e1): In function `print_and_abort':
/src/grep-2.5.4/lib/obstack.c:471: undefined reference to `_libintl_gettext'
 

Note that there are inconsistencies around use of ENABLE_NLS and #define of _.
Sometimes LIBINTL_H is checked, sometimes not.
This doesn't address that.
 

C:\src\grep-2.5.4\lib>diff -u getopt.c.orig getopt.c
--- getopt.c.orig       2009-06-20 03:32:47.750000000 -0700
+++ getopt.c    2009-06-20 03:34:51.859375000 -0700
@@ -77,7 +77,7 @@
 #ifndef _
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
-# ifdef HAVE_LIBINTL_H
+# if defined(HAVE_LIBINTL_H) && defined(ENABLE_NLS)
 #  include 
 #  define _(msgid)     gettext (msgid)
 # else
 

C:\src\grep-2.5.4\lib>diff -u obstack.c.orig obstack.c
--- obstack.c.orig      2009-06-20 03:35:29.671875000 -0700
+++ obstack.c   2009-06-20 03:45:50.781250000 -0700
@@ -451,7 +451,7 @@
 ♀
 /* Define the error handler.  */
 #ifndef _
-# ifdef HAVE_LIBINTL_H
+# if defined(HAVE_LIBINTL_H) && defined(ENABLE_NLS)
 #  include 
 #  ifndef _
 #   define _(Str) gettext (Str)
 
 
C:\src\grep-2.5.4\lib>diff regex.c.orig regex.c
119c119
< #if HAVE_LIBINTL_H || defined _LIBC
---
> #if (HAVE_LIBINTL_H && defined(ENABLE_NLS)) || defined _LIBC
 
 
I realize this last one could put the && further out.
 
 
 - Jay