Menu
▾
▴
benson-commit — Benson Commit Mailing List
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(27) |
Jul
(24) |
Aug
(64) |
Sep
(15) |
Oct
(72) |
Nov
(28) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(72) |
Feb
(58) |
Mar
(33) |
Apr
(3) |
May
(5) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
(29) |
Dec
(12) |
| 2003 |
Jan
(37) |
Feb
(44) |
Mar
(13) |
Apr
(23) |
May
(9) |
Jun
(3) |
Jul
|
Aug
(7) |
Sep
(33) |
Oct
(30) |
Nov
(31) |
Dec
(11) |
| 2004 |
Jan
(4) |
Feb
(35) |
Mar
(14) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(2) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Bob T. <bt...@us...> - 2003-10-08 02:53:58
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv1085
Modified Files:
Makefile.in network.h v31_network_client.c
Log Message:
Some changes to get things really on the new network code.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Makefile.in 8 Oct 2003 01:41:51 -0000 1.10
--- Makefile.in 8 Oct 2003 02:53:53 -0000 1.11
***************
*** 5,9 ****
CC=@CC@
LD=@LD@
! CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include @CFLAGS@
PERL_CFLAGS=@PERL_CFLAGS@
CPPFLAGS=@CPPFLAGS@ @DEFS@
--- 5,9 ----
CC=@CC@
LD=@LD@
! CFLAGS=-I. -I$(top_srcdir) -I$(top_srcdir)/include @CFLAGS@
PERL_CFLAGS=@PERL_CFLAGS@
CPPFLAGS=@CPPFLAGS@ @DEFS@
Index: network.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** network.h 28 Sep 2003 22:26:28 -0000 1.5
--- network.h 8 Oct 2003 02:53:53 -0000 1.6
***************
*** 16,19 ****
--- 16,20 ----
#include "v31_request.h"
+ #define ID_MAXSIZE ID_MAXSIZE_v31
#define DST_MAXSIZE DST_MAXSIZE_v31
#define AGT_MAXSIZE AGT_MAXSIZE_v31
***************
*** 59,62 ****
--- 60,64 ----
extern int network_listener_accept(bn_netlisten_ctx *current_ctx, bn_netaccept_ctx *connect_ctx);
extern int network_listener_accept_cleanup(bn_netaccept_ctx *connect_ctx);
+ int ibn_tcp_connect(bn_netconnect_ctx *current_ctx);
#endif
Index: v31_network_client.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_client.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** v31_network_client.c 8 Oct 2003 01:41:51 -0000 1.3
--- v31_network_client.c 8 Oct 2003 02:53:53 -0000 1.4
***************
*** 11,31 ****
#include "config.h"
! struct benson_alertlist_response *bn_alertlist (char *destination, int port, char *source, int *buffer_size)
{
int ctr;
int rc = 0;
! bnet_req req_pkt;
! bnet_resp resp_hdr;
! bnet_ack resp_ack;
! struct benson_alertlist_response *alertlist_ptr;
unsigned short total_alerts;
unsigned int alertlist_size;
unsigned int total_num_alerts = 0;
! int connfd;
! FILE *sockout, *sockin;
!
/* Open up a connection */
! if((connfd = ibn_tcp_connect(destination, port)) == ERROR) {
fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
return NULL;
--- 11,33 ----
#include "config.h"
! struct benson_alertlist_response_v31 *bn_alertlist (char *destination, int port, char *source, int *buffer_size)
{
int ctr;
int rc = 0;
! bn_req_hdr req_hdr;
! bnet_req_v31 req_pkt;
! bnet_resp_v31 resp_hdr;
! bnet_ack_v31 resp_ack;
! bn_netconnect_ctx connect_ctx;
! struct benson_alertlist_response_v31 *alertlist_ptr;
unsigned short total_alerts;
unsigned int alertlist_size;
unsigned int total_num_alerts = 0;
!
! safe_strncpy(connect_ctx.destination, destination, DST_MAXSIZE);
! connect_ctx.port = port;
/* Open up a connection */
! if(ibn_tcp_connect(&connect_ctx) == ERROR) {
fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
return NULL;
***************
*** 33,41 ****
/* Open up the socket descriptor as file descriptors */
! if((sockin = fdopen(connfd, "r")) == NULL) {
perror("bn_alertlist(): fdopen(r) error");
return NULL;
}
! if((sockout = fdopen(connfd, "w")) == NULL) {
perror("bn_alertlist(): fdopen(w) error");
return NULL;
--- 35,43 ----
/* Open up the socket descriptor as file descriptors */
! if((connect_ctx.input = fdopen(connect_ctx.connfd, "r")) == NULL) {
perror("bn_alertlist(): fdopen(r) error");
return NULL;
}
! if((connect_ctx.output = fdopen(connect_ctx.connfd, "w")) == NULL) {
perror("bn_alertlist(): fdopen(w) error");
return NULL;
***************
*** 43,61 ****
/* Build alertlist request */
! req_pkt.function = htons(BENSON_ALERTLIST_v31);
! safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
/* Write the data, check for errors, and flush the buffer */
! rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
if(rc < 1) {
perror("bn_alertlist(): fwrite() failure");
}
! fflush(sockout);
/* Read the response from the server, atleast the header portion, more should be coming. */
! rc = fread(&resp_hdr, sizeof(bnet_resp), 1, sockin);
if(rc < 1) {
perror("bn_alertlist(): fread() failure");
--- 45,67 ----
/* Build alertlist request */
! req_hdr.function = htons(BENSON_ALERTLIST_v31);
! safe_strncpy(req_hdr.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_hdr.version, VERSION, VER_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
/* Write the data, check for errors, and flush the buffer */
! rc = fwrite(&req_hdr, sizeof(bn_req_hdr), 1, connect_ctx.output);
! if(rc < 1) {
! perror("bn_alertlist(): fwrite() failure");
! }
! rc = fwrite(&req_pkt, sizeof(bnet_req_v31), 1, connect_ctx.output);
if(rc < 1) {
perror("bn_alertlist(): fwrite() failure");
}
! fflush(connect_ctx.output);
/* Read the response from the server, atleast the header portion, more should be coming. */
! rc = fread(&resp_hdr, sizeof(bnet_resp_v31), 1, connect_ctx.input);
if(rc < 1) {
perror("bn_alertlist(): fread() failure");
***************
*** 66,70 ****
/* Allocate some memory for the alertlist that will we read soon enough */
! if((alertlist_ptr = (struct benson_alertlist_response *) malloc(sizeof(struct benson_alertlist_response) * total_num_alerts)) == NULL) {
perror("bn_alertlist(): malloc() failed");
return NULL;
--- 72,76 ----
/* Allocate some memory for the alertlist that will we read soon enough */
! if((alertlist_ptr = (struct benson_alertlist_response_v31 *) malloc(sizeof(struct benson_alertlist_response_v31) * total_num_alerts)) == NULL) {
perror("bn_alertlist(): malloc() failed");
return NULL;
***************
*** 72,76 ****
for(ctr=0; ctr < total_num_alerts; ctr++) {
! rc = fread(&alertlist_ptr[ctr], sizeof(struct benson_alertlist_response), 1, sockin);
if(rc < 1) {
perror("bn_alertlist(): fread() failure");
--- 78,82 ----
for(ctr=0; ctr < total_num_alerts; ctr++) {
! rc = fread(&alertlist_ptr[ctr], sizeof(struct benson_alertlist_response_v31), 1, connect_ctx.input);
if(rc < 1) {
perror("bn_alertlist(): fread() failure");
***************
*** 79,93 ****
}
}
! *buffer_size = sizeof(struct benson_alertlist_response) * total_num_alerts;
! rc = fwrite(&resp_ack, sizeof(bnet_ack), 1, sockout);
if(rc < 1) {
perror("bn_alertlist(): fwrite() error");
}
! fflush(sockout);
! fclose(sockout);
! fclose(sockin);
! close(connfd);
return alertlist_ptr;
}
--- 85,99 ----
}
}
! *buffer_size = sizeof(struct benson_alertlist_response_v31) * total_num_alerts;
! rc = fwrite(&resp_ack, sizeof(bnet_ack_v31), 1, connect_ctx.output);
if(rc < 1) {
perror("bn_alertlist(): fwrite() error");
}
! fflush(connect_ctx.output);
! fclose(connect_ctx.output);
! fclose(connect_ctx.input);
! close(connect_ctx.connfd);
return alertlist_ptr;
}
***************
*** 96,123 ****
char *severity, char *subsystem, char *message)
{
- int connfd;
- FILE *sockin, *sockout;
int rc = 0;
! bnet_req req_pkt;
! bnet_resp resp_hdr;
! bnet_ack resp_ack;
! if((connfd = ibn_tcp_connect(destination, port)) == ERROR) {
fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
return ERROR;
}
! if((sockin = fdopen(connfd, "r")) == NULL) {
perror("bn_send_trap(): fdopen(r) error");
return ERROR;
}
! if((sockout = fdopen(connfd, "w")) == NULL) {
perror("bn_send_trap(): fdopen(w) error");
return ERROR;
}
! req_pkt.function = htons(BENSON_TRAP_v31);
! safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
--- 102,132 ----
char *severity, char *subsystem, char *message)
{
int rc = 0;
! bn_req_hdr req_hdr;
! bnet_req_v31 req_pkt;
! bnet_resp_v31 resp_hdr;
! bnet_ack_v31 resp_ack;
! bn_netconnect_ctx connect_ctx;
!
! safe_strncpy(connect_ctx.destination, destination, DST_MAXSIZE);
! connect_ctx.port = port;
! if(ibn_tcp_connect(&connect_ctx) == ERROR) {
fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
return ERROR;
}
! if((connect_ctx.input = fdopen(connect_ctx.connfd, "r")) == NULL) {
perror("bn_send_trap(): fdopen(r) error");
return ERROR;
}
! if((connect_ctx.output = fdopen(connect_ctx.connfd, "w")) == NULL) {
perror("bn_send_trap(): fdopen(w) error");
return ERROR;
}
! req_hdr.function = htons(BENSON_TRAP_v31);
! safe_strncpy(req_hdr.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_hdr.version, VERSION, VER_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
***************
*** 126,154 ****
safe_strncpy(req_pkt.data.trap.message, message, MSG_MAXSIZE_v31);
! rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
! if(ferror(sockout)) {
perror("bn_send_trap(): fwrite() error");
}
! rc = fflush(sockout);
! if(feof(sockout) || ferror(sockout) || (rc != 0)) {
perror("bn_send_trap(): fflush() error");
! clearerr(sockout);
}
! rc = fread(&resp_hdr, sizeof(bnet_resp), 1, sockin);
! if(ferror(sockin)) {
perror("bn_send_trap(): fread() error");
}
! rc = fwrite(&resp_ack, sizeof(bnet_ack), 1, sockout);
! if(ferror(sockout)) {
perror("bn_send_trap(): fwrite() error");
}
! fflush(sockout);
! fclose(sockout);
! fclose(sockin);
! close(connfd);
// fprintf(stderr, "bn_send_trap identity = %s\n", resp_hdr.resp.trap.identity);
--- 135,167 ----
safe_strncpy(req_pkt.data.trap.message, message, MSG_MAXSIZE_v31);
! rc = fwrite(&req_hdr, sizeof(bn_req_hdr), 1, connect_ctx.output);
! if(ferror(connect_ctx.output)) {
! perror("bn_send_trap(): fwrite() error");
! }
! rc = fwrite(&req_pkt, sizeof(bnet_req_v31), 1, connect_ctx.output);
! if(ferror(connect_ctx.output)) {
perror("bn_send_trap(): fwrite() error");
}
! rc = fflush(connect_ctx.output);
! if(feof(connect_ctx.output) || ferror(connect_ctx.output) || (rc != 0)) {
perror("bn_send_trap(): fflush() error");
! clearerr(connect_ctx.output);
}
! rc = fread(&resp_hdr, sizeof(bnet_resp_v31), 1, connect_ctx.input);
! if(ferror(connect_ctx.input)) {
perror("bn_send_trap(): fread() error");
}
! rc = fwrite(&resp_ack, sizeof(bnet_ack_v31), 1, connect_ctx.output);
! if(ferror(connect_ctx.output)) {
perror("bn_send_trap(): fwrite() error");
}
! fflush(connect_ctx.output);
! fclose(connect_ctx.output);
! fclose(connect_ctx.input);
! close(connect_ctx.connfd);
// fprintf(stderr, "bn_send_trap identity = %s\n", resp_hdr.resp.trap.identity);
***************
*** 160,210 ****
char *identity)
{
! int connfd, ofcmode, rc;
! FILE *sockin, *sockout;
! bnet_req req_pkt;
! bnet_resp resp_hdr;
! bnet_ack resp_ack;
! if((connfd = ibn_tcp_connect(destination, port)) == ERROR) {
fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
return ERROR;
}
! if((sockin = fdopen(connfd, "r")) == NULL) {
perror("bn_acknowledge(): fdopen(r) error");
return ERROR;
}
! if((sockout = fdopen(connfd, "w")) == NULL) {
perror("bn_acknowledge(): fdopen(w) error");
return ERROR;
}
! req_pkt.function = htons(BENSON_ACKNOWLEDGE_v31);
! safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
safe_strncpy(req_pkt.data.acknowledge.identity, identity, ID_MAXSIZE_v31);
! rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
if(rc < 1) {
perror("bn_acknowledge(): fwrite() error");
}
! fflush(sockout);
! rc = fread(&resp_hdr, sizeof(bnet_resp), 1, sockin);
if(rc < 1) {
perror("bn_acknowledge(): fread() error");
}
! rc = fwrite(&resp_ack, sizeof(bnet_ack), 1, sockout);
if(rc < 1) {
perror("bn_acknowledge(): fwrite() error");
}
! fflush(sockout);
! fclose(sockout);
! fclose(sockin);
! close(connfd);
return (int)ntohs(resp_hdr.resp.acknowledge.rc);
--- 173,227 ----
char *identity)
{
! int rc;
! bn_req_hdr req_hdr;
! bnet_req_v31 req_pkt;
! bnet_resp_v31 resp_hdr;
! bnet_ack_v31 resp_ack;
! bn_netconnect_ctx connect_ctx;
!
! safe_strncpy(connect_ctx.destination, destination, DST_MAXSIZE);
! connect_ctx.port = port;
! if((ibn_tcp_connect(&connect_ctx)) == ERROR) {
fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
return ERROR;
}
! if((connect_ctx.input = fdopen(connect_ctx.connfd, "r")) == NULL) {
perror("bn_acknowledge(): fdopen(r) error");
return ERROR;
}
! if((connect_ctx.output = fdopen(connect_ctx.connfd, "w")) == NULL) {
perror("bn_acknowledge(): fdopen(w) error");
return ERROR;
}
! req_hdr.function = htons(BENSON_ACKNOWLEDGE_v31);
! safe_strncpy(req_hdr.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_hdr.version, VERSION, VER_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
safe_strncpy(req_pkt.data.acknowledge.identity, identity, ID_MAXSIZE_v31);
! rc = fwrite(&req_pkt, sizeof(bnet_req_v31), 1, connect_ctx.output);
if(rc < 1) {
perror("bn_acknowledge(): fwrite() error");
}
! fflush(connect_ctx.output);
! rc = fread(&resp_hdr, sizeof(bnet_resp_v31), 1, connect_ctx.input);
if(rc < 1) {
perror("bn_acknowledge(): fread() error");
}
! rc = fwrite(&resp_ack, sizeof(bnet_ack_v31), 1, connect_ctx.output);
if(rc < 1) {
perror("bn_acknowledge(): fwrite() error");
}
! fflush(connect_ctx.output);
! fclose(connect_ctx.output);
! fclose(connect_ctx.input);
! close(connect_ctx.connfd);
return (int)ntohs(resp_hdr.resp.acknowledge.rc);
***************
*** 214,240 ****
char *identity, char *status)
{
! int connfd, ofcmode, rc;
! FILE *sockin, *sockout;
! bnet_req req_pkt;
! bnet_resp resp_hdr;
! bnet_ack resp_ack;
! if((connfd = ibn_tcp_connect(destination, port)) == ERROR) {
fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
return ERROR;
}
! if((sockin = fdopen(connfd, "r")) == NULL) {
perror("bn_update_status(): fdopen(r) error");
return ERROR;
}
! if((sockout = fdopen(connfd, "w")) == NULL) {
perror("bn_update_status(): fdopen(w) error");
return ERROR;
}
! req_pkt.function = htons(BENSON_UPDATE_STATUS_v31);
! safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
--- 231,261 ----
char *identity, char *status)
{
! int rc;
! bn_req_hdr req_hdr;
! bnet_req_v31 req_pkt;
! bnet_resp_v31 resp_hdr;
! bnet_ack_v31 resp_ack;
! bn_netconnect_ctx connect_ctx;
!
! safe_strncpy(connect_ctx.destination, destination, DST_MAXSIZE);
! connect_ctx.port = port;
! if(ibn_tcp_connect(&connect_ctx) == ERROR) {
fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
return ERROR;
}
! if((connect_ctx.input = fdopen(connect_ctx.connfd, "r")) == NULL) {
perror("bn_update_status(): fdopen(r) error");
return ERROR;
}
! if((connect_ctx.output = fdopen(connect_ctx.connfd, "w")) == NULL) {
perror("bn_update_status(): fdopen(w) error");
return ERROR;
}
! req_hdr.function = htons(BENSON_UPDATE_STATUS_v31);
! safe_strncpy(req_hdr.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_hdr.version, VERSION, VER_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
***************
*** 244,267 ****
printf("%s %s\n", identity, status);
! rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
if(rc < 1) {
perror("bn_update_status(): fwrite() error");
}
! fflush(sockout);
! rc = fread(&resp_hdr, sizeof(bnet_resp), 1, sockin);
if(rc < 1) {
perror("bn_update_status(): fread() error");
}
! rc = fwrite(&resp_ack, sizeof(bnet_ack), 1, sockout);
if(rc < 1) {
perror("bn_update_status(): fwrite() error");
}
! fflush(sockout);
! fclose(sockout);
! fclose(sockin);
! close(connfd);
return (int)ntohs(resp_hdr.resp.update_status.rc);
--- 265,293 ----
printf("%s %s\n", identity, status);
! rc = fwrite(&req_hdr, sizeof(bn_req_hdr), 1, connect_ctx.output);
! if(rc < 1) {
! perror("bn_update_status(): fwrite() error");
! }
! fflush(connect_ctx.output);
! rc = fwrite(&req_pkt, sizeof(bnet_req_v31), 1, connect_ctx.output);
if(rc < 1) {
perror("bn_update_status(): fwrite() error");
}
! fflush(connect_ctx.output);
! rc = fread(&resp_hdr, sizeof(bnet_resp_v31), 1, connect_ctx.input);
if(rc < 1) {
perror("bn_update_status(): fread() error");
}
! rc = fwrite(&resp_ack, sizeof(bnet_ack_v31), 1, connect_ctx.output);
if(rc < 1) {
perror("bn_update_status(): fwrite() error");
}
! fflush(connect_ctx.output);
! fclose(connect_ctx.output);
! fclose(connect_ctx.input);
! close(connect_ctx.connfd);
return (int)ntohs(resp_hdr.resp.update_status.rc);
|
|
From: Bob T. <bt...@us...> - 2003-10-08 01:41:59
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv23352/src/network
Modified Files:
Makefile.in network_utils.c v31_network_client.c
Log Message:
Here goes, lets see if this works over on unix now.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.in 7 Oct 2003 01:11:55 -0000 1.9
--- Makefile.in 8 Oct 2003 01:41:51 -0000 1.10
***************
*** 24,32 ****
libnetclient.a: v31_network_client.o
! $(AR) rv $@ v31_network_client.o
$(RANLIB) $@
libnetclient.so: libnetclient.a
! $(CC) -shared -o libnetclient.so v31_network_client.o $(LD_FLAGS) $(LIBS)
libnetwork.a: $(LIBNETWORK) v31_network_request.o
--- 24,32 ----
libnetclient.a: v31_network_client.o
! $(AR) rv $@ v31_network_client.o network_utils.o
$(RANLIB) $@
libnetclient.so: libnetclient.a
! $(CC) -shared -o libnetclient.so v31_network_client.o network_utils.o $(LD_FLAGS) $(LIBS)
libnetwork.a: $(LIBNETWORK) v31_network_request.o
Index: network_utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** network_utils.c 12 May 2003 03:28:56 -0000 1.4
--- network_utils.c 8 Oct 2003 01:41:51 -0000 1.5
***************
*** 56,57 ****
--- 56,67 ----
return GOOD;
}
+
+ void safe_strncpy(char *dest, char *src, int max_size)
+ {
+ int current_size = sizeof(src);
+ if(max_size >= current_size) {
+ /* truncate it, who cares it's just user data */
+ current_size = max_size;
+ }
+ snprintf(dest, current_size, "%s\0", src);
+ }
Index: v31_network_client.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_client.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** v31_network_client.c 30 Sep 2003 03:55:19 -0000 1.2
--- v31_network_client.c 8 Oct 2003 01:41:51 -0000 1.3
***************
*** 44,51 ****
/* Build alertlist request */
req_pkt.function = htons(BENSON_ALERTLIST_v31);
! safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
/* Write the data, check for errors, and flush the buffer */
--- 44,51 ----
/* Build alertlist request */
req_pkt.function = htons(BENSON_ALERTLIST_v31);
! safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
/* Write the data, check for errors, and flush the buffer */
***************
*** 118,128 ****
req_pkt.function = htons(BENSON_TRAP_v31);
! safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! safe_insert(req_pkt.data.trap.severity, severity, SEV_MAXSIZE_v31);
! safe_insert(req_pkt.data.trap.subsystem, subsystem, SUB_MAXSIZE_v31);
! safe_insert(req_pkt.data.trap.message, message, MSG_MAXSIZE_v31);
rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
--- 118,128 ----
req_pkt.function = htons(BENSON_TRAP_v31);
! safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! safe_strncpy(req_pkt.data.trap.severity, severity, SEV_MAXSIZE_v31);
! safe_strncpy(req_pkt.data.trap.subsystem, subsystem, SUB_MAXSIZE_v31);
! safe_strncpy(req_pkt.data.trap.message, message, MSG_MAXSIZE_v31);
rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
***************
*** 181,189 ****
req_pkt.function = htons(BENSON_ACKNOWLEDGE_v31);
! safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! safe_insert(req_pkt.data.acknowledge.identity, identity, ID_MAXSIZE_v31);
rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
--- 181,189 ----
req_pkt.function = htons(BENSON_ACKNOWLEDGE_v31);
! safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! safe_strncpy(req_pkt.data.acknowledge.identity, identity, ID_MAXSIZE_v31);
rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
***************
*** 235,244 ****
req_pkt.function = htons(BENSON_UPDATE_STATUS_v31);
! safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! safe_insert(req_pkt.data.update_status.identity, identity, ID_MAXSIZE_v31);
! safe_insert(req_pkt.data.update_status.status, status, STA_MAXSIZE_v31);
printf("%s %s\n", identity, status);
--- 235,244 ----
req_pkt.function = htons(BENSON_UPDATE_STATUS_v31);
! safe_strncpy(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
! safe_strncpy(req_pkt.version, VERSION, VER_MAXSIZE_v31);
! safe_strncpy(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
! safe_strncpy(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
! safe_strncpy(req_pkt.data.update_status.identity, identity, ID_MAXSIZE_v31);
! safe_strncpy(req_pkt.data.update_status.status, status, STA_MAXSIZE_v31);
printf("%s %s\n", identity, status);
|
|
From: Bob T. <bt...@us...> - 2003-10-08 01:41:58
|
Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23352/src
Modified Files:
utils.c
Log Message:
Here goes, lets see if this works over on unix now.
Index: utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/utils.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** utils.c 7 Oct 2003 01:11:54 -0000 1.14
--- utils.c 8 Oct 2003 01:41:51 -0000 1.15
***************
*** 67,98 ****
- int ibn_tcp_connect(char *forwarder, int port) {
- struct hostent *hp;
- struct sockaddr_in addr;
- int sock;
-
- if(!(hp=gethostbyname(forwarder))) {
- fprintf(stderr, "Couldn't resolve hostname: %s\n", hstrerror(h_errno));
- return ERROR;
- }
- memset(&addr, 0, sizeof(addr));
- addr.sin_addr=*(struct in_addr*)hp->h_addr_list[0];
- addr.sin_family=AF_INET;
- addr.sin_port=htons(port);
-
- if((sock=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP))<0) {
- fprintf(stderr, "Couldn't create socket(): %s\n", strerror(errno));
- return ERROR;
-
- }
- if(connect(sock, (struct sockaddr *)&addr, sizeof(addr))<0) {
- fprintf(stderr, "Couldn't connect() to host: %s\n", strerror(errno));
- return ERROR;
- }
- endhostent();
-
- return sock;
- }
-
int ibn_next_sequence(void) {
extern int sequence;
--- 67,70 ----
***************
*** 189,192 ****
--- 161,165 ----
return GOOD;
}
+
void *ibn_malloc(size_t length)
|
|
From: Bob T. <bt...@us...> - 2003-10-08 01:41:58
|
Update of /cvsroot/benson/benson3/include/benson In directory sc8-pr-cvs1:/tmp/cvs-serv23352/include/benson Modified Files: benson.h database.h Log Message: Here goes, lets see if this works over on unix now. Index: benson.h =================================================================== RCS file: /cvsroot/benson/benson3/include/benson/benson.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -r1.23 -r1.24 *** benson.h 7 Oct 2003 01:11:54 -0000 1.23 --- benson.h 8 Oct 2003 01:41:51 -0000 1.24 *************** *** 32,35 **** --- 32,37 ---- #include "benson/cfgctl.h" + int sequence; + void safe_insert(char *d, char *s, int maxsize); void sig_int(int signal); Index: database.h =================================================================== RCS file: /cvsroot/benson/benson3/include/benson/database.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** database.h 28 Mar 2002 20:56:51 -0000 1.4 --- database.h 8 Oct 2003 01:41:51 -0000 1.5 *************** *** 1,2 **** --- 1,3 ---- + #ifdef HAVE_DB_H #include <sys/types.h> *************** *** 25,26 **** --- 26,29 ---- int alert_net2db(bnet_req *net_alert, alertq *db_alert); int db_list_alerts(void *alertlist, int *ctr); + + #endif |
|
From: Bob T. <bt...@us...> - 2003-10-07 01:12:19
|
Update of /cvsroot/benson/benson3/src/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/src/tests
Modified Files:
Makefile.in
Removed Files:
Makefile.am
Log Message:
The latest changes to the build environment
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/tests/Makefile.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Makefile.in 7 Apr 2003 04:23:59 -0000 1.9
--- Makefile.in 7 Oct 2003 01:11:55 -0000 1.10
***************
*** 1,539 ****
! # Makefile.in generated by automake 1.7 from Makefile.am.
! # @configure_input@
- # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
- # Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! # PARTICULAR PURPOSE.
!
! @SET_MAKE@
!
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! VPATH = @srcdir@
! pkgdatadir = $(datadir)/@PACKAGE@
! pkglibdir = $(libdir)/@PACKAGE@
! pkgincludedir = $(includedir)/@PACKAGE@
! top_builddir = ../..
!
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
! INSTALL = @INSTALL@
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
! NORMAL_INSTALL = :
! PRE_INSTALL = :
! POST_INSTALL = :
! NORMAL_UNINSTALL = :
! PRE_UNINSTALL = :
! POST_UNINSTALL = :
! host_triplet = @host@
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
! AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
! AWK = @AWK@
! CC = @CC@
! CCDEPMODE = @CCDEPMODE@
! CFLAGS = @CFLAGS@
! CPP = @CPP@
! CPPFLAGS = @CPPFLAGS@
! CYGPATH_W = @CYGPATH_W@
! DEFS = @DEFS@
! DEPDIR = @DEPDIR@
! ECHO = @ECHO@
! ECHO_C = @ECHO_C@
! ECHO_N = @ECHO_N@
! ECHO_T = @ECHO_T@
! EGREP = @EGREP@
! EXEEXT = @EXEEXT@
! HAVE_X11 = @HAVE_X11@
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
! LDFLAGS = @LDFLAGS@
! LIBOBJS = @LIBOBJS@
! LIBS = @LIBS@
! LIBTOOL = @LIBTOOL@
! LIBTOOL_DEPS = @LIBTOOL_DEPS@
! LIBTOOL_VERSION = @LIBTOOL_VERSION@
! LN_S = @LN_S@
! LTLIBOBJS = @LTLIBOBJS@
! MAINT = @MAINT@
! MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
! MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
! MAKEINFO = @MAKEINFO@
! NETWORK_VERSION = @NETWORK_VERSION@
! OBJEXT = @OBJEXT@
! PACKAGE = @PACKAGE@
! PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
! PACKAGE_NAME = @PACKAGE_NAME@
! PACKAGE_STRING = @PACKAGE_STRING@
! PACKAGE_TARNAME = @PACKAGE_TARNAME@
! PACKAGE_VERSION = @PACKAGE_VERSION@
! PATH_SEPARATOR = @PATH_SEPARATOR@
! PERL_CFLAGS = @PERL_CFLAGS@
! PERL_LDFLAGS = @PERL_LDFLAGS@
! RANLIB = @RANLIB@
! SET_MAKE = @SET_MAKE@
! SHELL = @SHELL@
! STRIP = @STRIP@
! VERSION = @VERSION@
! X_CFLAGS = @X_CFLAGS@
! X_EXTRA_LIBS = @X_EXTRA_LIBS@
! X_LIBS = @X_LIBS@
! X_PRE_LIBS = @X_PRE_LIBS@
! ac_ct_CC = @ac_ct_CC@
! ac_ct_RANLIB = @ac_ct_RANLIB@
! ac_ct_STRIP = @ac_ct_STRIP@
! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
! am__include = @am__include@
! am__quote = @am__quote@
! bindir = @bindir@
! build = @build@
! build_alias = @build_alias@
! build_cpu = @build_cpu@
! build_os = @build_os@
! build_vendor = @build_vendor@
! datadir = @datadir@
! exec_prefix = @exec_prefix@
! host = @host@
! host_alias = @host_alias@
! host_cpu = @host_cpu@
! host_os = @host_os@
! host_vendor = @host_vendor@
! includedir = @includedir@
! infodir = @infodir@
! install_sh = @install_sh@
! libdir = @libdir@
! libexecdir = @libexecdir@
! localstatedir = @localstatedir@
! mandir = @mandir@
! oldincludedir = @oldincludedir@
! perlpath = @perlpath@
! prefix = @prefix@
! program_transform_name = @program_transform_name@
! pythonpath = @pythonpath@
! sbindir = @sbindir@
! sedpath = @sedpath@
! sharedstatedir = @sharedstatedir@
! sortpath = @sortpath@
! sysconfdir = @sysconfdir@
! target_alias = @target_alias@
! tclpath = @tclpath@
! trpath = @trpath@
! unamepath = @unamepath@
! uniqpath = @uniqpath@
! noinst_PROGRAMS = configtest btraptest alertlisttest acktest queuetest bsmtest rulescfgtest utilstest
! configtest_SOURCES = configtest.c
! configtest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@
! btraptest_SOURCES = btraptest.c
! btraptest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@
! alertlisttest_SOURCES = alertlisttest.c
! alertlisttest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@
! acktest_SOURCES = acktest.c
! acktest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@
! queuetest_SOURCES = queuetest.c
! queuetest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@
! bsmtest_SOURCES = bsmtest.c
! bsmtest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@
! utilstest_SOURCES = utilstest.c
! utilstest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@
! rulescfgtest_SOURCES = rulescfgtest.c
! rulescfgtest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@
! INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
!
! AUTOMAKE_OPTIONS = dejagnu
!
! RUNTESTDEFAULTFLAGS = --tool btrap BTRAP=`pwd`/btrap --srcdir $$srcdir/testsuite
! subdir = src/tests
! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! noinst_PROGRAMS = configtest$(EXEEXT) btraptest$(EXEEXT) \
! alertlisttest$(EXEEXT) acktest$(EXEEXT) queuetest$(EXEEXT) \
! bsmtest$(EXEEXT) rulescfgtest$(EXEEXT) utilstest$(EXEEXT)
! PROGRAMS = $(noinst_PROGRAMS)
!
! am_acktest_OBJECTS = acktest.$(OBJEXT)
! acktest_OBJECTS = $(am_acktest_OBJECTS)
! acktest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la
! acktest_LDFLAGS =
! am_alertlisttest_OBJECTS = alertlisttest.$(OBJEXT)
! alertlisttest_OBJECTS = $(am_alertlisttest_OBJECTS)
! alertlisttest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la
! alertlisttest_LDFLAGS =
! am_bsmtest_OBJECTS = bsmtest.$(OBJEXT)
! bsmtest_OBJECTS = $(am_bsmtest_OBJECTS)
! bsmtest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la
! bsmtest_LDFLAGS =
! am_btraptest_OBJECTS = btraptest.$(OBJEXT)
! btraptest_OBJECTS = $(am_btraptest_OBJECTS)
! btraptest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la
! btraptest_LDFLAGS =
! am_configtest_OBJECTS = configtest.$(OBJEXT)
! configtest_OBJECTS = $(am_configtest_OBJECTS)
! configtest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la
! configtest_LDFLAGS =
! am_queuetest_OBJECTS = queuetest.$(OBJEXT)
! queuetest_OBJECTS = $(am_queuetest_OBJECTS)
! queuetest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la
! queuetest_LDFLAGS =
! am_rulescfgtest_OBJECTS = rulescfgtest.$(OBJEXT)
! rulescfgtest_OBJECTS = $(am_rulescfgtest_OBJECTS)
! rulescfgtest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la
! rulescfgtest_LDFLAGS =
! am_utilstest_OBJECTS = utilstest.$(OBJEXT)
! utilstest_OBJECTS = $(am_utilstest_OBJECTS)
! utilstest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la
! utilstest_LDFLAGS =
!
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! am__depfiles_maybe = depfiles
! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acktest.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/alertlisttest.Po ./$(DEPDIR)/bsmtest.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/btraptest.Po ./$(DEPDIR)/configtest.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/queuetest.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/rulescfgtest.Po \
! @AMDEP_TRUE@ ./$(DEPDIR)/utilstest.Po
! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! $(AM_LDFLAGS) $(LDFLAGS) -o $@
! DIST_SOURCES = $(acktest_SOURCES) $(alertlisttest_SOURCES) \
! $(bsmtest_SOURCES) $(btraptest_SOURCES) $(configtest_SOURCES) \
! $(queuetest_SOURCES) $(rulescfgtest_SOURCES) \
! $(utilstest_SOURCES)
! DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(acktest_SOURCES) $(alertlisttest_SOURCES) $(bsmtest_SOURCES) $(btraptest_SOURCES) $(configtest_SOURCES) $(queuetest_SOURCES) $(rulescfgtest_SOURCES) $(utilstest_SOURCES)
!
! all: all-am
!
! .SUFFIXES:
! .SUFFIXES: .c .lo .o .obj
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu src/tests/Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
!
! clean-noinstPROGRAMS:
! @list='$(noinst_PROGRAMS)'; for p in $$list; do \
! f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
! echo " rm -f $$p $$f"; \
! rm -f $$p $$f ; \
! done
! acktest$(EXEEXT): $(acktest_OBJECTS) $(acktest_DEPENDENCIES)
! @rm -f acktest$(EXEEXT)
! $(LINK) $(acktest_LDFLAGS) $(acktest_OBJECTS) $(acktest_LDADD) $(LIBS)
! alertlisttest$(EXEEXT): $(alertlisttest_OBJECTS) $(alertlisttest_DEPENDENCIES)
! @rm -f alertlisttest$(EXEEXT)
! $(LINK) $(alertlisttest_LDFLAGS) $(alertlisttest_OBJECTS) $(alertlisttest_LDADD) $(LIBS)
! bsmtest$(EXEEXT): $(bsmtest_OBJECTS) $(bsmtest_DEPENDENCIES)
! @rm -f bsmtest$(EXEEXT)
! $(LINK) $(bsmtest_LDFLAGS) $(bsmtest_OBJECTS) $(bsmtest_LDADD) $(LIBS)
! btraptest$(EXEEXT): $(btraptest_OBJECTS) $(btraptest_DEPENDENCIES)
! @rm -f btraptest$(EXEEXT)
! $(LINK) $(btraptest_LDFLAGS) $(btraptest_OBJECTS) $(btraptest_LDADD) $(LIBS)
! configtest$(EXEEXT): $(configtest_OBJECTS) $(configtest_DEPENDENCIES)
! @rm -f configtest$(EXEEXT)
! $(LINK) $(configtest_LDFLAGS) $(configtest_OBJECTS) $(configtest_LDADD) $(LIBS)
! queuetest$(EXEEXT): $(queuetest_OBJECTS) $(queuetest_DEPENDENCIES)
! @rm -f queuetest$(EXEEXT)
! $(LINK) $(queuetest_LDFLAGS) $(queuetest_OBJECTS) $(queuetest_LDADD) $(LIBS)
! rulescfgtest$(EXEEXT): $(rulescfgtest_OBJECTS) $(rulescfgtest_DEPENDENCIES)
! @rm -f rulescfgtest$(EXEEXT)
! $(LINK) $(rulescfgtest_LDFLAGS) $(rulescfgtest_OBJECTS) $(rulescfgtest_LDADD) $(LIBS)
! utilstest$(EXEEXT): $(utilstest_OBJECTS) $(utilstest_DEPENDENCIES)
! @rm -f utilstest$(EXEEXT)
! $(LINK) $(utilstest_LDFLAGS) $(utilstest_OBJECTS) $(utilstest_LDADD) $(LIBS)
!
! mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
!
! distclean-compile:
! -rm -f *.tab.c
!
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acktest.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alertlisttest.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsmtest.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btraptest.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/configtest.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queuetest.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rulescfgtest.Po@am__quote@
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilstest.Po@am__quote@
!
! distclean-depend:
! -rm -rf ./$(DEPDIR)
.c.o:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
!
! .c.obj:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
!
! .c.lo:
! @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
!
! mostlyclean-libtool:
! -rm -f *.lo
!
! clean-libtool:
! -rm -rf .libs _libs
!
! distclean-libtool:
! -rm -f libtool
! uninstall-info-am:
!
! ETAGS = etags
! ETAGSFLAGS =
!
! CTAGS = ctags
! CTAGSFLAGS =
!
! tags: TAGS
!
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! mkid -fID $$unique
!
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
!
! ctags: CTAGS
! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
!
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
!
! distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! RUNTESTFLAGS =
! DEJATOOL = $(PACKAGE)
! EXPECT = expect
! RUNTEST = runtest
!
! check-DEJAGNU: site.exp
! srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
! EXPECT=$(EXPECT); export EXPECT; \
! runtest=$(RUNTEST); \
! if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
! l='$(DEJATOOL)'; for tool in $$l; do \
! $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
! done; \
! else echo "WARNING: could not find \`runtest'" 1>&2; :;\
! fi
! site.exp: Makefile
! @echo 'Making a new site.exp file...'
! @echo '## these variables are automatically generated by make ##' >site.tmp
! @echo '# Do not edit here. If you wish to override these values' >>site.tmp
! @echo '# edit the last section' >>site.tmp
! @echo 'set tool $(DEJATOOL)' >>site.tmp
! @echo 'set srcdir $(srcdir)' >>site.tmp
! @echo "set objdir `pwd`" >>site.tmp
! @echo 'set host_alias "$(host_alias)"' >>site.tmp
! @echo 'set host_triplet $(host_triplet)' >>site.tmp
! @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp
! @test ! -f site.exp || \
! sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
! @-rm -f site.bak
! @test ! -f site.exp || mv site.exp site.bak
! @mv site.tmp site.exp
!
! distclean-DEJAGNU:
! -rm -f site.exp site.bak
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
!
! top_distdir = ../..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
!
! distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! esac; \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
! if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
! else \
! test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
! fi; \
! done
! check-am: all-am
! $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
! check: check-am
! all-am: Makefile $(PROGRAMS)
!
! installdirs:
!
! install: install-am
! install-exec: install-exec-am
! install-data: install-data-am
! uninstall: uninstall-am
!
! install-am: all-am
! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
!
! installcheck: installcheck-am
! install-strip:
! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! INSTALL_STRIP_FLAG=-s \
! `test -z '$(STRIP)' || \
! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
! mostlyclean-generic:
!
! clean-generic:
!
! distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
!
! maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
!
! clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
! mostlyclean-am
!
! distclean: distclean-am
!
! distclean-am: clean-am distclean-DEJAGNU distclean-compile \
! distclean-depend distclean-generic distclean-libtool \
! distclean-tags
!
! dvi: dvi-am
!
! dvi-am:
!
! info: info-am
!
! info-am:
!
! install-data-am:
!
! install-exec-am:
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
!
! maintainer-clean: maintainer-clean-am
!
! maintainer-clean-am: distclean-am maintainer-clean-generic
!
! mostlyclean: mostlyclean-am
!
! mostlyclean-am: mostlyclean-compile mostlyclean-generic \
! mostlyclean-libtool
!
! pdf: pdf-am
!
! pdf-am:
!
! ps: ps-am
! ps-am:
! uninstall-am: uninstall-info-am
! .PHONY: CTAGS GTAGS all all-am check check-DEJAGNU check-am clean \
! clean-generic clean-libtool clean-noinstPROGRAMS ctags \
! distclean distclean-DEJAGNU distclean-compile distclean-depend \
! distclean-generic distclean-libtool distclean-tags distdir dvi \
! dvi-am info info-am install install-am install-data \
! install-data-am install-exec install-exec-am install-info \
! install-info-am install-man install-strip installcheck \
! installcheck-am installdirs maintainer-clean \
! maintainer-clean-generic mostlyclean mostlyclean-compile \
! mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
! tags uninstall uninstall-am uninstall-info-am
! # Tell versions [3.59,3.63) of GNU make to not export all variables.
! # Otherwise a system limit (for SysV at least) may be exceeded.
! .NOEXPORT:
--- 1,31 ----
! sysconfdir=@sysconfdir@
! srcdir=@srcdir@
! top_srcdir=@top_srcdir@
!
! CC=@CC@
! LD=@LD@
! CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/include @CFLAGS@ @PERL_CFLAGS@
! CPPFLAGS=@CPPFLAGS@ @DEFS@
! LIBS=@LIBS@
! AR=@arpath@
! RANLIB=@RANLIB@
! INSTALL=@INSTALL@
! LDFLAGS=-L. @LDFLAGS@
! PERL_LDFLAGS=@PERL_LDFLAGS@
! TEST_TARGETS=stacktest
.c.o:
! $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
! all: $(TEST_TARGETS)
! stacktest: stacktest.o
! $(CC) $(CFLAGS) $(CPPFLAGS) -o stacktest stacktest.o -L$(top_srcdir)/src -lbenson -Wl,--rpath -Wl,$(top_srcdir)/src
! clean:
! rm -f *.o *.a core
! distclean: clean
! rm -f Makefile *~
--- Makefile.am DELETED ---
|
|
From: Bob T. <bt...@us...> - 2003-10-07 01:12:18
|
Update of /cvsroot/benson/benson3/src/monitors/disk In directory sc8-pr-cvs1:/tmp/cvs-serv24349/src/monitors/disk Removed Files: Makefile.am Log Message: The latest changes to the build environment --- Makefile.am DELETED --- |
|
From: Bob T. <bt...@us...> - 2003-10-07 01:12:18
|
Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24349/src
Modified Files:
stack.c utils.c
Log Message:
The latest changes to the build environment
Index: stack.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/stack.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** stack.c 27 Sep 2003 18:25:52 -0000 1.1
--- stack.c 7 Oct 2003 01:11:54 -0000 1.2
***************
*** 5,10 ****
stack_ctx *current_ctx;
! current_ctx = (stack_ctx *)malloc(sizeof(stack_ctx));
! memset(current_ctx, 0, sizeof(stack_ctx));
current_ctx->max_items = max_items;
--- 5,9 ----
stack_ctx *current_ctx;
! current_ctx = (stack_ctx *)ibn_malloc(sizeof(stack_ctx));
current_ctx->max_items = max_items;
***************
*** 25,30 ****
// fixme check for error
if(current_ctx->first_node == NULL) {
! current_ctx->first_node = (snode *)malloc(snode_size);
! memset(current_ctx->first_node, 0, snode_size);
current_ctx->first_node->node_construct = item;
} else {
--- 24,28 ----
// fixme check for error
if(current_ctx->first_node == NULL) {
! current_ctx->first_node = (snode *)ibn_malloc(snode_size);
current_ctx->first_node->node_construct = item;
} else {
***************
*** 35,41 ****
}
// fixme check for error
! ptr->next = (snode *)malloc(snode_size);
ptr = ptr->next;
- memset(ptr, 0, snode_size);
ptr->node_construct = item;
}
--- 33,38 ----
}
// fixme check for error
! ptr->next = (snode *)ibn_malloc(snode_size);
ptr = ptr->next;
ptr->node_construct = item;
}
***************
*** 53,60 ****
}
! ptr = current_ctx->first_node;
while(ptr->next != NULL) {
prev_ptr = ptr;
ptr = ptr->next;
}
item = ptr->node_construct;
--- 50,59 ----
}
! prev_ptr = ptr = current_ctx->first_node;
! printf("%p\n", ptr);
while(ptr->next != NULL) {
prev_ptr = ptr;
ptr = ptr->next;
+ printf("%p\n", ptr);
}
item = ptr->node_construct;
***************
*** 62,66 ****
// fixme
memset(ptr, 0, sizeof(snode));
! free(ptr);
prev_ptr->next = NULL;
--- 61,65 ----
// fixme
memset(ptr, 0, sizeof(snode));
! ibn_free(ptr);
prev_ptr->next = NULL;
***************
*** 82,90 ****
ptr = ptr->next;
memset(prev_ptr, 0, sizeof(snode));
! free(prev_ptr);
}
memset(ptr, 0, sizeof(snode));
! free(ptr);
return GOOD;
--- 81,89 ----
ptr = ptr->next;
memset(prev_ptr, 0, sizeof(snode));
! ibn_free(prev_ptr);
}
memset(ptr, 0, sizeof(snode));
! ibn_free(ptr);
return GOOD;
Index: utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/utils.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** utils.c 28 Sep 2003 22:26:28 -0000 1.13
--- utils.c 7 Oct 2003 01:11:54 -0000 1.14
***************
*** 190,191 ****
--- 190,210 ----
}
+ void *ibn_malloc(size_t length)
+ {
+ void *ptr;
+ if(length < 1) {
+ fprintf(stderr, "ibn_malloc() error: requested length (%d) < 1\n", length);
+ exit(EXIT_FAILURE);
+ }
+ if((ptr = malloc(length)) == 0) {
+ fprintf(stderr, "ibn_malloc() error: out of memory\n");
+ exit(EXIT_FAILURE);
+ }
+ memset(ptr, 0, length);
+ return ptr;
+ }
+
+ void ibn_free(void *ptr)
+ {
+ free(ptr);
+ }
|
|
From: Bob T. <bt...@us...> - 2003-10-07 01:12:18
|
Update of /cvsroot/benson/benson3/src/network In directory sc8-pr-cvs1:/tmp/cvs-serv24349/src/network Modified Files: Makefile.in Log Message: The latest changes to the build environment Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile.in 30 Sep 2003 04:51:20 -0000 1.8 --- Makefile.in 7 Oct 2003 01:11:55 -0000 1.9 *************** *** 38,42 **** clean: ! rm -f *.o *.a core distclean: clean --- 38,42 ---- clean: ! rm -f *.o *.so *.a core distclean: clean |
|
From: Bob T. <bt...@us...> - 2003-10-07 01:12:18
|
Update of /cvsroot/benson/benson3/src/monitors In directory sc8-pr-cvs1:/tmp/cvs-serv24349/src/monitors Removed Files: Makefile.am Log Message: The latest changes to the build environment --- Makefile.am DELETED --- |
|
From: Bob T. <bt...@us...> - 2003-10-07 01:12:18
|
Update of /cvsroot/benson/benson3/include/benson In directory sc8-pr-cvs1:/tmp/cvs-serv24349/include/benson Modified Files: benson.h Log Message: The latest changes to the build environment Index: benson.h =================================================================== RCS file: /cvsroot/benson/benson3/include/benson/benson.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** benson.h 29 Sep 2003 17:36:25 -0000 1.22 --- benson.h 7 Oct 2003 01:11:54 -0000 1.23 *************** *** 35,38 **** --- 35,40 ---- void sig_int(int signal); int err_exit(char *string); + void *ibn_malloc(size_t length); + #endif /* __benson_h */ |
|
From: Bob T. <bt...@us...> - 2003-10-07 01:12:18
|
Update of /cvsroot/benson/benson3/src/monitors/process In directory sc8-pr-cvs1:/tmp/cvs-serv24349/src/monitors/process Removed Files: Makefile.am Log Message: The latest changes to the build environment --- Makefile.am DELETED --- |
|
From: Bob T. <bt...@us...> - 2003-09-30 04:51:24
|
Update of /cvsroot/benson/benson3/src/network In directory sc8-pr-cvs1:/tmp/cvs-serv30425/src/network Modified Files: Makefile.in Log Message: Small change to help it work on solaris. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Makefile.in 30 Sep 2003 03:55:19 -0000 1.7 --- Makefile.in 30 Sep 2003 04:51:20 -0000 1.8 *************** *** 17,21 **** .c.o: ! $(CC) $(CFLAGS) $(CPPFLAGS) -c $< all: libnetwork.a libnetclient.so --- 17,21 ---- .c.o: ! $(CC) -fPIC $(CFLAGS) $(CPPFLAGS) -c $< all: libnetwork.a libnetclient.so |
|
From: Bob T. <bt...@us...> - 2003-09-30 04:47:29
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1:/tmp/cvs-serv30035 Modified Files: configure configure.ac Log Message: because I am a shmuck Index: configure =================================================================== RCS file: /cvsroot/benson/benson3/configure,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** configure 30 Sep 2003 04:43:38 -0000 1.56 --- configure 30 Sep 2003 04:47:18 -0000 1.57 *************** *** 5488,5492 **** _ACEOF ! LD_SEARCH_FLAG="-rpath" fi if test X"$UNAME" = XLinux; then --- 5488,5492 ---- _ACEOF ! LD_SEARCH_FLAG="-R" fi if test X"$UNAME" = XLinux; then Index: configure.ac =================================================================== RCS file: /cvsroot/benson/benson3/configure.ac,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** configure.ac 30 Sep 2003 04:43:38 -0000 1.5 --- configure.ac 30 Sep 2003 04:47:18 -0000 1.6 *************** *** 102,106 **** if test X"$UNAME" = XSunOS; then AC_DEFINE_UNQUOTED(SUNOS, 1, "We're running solaris") ! LD_SEARCH_FLAG="-rpath" fi if test X"$UNAME" = XLinux; then --- 102,106 ---- if test X"$UNAME" = XSunOS; then AC_DEFINE_UNQUOTED(SUNOS, 1, "We're running solaris") ! LD_SEARCH_FLAG="-R" fi if test X"$UNAME" = XLinux; then |
|
From: Bob T. <bt...@us...> - 2003-09-30 04:47:29
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv30035/autom4te.cache
Modified Files:
output.0 requests
Log Message:
because I am a shmuck
Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** output.0 30 Sep 2003 04:43:38 -0000 1.8
--- output.0 30 Sep 2003 04:47:18 -0000 1.9
***************
*** 5488,5492 ****
_ACEOF
! LD_SEARCH_FLAG="-rpath"
fi
if test X"$UNAME" = XLinux; then
--- 5488,5492 ----
_ACEOF
! LD_SEARCH_FLAG="-R"
fi
if test X"$UNAME" = XLinux; then
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** requests 30 Sep 2003 04:43:38 -0000 1.14
--- requests 30 Sep 2003 04:47:18 -0000 1.15
***************
*** 17,33 ****
{
'm4_pattern_forbid' => 1,
- 'AC_C_VOLATILE' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
- 'AC_FUNC_WAIT3' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_FUNC_LSTAT' => 1,
! 'AC_STRUCT_TM' => 1,
'AM_AUTOMAKE_VERSION' => 1,
! 'AC_FUNC_GETMNTENT' => 1,
'AC_TYPE_MODE_T' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
--- 17,33 ----
{
'm4_pattern_forbid' => 1,
'AC_TYPE_OFF_T' => 1,
+ 'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_FUNC_WAIT3' => 1,
'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AC_FUNC_LSTAT' => 1,
'AC_TYPE_MODE_T' => 1,
+ 'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
***************
*** 52,59 ****
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
- 'AC_FUNC_FORK' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
! 'AC_FUNC_STRCOLL' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
--- 52,59 ----
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
! 'AC_FUNC_FORK' => 1,
'AC_FUNC_VPRINTF' => 1,
+ 'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
***************
*** 80,86 ****
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
- 'AC_TYPE_PID_T' => 1,
- 'AC_PROG_LEX' => 1,
'AC_C_CONST' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
--- 80,86 ----
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
'AC_C_CONST' => 1,
+ 'AC_PROG_LEX' => 1,
+ 'AC_TYPE_PID_T' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
***************
*** 88,93 ****
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_CHECK_LIB' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
--- 88,93 ----
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_FUNC_OBSTACK' => 1,
+ 'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
***************
*** 96,106 ****
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AC_FUNC_MKTIME' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
--- 96,106 ----
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AM_CONDITIONAL' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_FUNC_MEMCMP' => 1,
+ 'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
|
|
From: Bob T. <bt...@us...> - 2003-09-30 04:43:44
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv29651/autom4te.cache
Modified Files:
output.0 requests traces.0
Log Message:
More compile changes
Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** output.0 30 Sep 2003 04:32:07 -0000 1.7
--- output.0 30 Sep 2003 04:43:38 -0000 1.8
***************
*** 309,313 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIB@&t@OBJS LTLIBOBJS'
ac_subst_files=''
--- 309,313 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP LD_SEARCH_FLAG perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIB@&t@OBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 5488,5491 ****
--- 5488,5492 ----
_ACEOF
+ LD_SEARCH_FLAG="-rpath"
fi
if test X"$UNAME" = XLinux; then
***************
*** 5496,5501 ****
--- 5497,5504 ----
CONF_DLFLAGS=-rdynamic
+ LD_SEARCH_FLAG="-rpath"
fi
+
cat >>confdefs.h <<_ACEOF
@%:@define TARGETOSNAME $UNAME
***************
*** 6363,6366 ****
--- 6366,6370 ----
s,@CONF_PIC@,$CONF_PIC,;t t
s,@EGREP@,$EGREP,;t t
+ s,@LD_SEARCH_FLAG@,$LD_SEARCH_FLAG,;t t
s,@perlpath@,$perlpath,;t t
s,@PERL_CFLAGS@,$PERL_CFLAGS,;t t
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** requests 30 Sep 2003 04:32:07 -0000 1.13
--- requests 30 Sep 2003 04:43:38 -0000 1.14
***************
*** 17,33 ****
{
'm4_pattern_forbid' => 1,
- 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
- 'AC_HEADER_TIME' => 1,
'AC_FUNC_WAIT3' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_TM' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
--- 17,33 ----
{
'm4_pattern_forbid' => 1,
'AC_C_VOLATILE' => 1,
+ 'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_FUNC_WAIT3' => 1,
! 'AC_HEADER_TIME' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_GETMNTENT' => 1,
+ 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
***************
*** 52,59 ****
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
--- 52,59 ----
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
***************
*** 80,86 ****
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
- 'AC_C_CONST' => 1,
- 'AC_PROG_LEX' => 1,
'AC_TYPE_PID_T' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
--- 80,86 ----
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
'AC_TYPE_PID_T' => 1,
+ 'AC_PROG_LEX' => 1,
+ 'AC_C_CONST' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
***************
*** 88,93 ****
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
--- 88,93 ----
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
***************
*** 96,106 ****
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
--- 96,106 ----
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_FUNC_MKTIME' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
Index: traces.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/traces.0,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** traces.0 30 Sep 2003 04:32:07 -0000 1.7
--- traces.0 30 Sep 2003 04:43:38 -0000 1.8
***************
*** 222,240 ****
m4trace:configure.ac:103: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
#undef SUNOS])
! m4trace:configure.ac:106: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:106: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:109: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:109: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:113: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:119: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:133: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:134: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:135: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:141: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:147: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:170: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:187: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
src/network/Makefile src/perl/Makefile src/rules/Makefile \
--- 222,241 ----
m4trace:configure.ac:103: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
#undef SUNOS])
! m4trace:configure.ac:107: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:107: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:111: -1- AC_SUBST([LD_SEARCH_FLAG])
! m4trace:configure.ac:112: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:112: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:116: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:122: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:136: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:137: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:138: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:144: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:150: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:173: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:190: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
src/network/Makefile src/perl/Makefile src/rules/Makefile \
***************
*** 242,245 ****
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:187: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:187: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
--- 243,246 ----
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:190: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:190: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
|
From: Bob T. <bt...@us...> - 2003-09-30 04:43:44
|
Update of /cvsroot/benson/benson3/src In directory sc8-pr-cvs1:/tmp/cvs-serv29651/src Modified Files: Makefile.in Log Message: More compile changes Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.in,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** Makefile.in 30 Sep 2003 03:55:18 -0000 1.45 --- Makefile.in 30 Sep 2003 04:43:38 -0000 1.46 *************** *** 17,20 **** --- 17,21 ---- CPPFLAGS=@CPPFLAGS@ @DEFS@ LIBS=@LIBS@ + LD_SEARCH_FLAG=@LD_SEARCH_FLAG@ AR=@arpath@ RANLIB=@RANLIB@ *************** *** 45,49 **** bensond: $(BENSOND_OBJS) $(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o bensond $(BENSOND_OBJS) libbenson.so $(LIBPERL) \ ! $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS) $(PERL_LIBS) -Wl,--rpath -Wl,. -Wl,--rpath -Wl,$(libdir) bn_rules.o: --- 46,50 ---- bensond: $(BENSOND_OBJS) $(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o bensond $(BENSOND_OBJS) libbenson.so $(LIBPERL) \ ! $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS) $(PERL_LIBS) -Wl,$(LD_SEARCH_FLAG) -Wl,. -Wl,$(LD_SEARCH_FLAG) -Wl,$(libdir) bn_rules.o: |
|
From: Bob T. <bt...@us...> - 2003-09-30 04:43:44
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1:/tmp/cvs-serv29651 Modified Files: configure configure.ac Log Message: More compile changes Index: configure =================================================================== RCS file: /cvsroot/benson/benson3/configure,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -r1.55 -r1.56 *** configure 30 Sep 2003 04:32:06 -0000 1.55 --- configure 30 Sep 2003 04:43:38 -0000 1.56 *************** *** 309,313 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' --- 309,313 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP LD_SEARCH_FLAG perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 5488,5491 **** --- 5488,5492 ---- _ACEOF + LD_SEARCH_FLAG="-rpath" fi if test X"$UNAME" = XLinux; then *************** *** 5496,5501 **** --- 5497,5504 ---- CONF_DLFLAGS=-rdynamic + LD_SEARCH_FLAG="-rpath" fi + cat >>confdefs.h <<_ACEOF #define TARGETOSNAME $UNAME *************** *** 6363,6366 **** --- 6366,6370 ---- s,@CONF_PIC@,$CONF_PIC,;t t s,@EGREP@,$EGREP,;t t + s,@LD_SEARCH_FLAG@,$LD_SEARCH_FLAG,;t t s,@perlpath@,$perlpath,;t t s,@PERL_CFLAGS@,$PERL_CFLAGS,;t t Index: configure.ac =================================================================== RCS file: /cvsroot/benson/benson3/configure.ac,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** configure.ac 30 Sep 2003 04:32:07 -0000 1.4 --- configure.ac 30 Sep 2003 04:43:38 -0000 1.5 *************** *** 102,110 **** --- 102,113 ---- if test X"$UNAME" = XSunOS; then AC_DEFINE_UNQUOTED(SUNOS, 1, "We're running solaris") + LD_SEARCH_FLAG="-rpath" fi if test X"$UNAME" = XLinux; then AC_DEFINE_UNQUOTED(LINUX, 1, "We're running linux") CONF_DLFLAGS=-rdynamic + LD_SEARCH_FLAG="-rpath" fi + AC_SUBST(LD_SEARCH_FLAG) AC_DEFINE_UNQUOTED(TARGETOSNAME, $UNAME, "Operating System Name") fi |
|
From: Bob T. <bt...@us...> - 2003-09-30 04:32:10
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1:/tmp/cvs-serv28614 Modified Files: Makefile.in configure configure.ac Log Message: Fixes a lot of compile issues. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** Makefile.in 30 Sep 2003 03:18:01 -0000 1.11 --- Makefile.in 30 Sep 2003 04:32:06 -0000 1.12 *************** *** 9,17 **** --- 9,23 ---- (cd conf && $(MAKE)) + install: + (cd src && $(MAKE) install) + (cd conf && $(MAKE) install) + clean: (cd src && $(MAKE) clean) + (cd conf && $(MAKE) clean) distclean: clean rm -f Makefile *~ (cd src && $(MAKE) distclean) + (cd conf && $(MAKE) distclean) Index: configure =================================================================== RCS file: /cvsroot/benson/benson3/configure,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -r1.54 -r1.55 *** configure 30 Sep 2003 03:18:01 -0000 1.54 --- configure 30 Sep 2003 04:32:06 -0000 1.55 *************** *** 5495,5498 **** --- 5495,5499 ---- _ACEOF + CONF_DLFLAGS=-rdynamic fi *************** *** 5561,5566 **** PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'` PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'` ! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-l' | $trpath '\n' ' '` PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '` PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '` echo "$as_me:$LINENO: result: ok" >&5 --- 5562,5568 ---- PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'` PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'` ! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $greppath '^\-l' | $trpath '\n' ' '` PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '` + PERL_LDFLAGS="$PERL_LDFLAGS $CONF_DLFLAGS" PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '` echo "$as_me:$LINENO: result: ok" >&5 Index: configure.ac =================================================================== RCS file: /cvsroot/benson/benson3/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** configure.ac 30 Sep 2003 03:18:01 -0000 1.3 --- configure.ac 30 Sep 2003 04:32:07 -0000 1.4 *************** *** 105,108 **** --- 105,109 ---- if test X"$UNAME" = XLinux; then AC_DEFINE_UNQUOTED(LINUX, 1, "We're running linux") + CONF_DLFLAGS=-rdynamic fi AC_DEFINE_UNQUOTED(TARGETOSNAME, $UNAME, "Operating System Name") *************** *** 125,130 **** PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'` PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'` ! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-l' | $trpath '\n' ' '` PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '` PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '` AC_MSG_RESULT(ok) --- 126,132 ---- PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'` PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'` ! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $greppath '^\-l' | $trpath '\n' ' '` PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '` + PERL_LDFLAGS="$PERL_LDFLAGS $CONF_DLFLAGS" PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '` AC_MSG_RESULT(ok) |
|
From: Bob T. <bt...@us...> - 2003-09-30 04:32:10
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv28614/autom4te.cache
Modified Files:
output.0 requests traces.0
Log Message:
Fixes a lot of compile issues.
Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** output.0 30 Sep 2003 03:18:02 -0000 1.6
--- output.0 30 Sep 2003 04:32:07 -0000 1.7
***************
*** 5495,5498 ****
--- 5495,5499 ----
_ACEOF
+ CONF_DLFLAGS=-rdynamic
fi
***************
*** 5561,5566 ****
PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'`
PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'`
! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-l' | $trpath '\n' ' '`
PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '`
PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '`
echo "$as_me:$LINENO: result: ok" >&5
--- 5562,5568 ----
PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'`
PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'`
! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $greppath '^\-l' | $trpath '\n' ' '`
PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '`
+ PERL_LDFLAGS="$PERL_LDFLAGS $CONF_DLFLAGS"
PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '`
echo "$as_me:$LINENO: result: ok" >&5
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** requests 30 Sep 2003 03:18:02 -0000 1.12
--- requests 30 Sep 2003 04:32:07 -0000 1.13
***************
*** 17,33 ****
{
'm4_pattern_forbid' => 1,
- 'AC_C_VOLATILE' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
- 'AC_FUNC_WAIT3' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_FUNC_LSTAT' => 1,
! 'AC_STRUCT_TM' => 1,
'AM_AUTOMAKE_VERSION' => 1,
! 'AC_FUNC_GETMNTENT' => 1,
'AC_TYPE_MODE_T' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
--- 17,33 ----
{
'm4_pattern_forbid' => 1,
'AC_TYPE_OFF_T' => 1,
+ 'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_FUNC_WAIT3' => 1,
'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AC_FUNC_LSTAT' => 1,
'AC_TYPE_MODE_T' => 1,
+ 'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
***************
*** 52,59 ****
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
- 'AC_FUNC_FORK' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
! 'AC_FUNC_STRCOLL' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
--- 52,59 ----
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
! 'AC_FUNC_FORK' => 1,
'AC_FUNC_VPRINTF' => 1,
+ 'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
***************
*** 80,86 ****
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
- 'AC_TYPE_PID_T' => 1,
- 'AC_PROG_LEX' => 1,
'AC_C_CONST' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
--- 80,86 ----
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
'AC_C_CONST' => 1,
+ 'AC_PROG_LEX' => 1,
+ 'AC_TYPE_PID_T' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
***************
*** 88,93 ****
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_CHECK_LIB' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
--- 88,93 ----
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_FUNC_OBSTACK' => 1,
+ 'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
***************
*** 96,106 ****
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AC_FUNC_MKTIME' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
--- 96,106 ----
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AM_CONDITIONAL' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_FUNC_MEMCMP' => 1,
+ 'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
Index: traces.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/traces.0,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** traces.0 30 Sep 2003 03:18:02 -0000 1.6
--- traces.0 30 Sep 2003 04:32:07 -0000 1.7
***************
*** 225,240 ****
m4trace:configure.ac:106: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:108: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:112: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:118: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:131: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:132: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:133: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:139: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:145: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:168: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:185: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
src/network/Makefile src/perl/Makefile src/rules/Makefile \
--- 225,240 ----
m4trace:configure.ac:106: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:109: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:109: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:113: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:119: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:133: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:134: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:135: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:141: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:147: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:170: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:187: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
src/network/Makefile src/perl/Makefile src/rules/Makefile \
***************
*** 242,245 ****
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:185: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:185: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
--- 242,245 ----
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:187: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:187: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
|
From: Bob T. <bt...@us...> - 2003-09-30 03:55:24
|
Update of /cvsroot/benson/benson3/src In directory sc8-pr-cvs1:/tmp/cvs-serv24239 Modified Files: Makefile.in Removed Files: network.c Log Message: Reworked the network code to make a little more sense Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.in,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -r1.44 -r1.45 *** Makefile.in 30 Sep 2003 03:18:02 -0000 1.44 --- Makefile.in 30 Sep 2003 03:55:18 -0000 1.45 *************** *** 14,19 **** PERL_CFLAGS=@PERL_CFLAGS@ PERL_LDFLAGS=@PERL_LDFLAGS@ @PERL_SLIBS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ ! LIBS=@LIBS@ @PERL_LIBS@ AR=@arpath@ RANLIB=@RANLIB@ --- 14,20 ---- PERL_CFLAGS=@PERL_CFLAGS@ PERL_LDFLAGS=@PERL_LDFLAGS@ @PERL_SLIBS@ + PERL_LIBS=@PERL_LIBS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ ! LIBS=@LIBS@ AR=@arpath@ RANLIB=@RANLIB@ *************** *** 23,27 **** TARGETS=libbenson.so btrap ack alertlist bensond $(PERL_MODULES) ! LIBBENSON_OBJS=bsm.o cfgctl.o error.o network.o psaf_queue.o \ stack.o utils.o vrml_builder.o --- 24,28 ---- TARGETS=libbenson.so btrap ack alertlist bensond $(PERL_MODULES) ! LIBBENSON_OBJS=bsm.o cfgctl.o error.o psaf_queue.o \ stack.o utils.o vrml_builder.o *************** *** 34,37 **** --- 35,39 ---- LIBRULES=rules/librules.a LIBNETWORK=network/libnetwork.a + LIBNETCLIENT=network/libnetclient.a LIBPERL=perl/libperl.a *************** *** 43,59 **** bensond: $(BENSOND_OBJS) $(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o bensond $(BENSOND_OBJS) libbenson.so $(LIBPERL) \ ! $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS) -Wl,--rpath -Wl,. -Wl,--rpath -Wl,$(libdir) bn_rules.o: $(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -c bn_rules.c ! btrap: libbenson.a $(LIBPERL) $(LIBNETWORK) ! $(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o btrap btrap.c libbenson.a $(LIBPERL) $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS) ack: libbenson.a $(LIBPERL) $(LIBNETWORK) ! $(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o ack acknowledge.c libbenson.a $(LIBPERL) $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS) alertlist: libbenson.a $(LIBPERL) $(LIBNETWORK) ! $(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o alertlist alertlist.c libbenson.a $(LIBPERL) $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS) libbenson.a: $(LIBRULES) $(LIBPERL) $(LIBNETWORK) $(LIBBENSON_OBJS) --- 45,61 ---- bensond: $(BENSOND_OBJS) $(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -o bensond $(BENSOND_OBJS) libbenson.so $(LIBPERL) \ ! $(LIBNETWORK) $(PERL_LDFLAGS) $(LIBS) $(PERL_LIBS) -Wl,--rpath -Wl,. -Wl,--rpath -Wl,$(libdir) bn_rules.o: $(CC) $(CFLAGS) $(CPPFLAGS) $(PERL_CFLAGS) -c bn_rules.c ! btrap: libbenson.a $(LIBNETWORK) ! $(CC) $(CFLAGS) $(CPPFLAGS) -o btrap btrap.c libbenson.a $(LIBNETCLIENT) $(LIBS) ack: libbenson.a $(LIBPERL) $(LIBNETWORK) ! $(CC) $(CFLAGS) $(CPPFLAGS) -o ack acknowledge.c libbenson.a $(LIBNETCLIENT) $(LIBS) alertlist: libbenson.a $(LIBPERL) $(LIBNETWORK) ! $(CC) $(CFLAGS) $(CPPFLAGS) -o alertlist alertlist.c libbenson.a $(LIBNETCLIENT) $(LIBS) libbenson.a: $(LIBRULES) $(LIBPERL) $(LIBNETWORK) $(LIBBENSON_OBJS) --- network.c DELETED --- |
|
From: Bob T. <bt...@us...> - 2003-09-30 03:55:24
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv24239/network
Modified Files:
Makefile.in v31_network_client.c
Log Message:
Reworked the network code to make a little more sense
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Makefile.in 29 Sep 2003 18:04:10 -0000 1.6
--- Makefile.in 30 Sep 2003 03:55:19 -0000 1.7
***************
*** 19,25 ****
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
! all: libnetwork.a
$(LIBNETWORK): ../../config.h
libnetwork.a: $(LIBNETWORK) v31_network_request.o
--- 19,32 ----
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
! all: libnetwork.a libnetclient.so
$(LIBNETWORK): ../../config.h
+
+ libnetclient.a: v31_network_client.o
+ $(AR) rv $@ v31_network_client.o
+ $(RANLIB) $@
+
+ libnetclient.so: libnetclient.a
+ $(CC) -shared -o libnetclient.so v31_network_client.o $(LD_FLAGS) $(LIBS)
libnetwork.a: $(LIBNETWORK) v31_network_request.o
Index: v31_network_client.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_client.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** v31_network_client.c 12 May 2003 03:29:44 -0000 1.1
--- v31_network_client.c 30 Sep 2003 03:55:19 -0000 1.2
***************
*** 0 ****
--- 1,269 ----
+ /*
+ *
+ * src/network/v31_network_client.c
+ *
+ * Copyright (C) 2002, 2003 Bob Tribit <bt...@ne...>
+ */
+
+ #include <benson/benson.h>
+ #include "v31_request.h"
+ #include "network.h"
+ #include "config.h"
+
+ struct benson_alertlist_response *bn_alertlist (char *destination, int port, char *source, int *buffer_size)
+ {
+ int ctr;
+ int rc = 0;
+ bnet_req req_pkt;
+ bnet_resp resp_hdr;
+ bnet_ack resp_ack;
+ struct benson_alertlist_response *alertlist_ptr;
+ unsigned short total_alerts;
+ unsigned int alertlist_size;
+ unsigned int total_num_alerts = 0;
+ int connfd;
+ FILE *sockout, *sockin;
+
+
+ /* Open up a connection */
+ if((connfd = ibn_tcp_connect(destination, port)) == ERROR) {
+ fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
+ return NULL;
+ }
+
+ /* Open up the socket descriptor as file descriptors */
+ if((sockin = fdopen(connfd, "r")) == NULL) {
+ perror("bn_alertlist(): fdopen(r) error");
+ return NULL;
+ }
+ if((sockout = fdopen(connfd, "w")) == NULL) {
+ perror("bn_alertlist(): fdopen(w) error");
+ return NULL;
+ }
+
+ /* Build alertlist request */
+ req_pkt.function = htons(BENSON_ALERTLIST_v31);
+ safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
+ safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
+ safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
+ safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
+
+ /* Write the data, check for errors, and flush the buffer */
+ rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
+ if(rc < 1) {
+ perror("bn_alertlist(): fwrite() failure");
+ }
+ fflush(sockout);
+
+ /* Read the response from the server, atleast the header portion, more should be coming. */
+ rc = fread(&resp_hdr, sizeof(bnet_resp), 1, sockin);
+ if(rc < 1) {
+ perror("bn_alertlist(): fread() failure");
+ }
+
+ /* Get the total number of alerts coming in off the wire */
+ total_num_alerts = ntohs(resp_hdr.resp.total_alerts);
+
+ /* Allocate some memory for the alertlist that will we read soon enough */
+ if((alertlist_ptr = (struct benson_alertlist_response *) malloc(sizeof(struct benson_alertlist_response) * total_num_alerts)) == NULL) {
+ perror("bn_alertlist(): malloc() failed");
+ return NULL;
+ }
+
+ for(ctr=0; ctr < total_num_alerts; ctr++) {
+ rc = fread(&alertlist_ptr[ctr], sizeof(struct benson_alertlist_response), 1, sockin);
+ if(rc < 1) {
+ perror("bn_alertlist(): fread() failure");
+ free(alertlist_ptr);
+ return NULL;
+ }
+ }
+ *buffer_size = sizeof(struct benson_alertlist_response) * total_num_alerts;
+
+ rc = fwrite(&resp_ack, sizeof(bnet_ack), 1, sockout);
+ if(rc < 1) {
+ perror("bn_alertlist(): fwrite() error");
+ }
+ fflush(sockout);
+
+ fclose(sockout);
+ fclose(sockin);
+ close(connfd);
+ return alertlist_ptr;
+ }
+
+ int bn_send_trap (char *destination, int port, char *source,
+ char *severity, char *subsystem, char *message)
+ {
+ int connfd;
+ FILE *sockin, *sockout;
+ int rc = 0;
+ bnet_req req_pkt;
+ bnet_resp resp_hdr;
+ bnet_ack resp_ack;
+
+ if((connfd = ibn_tcp_connect(destination, port)) == ERROR) {
+ fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
+ return ERROR;
+ }
+
+ if((sockin = fdopen(connfd, "r")) == NULL) {
+ perror("bn_send_trap(): fdopen(r) error");
+ return ERROR;
+ }
+ if((sockout = fdopen(connfd, "w")) == NULL) {
+ perror("bn_send_trap(): fdopen(w) error");
+ return ERROR;
+ }
+
+ req_pkt.function = htons(BENSON_TRAP_v31);
+ safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
+ safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
+ safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
+ safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
+ safe_insert(req_pkt.data.trap.severity, severity, SEV_MAXSIZE_v31);
+ safe_insert(req_pkt.data.trap.subsystem, subsystem, SUB_MAXSIZE_v31);
+ safe_insert(req_pkt.data.trap.message, message, MSG_MAXSIZE_v31);
+
+ rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
+ if(ferror(sockout)) {
+ perror("bn_send_trap(): fwrite() error");
+ }
+
+ rc = fflush(sockout);
+ if(feof(sockout) || ferror(sockout) || (rc != 0)) {
+ perror("bn_send_trap(): fflush() error");
+ clearerr(sockout);
+ }
+
+ rc = fread(&resp_hdr, sizeof(bnet_resp), 1, sockin);
+ if(ferror(sockin)) {
+ perror("bn_send_trap(): fread() error");
+ }
+
+ rc = fwrite(&resp_ack, sizeof(bnet_ack), 1, sockout);
+ if(ferror(sockout)) {
+ perror("bn_send_trap(): fwrite() error");
+ }
+ fflush(sockout);
+
+ fclose(sockout);
+ fclose(sockin);
+ close(connfd);
+
+ // fprintf(stderr, "bn_send_trap identity = %s\n", resp_hdr.resp.trap.identity);
+
+ return (short)ntohs(resp_hdr.resp.trap.rc);
+ }
+
+ int bn_acknowledge (char *destination, int port, char *source,
+ char *identity)
+ {
+ int connfd, ofcmode, rc;
+ FILE *sockin, *sockout;
+ bnet_req req_pkt;
+ bnet_resp resp_hdr;
+ bnet_ack resp_ack;
+
+ if((connfd = ibn_tcp_connect(destination, port)) == ERROR) {
+ fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
+ return ERROR;
+ }
+
+ if((sockin = fdopen(connfd, "r")) == NULL) {
+ perror("bn_acknowledge(): fdopen(r) error");
+ return ERROR;
+ }
+ if((sockout = fdopen(connfd, "w")) == NULL) {
+ perror("bn_acknowledge(): fdopen(w) error");
+ return ERROR;
+ }
+
+ req_pkt.function = htons(BENSON_ACKNOWLEDGE_v31);
+ safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
+ safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
+ safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
+ safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
+ safe_insert(req_pkt.data.acknowledge.identity, identity, ID_MAXSIZE_v31);
+
+ rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
+ if(rc < 1) {
+ perror("bn_acknowledge(): fwrite() error");
+ }
+ fflush(sockout);
+
+ rc = fread(&resp_hdr, sizeof(bnet_resp), 1, sockin);
+ if(rc < 1) {
+ perror("bn_acknowledge(): fread() error");
+ }
+
+ rc = fwrite(&resp_ack, sizeof(bnet_ack), 1, sockout);
+ if(rc < 1) {
+ perror("bn_acknowledge(): fwrite() error");
+ }
+ fflush(sockout);
+
+ fclose(sockout);
+ fclose(sockin);
+ close(connfd);
+
+ return (int)ntohs(resp_hdr.resp.acknowledge.rc);
+ }
+
+ int bn_update_status (char *destination, int port, char *source,
+ char *identity, char *status)
+ {
+ int connfd, ofcmode, rc;
+ FILE *sockin, *sockout;
+ bnet_req req_pkt;
+ bnet_resp resp_hdr;
+ bnet_ack resp_ack;
+
+ if((connfd = ibn_tcp_connect(destination, port)) == ERROR) {
+ fprintf(stderr, "ibn_tcp_connect(%s, %i) failed.\n", destination, port);
+ return ERROR;
+ }
+
+ if((sockin = fdopen(connfd, "r")) == NULL) {
+ perror("bn_update_status(): fdopen(r) error");
+ return ERROR;
+ }
+ if((sockout = fdopen(connfd, "w")) == NULL) {
+ perror("bn_update_status(): fdopen(w) error");
+ return ERROR;
+ }
+
+ req_pkt.function = htons(BENSON_UPDATE_STATUS_v31);
+ safe_insert(req_pkt.benson, PACKAGE, BNH_MAXSIZE_v31);
+ safe_insert(req_pkt.version, VERSION, VER_MAXSIZE_v31);
+ safe_insert(req_pkt.inet.destination, destination, DST_MAXSIZE_v31);
+ safe_insert(req_pkt.inet.agent, source, AGT_MAXSIZE_v31);
+ safe_insert(req_pkt.data.update_status.identity, identity, ID_MAXSIZE_v31);
+ safe_insert(req_pkt.data.update_status.status, status, STA_MAXSIZE_v31);
+
+ printf("%s %s\n", identity, status);
+
+ rc = fwrite(&req_pkt, sizeof(bnet_req), 1, sockout);
+ if(rc < 1) {
+ perror("bn_update_status(): fwrite() error");
+ }
+ fflush(sockout);
+
+ rc = fread(&resp_hdr, sizeof(bnet_resp), 1, sockin);
+ if(rc < 1) {
+ perror("bn_update_status(): fread() error");
+ }
+
+ rc = fwrite(&resp_ack, sizeof(bnet_ack), 1, sockout);
+ if(rc < 1) {
+ perror("bn_update_status(): fwrite() error");
+ }
+ fflush(sockout);
+
+ fclose(sockout);
+ fclose(sockin);
+ close(connfd);
+
+ return (int)ntohs(resp_hdr.resp.update_status.rc);
+ }
+
|
|
From: Bob T. <bt...@us...> - 2003-09-30 03:18:09
|
Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv18133
Modified Files:
Makefile.in configure configure.ac
Removed Files:
Makefile.am
Log Message:
More changes to the build environment.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Makefile.in 13 Nov 2002 04:28:04 -0000 1.10
--- Makefile.in 30 Sep 2003 03:18:01 -0000 1.11
***************
*** 1,424 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
! # This Makefile.in is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! # PARTICULAR PURPOSE.
!
! SHELL = @SHELL@
!
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! VPATH = @srcdir@
! prefix = @prefix@
! exec_prefix = @exec_prefix@
!
! bindir = @bindir@
! sbindir = @sbindir@
! libexecdir = @libexecdir@
! datadir = @datadir@
! sysconfdir = @sysconfdir@
! sharedstatedir = @sharedstatedir@
! localstatedir = @localstatedir@
! libdir = @libdir@
! infodir = @infodir@
! mandir = @mandir@
! includedir = @includedir@
! oldincludedir = /usr/include
!
! DESTDIR =
!
! pkgdatadir = $(datadir)/@PACKAGE@
! pkglibdir = $(libdir)/@PACKAGE@
! pkgincludedir = $(includedir)/@PACKAGE@
!
! top_builddir = .
!
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
!
! INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! transform = @program_transform_name@
!
! NORMAL_INSTALL = :
! PRE_INSTALL = :
! POST_INSTALL = :
! NORMAL_UNINSTALL = :
! PRE_UNINSTALL = :
! POST_UNINSTALL = :
! host_alias = @host_alias@
! host_triplet = @host@
! AS = @AS@
! CC = @CC@
! DLLTOOL = @DLLTOOL@
! ECHO = @ECHO@
! EXEEXT = @EXEEXT@
! HAVE_X11 = @HAVE_X11@
! LIBTOOL = @LIBTOOL@
! LIBTOOL_DEPS = @LIBTOOL_DEPS@
! LIBTOOL_VERSION = @LIBTOOL_VERSION@
! LN_S = @LN_S@
! MAINT = @MAINT@
! MAKEINFO = @MAKEINFO@
! OBJDUMP = @OBJDUMP@
! OBJEXT = @OBJEXT@
! PACKAGE = @PACKAGE@
! PERL_CFLAGS = @PERL_CFLAGS@
! PERL_LDFLAGS = @PERL_LDFLAGS@
! RANLIB = @RANLIB@
! STRIP = @STRIP@
! VERSION = @VERSION@
! perlpath = @perlpath@
! pythonpath = @pythonpath@
! sedpath = @sedpath@
! sortpath = @sortpath@
! tclpath = @tclpath@
! trpath = @trpath@
! uniqpath = @uniqpath@
!
! SUBDIRS = src include scripts conf handlers man doc
! AUTOMAKE_OPTIONS = dejagnu
! RUNTEST = ` if [ -f ${srcdir}/runtest$(EXEEXT) ] ; then echo ${srcdir}/runtest$(EXEEXT); else echo "ERROR: runtest not found" ; exit 1; fi`
!
! ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = config.h
! CONFIG_CLEAN_FILES =
! DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
! Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess \
! config.h.in config.sub configure configure.in install-sh ltconfig \
! ltmain.sh missing mkinstalldirs
!
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
!
! TAR = tar
! GZIP_ENV = --best
! EXPECT = expect
! all: all-redirect
! .SUFFIXES:
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
!
! $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
! cd $(srcdir) && $(ACLOCAL)
!
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
! $(SHELL) ./config.status --recheck
! $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
! cd $(srcdir) && $(AUTOCONF)
!
! config.h: stamp-h
! @if test ! -f $@; then \
! rm -f stamp-h; \
! $(MAKE) stamp-h; \
! else :; fi
! stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
! cd $(top_builddir) \
! && CONFIG_FILES= CONFIG_HEADERS=config.h \
! $(SHELL) ./config.status
! @echo timestamp > stamp-h 2> /dev/null
! $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
! @if test ! -f $@; then \
! rm -f $(srcdir)/stamp-h.in; \
! $(MAKE) $(srcdir)/stamp-h.in; \
! else :; fi
! $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOHEADER)
! @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
!
! mostlyclean-hdr:
!
! clean-hdr:
!
! distclean-hdr:
! -rm -f config.h
!
! maintainer-clean-hdr:
!
! # This directory's subdirectories are mostly independent; you can cd
! # into them and run `make' without going through this Makefile.
! # To change the values of `make' variables: instead of editing Makefiles,
! # (1) if the variable is set in `config.status', edit `config.status'
! # (which will cause the Makefiles to be regenerated when you run `make');
! # (2) otherwise, pass the desired values on the `make' command line.
!
! @SET_MAKE@
!
! all-recursive install-data-recursive install-exec-recursive \
! installdirs-recursive install-recursive uninstall-recursive \
! check-recursive installcheck-recursive info-recursive dvi-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
! dot_seen=no; \
! target=`echo $@ | sed s/-recursive//`; \
! list='$(SUBDIRS)'; for subdir in $$list; do \
! echo "Making $$target in $$subdir"; \
! if test "$$subdir" = "."; then \
! dot_seen=yes; \
! local_target="$$target-am"; \
! else \
! local_target="$$target"; \
! fi; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
! done; \
! if test "$$dot_seen" = "no"; then \
! $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
! fi; test -z "$$fail"
!
! mostlyclean-recursive clean-recursive distclean-recursive \
! maintainer-clean-recursive:
! @set fnord $(MAKEFLAGS); amf=$$2; \
! dot_seen=no; \
! rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
! rev="$$subdir $$rev"; \
! test "$$subdir" = "." && dot_seen=yes; \
! done; \
! test "$$dot_seen" = "no" && rev=". $$rev"; \
! target=`echo $@ | sed s/-recursive//`; \
! for subdir in $$rev; do \
! echo "Making $$target in $$subdir"; \
! if test "$$subdir" = "."; then \
! local_target="$$target-am"; \
! else \
! local_target="$$target"; \
! fi; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
! || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
! done && test -z "$$fail"
! tags-recursive:
! list='$(SUBDIRS)'; for subdir in $$list; do \
! test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
! done
!
! tags: TAGS
!
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
!
! TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SUBDIRS)'; for subdir in $$list; do \
! if test "$$subdir" = .; then :; else \
! test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
! fi; \
! done; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
!
! mostlyclean-tags:
!
! clean-tags:
!
! distclean-tags:
! -rm -f TAGS ID
!
! maintainer-clean-tags:
!
! distdir = $(PACKAGE)-$(VERSION)
! top_distdir = $(distdir)
!
! # This target untars the dist file and tries a VPATH configuration. Then
! # it guarantees that the distribution is self-contained by making another
! # tarfile.
! distcheck: dist
! -rm -rf $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
! mkdir $(distdir)/=build
! mkdir $(distdir)/=inst
! dc_install_base=`cd $(distdir)/=inst && pwd`; \
! cd $(distdir)/=build \
! && ../configure --srcdir=.. --prefix=$$dc_install_base \
! && $(MAKE) $(AM_MAKEFLAGS) \
! && $(MAKE) $(AM_MAKEFLAGS) dvi \
! && $(MAKE) $(AM_MAKEFLAGS) check \
! && $(MAKE) $(AM_MAKEFLAGS) install \
! && $(MAKE) $(AM_MAKEFLAGS) installcheck \
! && $(MAKE) $(AM_MAKEFLAGS) dist
! -rm -rf $(distdir)
! @banner="$(distdir).tar.gz is ready for distribution"; \
! dashes=`echo "$$banner" | sed s/./=/g`; \
! echo "$$dashes"; \
! echo "$$banner"; \
! echo "$$dashes"
! dist: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! dist-all: distdir
! -chmod -R a+r $(distdir)
! GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
! -rm -rf $(distdir)
! distdir: $(DISTFILES)
! -rm -rf $(distdir)
! mkdir $(distdir)
! -chmod 777 $(distdir)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
! if test -d $$d/$$file; then \
! cp -pr $$/$$file $(distdir)/$$file; \
! else \
! test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
! fi; \
! done
! for subdir in $(SUBDIRS); do \
! if test "$$subdir" = .; then :; else \
! test -d $(distdir)/$$subdir \
! || mkdir $(distdir)/$$subdir \
! || exit 1; \
! chmod 777 $(distdir)/$$subdir; \
! (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
! || exit 1; \
! fi; \
! done
!
! RUNTESTFLAGS =
!
! DEJATOOL = $(PACKAGE)
!
! RUNTESTDEFAULTFLAGS = --tool $(DEJATOOL) --srcdir $$srcdir
!
! check-DEJAGNU: site.exp
! srcdir=`cd $(srcdir) && pwd`; export srcdir; \
! EXPECT=$(EXPECT); export EXPECT; \
! runtest=$(RUNTEST); \
! if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
! $$runtest $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
! else echo "WARNING: could not find \`runtest'" 1>&2; :;\
! fi
! info-am:
! info: info-recursive
! dvi-am:
! dvi: dvi-recursive
! check-am: all-am
! $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU
! check: check-recursive
! installcheck-am:
! installcheck: installcheck-recursive
! all-recursive-am: config.h
! $(MAKE) $(AM_MAKEFLAGS) all-recursive
!
! install-exec-am:
! install-exec: install-exec-recursive
!
! install-data-am: install-data-local
! install-data: install-data-recursive
!
! install-am: all-am
! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
! install: install-recursive
! uninstall-am:
! uninstall: uninstall-recursive
! all-am: Makefile config.h
! all-redirect: all-recursive-am
! install-strip:
! $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
! installdirs: installdirs-recursive
! installdirs-am:
!
!
! mostlyclean-generic:
!
! clean-generic:
!
! distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
! -rm -f config.cache config.log stamp-h stamp-h[0-9]*
!
! maintainer-clean-generic:
! mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
!
! mostlyclean: mostlyclean-recursive
!
! clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
!
! clean: clean-recursive
!
! distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
! -rm -f libtool
!
! distclean: distclean-recursive
! -rm -f config.status
!
! maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
! maintainer-clean-generic distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
!
! maintainer-clean: maintainer-clean-recursive
! -rm -f config.status
!
! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
! install-data-recursive uninstall-data-recursive install-exec-recursive \
! uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
! all-recursive check-recursive installcheck-recursive info-recursive \
! dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
! maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir check-DEJAGNU \
! info-am info dvi-am dvi check check-am installcheck-am installcheck \
! all-recursive-am install-exec-am install-exec install-data-local \
! install-data-am install-data install-am install uninstall-am uninstall \
! all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
!
!
! install-data-local:
! (cd src/perl/Benson; \
! perl Makefile.PL BENSON_HOME=$(prefix); make ); \
! (cd src/perl/Benson;make install)
clean:
! (cd src/perl/Benson; make clean)
!
! distclean:
! (cd src/perl/Benson; make distclean)
! site.exp: Makefile
! @echo 'Making a new site.exp file...'
! @test ! -f site.bak || rm -f site.bak
! @echo '## these variables are automatically generated by make ##' > $@-t
! @echo '# Do not edit here. If you wish to override these values' >> $-t
! @echo '# edit the last section' >> $@-t
! @echo 'set srcdir $(srcdir)' >> $@-t
! @echo 'set objdir' `pwd` >> $@-t
! @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
! @test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
! @test ! -f site.exp || mv site.exp site.bak
! @mv $@-t site.exp
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
--- 1,17 ----
! TARGETS=make-src make-conf
! all: $(TARGETS)
! make-src:
! (cd src && $(MAKE))
! make-conf:
! (cd conf && $(MAKE))
clean:
! (cd src && $(MAKE) clean)
! distclean: clean
! rm -f Makefile *~
! (cd src && $(MAKE) distclean)
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** configure 29 Sep 2003 18:04:09 -0000 1.53
--- configure 30 Sep 2003 03:18:01 -0000 1.54
***************
*** 309,313 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA sedpath trpath uniqpath sortpath unamepath arpath PERL END EGREP perlpath PERL_CFLAGS PERL_LDFLAGS pythonpath tclpath LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 309,313 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 2861,2864 ****
--- 2861,2903 ----
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ # Extract the first word of "grep", so it can be a program name with args.
+ set dummy grep; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_greppath+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $greppath in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_greppath="$greppath" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_greppath="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
+ ;;
+ esac
+ fi
+ greppath=$ac_cv_path_greppath
+
+ if test -n "$greppath"; then
+ echo "$as_me:$LINENO: result: $greppath" >&5
+ echo "${ECHO_T}$greppath" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
***************
*** 3206,3214 ****
--- 3245,3257 ----
*linux*)
CONF_DLFLAGS=-rdynamic
+ CONF_PIC=-fpic
;;
*solaris*|*sunos*)
+ CONF_PIC=-fpic
;;
esac
+
+
if test X"$CONF_LIBNSL" = Xyes; then
***************
*** 5507,5513 ****
echo "$as_me:$LINENO: checking for Perl compile flags" >&5
echo $ECHO_N "checking for Perl compile flags... $ECHO_C" >&6
-
-
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
echo "$as_me:$LINENO: result: not found, building without Perl." >&5
--- 5550,5555 ----
echo "$as_me:$LINENO: checking for Perl compile flags" >&5
echo $ECHO_N "checking for Perl compile flags... $ECHO_C" >&6
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+
if test "_$PERL_CFLAGS" = _ ; then
echo "$as_me:$LINENO: result: not found, building without Perl." >&5
***************
*** 5516,5531 ****
exit
else
! PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
! if test "$system" = "Linux"; then
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
! fi
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
! # CFLAGS="$CFLAGS $PERL_CFLAGS"
! # LIBS="$LIBS $PERL_LDFLAGS"
fi
fi
--- 5558,5572 ----
exit
else
! PERL_LDOPTS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'`
! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-l' | $trpath '\n' ' '`
! PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '`
! PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '`
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
!
!
!
fi
fi
***************
*** 5639,5645 ****
fi
! LIBS=`echo "$LIBS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
if test X"$use_debug" = Xyes; then
--- 5680,5690 ----
fi
! LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
!
! ALL_LIBS="$LIBS $PERL_LIBS"
! ALL_LIBS=`echo $ALL_LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
!
if test X"$use_debug" = Xyes; then
***************
*** 6305,6308 ****
--- 6350,6354 ----
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+ s,@greppath@,$greppath,;t t
s,@sedpath@,$sedpath,;t t
s,@trpath@,$trpath,;t t
***************
*** 6313,6322 ****
--- 6359,6372 ----
s,@PERL@,$PERL,;t t
s,@END@,$END,;t t
+ s,@CONF_PIC@,$CONF_PIC,;t t
s,@EGREP@,$EGREP,;t t
s,@perlpath@,$perlpath,;t t
s,@PERL_CFLAGS@,$PERL_CFLAGS,;t t
+ s,@PERL_LIBS@,$PERL_LIBS,;t t
s,@PERL_LDFLAGS@,$PERL_LDFLAGS,;t t
+ s,@PERL_SLIBS@,$PERL_SLIBS,;t t
s,@pythonpath@,$pythonpath,;t t
s,@tclpath@,$tclpath,;t t
+ s,@ALL_LIBS@,$ALL_LIBS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** configure.ac 29 Sep 2003 18:04:09 -0000 1.2
--- configure.ac 30 Sep 2003 03:18:01 -0000 1.3
***************
*** 13,16 ****
--- 13,17 ----
AC_PROG_RANLIB
AC_PROG_INSTALL
+ AC_PATH_PROG(greppath, grep)
AC_PATH_PROG(sedpath, sed)
AC_PATH_PROG(trpath, tr)
***************
*** 29,36 ****
--- 30,41 ----
*linux*)
CONF_DLFLAGS=-rdynamic
+ CONF_PIC=-fpic
;;
*solaris*|*sunos*)
+ CONF_PIC=-fpic
;;
esac
+ AC_SUBST(CONF_PIC)
+
if test X"$CONF_LIBNSL" = Xyes; then
***************
*** 110,116 ****
AC_MSG_RESULT($PERL_VERSION)
AC_MSG_CHECKING(for Perl compile flags)
- AC_SUBST(PERL_CFLAGS)
- AC_SUBST(PERL_LDFLAGS)
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
AC_MSG_RESULT([not found, building without Perl.])
--- 115,120 ----
AC_MSG_RESULT($PERL_VERSION)
AC_MSG_CHECKING(for Perl compile flags)
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+ AC_SUBST(PERL_CFLAGS)
if test "_$PERL_CFLAGS" = _ ; then
AC_MSG_RESULT([not found, building without Perl.])
***************
*** 118,132 ****
exit
else
! PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
! if test "$system" = "Linux"; then
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
! fi
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
AC_MSG_RESULT(ok)
! # CFLAGS="$CFLAGS $PERL_CFLAGS"
! # LIBS="$LIBS $PERL_LDFLAGS"
fi
fi
--- 122,135 ----
exit
else
! PERL_LDOPTS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'`
! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-l' | $trpath '\n' ' '`
! PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '`
! PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '`
AC_MSG_RESULT(ok)
! AC_SUBST(PERL_LIBS)
! AC_SUBST(PERL_LDFLAGS)
! AC_SUBST(PERL_SLIBS)
fi
fi
***************
*** 157,163 ****
fi
! LIBS=`echo "$LIBS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
if test X"$use_debug" = Xyes; then
--- 160,170 ----
fi
! LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
!
! ALL_LIBS="$LIBS $PERL_LIBS"
! ALL_LIBS=`echo $ALL_LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
! AC_SUBST(ALL_LIBS)
if test X"$use_debug" = Xyes; then
--- Makefile.am DELETED ---
|
|
From: Bob T. <bt...@us...> - 2003-09-30 03:18:09
|
Update of /cvsroot/benson/benson3/conf
In directory sc8-pr-cvs1:/tmp/cvs-serv18133/conf
Modified Files:
Makefile.in
Log Message:
More changes to the build environment.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/conf/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Makefile.in 24 Feb 2003 07:43:02 -0000 1.10
--- Makefile.in 30 Sep 2003 03:18:02 -0000 1.11
***************
*** 1,338 ****
! # Makefile.in generated by automake 1.7 from Makefile.am.
! # @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
! # This Makefile.in is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
!
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! # PARTICULAR PURPOSE.
!
! @SET_MAKE@
!
! srcdir = @srcdir@
! top_srcdir = @top_srcdir@
! VPATH = @srcdir@
! pkgdatadir = $(datadir)/@PACKAGE@
! pkglibdir = $(libdir)/@PACKAGE@
! pkgincludedir = $(includedir)/@PACKAGE@
! top_builddir = ..
!
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
! INSTALL = @INSTALL@
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
! NORMAL_INSTALL = :
! PRE_INSTALL = :
! POST_INSTALL = :
! NORMAL_UNINSTALL = :
! PRE_UNINSTALL = :
! POST_UNINSTALL = :
! host_triplet = @host@
! ACLOCAL = @ACLOCAL@
! AMDEP_FALSE = @AMDEP_FALSE@
! AMDEP_TRUE = @AMDEP_TRUE@
! AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
! AWK = @AWK@
! CC = @CC@
! CCDEPMODE = @CCDEPMODE@
! CFLAGS = @CFLAGS@
! CPP = @CPP@
! CPPFLAGS = @CPPFLAGS@
! CYGPATH_W = @CYGPATH_W@
! DEFS = @DEFS@
! DEPDIR = @DEPDIR@
! ECHO = @ECHO@
! ECHO_C = @ECHO_C@
! ECHO_N = @ECHO_N@
! ECHO_T = @ECHO_T@
! EGREP = @EGREP@
! EXEEXT = @EXEEXT@
! HAVE_X11 = @HAVE_X11@
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
! LDFLAGS = @LDFLAGS@
! LIBOBJS = @LIBOBJS@
! LIBS = @LIBS@
! LIBTOOL = @LIBTOOL@
! LIBTOOL_DEPS = @LIBTOOL_DEPS@
! LIBTOOL_VERSION = @LIBTOOL_VERSION@
! LN_S = @LN_S@
! LTLIBOBJS = @LTLIBOBJS@
! MAINT = @MAINT@
! MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
! MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
! MAKEINFO = @MAKEINFO@
! OBJEXT = @OBJEXT@
! PACKAGE = @PACKAGE@
! PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
! PACKAGE_NAME = @PACKAGE_NAME@
! PACKAGE_STRING = @PACKAGE_STRING@
! PACKAGE_TARNAME = @PACKAGE_TARNAME@
! PACKAGE_VERSION = @PACKAGE_VERSION@
! PATH_SEPARATOR = @PATH_SEPARATOR@
! PERL_CFLAGS = @PERL_CFLAGS@
! PERL_LDFLAGS = @PERL_LDFLAGS@
! RANLIB = @RANLIB@
! SET_MAKE = @SET_MAKE@
! SHELL = @SHELL@
! STRIP = @STRIP@
! VERSION = @VERSION@
! X_CFLAGS = @X_CFLAGS@
! X_EXTRA_LIBS = @X_EXTRA_LIBS@
! X_LIBS = @X_LIBS@
! X_PRE_LIBS = @X_PRE_LIBS@
! ac_ct_CC = @ac_ct_CC@
! ac_ct_RANLIB = @ac_ct_RANLIB@
! ac_ct_STRIP = @ac_ct_STRIP@
! am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
! am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
! am__include = @am__include@
! am__quote = @am__quote@
! bindir = @bindir@
! build = @build@
! build_alias = @build_alias@
! build_cpu = @build_cpu@
! build_os = @build_os@
! build_vendor = @build_vendor@
! datadir = @datadir@
! exec_prefix = @exec_prefix@
! host = @host@
! host_alias = @host_alias@
! host_cpu = @host_cpu@
! host_os = @host_os@
! host_vendor = @host_vendor@
! includedir = @includedir@
! infodir = @infodir@
! install_sh = @install_sh@
! libdir = @libdir@
! libexecdir = @libexecdir@
! localstatedir = @localstatedir@
! mandir = @mandir@
! oldincludedir = @oldincludedir@
! perlpath = @perlpath@
! prefix = @prefix@
! program_transform_name = @program_transform_name@
! pythonpath = @pythonpath@
! sbindir = @sbindir@
! sedpath = @sedpath@
! sharedstatedir = @sharedstatedir@
! sortpath = @sortpath@
! sysconfdir = @sysconfdir@
! target_alias = @target_alias@
! tclpath = @tclpath@
! trpath = @trpath@
! unamepath = @unamepath@
! uniqpath = @uniqpath@
! noinst_DATA = benson.conf autoack.conf email.conf diskmon.conf rules.conf procmon.conf
! subdir = conf
! mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! DIST_SOURCES =
! DATA = $(noinst_DATA)
!
! DIST_COMMON = Makefile.am Makefile.in
! all: all-am
!
! .SUFFIXES:
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu conf/Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
!
! mostlyclean-libtool:
! -rm -f *.lo
!
! clean-libtool:
! -rm -rf .libs _libs
!
! distclean-libtool:
! -rm -f libtool
! uninstall-info-am:
! tags: TAGS
! TAGS:
!
! ctags: CTAGS
! CTAGS:
!
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
!
! top_distdir = ..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
!
! distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! esac; \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
! if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
! else \
! test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
! fi; \
! done
! check-am: all-am
! check: check-am
! all-am: Makefile $(DATA)
!
! installdirs:
!
! install: install-am
! install-exec: install-exec-am
! install-data: install-data-am
! uninstall: uninstall-am
!
! install-am: all-am
! @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
!
! installcheck: installcheck-am
! install-strip:
! $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
! INSTALL_STRIP_FLAG=-s \
! `test -z '$(STRIP)' || \
! echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
! mostlyclean-generic:
!
! clean-generic:
!
! distclean-generic:
! -rm -f Makefile $(CONFIG_CLEAN_FILES)
!
! maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
!
! clean-am: clean-generic clean-libtool mostlyclean-am
!
! distclean: distclean-am
!
! distclean-am: clean-am distclean-generic distclean-libtool
!
! dvi: dvi-am
!
! dvi-am:
!
! info: info-am
!
! info-am:
!
! install-data-am:
!
! install-exec-am:
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
!
! maintainer-clean: maintainer-clean-am
!
! maintainer-clean-am: distclean-am maintainer-clean-generic
!
! mostlyclean: mostlyclean-am
!
! mostlyclean-am: mostlyclean-generic mostlyclean-libtool
!
! pdf: pdf-am
!
! pdf-am:
!
! ps: ps-am
!
! ps-am:
!
! uninstall-am: uninstall-info-am
!
! .PHONY: all all-am check check-am clean clean-generic clean-libtool \
! distclean distclean-generic distclean-libtool distdir dvi \
! dvi-am info info-am install install-am install-data \
! install-data-am install-exec install-exec-am install-info \
! install-info-am install-man install-strip installcheck \
! installcheck-am installdirs maintainer-clean \
! maintainer-clean-generic mostlyclean mostlyclean-generic \
! mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
! uninstall-info-am
!
!
! distclean:
! test -z benson.conf || rm -f benson.conf; \
! test -z email.conf || rm -f email.conf; \
! test -z diskmon.conf || rm -f diskmon.conf; \
! test -z rules.conf || rm -f rules.conf; \
! test -z procmon.conf || rm -f procmon.conf; \
! test -z autoack.conf || rm -f autoack.conf;
! clean:
! test -z benson.conf || rm -f benson.conf; \
! test -z email.conf || rm -f email.conf; \
! test -z diskmon.conf || rm -f diskmon.conf; \
! test -z rules.conf || rm -f rules.conf; \
! test -z procmon.conf || rm -f procmon.conf; \
! test -z autoack.conf || rm -f autoack.conf;
!
! install-exec-am:
! $(mkinstalldirs) $(prefix)/etc; \
! $(mkinstalldirs) $(prefix)/logs; \
! if [ ! -f "$(sysconfdir)/benson.conf" ]; then \
! cp benson.conf $(sysconfdir)/; \
! else \
! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/benson.conf]"; \
! fi; \
! if [ ! -f "$(sysconfdir)/email.conf" ]; then \
! cp email.conf $(sysconfdir)/; \
! else \
! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/email.conf]"; \
! fi; \
! if [ ! -f "$(sysconfdir)/diskmon.conf" ]; then \
! cp diskmon.conf $(sysconfdir)/; \
! else \
! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/diskmon.conf]"; \
! fi; \
! if [ ! -f "$(sysconfdir)/rules.conf" ]; then \
! cp rules.conf $(sysconfdir)/; \
! else \
! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/rules.conf]"; \
! fi; \
! if [ ! -f "$(sysconfdir)/procmon.conf" ]; then \
! cp procmon.conf $(sysconfdir)/; \
! else \
! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/procmon.conf]"; \
! fi; \
! if [ ! -f "$(sysconfdir)/autoack.conf" ]; then \
! cp autoack.conf $(sysconfdir)/; \
! else \
! echo "[PRESERVING EXISTING CONFIG FILE: $(sysconfdir)/autoack.conf]"; \
! fi; \
! exit;
benson.conf: benson.conf.tmpl
--- 1,23 ----
! prefix=@prefix@
! sysconfdir=@sysconfdir@
! srcdir=@srcdir@
! top_srcdir=@top_srcdir@
!
! CC=@CC@
! LD=@LD@
! CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/src/perl @CFLAGS@
! PERL_CFLAGS=@PERL_CFLAGS@
! PERL_LDFLAGS=@PERL_LDFLAGS@
! CPPFLAGS=@CPPFLAGS@ @DEFS@
! LIBS=@LIBS@
! AR=@arpath@
! RANLIB=@RANLIB@
! INSTALL=@INSTALL@
! LDFLAGS=-L. @LDFLAGS@
! TARGETS=benson.conf email.conf diskmon.conf rules.conf procmon.conf autoack.conf
!
! all: $(TARGETS)
benson.conf: benson.conf.tmpl
***************
*** 342,345 ****
--- 27,33 ----
cat email.conf.tmpl > email.conf
+ diskmon.conf: diskmon.conf.tmpl
+ cat diskmon.conf.tmpl > diskmon.conf
+
rules.conf: rules.conf.tmpl
cat rules.conf.tmpl > rules.conf
***************
*** 351,357 ****
cat autoack.conf.tmpl > autoack.conf
! diskmon.conf: diskmon.conf.tmpl
! cat diskmon.conf.tmpl > diskmon.conf
! # Tell versions [3.59,3.63) of GNU make to not export all variables.
! # Otherwise a system limit (for SysV at least) may be exceeded.
! .NOEXPORT:
--- 39,55 ----
cat autoack.conf.tmpl > autoack.conf
! install: $(TARGETS)
! $(top_srcdir)/mkinstalldirs $(sysconfdir)
! $(INSTALL) -m 0644 benson.conf $(sysconfdir)
! $(INSTALL) -m 0644 email.conf $(sysconfdir)
! $(INSTALL) -m 0644 diskmon.conf $(sysconfdir)
! $(INSTALL) -m 0644 rules.conf $(sysconfdir)
! $(INSTALL) -m 0644 procmon.conf $(sysconfdir)
! $(INSTALL) -m 0644 autoack.conf $(sysconfdir)
!
! clean:
! rm -f *.conf
!
! distclean: clean
! rm -f Makefile *~ *.conf
!
|
|
From: Bob T. <bt...@us...> - 2003-09-30 03:18:08
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv18133/autom4te.cache
Modified Files:
output.0 requests traces.0
Log Message:
More changes to the build environment.
Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** output.0 29 Sep 2003 18:04:09 -0000 1.5
--- output.0 30 Sep 2003 03:18:02 -0000 1.6
***************
*** 309,313 ****
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA sedpath trpath uniqpath sortpath unamepath arpath PERL END EGREP perlpath PERL_CFLAGS PERL_LDFLAGS pythonpath tclpath LIB@&t@OBJS LTLIBOBJS'
ac_subst_files=''
--- 309,313 ----
#endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os AWK CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA greppath sedpath trpath uniqpath sortpath unamepath arpath PERL END CONF_PIC EGREP perlpath PERL_CFLAGS PERL_LIBS PERL_LDFLAGS PERL_SLIBS pythonpath tclpath ALL_LIBS LIB@&t@OBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 2861,2864 ****
--- 2861,2903 ----
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ # Extract the first word of "grep", so it can be a program name with args.
+ set dummy grep; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_greppath+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ case $greppath in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_greppath="$greppath" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_greppath="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+
+ ;;
+ esac
+ fi
+ greppath=$ac_cv_path_greppath
+
+ if test -n "$greppath"; then
+ echo "$as_me:$LINENO: result: $greppath" >&5
+ echo "${ECHO_T}$greppath" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
# Extract the first word of "sed", so it can be a program name with args.
set dummy sed; ac_word=$2
***************
*** 3206,3214 ****
--- 3245,3257 ----
*linux*)
CONF_DLFLAGS=-rdynamic
+ CONF_PIC=-fpic
;;
*solaris*|*sunos*)
+ CONF_PIC=-fpic
;;
esac
+
+
if test X"$CONF_LIBNSL" = Xyes; then
***************
*** 5507,5513 ****
echo "$as_me:$LINENO: checking for Perl compile flags" >&5
echo $ECHO_N "checking for Perl compile flags... $ECHO_C" >&6
-
-
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
echo "$as_me:$LINENO: result: not found, building without Perl." >&5
--- 5550,5555 ----
echo "$as_me:$LINENO: checking for Perl compile flags" >&5
echo $ECHO_N "checking for Perl compile flags... $ECHO_C" >&6
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+
if test "_$PERL_CFLAGS" = _ ; then
echo "$as_me:$LINENO: result: not found, building without Perl." >&5
***************
*** 5516,5531 ****
exit
else
! PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
! if test "$system" = "Linux"; then
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
! fi
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
! # CFLAGS="$CFLAGS $PERL_CFLAGS"
! # LIBS="$LIBS $PERL_LDFLAGS"
fi
fi
--- 5558,5572 ----
exit
else
! PERL_LDOPTS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-ldb //'`
! PERL_LDOPTS=`echo $PERL_LDOPTS |$sedpath 's/-lndbm //'`
! PERL_LIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-l' | $trpath '\n' ' '`
! PERL_LDFLAGS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath '^\-L' | $trpath '\n' ' '`
! PERL_SLIBS=`echo $PERL_LDOPTS | $trpath ' ' '\n' | $sortpath | $uniqpath | $greppath 'Dyna' | $trpath '\n' ' '`
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
!
!
!
fi
fi
***************
*** 5639,5645 ****
fi
! LIBS=`echo "$LIBS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
if test X"$use_debug" = Xyes; then
--- 5680,5690 ----
fi
! LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
! CFLAGS=`echo "$CFLAGS" | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
!
! ALL_LIBS="$LIBS $PERL_LIBS"
! ALL_LIBS=`echo $ALL_LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
!
if test X"$use_debug" = Xyes; then
***************
*** 6305,6308 ****
--- 6350,6354 ----
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+ s,@greppath@,$greppath,;t t
s,@sedpath@,$sedpath,;t t
s,@trpath@,$trpath,;t t
***************
*** 6313,6322 ****
--- 6359,6372 ----
s,@PERL@,$PERL,;t t
s,@END@,$END,;t t
+ s,@CONF_PIC@,$CONF_PIC,;t t
s,@EGREP@,$EGREP,;t t
s,@perlpath@,$perlpath,;t t
s,@PERL_CFLAGS@,$PERL_CFLAGS,;t t
+ s,@PERL_LIBS@,$PERL_LIBS,;t t
s,@PERL_LDFLAGS@,$PERL_LDFLAGS,;t t
+ s,@PERL_SLIBS@,$PERL_SLIBS,;t t
s,@pythonpath@,$pythonpath,;t t
s,@tclpath@,$tclpath,;t t
+ s,@ALL_LIBS@,$ALL_LIBS,;t t
s,@LIB@&t@OBJS@,$LIB@&t@OBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** requests 29 Sep 2003 18:04:09 -0000 1.11
--- requests 30 Sep 2003 03:18:02 -0000 1.12
***************
*** 17,33 ****
{
'm4_pattern_forbid' => 1,
- 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
- 'AC_HEADER_TIME' => 1,
'AC_FUNC_WAIT3' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_TM' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
--- 17,33 ----
{
'm4_pattern_forbid' => 1,
'AC_C_VOLATILE' => 1,
+ 'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_FUNC_WAIT3' => 1,
! 'AC_HEADER_TIME' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_GETMNTENT' => 1,
+ 'AC_TYPE_MODE_T' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
***************
*** 52,59 ****
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
--- 52,59 ----
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
***************
*** 80,86 ****
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
- 'AC_C_CONST' => 1,
- 'AC_PROG_LEX' => 1,
'AC_TYPE_PID_T' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
--- 80,86 ----
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
'AC_TYPE_PID_T' => 1,
+ 'AC_PROG_LEX' => 1,
+ 'AC_C_CONST' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
***************
*** 88,93 ****
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
--- 88,93 ----
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
***************
*** 96,106 ****
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
--- 96,106 ----
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_FUNC_MKTIME' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
Index: traces.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/traces.0,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** traces.0 29 Sep 2003 18:04:09 -0000 1.5
--- traces.0 30 Sep 2003 03:18:02 -0000 1.6
***************
*** 94,235 ****
m4trace:configure.ac:14: -1- AC_SUBST([INSTALL_SCRIPT])
m4trace:configure.ac:14: -1- AC_SUBST([INSTALL_DATA])
! m4trace:configure.ac:15: -1- AC_SUBST([sedpath], [$ac_cv_path_sedpath])
! m4trace:configure.ac:16: -1- AC_SUBST([trpath], [$ac_cv_path_trpath])
! m4trace:configure.ac:17: -1- AC_SUBST([uniqpath], [$ac_cv_path_uniqpath])
! m4trace:configure.ac:18: -1- AC_SUBST([sortpath], [$ac_cv_path_sortpath])
! m4trace:configure.ac:19: -1- AC_SUBST([unamepath], [$ac_cv_path_unamepath])
! m4trace:configure.ac:20: -1- AC_SUBST([arpath], [$ac_cv_path_arpath])
! m4trace:configure.ac:21: -1- AC_SUBST([PERL])
! m4trace:configure.ac:22: -1- AC_SUBST([END], [$ac_cv_path_END])
! m4trace:configure.ac:24: -1- AC_CHECK_LIB([m], [open])
! m4trace:configure.ac:24: -1- AH_OUTPUT([HAVE_LIBM], [/* Define to 1 if you have the `m\' library (-lm). */
#undef HAVE_LIBM])
! m4trace:configure.ac:24: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBM])
! m4trace:configure.ac:37: -1- AC_CHECK_LIB([nsl], [open], [], [], [-lsocket])
! m4trace:configure.ac:37: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:37: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:50: -1- AC_DEFINE_TRACE_LITERAL([BENSON_HOME])
! m4trace:configure.ac:50: -1- AH_OUTPUT([BENSON_HOME], [/* "Benson home directory" */
#undef BENSON_HOME])
! m4trace:configure.ac:51: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.ac:51: -1- AH_OUTPUT([PACKAGE], [/* "Benson package name" */
#undef PACKAGE])
! m4trace:configure.ac:52: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.ac:52: -1- AH_OUTPUT([VERSION], [/* "Benson version number" */
#undef VERSION])
! m4trace:configure.ac:74: -1- AC_CHECK_HEADERS([expat.h])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
#undef HAVE_EXPAT_H])
! m4trace:configure.ac:74: -1- AC_HEADER_STDC
! m4trace:configure.ac:74: -1- AC_SUBST([EGREP])
! m4trace:configure.ac:74: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
! m4trace:configure.ac:74: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS])
! m4trace:configure.ac:74: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H])
! m4trace:configure.ac:74: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H])
! m4trace:configure.ac:75: -1- AC_CHECK_HEADERS([openssl/ssl.h])
! m4trace:configure.ac:75: -1- AH_OUTPUT([HAVE_OPENSSL_SSL_H], [/* Define to 1 if you have the <openssl/ssl.h> header file. */
#undef HAVE_OPENSSL_SSL_H])
! m4trace:configure.ac:76: -1- AC_CHECK_HEADERS([signal.h])
! m4trace:configure.ac:76: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
#undef HAVE_SIGNAL_H])
! m4trace:configure.ac:77: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:77: -1- AH_OUTPUT([HAVE_SYS_SHM_H], [/* Define to 1 if you have the <sys/shm.h> header file. */
#undef HAVE_SYS_SHM_H])
! m4trace:configure.ac:78: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:78: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:79: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H])
! m4trace:configure.ac:80: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:80: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
#undef HAVE_DB_H])
! m4trace:configure.ac:81: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:81: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:82: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:83: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:83: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
#undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:83: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:84: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
#undef HAVE_LIBSOCKET])
! m4trace:configure.ac:84: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:85: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:85: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
#undef HAVE_LIBDL])
! m4trace:configure.ac:85: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:86: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:86: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
#undef HAVE_LIBDLD])
! m4trace:configure.ac:86: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:87: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
#undef HAVE_LIBLD])
! m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:88: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
#undef HAVE_LIBW])
! m4trace:configure.ac:88: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:89: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
#undef HAVE_LIBDB])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
#undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
#undef HAVE_LIBSSL])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
#undef HAVE_LIBEXPAT])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
! m4trace:configure.ac:98: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
#undef SUNOS])
! m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:101: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:103: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:103: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:107: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:112: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:113: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:136: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:142: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:178: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
src/network/Makefile src/perl/Makefile src/rules/Makefile \
--- 94,240 ----
m4trace:configure.ac:14: -1- AC_SUBST([INSTALL_SCRIPT])
m4trace:configure.ac:14: -1- AC_SUBST([INSTALL_DATA])
! m4trace:configure.ac:15: -1- AC_SUBST([greppath], [$ac_cv_path_greppath])
! m4trace:configure.ac:16: -1- AC_SUBST([sedpath], [$ac_cv_path_sedpath])
! m4trace:configure.ac:17: -1- AC_SUBST([trpath], [$ac_cv_path_trpath])
! m4trace:configure.ac:18: -1- AC_SUBST([uniqpath], [$ac_cv_path_uniqpath])
! m4trace:configure.ac:19: -1- AC_SUBST([sortpath], [$ac_cv_path_sortpath])
! m4trace:configure.ac:20: -1- AC_SUBST([unamepath], [$ac_cv_path_unamepath])
! m4trace:configure.ac:21: -1- AC_SUBST([arpath], [$ac_cv_path_arpath])
! m4trace:configure.ac:22: -1- AC_SUBST([PERL])
! m4trace:configure.ac:23: -1- AC_SUBST([END], [$ac_cv_path_END])
! m4trace:configure.ac:25: -1- AC_CHECK_LIB([m], [open])
! m4trace:configure.ac:25: -1- AH_OUTPUT([HAVE_LIBM], [/* Define to 1 if you have the `m\' library (-lm). */
#undef HAVE_LIBM])
! m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBM])
! m4trace:configure.ac:38: -1- AC_SUBST([CONF_PIC])
! m4trace:configure.ac:42: -1- AC_CHECK_LIB([nsl], [open], [], [], [-lsocket])
! m4trace:configure.ac:42: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:42: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:55: -1- AC_DEFINE_TRACE_LITERAL([BENSON_HOME])
! m4trace:configure.ac:55: -1- AH_OUTPUT([BENSON_HOME], [/* "Benson home directory" */
#undef BENSON_HOME])
! m4trace:configure.ac:56: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.ac:56: -1- AH_OUTPUT([PACKAGE], [/* "Benson package name" */
#undef PACKAGE])
! m4trace:configure.ac:57: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.ac:57: -1- AH_OUTPUT([VERSION], [/* "Benson version number" */
#undef VERSION])
! m4trace:configure.ac:79: -1- AC_CHECK_HEADERS([expat.h])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
#undef HAVE_EXPAT_H])
! m4trace:configure.ac:79: -1- AC_HEADER_STDC
! m4trace:configure.ac:79: -1- AC_SUBST([EGREP])
! m4trace:configure.ac:79: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
! m4trace:configure.ac:79: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS])
! m4trace:configure.ac:79: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H])
! m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H])
! m4trace:configure.ac:80: -1- AC_CHECK_HEADERS([openssl/ssl.h])
! m4trace:configure.ac:80: -1- AH_OUTPUT([HAVE_OPENSSL_SSL_H], [/* Define to 1 if you have the <openssl/ssl.h> header file. */
#undef HAVE_OPENSSL_SSL_H])
! m4trace:configure.ac:81: -1- AC_CHECK_HEADERS([signal.h])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
#undef HAVE_SIGNAL_H])
! m4trace:configure.ac:82: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_SYS_SHM_H], [/* Define to 1 if you have the <sys/shm.h> header file. */
#undef HAVE_SYS_SHM_H])
! m4trace:configure.ac:83: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:83: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H])
! m4trace:configure.ac:84: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H])
! m4trace:configure.ac:85: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:85: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
#undef HAVE_DB_H])
! m4trace:configure.ac:86: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:86: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:86: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:87: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:88: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
#undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:88: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:89: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
#undef HAVE_LIBSOCKET])
! m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
#undef HAVE_LIBDL])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
#undef HAVE_LIBDLD])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
#undef HAVE_LIBLD])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
#undef HAVE_LIBW])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
#undef HAVE_LIBDB])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:96: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
#undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
#undef HAVE_LIBSSL])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
#undef HAVE_LIBEXPAT])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
! m4trace:configure.ac:103: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
! m4trace:configure.ac:103: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
#undef SUNOS])
! m4trace:configure.ac:106: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:106: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:108: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:112: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:118: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:131: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:132: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:133: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:139: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:145: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:168: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:185: -1- AC_CONFIG_FILES([Makefile man/Makefile handlers/Makefile conf/Makefile \
include/Makefile scripts/Makefile scripts/cgi/Makefile src/Makefile \
src/network/Makefile src/perl/Makefile src/rules/Makefile \
***************
*** 237,240 ****
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:178: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:178: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
--- 242,245 ----
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:185: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:185: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
|
From: Bob T. <bt...@us...> - 2003-09-30 03:18:08
|
Update of /cvsroot/benson/benson3/src In directory sc8-pr-cvs1:/tmp/cvs-serv18133/src Modified Files: Makefile.in Log Message: More changes to the build environment. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.in,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -r1.43 -r1.44 *** Makefile.in 29 Sep 2003 18:04:09 -0000 1.43 --- Makefile.in 30 Sep 2003 03:18:02 -0000 1.44 *************** *** 13,19 **** CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/src/perl @CFLAGS@ PERL_CFLAGS=@PERL_CFLAGS@ ! PERL_LDFLAGS=@PERL_LDFLAGS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ ! LIBS=@LIBS@ AR=@arpath@ RANLIB=@RANLIB@ --- 13,19 ---- CFLAGS=-I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/src/perl @CFLAGS@ PERL_CFLAGS=@PERL_CFLAGS@ ! PERL_LDFLAGS=@PERL_LDFLAGS@ @PERL_SLIBS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ ! LIBS=@LIBS@ @PERL_LIBS@ AR=@arpath@ RANLIB=@RANLIB@ |
