Change pst3 again, this time to remove use of kvm which is not

[nagiosplug.git] / plugins-root / Makefile.am

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index d2e4e8bdef7218c982a952415aa36ae92a07d1f0..107d9933d2e828418d8744c17eb231b2daa6b66e 100644 (file)
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -1,13 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
-VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
+VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir)
 
 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@ @SSLLIBS@
+# Don't add LTLIBINTL to all, as pst3 doesn't need it
+#LIBS = @LTLIBINTL@ @LIBS@
 
 noinst_PROGRAMS = check_dhcp check_icmp @EXTRAS_ROOT@
 
@@ -26,7 +26,7 @@ TESTS = @PLUGIN_TEST@
 test:
        perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
 
-setuid_root_mode = 4550
+setuid_root_mode = ug=rx,u+s
 
 # /* Author Coreutils team - see ACKNOWLEDGEMENTS */
 
@@ -66,9 +66,11 @@ install-exec-local: $(noinst_PROGRAMS)
 
 ##############################################################################
 # the actual targets
-check_dhcp_LDADD = $(NETLIBS)
-check_icmp_LDADD = $(NETLIBS) $(SOCKETLIBS)
-pst3_LDADD = -lkvm
+check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS)
+check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
+# -m64 needed at compiler and linker phase
+pst3_CFLAGS = @PST3CFLAGS@
+pst3_LDFLAGS = @PST3CFLAGS@
 
 check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
 check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS)