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
This commit is contained in:
Ton Voon 2008-03-11 00:10:23 +00:00
parent 9f3d864fd3
commit dc2ec71d22
6 changed files with 7 additions and 12 deletions

View file

@ -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

View file

@ -27,8 +27,8 @@
*
*****************************************************************************/
#include <stdarg.h>
#include "common.h"
#include <stdarg.h>
#include "utils_base.h"
void

View file

@ -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)

View file

@ -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 ";"

View file

@ -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;

View file

@ -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>