[postgis-commits] svn - r3683 - trunk

[postgis-commits at postgis.refractions.net]

Author: pramsey
Date: 2009-02-10 13:20:17 -0800 (Tue, 10 Feb 2009)
New Revision: 3683

Modified:
   trunk/configure.ac
Log:
Solve iconv-on-Solaris (and hopefully  many other platforms with system iconv in libc) problem in autoconf.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-02-10 20:10:53 UTC (rev 3682)
+++ trunk/configure.ac	2009-02-10 21:20:17 UTC (rev 3683)
@@ -191,14 +191,14 @@
 
 dnl If we find the header file, try and link against the library
 if test "x$HAVE_ICONV_H" != "x0"; then
-	dnl Check for iconv includes as part of libc
-	AC_CHECK_LIB([c], [iconv_open], [ICONV_LDFLAGS=-lc HAVE_ICONV=1], [])
+	dnl libconv defines iconv_open to libiconv_open, so we'll check that directly
+	AC_CHECK_LIB([iconv], [libiconv_open], [ICONV_LDFLAGS=-liconv HAVE_ICONV=1], [])
 	if test "x$HAVE_ICONV" = "x"; then
-		dnl If not found, check for iconv included as part of libiconv
-		AC_CHECK_LIB([iconv], [iconv_open], [ICONV_LDFLAGS=-liconv HAVE_ICONV=1], [])
+	        dnl Check for iconv included as part of libc, using iconv_open
+	        AC_CHECK_LIB([c], [iconv_open], [ICONV_LDFLAGS=-lc HAVE_ICONV=1], [])
 		if test "x$HAVE_ICONV" = "x"; then
-			dnl If not found, check for Win32 iconv (some of them use a lib prefix for functions within the iconv DLLs)
-			AC_CHECK_LIB([iconv], [libiconv_open], [ICONV_LDFLAGS=-liconv HAVE_ICONV=1], [])
+			dnl But it's possible this implementation of libiconv doesn't have a libiconv_* define
+			AC_CHECK_LIB([iconv], [iconv_open], [ICONV_LDFLAGS=-liconv HAVE_ICONV=1], [])
 			if test "x$HAVE_ICONV" = "x"; then
 				dnl No iconv library was found; issue a warning to the console
 				AC_MSG_WARN([could not find iconv library: no support for encoding conversion will be included])