From: Sandro Santilli <strk@keybit.net>
Date: Wed, 12 Jan 2005 17:03:57 +0000 (+0000)
Subject: added USE_ICONV configuration
X-Git-Tag: pgis_1_0_0RC1~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34c50dbef67046a329e6be826646f9a6f3172488;p=postgis

added USE_ICONV configuration


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

diff --git a/Makefile.config b/Makefile.config
index 5e1bcb77a..c8db43c72 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -37,7 +37,10 @@ GEOS_DIR ?= /usr/local
 # Set USE_STATS to 1 for new GiST statistics collection support
 # Note that this support requires additional columns in 
 # GEOMETRY_COLUMNS, so see the list archives for info or
-# install a fresh database using postgis.sql
+# install a fresh database using postgis.sql.
+# This option is useless for builds against PGSQL>=80 (stats
+# are always gathered in that case, and you don't need additional
+# columns in geometry_columns).
 #
 USE_STATS=1
 
@@ -58,6 +61,12 @@ AUTOCACHE_BBOX ?= 1
 # PGSQL_SRC=/usr/src/postgresql
 PGSQL_SRC ?= ${PWD}/../..
 
+#
+# Set USE_ICONV to 1 if you want the loader (shp2pgsql)
+# to support UTF-8 output.
+#
+USE_ICONV ?= 0
+
 #
 # Path to library (to be specified in CREATE FUNCTION queries)
 # Defaults to $libdir.
diff --git a/loader/Makefile b/loader/Makefile
index 54b4a304f..de941d594 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -16,6 +16,10 @@ OBJS = shpopen.o dbfopen.o getopt.o PQunescapeBytea.o
 
 #---------------------------------------------------------------
 
+ifeq ($(USE_ICONV),1)
+	override CFLAGS += -DUSE_ICONV
+endif
+
 override CFLAGS := -g -I.. -I$(srcdir) -I$(top_builddir)/src/interfaces/libpq $(CFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' -DUSE_VERSION=$(USE_VERSION)
 
 all: shp2pgsql$(EXE) pgsql2shp$(EXE)