Re: [Nautilus-list] iconv problem

[Alex Larsson <alexl redhat com>]

On Sun, 21 Oct 2001, Darin Adler wrote:

> Could one of the Red Hat Labs folks who worked on the desktop icon code
> contribute a configure.in fix to resolve this iconv build problem?
> 
> If that's not possible, I'll get to it some time later this week, and
> probably make a 1.0.6 release after that.

Stolen from glib 2, but untested, since i have no machine with libiconv.

/ Alex

 
Index: configure.in
===================================================================
RCS file: /cvs/gnome/nautilus/configure.in,v
retrieving revision 1.371
diff -u -p -r1.371 configure.in
--- configure.in	2001/10/16 02:38:41	1.371
+++ configure.in	2001/10/24 15:19:39
@@ -333,6 +333,37 @@ AC_CHECK_HEADERS(cdda_interface.h cdda_p
 	])
 
 dnl ====================================
+dnl Tests for iconv
+dnl ====================================
+
+AC_ARG_WITH(libiconv, [ --with-libiconv     Use the libiconv library ],,with_libiconv=maybe)
+
+found_iconv=no
+
+if test "x$with_libiconv" != "xyes" ; then
+   # 
+   # Check in the C library 
+   #
+   AC_CHECK_FUNC(iconv_open, with_libiconv=no; found_iconv=yes)
+fi
+
+if test "x$with_libiconv" != "xno" ; then
+   #
+   # Check for libiconv
+   #
+   AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=yes; found_iconv=yes)
+fi
+
+if test "x$found_iconv" = "xno" ; then
+   AC_MSG_ERROR([*** No iconv() implementation found in C library or libiconv])
+fi
+
+if test "x$with_libiconv" = "xyes" ; then
+  ICONV_LIBS="-liconv"
+fi
+AC_SUBST(ICONV_LIBS)
+	
+dnl ====================================
 dnl Gnome libraries.
 dnl ====================================
 
Index: libnautilus-private/Makefile.am
===================================================================
RCS file: /cvs/gnome/nautilus/libnautilus-private/Makefile.am,v
retrieving revision 1.197
diff -u -p -r1.197 Makefile.am
--- libnautilus-private/Makefile.am	2001/10/08 19:07:48	1.197
+++ libnautilus-private/Makefile.am	2001/10/24 15:19:40
@@ -31,6 +31,7 @@ libnautilus_private_la_LDFLAGS =	\
 	$(LIBJPEG) 			\
 	$(MEDUSA_LIBS) 			\
 	$(FAM_LIBS) 			\
+	$(ICONV_LIBS)			\
 	$(CDDALIBADD)			\
 	$(NULL)