diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | plugins-root/Makefile.am | 8 | ||||
| -rw-r--r-- | plugins/Makefile.am | 5 |
3 files changed, 8 insertions, 6 deletions
@@ -14,6 +14,7 @@ This file documents the major additions and syntax changes between releases. check_pgsql now successfully builds with postgres lib v8.3 (Bug #1878972) check_procs now accepts --ereg-argument-array for a regular expression match to the argument array Reverted back to using pst3 for Solaris systems. Fixed issues re: -m64 needed to compile on 64bit systems + If applicable, Gettext linked dynamically instead of statically 1.4.11 13th December 2007 Fixed check_http regression in 1.4.10 where following redirects to diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 83c06487..bca3ceb5 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am @@ -4,10 +4,10 @@ VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plug INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@ -datadir = @datadir@ localedir = $(datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -LIBS = @LIBINTL@ @LIBS@ +# Don't add LTLIBINTL to all, as pst3 doesn't need it +#LIBS = @LTLIBINTL@ @LIBS@ noinst_PROGRAMS = check_dhcp check_icmp @EXTRAS_ROOT@ @@ -66,8 +66,8 @@ install-exec-local: $(noinst_PROGRAMS) ############################################################################## # the actual targets -check_dhcp_LDADD = $(NETLIBS) -check_icmp_LDADD = $(NETLIBS) $(SOCKETLIBS) +check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) +check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) # -m64 needed at compiler and linker phase pst3_CFLAGS = @PST3CFLAGS@ pst3_LDFLAGS = @PST3CFLAGS@ diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 30080aeb..67c49ca9 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -4,10 +4,11 @@ VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plug INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ -datadir = @datadir@ localedir = $(datadir)/locale +# gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -LIBS = @LIBINTL@ @LIBS@ +# gettext docs say to use LDADD, but per module_LDADD override +LIBS = @LTLIBINTL@ @LIBS@ MATHLIBS = @MATHLIBS@ # This is not portable. Run ". tools/devmode" to get development compile flags |