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 5e1bcb77abe771fd5dc9cf5ab61599d2d8ab2971..c8db43c72be0e77457df6b9a8e1d589f94aa99f9 100644 (file)
--- 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 54b4a304f31c0ee18084817893b891371d6915dc..de941d594a26030f3aa9fb8b6acebf72304630b3 100644 (file)
--- 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)