diff options
author | Ton Voon <tonvoon@users.sourceforge.net> | 2008-03-11 00:10:23 (GMT) |
---|---|---|
committer | Ton Voon <tonvoon@users.sourceforge.net> | 2008-03-11 00:10:23 (GMT) |
commit | dc2ec71d22943a02058f1944e05e4f5c8db15f88 (patch) | |
tree | dc8cedfc2f151e01cc09b4e640fc5e8b33cfe62c | |
parent | 9f3d864fd3e47d4e728b196b1b6948a8a5e47e4e (diff) | |
download | monitoring-plugins-dc2ec71d22943a02058f1944e05e4f5c8db15f88.tar.gz |
Fixed link -m64 problems on pst3 for solaris. Fixed _FILE_OFFSET_BITS
redefinition warnings. Fixed helper ar error in ./configure
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1938 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | lib/utils_base.c | 2 | ||||
-rw-r--r-- | plugins-root/Makefile.am | 2 | ||||
-rw-r--r-- | plugins/check_http.c | 3 | ||||
-rw-r--r-- | plugins/check_smtp.c | 4 | ||||
-rw-r--r-- | plugins/common.h | 6 |
6 files changed, 7 insertions, 12 deletions
diff --git a/configure.in b/configure.in index 6d94582..32e9411 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1569,7 +1569,7 @@ dnl External libraries - see ACKNOWLEDGEMENTS | |||
1569 | gl_INIT | 1569 | gl_INIT |
1570 | 1570 | ||
1571 | dnl Some helpful common compile errors checked here | 1571 | dnl Some helpful common compile errors checked here |
1572 | if test "$ac_cv_uname_s" = 'SunOS' -a "$ac_cv_prog_ac_ct_AR" = 'false' ; then | 1572 | if test "$ac_cv_uname_s" = 'SunOS' -a \( "x$ac_cv_prog_ac_ct_AR" = "x" -o "$ac_cv_prog_ac_ct_AR" = 'false' \) ; then |
1573 | AC_MSG_ERROR(No ar found for Solaris - is /usr/ccs/bin in PATH?) | 1573 | AC_MSG_ERROR(No ar found for Solaris - is /usr/ccs/bin in PATH?) |
1574 | fi | 1574 | fi |
1575 | 1575 | ||
diff --git a/lib/utils_base.c b/lib/utils_base.c index a36eb68..d1453c6 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c | |||
@@ -27,8 +27,8 @@ | |||
27 | * | 27 | * |
28 | *****************************************************************************/ | 28 | *****************************************************************************/ |
29 | 29 | ||
30 | #include <stdarg.h> | ||
31 | #include "common.h" | 30 | #include "common.h" |
31 | #include <stdarg.h> | ||
32 | #include "utils_base.h" | 32 | #include "utils_base.h" |
33 | 33 | ||
34 | void | 34 | void |
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 3e6ee43..83c0648 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am | |||
@@ -68,7 +68,9 @@ install-exec-local: $(noinst_PROGRAMS) | |||
68 | # the actual targets | 68 | # the actual targets |
69 | check_dhcp_LDADD = $(NETLIBS) | 69 | check_dhcp_LDADD = $(NETLIBS) |
70 | check_icmp_LDADD = $(NETLIBS) $(SOCKETLIBS) | 70 | check_icmp_LDADD = $(NETLIBS) $(SOCKETLIBS) |
71 | # -m64 needed at compiler and linker phase | ||
71 | pst3_CFLAGS = @PST3CFLAGS@ | 72 | pst3_CFLAGS = @PST3CFLAGS@ |
73 | pst3_LDFLAGS = @PST3CFLAGS@ | ||
72 | pst3_LDADD = -lkvm | 74 | pst3_LDADD = -lkvm |
73 | 75 | ||
74 | check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) | 76 | check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) |
diff --git a/plugins/check_http.c b/plugins/check_http.c index 151eaca..b3d2ae3 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
@@ -41,12 +41,11 @@ const char *revision = "$Revision$"; | |||
41 | const char *copyright = "1999-2008"; | 41 | const char *copyright = "1999-2008"; |
42 | const char *email = "nagiosplug-devel@lists.sourceforge.net"; | 42 | const char *email = "nagiosplug-devel@lists.sourceforge.net"; |
43 | 43 | ||
44 | #include <ctype.h> | ||
45 | |||
46 | #include "common.h" | 44 | #include "common.h" |
47 | #include "netutils.h" | 45 | #include "netutils.h" |
48 | #include "utils.h" | 46 | #include "utils.h" |
49 | #include "base64.h" | 47 | #include "base64.h" |
48 | #include <ctype.h> | ||
50 | 49 | ||
51 | #define INPUT_DELIMITER ";" | 50 | #define INPUT_DELIMITER ";" |
52 | 51 | ||
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 3310bce..97208b0 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c | |||
@@ -36,13 +36,13 @@ const char *revision = "$Revision$"; | |||
36 | const char *copyright = "2000-2007"; | 36 | const char *copyright = "2000-2007"; |
37 | const char *email = "nagiosplug-devel@lists.sourceforge.net"; | 37 | const char *email = "nagiosplug-devel@lists.sourceforge.net"; |
38 | 38 | ||
39 | #include <ctype.h> | ||
40 | |||
41 | #include "common.h" | 39 | #include "common.h" |
42 | #include "netutils.h" | 40 | #include "netutils.h" |
43 | #include "utils.h" | 41 | #include "utils.h" |
44 | #include "base64.h" | 42 | #include "base64.h" |
45 | 43 | ||
44 | #include <ctype.h> | ||
45 | |||
46 | #ifdef HAVE_SSL | 46 | #ifdef HAVE_SSL |
47 | int check_cert = FALSE; | 47 | int check_cert = FALSE; |
48 | int days_till_exp; | 48 | int days_till_exp; |
diff --git a/plugins/common.h b/plugins/common.h index 39a28a9..0711dbf 100644 --- a/plugins/common.h +++ b/plugins/common.h | |||
@@ -35,12 +35,6 @@ | |||
35 | #define _COMMON_H_ | 35 | #define _COMMON_H_ |
36 | 36 | ||
37 | #include "config.h" | 37 | #include "config.h" |
38 | /* This needs to be removed for Solaris servers, where 64 bit files, but 32 bit architecture | ||
39 | This needs to be done early on because subsequent system includes use _FILE_OFFSET_BITS | ||
40 | Cannot remove from config.h because is included by regex.c from lib/ */ | ||
41 | #if __sun__ && !defined(_LP64) && _FILE_OFFSET_BITS == 64 | ||
42 | #undef _FILE_OFFSET_BITS | ||
43 | #endif | ||
44 | 38 | ||
45 | #ifdef HAVE_FEATURES_H | 39 | #ifdef HAVE_FEATURES_H |
46 | #include <features.h> | 40 | #include <features.h> |