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=bfd9e34141b9660f563d917fdaccc975d0c69f17 The branch, master has been updated via bfd9e34141b9660f563d917fdaccc975d0c69f17 (commit) from 59b0dfa5680b2da201cf8bdfbd123133073829f3 (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 bfd9e34141b9660f563d917fdaccc975d0c69f17 Author: Sergey Poznyakoff <g...@gnu.org> Date: Fri Jan 22 14:12:54 2016 +0200 Fix build without tcpwrappers * configure.ac (MU_TCPWRAP_LIBRARIES): New subst variable. Always includes lib/libmutcpwrap.a. If libwrap is present on the system and required, it is included as well * imap4d/Makefile.am (TCPWRAP_LIBRARIES): Replace with MU_TCPWRAP_LIBRARIES. * maidag/Makefile.am: Likewise. * pop3d/Makefile.am: Likewise. ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 +++++- imap4d/Makefile.am | 2 +- maidag/Makefile.am | 2 +- pop3d/Makefile.am | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c447974..d473f80 100644 --- a/configure.ac +++ b/configure.ac @@ -222,10 +222,14 @@ esac LIBS=$saved_LIBS if test "$status_tcpwrap" = "yes"; then - AC_SUBST(TCPWRAP_LIBRARIES, "\${top_builddir}/lib/libmutcpwrap.a $TCPWRAP_LIBRARIES -lwrap") + TCPWRAP_LIBRARIES="$TCPWRAP_LIBRARIES -lwrap" AC_DEFINE_UNQUOTED(WITH_LIBWRAP, 1, [Define to 1 to use tcp wrappers.]) +else + # Provide placeholder functions only + TCPWRAP_LIBRARIES= fi +AC_SUBST([MU_TCPWRAP_LIBRARIES], "\${top_builddir}/lib/libmutcpwrap.a $TCPWRAP_LIBRARIES") AC_ARG_ENABLE([pthread], AC_HELP_STRING([--disable-pthread], diff --git a/imap4d/Makefile.am b/imap4d/Makefile.am index a52ff4c..d0f0e81 100644 --- a/imap4d/Makefile.am +++ b/imap4d/Makefile.am @@ -79,7 +79,7 @@ imap4d_LDADD = \ ${MU_LIB_AUTH}\ @MU_AUTHLIBS@ \ ${MU_LIB_MAILUTILS}\ - @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@ @TCPWRAP_LIBRARIES@ + @SERV_AUTHLIBS@ @MU_COMMON_LIBRARIES@ @MU_TCPWRAP_LIBRARIES@ ## This kludge is necessary to correctly establish imap4d -> MU_AUTHLIBS ## dependencies. Automake stupidly refuses to include them. diff --git a/maidag/Makefile.am b/maidag/Makefile.am index 1a6846e..53c887e 100644 --- a/maidag/Makefile.am +++ b/maidag/Makefile.am @@ -51,7 +51,7 @@ maidag_LDADD = \ @MU_COMMON_LIBRARIES@\ $(LIBMU_DBM)\ @DBMLIBS@\ - @TCPWRAP_LIBRARIES@ + @MU_TCPWRAP_LIBRARIES@ AM_CPPFLAGS = -I${top_srcdir} @MU_APP_COMMON_INCLUDES@ @GUILE_INCLUDES@ \ @PYTHON_INCLUDES@ diff --git a/pop3d/Makefile.am b/pop3d/Makefile.am index 193473f..792acd4 100644 --- a/pop3d/Makefile.am +++ b/pop3d/Makefile.am @@ -61,7 +61,7 @@ pop3d_LDADD = \ @MU_COMMON_LIBRARIES@\ ${LIBMU_DBM}\ @DBMLIBS@\ - @TCPWRAP_LIBRARIES@ + @MU_TCPWRAP_LIBRARIES@ popauth_SOURCES = popauth.c popauth_LDADD = \ hooks/post-receive -- GNU Mailutils _______________________________________________ Commit-mailutils mailing list Commit-mailutils@gnu.org https://lists.gnu.org/mailman/listinfo/commit-mailutils
