Automated merge with file:/home/micah/devel/wget/mainline

diff --combined .hgignore
index 9e6fcf9a8f2a368cbb1336b2bab55d08bb211ab4,9dd951df907c75b2bacfe2b7b7393388db6f69a2..3a6b01c6a290959656756ec09e724f48ba2e1d63
--- 1/.hgignore
--- 2/.hgignore
+++ b/.hgignore
@@@ -9,6 -9,7 +9,7 @@@ config.lo
  **Makefile
  **Makefile.in
  config.status
+ config.status.lineno
  autom4te.cache
  tests/WgetTest.pm
  tests/unit-tests
@@@ -22,7 -23,6 +23,7 @@@ src/wge
  src/tags
  src/TAGS
  src/libunittest.a
 +src/version.c
  doc/stamp-vti
  doc/wget.1
  doc/wget.pod
@@@ -48,5 -48,7 +49,7 @@@ po/*.gm
  po/wget.pot
  po/remove-potcdate.sed
  po/stamp-po
+ po/en@boldquot.insert-header
+ po/en@quot.insert-header
  **~
  **.*.swp

diff --combined configure.ac
index d7e251377903bd6798f94e37994c86e2bf552da6,6a00b79c5dc6e6a4e63c71bee56953896e41c0c0..33df20a272a78232319ca9994e716b4366277ea8
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -29,10 -29,13 +29,10 @@@ dnl Process this file with autoconf to 
  dnl
  
  AC_INIT([wget], 
 -      [m4_normalize(esyscmd([sed -e 's/^.*"\(.*\)";$/\1/' src/version.c]))],
 +      [1.12-devel],
        [bug-wget@gnu.org])
  AC_PREREQ(2.61)
  
 -# Make configure depend on the VERSION file, since it's used in AC_INIT
 -AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/src/version.c'])
 -
  dnl
  dnl What version of Wget are we building?
  dnl
@@@ -429,7 -432,7 +429,7 @@@ dnl     ALL_LINGUAS="cs de hr it ...
  dnl The downside was that configure needed to be rebuilt whenever a
  dnl new language was added.
  dnl
- ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')`
+ ALL_LINGUAS="en@quot en@boldquot $(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')"
  
  dnl
  dnl Find makeinfo.  We used to provide support for Emacs processing

diff --combined src/Makefile.am
index 97803a9ac321c31f829836456f70eb119ade16cc,f0f2214c511d76fbf7317c63e51350fdb55c7182..dcc19c816d0f31cf7f1afdf0046b045986a80a26
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -31,7 -31,7 +31,7 @@@
  
  # The following line is losing on some versions of make!
  DEFS     = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
- LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@
+ LIBS     = @LIBS@ @LIBSSL@ @LIBGNUTLS@ @LIBINTL@
  
  bin_PROGRAMS = wget
  wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c ftp-basic.c \
@@@ -47,17 -47,6 +47,17 @@@
  EXTRA_wget_SOURCES = mswindows.c
  LDADD = $(ALLOCA) $(LIBOBJS)
  
 +# version.c's not really _phony_, but it does need to be generated each run.
 +.PHONY: version.c
 +version.c: hg-id
 +      printf '%s' 'const char *version_string = "@VERSION@' > $@
 +      -HG_ID=$$(cat hg-id); [ "$$HG_ID" ] && printf '%s' " ($${HG_ID})" >> $@
 +      printf '%s\n' '";' >> $@
 +
 +.INTERMEDIATE: hg-id
 +hg-id:
 +      -( hg id | cut -f 1 -d ' ' ) 2>/dev/null > $@
 +
  check_LIBRARIES = libunittest.a
  libunittest_a_SOURCES = $(wget_SOURCES) test.c test.h
  libunittest_a_CPPFLAGS = -DTESTING