--- glib/gconvert.c.mps	Tue Sep 21 21:19:41 2004
+++ glib/gconvert.c	Tue Sep 21 21:18:01 2004
@@ -22,7 +22,9 @@
 
 #include "config.h"
 
+#ifdef HAVE_ICONV_H
 #include <iconv.h>
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -49,6 +49,24 @@
 #error GNU libiconv not in use but included iconv.h is from libiconv
 #endif
 
+#ifndef HAVE_ICONV_H
+typedef void *iconv_t;
+
+static iconv_t iconv_open(const char *tocode, const char *fromcode)
+{
+	return (iconv_t)(-1);
+}
+
+static int iconv_close(iconv_t cd)
+{
+	free(cd);
+
+	return 0;
+}
+
+static size_t iconv() {return 0;}
+#endif
+
 GQuark 
 g_convert_error_quark (void)
 {