--- aclocal.m4.ori	2010-11-24 00:54:36.000000000 -0800
+++ aclocal.m4	2010-11-24 19:03:46.000000000 -0800
@@ -5972,7 +5972,7 @@
 ],[
 	char *output = 0;
     int code = idna_to_ascii_8z("name", &output, IDNA_USE_STD3_ASCII_RULES);
-],idn)
+],idn,,,,[$LIBICONV])
 
 if test "x$cf_cv_find_linkage_idn" = xyes ; then
 	AC_DEFINE(USE_IDNA)
--- src/makefile.in.ori	2010-11-24 18:55:06.000000000 -0800
+++ src/makefile.in	2010-11-24 18:57:06.000000000 -0800
@@ -102,7 +102,7 @@
 
 lynx$x:   message do_chartrans_stuff $(top_builddir)/LYHelp.h $(OBJS) $(WWWLIB)
 	@echo "Linking and creating Lynx executable"
-	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@  $(OBJS) $(WWWLIB) $(INTLLIB) $(LDFLAGS) $(LIBS)
+	$(CC) $(CC_OPTS) $(LDFLAGS) -o $@  $(OBJS) $(WWWLIB) $(LDFLAGS) $(LIBS) $(INTLLIB)
 	@echo "Copying Lynx executable into top-level directory"
 	rm -f $(top_builddir)/$@
 	cp $@ $(top_builddir)/