Automated merge.

diff --combined src/Makefile.am
index 441cfa1b3a3310aa631c752d36a8a47d993b4bab,edbb592e8990422a8ae65d5954fa2c58d7aee599..ab830ba080a828041ed65d92a7371901ade35618
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -30,6 -30,10 +30,10 @@@
  # Version: @VERSION@
  #
  
+ if IRI_IS_ENABLED
+ IRI_OBJ = iri.c
+ endif
+ 
  # The following line is losing on some versions of make!
  DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
  LIBS     = @LIBSSL@ @LIBGNUTLS@ @LIBINTL@ @LIBS@
@@@ -40,8 -44,8 +44,8 @@@ wget_SOURCES = build_info.c cmpt.c conn
               ftp-basic.c ftp-ls.c hash.c host.c html-parse.c html-url.c \
               http.c init.c log.c main.c netrc.c progress.c ptimer.c     \
               recur.c res.c retr.c snprintf.c spider.c url.c             \
-              utils.c                                    \
-              css-url.h connect.h convert.h cookies.h \
+              utils.c $(IRI_OBJ)                                         \
+              css-url.h connect.h convert.h cookies.h                    \
               ftp.h gen-md5.h hash.h host.h html-parse.h html-url.h      \
               http.h http-ntlm.h init.h log.h mswindows.h netrc.h        \
               options.h progress.h ptimer.h recur.h res.h retr.h         \
@@@ -51,12 -55,6 +55,12 @@@ EXTRA_wget_SOURCES = mswindows.
  LDADD = $(LIBOBJS) ../lib/libgnu.a @MD5_LDADD@
  AM_CPPFLAGS = -I$(top_srcdir)/lib @MD5_CPPFLAGS@
  
 +../lib/libgnu.a:
 +      cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
 +
 +../md5/libmd5.a:
 +      cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
 +
  ESCAPEQUOTE = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
  version.c:  $(wget_SOURCES) $(LDADD) $(srcdir)/Makefile.am
        echo '/* version.c */' > $@

diff --combined tests/run-px
index 50db5819f7b4792e7d413dbce855998af24284b9,51dec828d8ce2a27d7e0b6389d30966f0a3d4094..c18c8d85ac227de593e20fc03244b4ae09ca4b4f
--- 1/tests/run-px
--- 2/tests/run-px
+++ b/tests/run-px
@@@ -12,14 -12,20 +12,21 @@@ my @tests = 
      'Test--spider.px',
      'Test-c-full.px',
      'Test-c-partial.px',
 +    'Test-c-shorter.px',
      'Test-c.px',
      'Test-E-k-K.px',
      'Test-E-k.px',
      'Test-ftp.px',
+     'Test-ftp-iri.px',
+     'Test-ftp-iri-fallback.px',
+     'Test-ftp-iri-disabled.px',
      'Test-HTTP-Content-Disposition-1.px',
      'Test-HTTP-Content-Disposition-2.px',
      'Test-HTTP-Content-Disposition.px',
+     'Test-iri.px',
+     'Test-iri-disabled.px',
+     'Test-iri-forced-remote.px',
+     'Test-iri-list.px',
      'Test-N-current.px',
      'Test-N-smaller.px',
      'Test-N-no-info.px',
@@@ -37,7 -43,6 +44,7 @@@
      'Test-O--no-content-disposition-trivial.px',
      'Test-O-nonexisting.px',
      'Test-O.px',
 +    'Test-O-nc.px',
      'Test-Restrict-Lowercase.px',
      'Test-Restrict-Uppercase.px',
      'Test--spider-fail.px',