iconv autodetection

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

diff --git a/Makefile.config.in b/Makefile.config.in
index d1875b541f5446bca385d99e4a3d128a7932d16c..987b3c19a812143613efd9a5d9f1b71e6a6c743b 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -64,7 +64,7 @@ AUTOCACHE_BBOX=1
 # Set USE_ICONV to 1 if you want the loader (shp2pgsql)
 # to support UTF-8 output.
 #
-USE_ICONV=0
+USE_ICONV=@USE_ICONV@
 
 #
 # PGSQL

diff --git a/TODO b/TODO
index 85e6adf1d10e2a2b70893e85ae5f65f2a8586171..8069080c61daaf8290bb3e24d4759928a01e3e54 100644 (file)
--- a/TODO
+++ b/TODO
@@ -14,7 +14,7 @@ Following is TODO list for release 1.1
 Tue May 24 18:55:46 CEST 2005
 ======================================
 
-- iconv autodetection (for already-present UTF-8 support in loader)
++ Better upgrade mechanism
 
 - Full autoconf support / PG sources dependency drop
 
@@ -26,8 +26,6 @@ Tue May 24 18:55:46 CEST 2005
 - Special threatment of SRID=-1, dims=-1, type=GEOMETRY
   in geometry_columns
 
-- Better upgrade mechanism
-
 - Pre-8.0 port of new estimator code
 
 - Better regression tests (single load, multi operations)

diff --git a/configure.in b/configure.in
index edf4a259c4f9ea2261ca62cf03afed7f33c1c57f..f29f8e9d5cfd4e5dbf1b22501c9f5d11f19388e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,6 +16,18 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_LN_S
 
+
+dnl
+dnl iconv support (might fail in case of non-default iconv installation)
+dnl
+AC_SUBST(USE_ICONV)
+USE_ICONV=
+AC_CHECK_HEADER(iconv.h,
+   USE_ICONV=1,
+   AC_MSG_WARN(utf8 encoding disabled)
+)
+
+
 dnl
 dnl host operating system
 dnl
@@ -56,7 +68,6 @@ PGBELIBS="-L$( echo $(${PGCONFIG} --libdir)) -lpostgres"
 PGBEINCLUDES="-I`${PGCONFIG} --includedir-server`"
 PGBIN="$(${PGCONFIG} --bindir)"
 AC_MSG_CHECKING([which template to use])
-
 PGTEMPLATE="$(${PGCONFIG} --configure | \
              awk 'BEGIN {RS = " "; FS = "=";} \
                          { \