[Nagiosplug-checkins] SF.net SVN: nagiosplug: [1938] nagiosplug/trunk

[tonvoon at users.sourceforge.net]

Revision: 1938
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=1938&view=rev
Author:   tonvoon
Date:     2008-03-10 17:10:23 -0700 (Mon, 10 Mar 2008)

Log Message:
-----------
Fixed link -m64 problems on pst3 for solaris. Fixed _FILE_OFFSET_BITS
redefinition warnings. Fixed helper ar error in ./configure

Modified Paths:
--------------
    nagiosplug/trunk/configure.in
    nagiosplug/trunk/lib/utils_base.c
    nagiosplug/trunk/plugins/check_http.c
    nagiosplug/trunk/plugins/check_smtp.c
    nagiosplug/trunk/plugins/common.h
    nagiosplug/trunk/plugins-root/Makefile.am

Modified: nagiosplug/trunk/configure.in
===================================================================
--- nagiosplug/trunk/configure.in	2008-02-28 16:21:59 UTC (rev 1937)
+++ nagiosplug/trunk/configure.in	2008-03-11 00:10:23 UTC (rev 1938)
@@ -1569,7 +1569,7 @@
 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
 

Modified: nagiosplug/trunk/lib/utils_base.c
===================================================================
--- nagiosplug/trunk/lib/utils_base.c	2008-02-28 16:21:59 UTC (rev 1937)
+++ nagiosplug/trunk/lib/utils_base.c	2008-03-11 00:10:23 UTC (rev 1938)
@@ -27,8 +27,8 @@
 *
 *****************************************************************************/
 
+#include "common.h"
 #include <stdarg.h>
-#include "common.h"
 #include "utils_base.h"
 
 void

Modified: nagiosplug/trunk/plugins/check_http.c
===================================================================
--- nagiosplug/trunk/plugins/check_http.c	2008-02-28 16:21:59 UTC (rev 1937)
+++ nagiosplug/trunk/plugins/check_http.c	2008-03-11 00:10:23 UTC (rev 1938)
@@ -41,12 +41,11 @@
 const char *copyright = "1999-2008";
 const char *email = "nagiosplug-devel at lists.sourceforge.net";
 
-#include <ctype.h>
-
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
 #include "base64.h"
+#include <ctype.h>
 
 #define INPUT_DELIMITER ";"
 

Modified: nagiosplug/trunk/plugins/check_smtp.c
===================================================================
--- nagiosplug/trunk/plugins/check_smtp.c	2008-02-28 16:21:59 UTC (rev 1937)
+++ nagiosplug/trunk/plugins/check_smtp.c	2008-03-11 00:10:23 UTC (rev 1938)
@@ -36,13 +36,13 @@
 const char *copyright = "2000-2007";
 const char *email = "nagiosplug-devel at 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;

Modified: nagiosplug/trunk/plugins/common.h
===================================================================
--- nagiosplug/trunk/plugins/common.h	2008-02-28 16:21:59 UTC (rev 1937)
+++ nagiosplug/trunk/plugins/common.h	2008-03-11 00:10:23 UTC (rev 1938)
@@ -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>

Modified: nagiosplug/trunk/plugins-root/Makefile.am
===================================================================
--- nagiosplug/trunk/plugins-root/Makefile.am	2008-02-28 16:21:59 UTC (rev 1937)
+++ nagiosplug/trunk/plugins-root/Makefile.am	2008-03-11 00:10:23 UTC (rev 1938)
@@ -68,7 +68,9 @@
 # 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) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.