[SCM] GNU Mailutils branch, master, updated. release-2.2-85-g52d2552

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=52d2552d23daa6cb48ed26396ba2fa374a168100

The branch, master has been updated
       via  52d2552d23daa6cb48ed26396ba2fa374a168100 (commit)
      from  c22a0737039761f7f4ae222e27573bec0ac79f85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52d2552d23daa6cb48ed26396ba2fa374a168100
Author: Sergey Poznyakoff <address@hidden>
Date:   Fri Sep 17 19:01:28 2010 +0300

    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.

-----------------------------------------------------------------------

Summary of changes:
 .gitignore              |    1 +
 bootstrap.conf          |    3 +++
 configure.ac            |    2 +-
 doc/texinfo/Makefile.am |    9 ---------
 doc/texinfo/maint.mk    |   31 +++++++++++++++++++++++++++++++
 lib/Makefile.am         |    2 +-
 6 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 doc/texinfo/maint.mk

diff --git a/.gitignore b/.gitignore
index a142bc9..d827e24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ ChangeLog
 INSTALL
 Makefile
 Makefile.in
+TAGS
 aclocal.m4
 autom4te.cache
 build-aux
diff --git a/bootstrap.conf b/bootstrap.conf
index 5a9561d..df7f359 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -97,3 +97,6 @@ do
   test -d $mbox/cur || mkdir $mbox/cur
   test -d $mbox/tmp || mkdir $mbox/tmp
 done
+
+# Create included listings for texinfo docs.
+make -C doc/texinfo -f maint.mk
diff --git a/configure.ac b/configure.ac
index 9a44d17..c22ab2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ status_tcpwrap=maybe
 
 dnl Internationalization macros.
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.17)
+AM_GNU_GETTEXT_VERSION(0.18)
 AM_ICONV
 AC_CHECK_HEADERS(iconv.h)
 AC_CHECK_TYPE(iconv_t,:,
diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
index 6a13b0a..2142053 100644
--- a/doc/texinfo/Makefile.am
+++ b/doc/texinfo/Makefile.am
@@ -77,16 +77,7 @@ mailutils_TEXINFOS = \
  $(RENDITION_TEXI)\
  $(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
-MAINTAINERCLEANFILES=$(INCFILES)
 clean-local:
        rm -rf manual
 
diff --git a/doc/texinfo/maint.mk b/doc/texinfo/maint.mk
new file mode 100644
index 0000000..80ef936
--- /dev/null
+++ b/doc/texinfo/maint.mk
@@ -0,0 +1,31 @@
+# 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
+
diff --git a/lib/Makefile.am b/lib/Makefile.am
index d4c3b3c..4f7ad17 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,7 +22,7 @@ include gnulib.mk
 
 INCLUDES = @MU_LIB_COMMON_INCLUDES@ 
 
-libmuaux_la_SOURCES += \
+libmuaux_a_SOURCES += \
  daemon.c\
  mailcap.c\
  mu_dbm.c\


hooks/post-receive
-- 
GNU Mailutils