From 885d19a614c83cd3dd2f1128980b3a534f32562b Mon Sep 17 00:00:00 2001
From: Bborie Park <bkpark at ucdavis.edu>
Date: Fri, 9 Mar 2012 19:00:25 +0000
Subject: [PATCH] Initialize variables that may cause compile-time warnings in
 rt_api.c.  Added additional NLS items to raster2pgsql.

git-svn-id: http://svn.osgeo.org/postgis/trunk@9436 b70326c6-7e19-0410-871a-916f4a2858ee
---
 raster/loader/Makefile.in    | 14 +++++++++++++-
 raster/loader/raster2pgsql.h |  2 +-
 raster/rt_core/rt_api.c      | 14 +++++++-------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index 3e81262d5..fcfc705c3 100644
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -38,13 +38,23 @@ GEOS_LDFLAGS=@GEOS_LDFLAGS@ -lgeos_c
 RTCORE_CFLAGS=-I$(RT_CORE)
 RTCORE_LDFLAGS=$(RT_CORE)/librtcore.a
 
+# GetText includes and libraries
+GETTEXT_CFLAGS = @GETTEXT_CFLAGS@
+GETTEXT_LDFLAGS = @GETTEXT_LDFLAGS@ @LIBINTL@
+
+# iconv flags
+ICONV_LDFLAGS=@ICONV_LDFLAGS@
+ICONV_CFLAGS=@ICONV_CFLAGS@
+
 CFLAGS = \
 	@CFLAGS@ @PICFLAGS@ @WARNFLAGS@ \
 	$(RTCORE_CFLAGS) \
 	$(LIBLWGEOM_CFLAGS) \
 	$(PROJ_CFLAGS) \
 	$(LIBGDAL_CFLAGS) \
-	$(GEOS_CFLAGS)
+	$(GEOS_CFLAGS) \
+	$(GETTEXT_CFLAGS) \
+	$(ICONV_CFLAGS)
 
 LDFLAGS = \
 	@LDFLAGS@ \
@@ -52,6 +62,8 @@ LDFLAGS = \
 	$(LIBLWGEOM_LDFLAGS) \
 	$(LIBGDAL_LDFLAGS) \
 	$(GEOS_LDFLAGS) \
+	$(GETTEXT_LDFLAGS) \
+	$(ICONV_LDFLAGS) \
 	-lm
 
 all: $(RASTER2PGSQL)
diff --git a/raster/loader/raster2pgsql.h b/raster/loader/raster2pgsql.h
index 039cebde4..b4104de24 100644
--- a/raster/loader/raster2pgsql.h
+++ b/raster/loader/raster2pgsql.h
@@ -27,7 +27,7 @@
  */
 
 /* For internationalization */
-#ifdef USE_NLS
+#ifdef ENABLE_NLS
 #include <libintl.h>
 #include <locale.h>
 #define _(String) gettext(String)
diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c
index 0a5999c7d..fcd8405ff 100644
--- a/raster/rt_core/rt_api.c
+++ b/raster/rt_core/rt_api.c
@@ -10258,13 +10258,13 @@ int rt_raster_intersects_algorithm(
 
 	enum line_points {X1, Y1, X2, Y2};
 	enum point {pX, pY};
-	double line1[4];
-	double line2[4];
-	double P[2];
-	double Qw[2];
-	double Qr[2];
-	double gt1[6] = {0.0};
-	double gt2[6] = {0.0};
+	double line1[4] = {0.};
+	double line2[4] = {0.};
+	double P[2] = {0.};
+	double Qw[2] = {0.};
+	double Qr[2] = {0.};
+	double gt1[6] = {0.};
+	double gt2[6] = {0.};
 	double igt1[6] = {0};
 	double igt2[6] = {0};
 	double d;
-- 
2.40.0