Revision: 1941
http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=1941&view=rev
Author: tonvoon
Date: 2008-03-14 08:44:27 -0700 (Fri, 14 Mar 2008)
Log Message:
-----------
Fixed 64 bit pst3 when tries to link to gettext. Gettext linked
dynamically, if necessary
Modified Paths:
--------------
nagiosplug/trunk/NEWS
nagiosplug/trunk/plugins/Makefile.am
nagiosplug/trunk/plugins-root/Makefile.am
Modified: nagiosplug/trunk/NEWS
===================================================================
--- nagiosplug/trunk/NEWS 2008-03-14 10:17:24 UTC (rev 1940)
+++ nagiosplug/trunk/NEWS 2008-03-14 15:44:27 UTC (rev 1941)
@@ -14,6 +14,7 @@
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
Modified: nagiosplug/trunk/plugins/Makefile.am
===================================================================
--- nagiosplug/trunk/plugins/Makefile.am 2008-03-14 10:17:24 UTC (rev 1940)
+++ nagiosplug/trunk/plugins/Makefile.am 2008-03-14 15:44:27 UTC (rev 1941)
@@ -4,10 +4,11 @@
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
Modified: nagiosplug/trunk/plugins-root/Makefile.am
===================================================================
--- nagiosplug/trunk/plugins-root/Makefile.am 2008-03-14 10:17:24 UTC (rev 1940)
+++ nagiosplug/trunk/plugins-root/Makefile.am 2008-03-14 15:44:27 UTC (rev 1941)
@@ -4,10 +4,10 @@
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 @@
##############################################################################
# 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@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.