[syslog-ng] [PATCH (3.4)] modules: Do not build or install disabled modules

[Balazs Scheidler]

applied, thanks Gergely.


On Fri, 2012-03-23 at 11:48 +0100, Gergely Nagy wrote:
> The afmongodb and afsmtp modules had a subtle bug in their
> Makefile.ams: even if they were disabled, the Makefile still built and
> installed an empty module.
> 
> This patch corrects that, by moving the module_LTLIBRARIES inside the
> if block.
> 
> Reported-by: Peter Czanik <czanik at balabit.hu>
> Signed-off-by: Gergely Nagy <algernon at balabit.hu>
> ---
>  modules/afmongodb/Makefile.am |    5 ++---
>  modules/afsmtp/Makefile.am    |    2 +-
>  2 files changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/modules/afmongodb/Makefile.am b/modules/afmongodb/Makefile.am
> index c0eec33..d022912 100644
> --- a/modules/afmongodb/Makefile.am
> +++ b/modules/afmongodb/Makefile.am
> @@ -1,14 +1,13 @@
> -
>  SUBDIRS = @LIBMONGO_SUBDIRS@
>  DIST_SUBDIRS = libmongo-client
>  
>  moduledir = @moduledir@
>  AM_CPPFLAGS = -I$(top_srcdir)/lib -I../../lib
> -module_LTLIBRARIES = libafmongodb.la
>  
>  export top_srcdir
>  
>  if ENABLE_MONGODB
> +module_LTLIBRARIES = libafmongodb.la
>  
>  libafmongodb_la_CFLAGS = $(LIBMONGO_CFLAGS)
>  libafmongodb_la_SOURCES = afmongodb-grammar.y afmongodb.c afmongodb.h afmongodb-parser.c afmongodb-parser.h
> @@ -32,4 +31,4 @@ uninstall:
>  	$(MAKE) $(AM_MAKEFLAGS) uninstall-am
>  
>  check:
> -	echo "Make check disabled, since it requires a newer glib"
> \ No newline at end of file
> +	echo "Make check disabled, since it requires a newer glib"
> diff --git a/modules/afsmtp/Makefile.am b/modules/afsmtp/Makefile.am
> index 790aad7..bb5b94d 100644
> --- a/modules/afsmtp/Makefile.am
> +++ b/modules/afsmtp/Makefile.am
> @@ -1,10 +1,10 @@
>  moduledir = @moduledir@
>  AM_CPPFLAGS = -I$(top_srcdir)/lib -I../../lib
> -module_LTLIBRARIES = libafsmtp.la
>  
>  export top_srcdir
>  
>  if ENABLE_SMTP
> +module_LTLIBRARIES = libafsmtp.la
>  
>  libafsmtp_la_CFLAGS = $(LIBESMTP_CFLAGS) $(IVYKIS_CFLAGS) $(EVENTLOG_CFLAGS) $(SYSLOG_NG_CFLAGS)
>  libafsmtp_la_SOURCES = afsmtp-grammar.y afsmtp.c afsmtp.h afsmtp-parser.c afsmtp-parser.h

-- 
Bazsi