Rename MU_APP_NEW_LIBRARIES back to MU_APP_LIBRARIES. Version 2.99.991.

20 files changed, 20 insertions, 27 deletions

diff --git a/NEWS b/NEWS
index 4614802c9..7ebc72a18 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,11 @@
-GNU mailutils NEWS -- history of user-visible changes. 2016-01-22
+GNU mailutils NEWS -- history of user-visible changes. 2016-10-19
 Copyright (C) 2002-2016 Free Software Foundation, Inc.
 See the end of file for copying conditions.
 
 Please send mailutils bug reports to <bug-mailutils@gnu.org>.
 
 
-Version 2.99.99 (Git)
+Version 2.99.991 (Git)
 
 This version is a major rewrite of GNU Mailutils.  Quite a few parts
 of the basic framework were rewritten from scratch, while some others
diff --git a/comsat/Makefile.am b/comsat/Makefile.am
index a661ffe11..e67b21848 100644
--- a/comsat/Makefile.am
+++ b/comsat/Makefile.am
@@ -31,7 +31,7 @@ biff.rc.h: $(top_srcdir)/comsat/biff.rc
 	  $(top_srcdir)/comsat/biff.rc > biff.rc.h
 
 comsatd_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_IMAP}\
  ${MU_LIB_POP}\
diff --git a/configure.ac b/configure.ac
index 089419ae6..5fd7d857d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU General Public License along
 dnl with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.63)
-AC_INIT([GNU Mailutils], [2.99.99], [bug-mailutils@gnu.org], [mailutils],
+AC_INIT([GNU Mailutils], [2.99.991], [bug-mailutils@gnu.org], [mailutils],
         [http://mailutils.org])
 AC_CONFIG_SRCDIR([libmailutils/mailbox/mailbox.c])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -57,8 +57,7 @@ AC_SUBST(mu_aux_dir,'$(top_srcdir)/mu-aux')
 AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
 
 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
-AC_SUBST(MU_APP_LIBRARIES,'${top_builddir}/libmu_argp/libmu_argp.la ${top_builddir}/libmu_cfg/libmu_cfg.la ${top_builddir}/lib/libmuaux.la')
-AC_SUBST(MU_APP_NEW_LIBRARIES,'${top_builddir}/lib/libmuaux.la')
+AC_SUBST(MU_APP_LIBRARIES,'${top_builddir}/lib/libmuaux.la')
 
 # There are two sets of include directories: MU_LIB_COMMON_INCLUDES, used
 # by the libraries, and MU_APP_COMMON_INCLUDES, which is used by applications.
diff --git a/dotlock/Makefile.am b/dotlock/Makefile.am
index 0ab3f34f6..3425b0fd7 100644
--- a/dotlock/Makefile.am
+++ b/dotlock/Makefile.am
@@ -20,7 +20,7 @@ AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
 bin_PROGRAMS = dotlock
 
 dotlock_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 5ffabeb80..55b53df9a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -113,14 +113,14 @@ lsf_LDADD = \
 
 muauth_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
 muauth_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_AUTH}\
  @MU_AUTHLIBS@ \
  ${MU_LIB_MAILUTILS}
 
 muemail_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
 muemail_LDADD = \
- ${MU_APP_NEW_LIBRARIES} \
+ ${MU_APP_LIBRARIES} \
  ${MU_LIB_MAILUTILS}
 
 mboxidx_CPPFLAGS = @MU_APP_COMMON_INCLUDES@
diff --git a/frm/Makefile.am b/frm/Makefile.am
index 8678e2f24..7861b5172 100644
--- a/frm/Makefile.am
+++ b/frm/Makefile.am
@@ -27,7 +27,7 @@ frm_LDADD =  $(common_ldadd)
 from_LDADD = $(common_ldadd)
 
 common_ldadd = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_IMAP}\
  ${MU_LIB_POP}\
diff --git a/gnulib.modules b/gnulib.modules
index a55228275..b672acc25 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -4,7 +4,6 @@
 # FIXME: fnmatch, regex and glob are used by libmailutils...
 
 autobuild
-argp
 crypto/des
 gettext
 gitlog-to-changelog
diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am
index ab421cc73..d0f0e81a6 100644
--- a/imap4d/Makefile.am
+++ b/imap4d/Makefile.am
@@ -72,7 +72,7 @@ imap4d_SOURCES = \
  util.c
 
 imap4d_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_MH}\
  ${MU_LIB_MAILDIR}\
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0cc973120..2cdff6fbe 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -28,7 +28,6 @@ lib_LTLIBRARIES = libmuaux.la
 noinst_LIBRARIES = libmuscript.a libmutcpwrap.a
 
 libmuaux_la_SOURCES = \
