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