FreeBSD 4.1 compile problems with 2.0.0a

[Carter Bullard]

Great Guys,
   I'll have these corrected and out tomorrow.
Do we want whole tarfiles or patches at this point?
I don't have any problems with tarfiles, as they
overtly help keep everyone in sync.

Carter

-----Original Message-----
From: owner-argus at lists.andrew.cmu.edu
[mailto:owner-argus at lists.andrew.cmu.edu]On Behalf Of Peter Van Epp
Sent: Monday, September 04, 2000 9:41 PM
To: argus
Subject: Re: FreeBSD 4.1 compile problems with 2.0.0a


	Got it. Its a config error, ../include/linux-include is needed but got
dropped. The following two patches make argus-2.0.0a.tar.gz compile on both
the
GENERIC and ARGUS kernels. I expect Neil is going to need to change them to
include 3.5 to make his laptop version work (I think 3.5 and 4.1 are pretty
close both being the latest in the two streams) though. We probably want to
identify how far back in the FreeBSD line we can go and still compile and
then
stick in a test for the version number and come up with a "FreeBSD version
too
old to run Argus needs at least version 3.x" error message to add to
configure.
	I have a set of 3.1 CDs at work I can pop them on a machine and see
if it will work that far back.

Peter Van Epp / Operations and Technical Support
Simon Fraser University, Burnaby, B.C. Canada


*** configure.orig	Mon Sep  4 18:20:17 2000
--- configure	Mon Sep  4 18:20:06 2000
***************
*** 1631,1636 ****
--- 1631,1639 ----
  	COMPAT_LIB="-lpthread"
  	V_INCLS="$V_INCLS -I../include/linux-include"
  	;;
+ freebsd4*)
+ 	V_INCLS="$V_INCLS -I../include/linux-include"
+ 	;;
  esac

  for ac_prog in ranlib

*** server/ArgusModeler.h.orig	Mon Sep  4 17:58:25 2000
--- server/ArgusModeler.h	Mon Sep  4 18:13:24 2000
***************
*** 93,99 ****
  #include <sys/types.h>
  #include <sys/time.h>

! #if defined(HAVE_SOLARIS) || defined(__FreeBSD)
  #include <sys/socket.h>
  #endif

--- 93,99 ----
  #include <sys/types.h>
  #include <sys/time.h>

! #if defined(HAVE_SOLARIS) || defined(__FreeBSD__)
  #include <sys/socket.h>
  #endif

***************
*** 107,114 ****
  #include <netinet/ip_icmp.h>
  #include <netinet/igmp.h>
  #include <netinet/rtp.h>
-
-

  struct AHHeader {
     unsigned char  nxt, len;
--- 107,112 ----