- argp_base.c\
  daemon.c\
  mailcap.c\
  manlock.c\
diff --git a/maidag/Makefile.am b/maidag/Makefile.am
index 008713e75..53c887eaf 100644
--- a/maidag/Makefile.am
+++ b/maidag/Makefile.am
@@ -36,7 +36,7 @@ maidag_LDADD = \
  @LIBMU_SCM@ @GUILE_LIBS@\
  @LIBMU_SCM_DEPS@\
  @MU_LIB_PY@ @PYTHON_LIBS@\
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_SIEVE}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_IMAP}\
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 7af953a2f..7134b5ab4 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -25,7 +25,7 @@ mailbindir=@MAILBINDIR@
 mailbin_PROGRAMS = mail
 
 mail_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_IMAP}\
  ${MU_LIB_POP}\
diff --git a/messages/Makefile.am b/messages/Makefile.am
index 56ff5e72f..d611b2c98 100644
--- a/messages/Makefile.am
+++ b/messages/Makefile.am
@@ -22,7 +22,7 @@ SUBDIRS = . tests
 bin_PROGRAMS = messages
 messages_SOURCES = messages.c
 messages_LDADD =\
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_IMAP}\
  ${MU_LIB_POP}\
diff --git a/mimeview/Makefile.am b/mimeview/Makefile.am
index d85eebb76..b4c91085b 100644
--- a/mimeview/Makefile.am
+++ b/mimeview/Makefile.am
@@ -47,7 +47,7 @@ mimetypes-lex.c: $(srcdir)/mimetypes.l mimetypes-decl.h
 BUILT_SOURCES = mimetypes-gram.c mimetypes-lex.c mimetypes-decl.h
 
 mimeview_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MAILUTILS}\
  @LTLIBINTL@
  
diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index 5d0b5c694..e166b81bc 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -19,7 +19,7 @@ AM_CPPFLAGS = @MU_APP_COMMON_INCLUDES@ @MU_AUTHINCS@
 bin_PROGRAMS = movemail
 
 movemail_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_IMAP}\
  ${MU_LIB_POP}\
diff --git a/movemail/movemail.c b/movemail/movemail.c
index aa178fceb..13525786d 100644
--- a/movemail/movemail.c
+++ b/movemail/movemail.c
@@ -381,7 +381,6 @@ static char *movemail_capa[] = {
   "locking",
   "mailbox",
   "auth",
-  "tls",
   NULL 
 };
 
diff --git a/mu/Makefile.am b/mu/Makefile.am
index b01900427..d9355dff6 100644
--- a/mu/Makefile.am
+++ b/mu/Makefile.am
@@ -75,7 +75,7 @@ mailutils_SOURCES = \
  $(MODULES)
 
 mailutils_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_IMAP}\
  ${MU_LIB_POP}\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 60180ba6a..d62e071b0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -25,9 +25,6 @@ imap4d/signal.c
 imap4d/starttls.c
 imap4d/util.c
 
-lib/gnu/argp-help.c
-lib/gnu/argp-parse.c
-lib/gnu/getopt.c
 lib/mailcap.c
 lib/tcpwrap.c
 lib/strexit.c
diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am
index 9923bf7c2..792acd4e5 100644
--- a/pop3d/Makefile.am
+++ b/pop3d/Makefile.am
@@ -51,7 +51,7 @@ if MU_COND_DBM
 endif
 
 pop3d_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_MH}\
  ${MU_LIB_MAILDIR}\
@@ -65,7 +65,7 @@ pop3d_LDADD = \
 
 popauth_SOURCES = popauth.c
 popauth_LDADD = \
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@\
  ${LIBMU_DBM}\
diff --git a/readmsg/Makefile.am b/readmsg/Makefile.am
index 57c9dc394..66ffef6a5 100644
--- a/readmsg/Makefile.am
+++ b/readmsg/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = readmsg
 readmsg_SOURCES = readmsg.c msglist.c readmsg.h
 
 readmsg_LDADD =\
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_IMAP}\
  ${MU_LIB_POP}\
diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index 2a294ba64..d51db0cb5 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -22,7 +22,7 @@ EXTRA_DIST = examples
 bin_PROGRAMS = sieve
 sieve_SOURCES = sieve.c
 sieve_LDADD =\
- ${MU_APP_NEW_LIBRARIES}\
+ ${MU_APP_LIBRARIES}\
  ${MU_LIB_SIEVE}\
  ${MU_LIB_MBOX}\
  ${MU_LIB_IMAP}\