Index: configure
--- configure.orig
+++ configure
@@ -7645,7 +7645,7 @@ main (void)
 {
 int i; static j; int *p; char *c;
   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
-  *c = &i; c = p;
+  *c = &i;
   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
 
   ;
@@ -12109,7 +12109,7 @@ then :
 else $as_nop
 
     with_intl=maybe
-    intl_LIBS="-l${smr_lib}"
+    intl_LIBS="-l${smr_lib} -liconv"
 
 fi
 
