From 26725ccd159105e38e5ab4ddc9ef848a5253e6d2 Mon Sep 17 00:00:00 2001 From: Ton Voon Date: Wed, 6 Dec 2006 20:34:31 +0000 Subject: [PATCH] Move SSL libs to correct order per plugin git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1545 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index a8e896a..69b016a 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -35,7 +35,7 @@ PLUGINHDRS = common.h BASEOBJS = utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a NETOBJS = netutils.o $(BASEOBJS) $(EXTRA_NETOBJS) -SSLOBJS = sslutils.o @SSLLIBS@ +SSLOBJS = sslutils.o NETLIBS = $(NETOBJS) $(SOCKETLIBS) TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir) @@ -55,7 +55,7 @@ check_dns_LDADD = $(NETLIBS) runcmd.o check_dummy_LDADD = $(BASEOBJS) check_fping_LDADD = $(NETLIBS) popen.o check_game_LDADD = $(BASEOBJS) runcmd.o -check_http_LDADD = $(SSLOBJS) $(NETLIBS) +check_http_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS) check_hpjd_LDADD = $(NETLIBS) popen.o check_ldap_LDADD = $(NETLIBS) $(LDAPLIBS) check_load_LDADD = $(BASEOBJS) popen.o @@ -78,10 +78,10 @@ check_procs_LDADD = $(BASEOBJS) popen.o check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS) check_real_LDADD = $(NETLIBS) check_snmp_LDADD = $(BASEOBJS) popen.o -check_smtp_LDADD = $(SSLOBJS) $(NETLIBS) +check_smtp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS) check_ssh_LDADD = $(NETLIBS) check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o -check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) +check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS) check_time_LDADD = $(NETLIBS) check_ups_LDADD = $(NETLIBS) check_users_LDADD = $(BASEOBJS) popen.o -- 2.30.2