>Number:         11991
>Category:       pkg
>Synopsis:       patch gmake to use shipped libintl
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 18 09:26:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     Patrick Welche
>Release:        17 Jan 2001
>Organization:
	
>Environment:
1.5Q/i386

First part of configure patch ($withval) is to fix:

% configure --with-included-gettext=no
...
checking whether to use included gettext... yes

then becomes no, next part is to allow it to find libintl.
Patch to getopt.c is to fix a compile warning, but I'm not sure it is the correct thing
to do..
>Description:
>How-To-Repeat:
>Fix:
--- configure.orig	Thu Jan 18 17:13:54 2001
+++ configure	Thu Jan 18 17:21:25 2001
@@ -2528,7 +2528,7 @@
     # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
-  with_included_gettext=yes
+  with_included_gettext=$withval
 else
   with_included_gettext=maybe
 fi
@@ -2669,12 +2669,8 @@
 
 int main() {
 
-#if __USE_GNU_GETTEXT
   extern int _nl_msg_cat_cntr;
   return _nl_msg_cat_cntr;
-#else
-not GNU gettext
-#endif
 
 ; return 0; }
 EOF
--- getopt.c.orig	Thu Jan 18 17:14:07 2001
+++ getopt.c	Wed Jan  3 13:48:19 2001
@@ -79,9 +79,13 @@
 # endif
 #endif
 
+#ifdef HAVE_GETTEXT
+# include <libintl.h>
+#else
 /* This is for other GNU distributions with internationalized messages.
    When compiling libc, the _ macro is predefined.  */
-#include "gettext.h"
+# include "gettext.h"
+#endif
 #define _(msgid)    gettext (msgid)
 
>Release-Note:
>Audit-Trail:
>Unformatted: