diff options
| -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 6d94582c..32e9411e 100644 --- a/configure.in +++ b/configure.in @@ -1569,7 +1569,7 @@ dnl External libraries - see ACKNOWLEDGEMENTS gl_INIT dnl Some helpful common compile errors checked here -if test "$ac_cv_uname_s" = 'SunOS' -a "$ac_cv_prog_ac_ct_AR" = 'false' ; then +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 AC_MSG_ERROR(No ar found for Solaris - is /usr/ccs/bin in PATH?) fi diff --git a/lib/utils_base.c b/lib/utils_base.c index a36eb680..d1453c67 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -27,8 +27,8 @@ * *****************************************************************************/ -#include <stdarg.h> #include "common.h" +#include <stdarg.h> #include "utils_base.h" void diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index 3e6ee43d..83c06487 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am @@ -68,7 +68,9 @@ install-exec-local: $(noinst_PROGRAMS) # the actual targets check_dhcp_LDADD = $(NETLIBS) check_icmp_LDADD = $(NETLIBS) $(SOCKETLIBS) +# -m64 needed at compiler and linker phase pst3_CFLAGS = @PST3CFLAGS@ +pst3_LDFLAGS = @PST3CFLAGS@ pst3_LDADD = -lkvm check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) diff --git a/plugins/check_http.c b/plugins/check_http.c index 151eacac..b3d2ae39 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -41,12 +41,11 @@ const char *revision = "$Revision$"; const char *copyright = "1999-2008"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; -#include <ctype.h> - #include "common.h" #include "netutils.h" #include "utils.h" #include "base64.h" +#include <ctype.h> #define INPUT_DELIMITER ";" diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 3310bceb..97208b05 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -36,13 +36,13 @@ const char *revision = "$Revision$"; const char *copyright = "2000-2007"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; -#include <ctype.h> - #include "common.h" #include "netutils.h" #include "utils.h" #include "base64.h" +#include <ctype.h> + #ifdef HAVE_SSL int check_cert = FALSE; int days_till_exp; diff --git a/plugins/common.h b/plugins/common.h index 39a28a9d..0711dbf1 100644 --- a/plugins/common.h +++ b/plugins/common.h @@ -35,12 +35,6 @@ #define _COMMON_H_ #include "config.h" -/* This needs to be removed for Solaris servers, where 64 bit files, but 32 bit architecture - This needs to be done early on because subsequent system includes use _FILE_OFFSET_BITS - Cannot remove from config.h because is included by regex.c from lib/ */ -#if __sun__ && !defined(_LP64) && _FILE_OFFSET_BITS == 64 -#undef _FILE_OFFSET_BITS -#endif #ifdef HAVE_FEATURES_H #include <features.h> |