From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Jan 2012 14:04:21 +0000 (+0000)
Subject: Allow building with gettext 0.14. Patch by Greg Troxel <gdt@ir.bbn.com>
X-Git-Tag: 2.0.0alpha1~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0910bbdecb17fb105de034387d9cf530642b1dd;p=postgis

Allow building with gettext 0.14. Patch by Greg Troxel <gdt@ir.bbn.com>

git-svn-id: http://svn.osgeo.org/postgis/trunk@8841 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/README.postgis b/README.postgis
index 504d37501..9b45eb7c7 100644
--- a/README.postgis
+++ b/README.postgis
@@ -59,6 +59,11 @@ for this to work.
 
     http://xmlsoft.org/
 
+* GNU gettext
+
+   The loader, and hence postgis, requires GNU gettext 0.14 or higher
+   (typically in libc on GNU/Linux, in which case 0.17 is required).
+
 If you want to compile PostGIS with raster support, you additionally 
 must have installed:
 
diff --git a/macros/gettext.m4 b/macros/gettext.m4
index c9ae1f7de..3743ef465 100644
--- a/macros/gettext.m4
+++ b/macros/gettext.m4
@@ -17,6 +17,10 @@ dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
 dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2006.
 
+dnl Modified 20120114 to not insist on _nl_expand_alias, so that it
+dnl will find and accept gettext 0.14, because postgis does not
+dnl actually require any 0.17 features.
+
 dnl Macro to add for using GNU gettext.
 
 dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
@@ -187,10 +191,9 @@ extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
-#endif
-const char *_nl_expand_alias (const char *);],
+#endif],
               [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr],
               [eval "$gt_func_gnugettext_libintl=yes"],
               [eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv.