Update for gnulib v0.0-4270-g18aae5b.

* bootstrap.conf: Build included listings in doc/texinfo.
* configure.ac: Require gettext 0.18
* doc/texinfo/Makefile.am: Remove the .c.inc rules.
* doc/texinfo/maint.mk: New file.
* lib/Makefile.am (libmuaux_la_SOURCES): Replace with libmuaux_a_SOURCES.

@@ -14,6 +14,7 @@ ChangeLog
 INSTALL
 INSTALL
 Makefile
 Makefile
 Makefile.in
 Makefile.in
+TAGS
 aclocal.m4
 aclocal.m4
 autom4te.cache
 autom4te.cache
 build-aux
 build-aux

@@ -97,3 +97,6 @@ do
   test -d $mbox/cur || mkdir $mbox/cur
   test -d $mbox/cur || mkdir $mbox/cur
   test -d $mbox/tmp || mkdir $mbox/tmp
   test -d $mbox/tmp || mkdir $mbox/tmp
 done
 done
+
+# Create included listings for texinfo docs.
+make -C doc/texinfo -f maint.mk

@@ -98,7 +98,7 @@ status_tcpwrap=maybe
 
 
 dnl Internationalization macros.
 dnl Internationalization macros.
 AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.17)
+AM_GNU_GETTEXT_VERSION(0.18)
 AM_ICONV
 AM_ICONV
 AC_CHECK_HEADERS(iconv.h)
 AC_CHECK_HEADERS(iconv.h)
 AC_CHECK_TYPE(iconv_t,:,
 AC_CHECK_TYPE(iconv_t,:,

@@ -77,16 +77,7 @@ mailutils_TEXINFOS = \
  $(RENDITION_TEXI)\
  $(RENDITION_TEXI)\
  $(INCFILES)
  $(INCFILES)
 
 
-## Fake configure into including srcdir to VPATH:
-s=${srcdir}:${top_srcdir}/examples/
-VPATH = $(s)
-
-SUFFIXES=.c .inc 
-.c.inc:
-	sed -f $(mu_aux_dir)/texify.sed $< > $@
-
 DISTCLEANFILES=*.pgs *.kys *.vrs
 DISTCLEANFILES=*.pgs *.kys *.vrs
-MAINTAINERCLEANFILES=$(INCFILES)
 clean-local:
 clean-local:
 	rm -rf manual
 	rm -rf manual
 
 

+# GNU Mailutils -- a suite of utilities for electronic mail
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This library is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
+
+mu_aux_dir = ../../mu-aux
+
+.SUFFIXES: .c .inc
+.c.inc:
+	sed -f $(mu_aux_dir)/texify.sed $< > $@
+
+all: addr.inc http.inc mailcap.inc numaddr.inc sfrom.inc url-parse.inc
+
+addr.inc:	../../libmailutils/tests/addr.c
+http.inc:	../../examples/http.inc
+mailcap.inc:	../../libmailutils/tests/mailcap.c
+numaddr.inc:	../../examples/numaddr.inc
+sfrom.inc:	../../examples/sfrom.inc
+url-parse.inc:	../../libmailutils/tests/url-parse.inc
+

@@ -22,7 +22,7 @@ include gnulib.mk
 
 
 INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 
 
-libmuaux_la_SOURCES += \
+libmuaux_a_SOURCES += \
  daemon.c\
  daemon.c\
  mailcap.c\
  mailcap.c\
  mu_dbm.c\
  mu_dbm.c\