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-11-08 21:05:20
|
Update of /cvsroot/benson/benson3/handlers In directory sc8-pr-cvs1:/tmp/cvs-serv14518/handlers Removed Files: Makefile.am Log Message: Added the v32 changes. --- Makefile.am DELETED --- |
|
From: Bob T. <bt...@us...> - 2003-11-08 21:05:20
|
Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14518/src
Modified Files:
error.c utils.c
Log Message:
Added the v32 changes.
Index: error.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/error.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** error.c 26 Jan 2003 20:55:38 -0000 1.8
--- error.c 8 Nov 2003 21:05:16 -0000 1.9
***************
*** 61,63 ****
--- 61,64 ----
{
fprintf(stderr,"%s\n",string);
+ return 0;
}
Index: utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/utils.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** utils.c 8 Nov 2003 20:43:19 -0000 1.18
--- utils.c 8 Nov 2003 21:05:16 -0000 1.19
***************
*** 79,82 ****
--- 79,83 ----
sequence = 0;
}
+ return 0;
}
|
Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv10656
Modified Files:
Makefile.in acknowledge.c alertlist.c bensond.c bn_monitor.c
bn_network.c bsm.c btrap.c stack.c stack.h utils.c
Log Message:
Fixed a whole lot of warnings.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** Makefile.in 30 Sep 2003 04:43:38 -0000 1.46
--- Makefile.in 8 Nov 2003 20:43:19 -0000 1.47
***************
*** 54,58 ****
$(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)
--- 54,58 ----
$(CC) $(CFLAGS) $(CPPFLAGS) -o btrap btrap.c libbenson.a $(LIBNETCLIENT) $(LIBS)
! ack: libbenson.a $(LIBPERL) $(LIBNETWORK) acknowledge.c
$(CC) $(CFLAGS) $(CPPFLAGS) -o ack acknowledge.c libbenson.a $(LIBNETCLIENT) $(LIBS)
Index: acknowledge.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/acknowledge.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** acknowledge.c 8 Oct 2003 02:59:12 -0000 1.8
--- acknowledge.c 8 Nov 2003 20:43:19 -0000 1.9
***************
*** 7,12 ****
--- 7,40 ----
#include "benson/benson.h"
+ #include "benson/cfgctl.h"
#include "network/network.h"
+ void usage(char *command, int verbose)
+ {
+ if(verbose) {
+ printf("Benson Distributed Monitoring System (%s %s)\n", PACKAGE, VERSION);
+ printf("Copyright (C) 1999, 2000, 2001, 2002, 2003 Bob Tribit\n\n");
+ printf("This program is distributed in the hope that it will be useful,\n");
+ printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
+ printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n");
+ printf("GNU General Public License for more details.\n\n");
+ }
+ printf("Usage: %s [options] agent subsystem\n", command);
+ printf("Acknowledges an alert by agent and subsystem in the Benson collector system.\n");
+ printf("NOTE: Can still be acknowledged with identity, requires -i flag though\n\n");
+ #ifdef HAVE_SSL
+ printf(" -c cert.pem path to this agents SSL certificate\n");
+ printf(" -k key.pem path to this agents SSL key\n");
+ #endif
+ printf(" -s srcaddr source address for trap\n");
+ printf(" -d destaddr destination address for trap\n");
+ printf(" -i identity benson trap identity\n");
+ printf(" -v verbose output\n");
+ printf(" -V display version information\n\n");
+ printf("Report bugs to <ben...@ne...>\n");
+
+ }
+
+
int main(int argc, char *argv[], char *env[]) {
int index = 0;
***************
*** 16,27 ****
int version = 0;
int port = 0;
! int have_source = 0, have_destination = 0;
char temp[DVALUE_LENGTH];
char source[AGT_MAXSIZE], destination[DST_MAXSIZE];
char identity[ID_MAXSIZE];
char certfile[FILE_MAXSIZE], keyfile[FILE_MAXSIZE];
- char config_file[FILE_MAXSIZE];
! while((c = getopt(argc,argv,"Vvd:s:c:k:")) != -1) {
switch(c)
{
--- 44,55 ----
int version = 0;
int port = 0;
! int have_source = 0, have_destination = 0, have_identity;
char temp[DVALUE_LENGTH];
char source[AGT_MAXSIZE], destination[DST_MAXSIZE];
char identity[ID_MAXSIZE];
+ char agent[AGT_MAXSIZE], subsystem[SUB_MAXSIZE];
char certfile[FILE_MAXSIZE], keyfile[FILE_MAXSIZE];
! while((c = getopt(argc,argv,"Vvd:s:c:k:i:")) != -1) {
switch(c)
{
***************
*** 42,45 ****
--- 70,77 ----
have_destination = 1;
break;
+ case 'i':
+ safe_insert(identity, optarg, ID_MAXSIZE);
+ have_identity = 1;
+ break;
case 'v':
verbose = 1;
***************
*** 54,70 ****
if(!verbose) {
freopen("/dev/null", "a+", stderr);
}
if((rc = load_config()) == ERROR) {
! printf("Error loading configuration file.\n");
! exit(EXIT_FAILURE);
! }
! if((rc = cfg_helper(FIND, "Port", temp)) == ERROR) {
! printf("Configuraton file does not specify a Port and I'm not going to guess.\n");
! exit(EXIT_FAILURE);
} else {
! port = atoi(temp);
}
--- 86,112 ----
+ if(version) {
+ printf("%s %s\n", PACKAGE, VERSION);
+ exit(EXIT_SUCCESS);
+ }
+
if(!verbose) {
freopen("/dev/null", "a+", stderr);
}
+
if((rc = load_config()) == ERROR) {
! if(!have_destination && !have_source) {
! printf("Error loading configuration file.\n");
! exit(EXIT_FAILURE);
! }
! port = 9021;
} else {
! if((rc = cfg_helper(FIND, "Port", temp)) == ERROR) {
! printf("Configuraton file does not specify a Port and I'm not going to guess.\n");
! exit(EXIT_FAILURE);
! } else {
! port = atoi(temp);
! }
}
***************
*** 97,110 ****
}
! if(version)
! {
! printf("%s %s\n", PACKAGE, VERSION);
! exit(0);
! }
! if((argc - optind) == 1)
{
index = optind;
! strncpy(identity, argv[index++], ID_MAXSIZE-1);
! identity[ID_MAXSIZE-1] = '\0';
if(verbose) {
--- 139,150 ----
}
!
! if((argc - optind) == 2)
{
index = optind;
! strncpy(agent, argv[index++], AGT_MAXSIZE-1);
! agent[AGT_MAXSIZE-1] = '\0';
! strncpy(subsystem, argv[index++], SUB_MAXSIZE-1);
! subsystem[SUB_MAXSIZE-1] = '\0';
if(verbose) {
***************
*** 112,140 ****
printf("Destination: %s\n", destination);
printf("Identity: %s\n", identity);
}
! if((rc = bn_acknowledge(destination, port, source, identity)) == ERROR) {
printf("bn_acknowledge() failed.\n");
exit(EXIT_FAILURE);
}
} else {
! if(verbose) {
! printf("Benson Distributed Monitoring System (%s %s)\n", PACKAGE, VERSION);
! printf("Copyright (C) 1999, 2000, 2001, 2002 Bob Tribit\n\n");
! printf("This program is distributed in the hope that it will be useful,\n");
! printf("but WITHOUT ANY WARRANTY; without even the implied warranty of\n");
! printf("MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n");
! printf("GNU General Public License for more details.\n\n");
! }
! printf("Usage: %s [options] identity\n", argv[0]);
! printf("Acknowledges an alert by ID in the Benson collector system.\n\n");
! #ifdef HAVE_SSL
! printf(" -c cert.pem path to this agents SSL certificate\n");
! printf(" -k key.pem path to this agents SSL key\n");
! #endif
! printf(" -s srcaddr source address for trap\n");
! printf(" -d destaddr destination address for trap\n");
! printf(" -v verbose output\n");
! printf(" -V display version information\n\n");
! printf("Report bugs to <ben...@ne...>\n");
}
--- 152,164 ----
printf("Destination: %s\n", destination);
printf("Identity: %s\n", identity);
+ printf("Agent: %s\n", agent);
+ printf("Subsystem: %s\n", subsystem);
}
! if((rc = bn_ack_v32(destination, port, source, identity, agent, subsystem)) == ERROR) {
printf("bn_acknowledge() failed.\n");
exit(EXIT_FAILURE);
}
} else {
! usage(argv[0], verbose);
}
Index: alertlist.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/alertlist.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** alertlist.c 8 Oct 2003 04:35:32 -0000 1.11
--- alertlist.c 8 Nov 2003 20:43:19 -0000 1.12
***************
*** 7,12 ****
--- 7,14 ----
#include "benson/benson.h"
+ #include "benson/cfgctl.h"
#include "network/network.h"
+
int main(int argc, char *argv[], char *env[]) {
int index = 0;
***************
*** 20,24 ****
char source[AGT_MAXSIZE], destination[DST_MAXSIZE];
char certfile[FILE_MAXSIZE], keyfile[FILE_MAXSIZE];
- char config_file[FILE_MAXSIZE];
--- 22,25 ----
Index: bensond.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bensond.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** bensond.c 11 May 2003 08:02:04 -0000 1.30
--- bensond.c 8 Nov 2003 20:43:19 -0000 1.31
***************
*** 6,10 ****
*/
! #include <benson/benson.h>
int
--- 6,11 ----
*/
! #include "benson/benson.h"
! #include "benson/cfgctl.h"
int
***************
*** 12,16 ****
char *path;
int size = 0;
! char trace[255];
size = strlen(BENSON_HOME);
size += strlen("/sbin/");
--- 13,17 ----
char *path;
int size = 0;
! // char trace[255];
size = strlen(BENSON_HOME);
size += strlen("/sbin/");
Index: bn_monitor.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bn_monitor.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** bn_monitor.c 28 Sep 2003 22:26:28 -0000 1.8
--- bn_monitor.c 8 Nov 2003 20:43:19 -0000 1.9
***************
*** 12,17 ****
unsigned char config_file[256];
unsigned char error_logfile[256];
- pid_t pid;
- int rc;
// Make me a daemon, baby
--- 12,15 ----
Index: bn_network.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bn_network.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** bn_network.c 11 May 2003 08:02:05 -0000 1.36
--- bn_network.c 8 Nov 2003 20:43:19 -0000 1.37
***************
*** 28,32 ****
int bn_network_daemon() {
- pid_t pid;
int rc;
unsigned char error_logfile[256];
--- 28,31 ----
Index: bsm.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bsm.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** bsm.c 8 Oct 2003 03:34:10 -0000 1.8
--- bsm.c 8 Nov 2003 20:43:19 -0000 1.9
***************
*** 12,16 ****
#ifndef CANT_BUILD_SERVER
#include <benson/bsm.h>
!
#define MAX_TITEMS 50
--- 12,16 ----
#ifndef CANT_BUILD_SERVER
#include <benson/bsm.h>
! #include <benson/utils.h>
#define MAX_TITEMS 50
***************
*** 28,33 ****
/* Allocate process local memory, so reservations can be made. */
! if(!(init_items = (bsm_titem *)malloc(size))) {
! perror("bsm_prepare(): malloc() failed");
return ERROR;
}
--- 28,33 ----
/* Allocate process local memory, so reservations can be made. */
! if(!(init_items = (bsm_titem *)ibn_malloc(size))) {
! perror("bsm_prepare(): ibn_malloc() failed");
return ERROR;
}
***************
*** 51,56 ****
int data_size = 0;
int allocated_titems = 0;
- bsm_hdr *header;
- bsm_titem *table_ptr;
/* Find the number of allocated items */
--- 51,54 ----
***************
*** 100,104 ****
}
! free(init_items);
return GOOD;
}
--- 98,102 ----
}
! ibn_free(init_items);
return GOOD;
}
Index: btrap.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/btrap.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** btrap.c 8 Oct 2003 04:35:32 -0000 1.20
--- btrap.c 8 Nov 2003 20:43:19 -0000 1.21
***************
*** 7,10 ****
--- 7,11 ----
#include <benson/benson.h>
+ #include <benson/cfgctl.h>
#include "network/network.h"
//#include <benson/perl_util.h>
***************
*** 22,26 ****
char severity[SEV_MAXSIZE], subsystem[SUB_MAXSIZE], message[MSG_MAXSIZE];
char certfile[FILE_MAXSIZE], keyfile[FILE_MAXSIZE];
- char config_file[FILE_MAXSIZE];
while((c = getopt(argc,argv,"Vvd:s:c:k:")) != -1) {
--- 23,26 ----
Index: stack.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/stack.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** stack.c 7 Oct 2003 01:11:54 -0000 1.2
--- stack.c 8 Nov 2003 20:43:19 -0000 1.3
***************
*** 1,2 ****
--- 1,3 ----
+ #include <benson/benson.h>
#include "stack.h"
***************
*** 14,18 ****
int stack_push(stack_ctx *current_ctx, void *item)
{
! int ctr = 0;
snode *ptr;
int snode_size = sizeof(snode);
--- 15,19 ----
int stack_push(stack_ctx *current_ctx, void *item)
{
! int ctr = 1;
snode *ptr;
int snode_size = sizeof(snode);
***************
*** 27,36 ****
current_ctx->first_node->node_construct = item;
} else {
! ptr = current_ctx->first_node;
! while(ptr->next != NULL) {
! ptr = ptr->next;
ctr++;
}
! // fixme check for error
ptr->next = (snode *)ibn_malloc(snode_size);
ptr = ptr->next;
--- 28,39 ----
current_ctx->first_node->node_construct = item;
} else {
! for(ptr=current_ctx->first_node;ptr->next != NULL;ptr = ptr->next) {
ctr++;
}
!
! if(ctr >= current_ctx->max_items) {
! return -1;
! }
!
ptr->next = (snode *)ibn_malloc(snode_size);
ptr = ptr->next;
***************
*** 38,47 ****
}
! return 0;
}
void *stack_pop(stack_ctx *current_ctx)
{
! snode *ptr, *prev_ptr;
void *item;
--- 41,51 ----
}
! return GOOD;
}
void *stack_pop(stack_ctx *current_ctx)
{
! snode *ptr;
! snode *prev_ptr = NULL;
void *item;
***************
*** 50,60 ****
}
! 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;
--- 54,61 ----
}
! for(ptr=current_ctx->first_node;ptr->next != NULL;ptr = ptr->next) {
! prev_ptr = ptr;
}
+
item = ptr->node_construct;
***************
*** 63,67 ****
ibn_free(ptr);
! prev_ptr->next = NULL;
return item;
--- 64,73 ----
ibn_free(ptr);
! if(ptr == current_ctx->first_node) {
! current_ctx->first_node = NULL;
! } else {
! assert(prev_ptr == NULL);
! prev_ptr->next = NULL;
! }
return item;
***************
*** 73,80 ****
if(current_ctx->first_node == NULL) {
! return ERROR;
}
! ptr = current_ctx->first_node;
while(ptr->next != NULL) {
prev_ptr = ptr;
--- 79,86 ----
if(current_ctx->first_node == NULL) {
! return GOOD;
}
! ptr=current_ctx->first_node;
while(ptr->next != NULL) {
prev_ptr = ptr;
***************
*** 84,89 ****
}
! memset(ptr, 0, sizeof(snode));
! ibn_free(ptr);
return GOOD;
--- 90,95 ----
}
! memset(current_ctx, 0, sizeof(stack_ctx));
! ibn_free(current_ctx);
return GOOD;
Index: stack.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/stack.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** stack.h 27 Sep 2003 18:25:53 -0000 1.1
--- stack.h 8 Nov 2003 20:43:19 -0000 1.2
***************
*** 1,3 ****
--- 1,4 ----
#include <stdio.h>
+ #include <assert.h>
#include <benson/const.h>
Index: utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/utils.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** utils.c 8 Oct 2003 04:16:37 -0000 1.17
--- utils.c 8 Nov 2003 20:43:19 -0000 1.18
***************
*** 21,25 ****
current_size = maxsize;
}
! snprintf(d, maxsize, "%s\0", s);
}
--- 21,25 ----
current_size = maxsize;
}
! snprintf(d, maxsize, "%s", s);
}
***************
*** 118,122 ****
{
int rc;
! if (rc = semop(semid, sops, nsops) == -1) {
fprintf(stderr, "ibn_semop() error: %s\n", strerror(errno));
return ERROR;
--- 118,122 ----
{
int rc;
! if ((rc = semop(semid, sops, nsops)) == -1) {
fprintf(stderr, "ibn_semop() error: %s\n", strerror(errno));
return ERROR;
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv10656/network
Modified Files:
Makefile.in network.h network_listener.c network_master.c
network_utils.c v31_network_client.c v31_network_request.c
v31_request.h
Log Message:
Fixed a whole lot of warnings.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Makefile.in 8 Oct 2003 02:53:53 -0000 1.11
--- Makefile.in 8 Nov 2003 20:43:20 -0000 1.12
***************
*** 23,28 ****
$(LIBNETWORK): ../../config.h
! libnetclient.a: v31_network_client.o
! $(AR) rv $@ v31_network_client.o network_utils.o
$(RANLIB) $@
--- 23,28 ----
$(LIBNETWORK): ../../config.h
! libnetclient.a: v31_network_client.o v32_network_client.o
! $(AR) rv $@ v31_network_client.o v32_network_client.o network_utils.o
$(RANLIB) $@
***************
*** 30,39 ****
$(CC) -shared -o libnetclient.so v31_network_client.o network_utils.o $(LD_FLAGS) $(LIBS)
! libnetwork.a: $(LIBNETWORK) v31_network_request.o
! $(AR) rv $@ $(LIBNETWORK) v31_network_request.o
$(RANLIB) $@
v31_network_request.o:
$(CC) $(CFLAGS) $(PERL_CFLAGS) $(CPPFLAGS) -c v31_network_request.c
clean:
--- 30,42 ----
$(CC) -shared -o libnetclient.so v31_network_client.o network_utils.o $(LD_FLAGS) $(LIBS)
! libnetwork.a: $(LIBNETWORK) v31_network_request.o v32_network_request.o
! $(AR) rv $@ $(LIBNETWORK) v31_network_request.o v32_network_request.o
$(RANLIB) $@
v31_network_request.o:
$(CC) $(CFLAGS) $(PERL_CFLAGS) $(CPPFLAGS) -c v31_network_request.c
+
+ v32_network_request.o:
+ $(CC) $(CFLAGS) $(PERL_CFLAGS) $(CPPFLAGS) -c v32_network_request.c
clean:
Index: network.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** network.h 8 Oct 2003 03:15:02 -0000 1.7
--- network.h 8 Nov 2003 20:43:20 -0000 1.8
***************
*** 5,8 ****
--- 5,9 ----
#include <stdlib.h>
#include <signal.h>
+ #include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
***************
*** 13,18 ****
--- 14,21 ----
#include <errno.h>
#include <assert.h>
+ #include <string.h>
#include "config.h"
#include "v31_request.h"
+ #include "v32_request.h"
#define ID_MAXSIZE ID_MAXSIZE_v31
***************
*** 57,65 ****
#define ERROR -1
extern int open_network_listener(bn_netlisten_ctx *current_ctx);
extern int close_network_listener(bn_netlisten_ctx *current_ctx);
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
--- 60,73 ----
#define ERROR -1
+ extern int network_master(void);
extern int open_network_listener(bn_netlisten_ctx *current_ctx);
extern int close_network_listener(bn_netlisten_ctx *current_ctx);
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);
! extern int network_header_parser(bn_netaccept_ctx *conn_ctx, bn_req_hdr *request_header);
! extern int network_request_parser_v31(bn_netaccept_ctx *conn_ctx, bn_req_hdr *request_header);
! extern int network_request_parser_v32(bn_netaccept_ctx *conn_ctx, bn_req_hdr *request_header);
! extern void safe_strncpy(char *dest, char *src, int max_size);
! extern int ibn_tcp_connect(bn_netconnect_ctx *current_ctx);
! extern int ibn_tcp_listen(bn_netlisten_ctx *current_ctx);
#endif
Index: network_listener.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_listener.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** network_listener.c 11 May 2003 08:01:12 -0000 1.6
--- network_listener.c 8 Nov 2003 20:43:20 -0000 1.7
***************
*** 26,30 ****
int network_listener_accept(bn_netlisten_ctx *current_ctx, bn_netaccept_ctx *conn_ctx)
{
- int rc = 0;
socklen_t peer_addr_size = (socklen_t)sizeof(struct sockaddr);
--- 26,29 ----
***************
*** 77,81 ****
{
int bytes_read = 0;
- int function = 0;
assert(conn_ctx != NULL);
--- 76,79 ----
Index: network_master.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_master.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** network_master.c 28 Sep 2003 22:26:28 -0000 1.6
--- network_master.c 8 Nov 2003 20:43:20 -0000 1.7
***************
*** 23,27 ****
network_listener_accept(&main_ctx, &connection_ctx);
! if(pid=fork()) {
network_listener_accept_cleanup(&connection_ctx);
} else {
--- 23,27 ----
network_listener_accept(&main_ctx, &connection_ctx);
! if((pid=fork())) {
network_listener_accept_cleanup(&connection_ctx);
} else {
***************
*** 35,42 ****
if((char *)strstr(request_header.version, "3.2") != NULL) {
fprintf(stderr, "version %s is a 3.2 compatible protocol\n", request_header.version);
! // if((rc = network_request_parser_v32(&connection_ctx, &request_header)) == ERROR) {
fprintf(stderr, "network_request_parser_v32(): An error occured while trying to parse the request.\n");
goto CLEANUP;
! // }
} else if((char *)strstr(request_header.version, "3.1") != NULL) {
fprintf(stderr, "version %s is a 3.1 compatible protocol\n", request_header.version);
--- 35,42 ----
if((char *)strstr(request_header.version, "3.2") != NULL) {
fprintf(stderr, "version %s is a 3.2 compatible protocol\n", request_header.version);
! if((rc = network_request_parser_v32(&connection_ctx, &request_header)) == ERROR) {
fprintf(stderr, "network_request_parser_v32(): An error occured while trying to parse the request.\n");
goto CLEANUP;
! }
} else if((char *)strstr(request_header.version, "3.1") != NULL) {
fprintf(stderr, "version %s is a 3.1 compatible protocol\n", request_header.version);
Index: network_utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_utils.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** network_utils.c 8 Oct 2003 01:41:51 -0000 1.5
--- network_utils.c 8 Nov 2003 20:43:20 -0000 1.6
***************
*** 5,9 ****
struct hostent *hp;
struct sockaddr_in addr;
- int sock;
if(!(hp=gethostbyname(current_ctx->destination))) {
--- 5,8 ----
***************
*** 64,67 ****
current_size = max_size;
}
! snprintf(dest, current_size, "%s\0", src);
}
--- 63,66 ----
current_size = max_size;
}
! snprintf(dest, current_size, "%s", src);
}
Index: v31_network_client.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_client.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** v31_network_client.c 8 Oct 2003 03:15:02 -0000 1.5
--- v31_network_client.c 8 Nov 2003 20:43:20 -0000 1.6
***************
*** 21,26 ****
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;
--- 21,24 ----
Index: v31_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_request.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** v31_network_request.c 29 Sep 2003 18:04:10 -0000 1.8
--- v31_network_request.c 8 Nov 2003 20:43:20 -0000 1.9
***************
*** 1,5 ****
#include "network.h"
#include "v31_request.h"
! #include <benson/perl_util.h>
--- 1,5 ----
#include "network.h"
#include "v31_request.h"
! #include "benson/perl_util.h"
***************
*** 16,25 ****
int rc;
! safe_insert(destination, req_pkt->inet.destination, DST_MAXSIZE_v31);
! safe_insert(agent, req_pkt->inet.agent, AGT_MAXSIZE_v31);
! safe_insert(severity, req_pkt->data.trap.severity, SEV_MAXSIZE_v31);
! safe_insert(subsystem, req_pkt->data.trap.subsystem, SUB_MAXSIZE_v31);
! safe_insert(message, req_pkt->data.trap.message, MSG_MAXSIZE_v31);
! safe_insert(status, "initial", STA_MAXSIZE_v31);
ENTER;
--- 16,25 ----
int rc;
! safe_strncpy(destination, req_pkt->inet.destination, DST_MAXSIZE_v31);
! safe_strncpy(agent, req_pkt->inet.agent, AGT_MAXSIZE_v31);
! safe_strncpy(severity, req_pkt->data.trap.severity, SEV_MAXSIZE_v31);
! safe_strncpy(subsystem, req_pkt->data.trap.subsystem, SUB_MAXSIZE_v31);
! safe_strncpy(message, req_pkt->data.trap.message, MSG_MAXSIZE_v31);
! safe_strncpy(status, "initial", STA_MAXSIZE_v31);
ENTER;
***************
*** 53,60 ****
SV *acknowledge_ref;
SV *rc;
- unsigned int rc_int;
! safe_insert(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
! safe_insert(status, "acknowledge", STA_MAXSIZE_v31);
ENTER;
--- 53,59 ----
SV *acknowledge_ref;
SV *rc;
! safe_strncpy(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
! safe_strncpy(status, "acknowledge", STA_MAXSIZE_v31);
ENTER;
***************
*** 83,90 ****
SV *acknowledge_ref;
SV *rc;
- unsigned int rc_int;
! safe_insert(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
! safe_insert(status, req_pkt->data.update_status.status, STA_MAXSIZE_v31);
ENTER;
--- 82,88 ----
SV *acknowledge_ref;
SV *rc;
! safe_strncpy(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
! safe_strncpy(status, req_pkt->data.update_status.status, STA_MAXSIZE_v31);
ENTER;
***************
*** 108,112 ****
void *process_alertlist_v31 (bnet_req_v31 *req_pkt, SV *server_ref, bnet_resp_v31 *resp_hdr)
{
- int max_num_alerts;
SV *result;
SV *alert;
--- 106,109 ----
***************
*** 115,119 ****
HV *fields;
AV *alerts;
- void *response_ptr;
bn_alertlist_response_v31 *resp_alerts_ptr;
int ctr = 0;
--- 112,115 ----
***************
*** 137,148 ****
bn_alertlist_response_v31 insert;
fields = (HV*)SvRV(alert);
! safe_insert(insert.identity, SvPVX(*hv_fetch(fields, "identity", 8, FALSE)), ID_MAXSIZE_v31);
! safe_insert(insert.inet.destination, SvPVX(*hv_fetch(fields, "destination", 11, FALSE)), DST_MAXSIZE_v31);
! safe_insert(insert.inet.agent, SvPVX(*hv_fetch(fields, "agent", 5, FALSE)), AGT_MAXSIZE_v31);
! safe_insert(insert.trap.severity, SvPVX(*hv_fetch(fields, "severity", 8, FALSE)), SEV_MAXSIZE_v31);
! safe_insert(insert.trap.subsystem, SvPVX(*hv_fetch(fields, "subsystem", 9, FALSE)), SUB_MAXSIZE_v31);
! safe_insert(insert.trap.message, SvPVX(*hv_fetch(fields, "message", 7, FALSE)), MSG_MAXSIZE_v31);
! safe_insert(insert.misc.updated, SvPVX(*hv_fetch(fields, "updated", 7, FALSE)), UPD_MAXSIZE_v31);
! safe_insert(insert.misc.status, SvPVX(*hv_fetch(fields, "status", 6, FALSE)), STA_MAXSIZE_v31);
memcpy(&resp_alerts_ptr[ctr++], &insert, sizeof(bn_alertlist_response_v31));
}
--- 133,144 ----
bn_alertlist_response_v31 insert;
fields = (HV*)SvRV(alert);
! safe_strncpy(insert.identity, SvPVX(*hv_fetch(fields, "identity", 8, FALSE)), ID_MAXSIZE_v31);
! safe_strncpy(insert.inet.destination, SvPVX(*hv_fetch(fields, "destination", 11, FALSE)), DST_MAXSIZE_v31);
! safe_strncpy(insert.inet.agent, SvPVX(*hv_fetch(fields, "agent", 5, FALSE)), AGT_MAXSIZE_v31);
! safe_strncpy(insert.trap.severity, SvPVX(*hv_fetch(fields, "severity", 8, FALSE)), SEV_MAXSIZE_v31);
! safe_strncpy(insert.trap.subsystem, SvPVX(*hv_fetch(fields, "subsystem", 9, FALSE)), SUB_MAXSIZE_v31);
! safe_strncpy(insert.trap.message, SvPVX(*hv_fetch(fields, "message", 7, FALSE)), MSG_MAXSIZE_v31);
! safe_strncpy(insert.misc.updated, SvPVX(*hv_fetch(fields, "updated", 7, FALSE)), UPD_MAXSIZE_v31);
! safe_strncpy(insert.misc.status, SvPVX(*hv_fetch(fields, "status", 6, FALSE)), STA_MAXSIZE_v31);
memcpy(&resp_alerts_ptr[ctr++], &insert, sizeof(bn_alertlist_response_v31));
}
Index: v31_request.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_request.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** v31_request.h 28 Sep 2003 22:26:28 -0000 1.3
--- v31_request.h 8 Nov 2003 20:43:20 -0000 1.4
***************
*** 108,111 ****
--- 108,115 ----
} bnet_ack_v31;
+ extern int bn_send_trap (char *destination, int port, char *source, char *severity, char *subsystem, char *message);
+ extern struct benson_alertlist_response_v31 *bn_alertlist (char *destination, int port, char *source, int *buffer_size);
+
+
#endif /* __v31_request_h */
|
|
From: Bob T. <bt...@us...> - 2003-11-08 20:43:26
|
Update of /cvsroot/benson/benson3/src/tests In directory sc8-pr-cvs1:/tmp/cvs-serv10656/tests Modified Files: Makefile.in Log Message: Fixed a whole lot of warnings. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/tests/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** Makefile.in 7 Oct 2003 01:11:55 -0000 1.10 --- Makefile.in 8 Nov 2003 20:43:20 -0000 1.11 *************** *** 13,17 **** LDFLAGS=-L. @LDFLAGS@ PERL_LDFLAGS=@PERL_LDFLAGS@ ! TEST_TARGETS=stacktest --- 13,18 ---- LDFLAGS=-L. @LDFLAGS@ PERL_LDFLAGS=@PERL_LDFLAGS@ ! TESTSUITE=./testsuite ! AUTOTEST=./autom4te --language=autotest TEST_TARGETS=stacktest *************** *** 23,29 **** 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 --- 24,35 ---- stacktest: stacktest.o ! $(CC) $(CFLAGS) $(CPPFLAGS) -static -o stacktest stacktest.o -L$(top_srcdir)/src -lbenson ! #-Wl,--rpath -Wl,$(top_srcdir)/src ! ! check: atconfig $(TESTSUITE) ! $(SHELL) $(TESTSUITE) clean: + test -z stacktest || rm -f stacktest rm -f *.o *.a core |
|
From: Bob T. <bt...@us...> - 2003-11-08 20:43:26
|
Update of /cvsroot/benson/benson3/src/perl
In directory sc8-pr-cvs1:/tmp/cvs-serv10656/perl
Modified Files:
perl_util.c
Log Message:
Fixed a whole lot of warnings.
Index: perl_util.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/perl/perl_util.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** perl_util.c 29 Sep 2003 18:04:10 -0000 1.14
--- perl_util.c 8 Nov 2003 20:43:20 -0000 1.15
***************
*** 82,86 ****
STRLEN n_a;
printf("Error - PerlObject::require_module(\"%s\")\n", pkgname);
! printf("%s",SvPV(ERRSV,n_a));
return 1;
}
--- 82,86 ----
STRLEN n_a;
printf("Error - PerlObject::require_module(\"%s\")\n", pkgname);
! printf("%s",SvPV(ERRSV, n_a));
return 1;
}
***************
*** 104,108 ****
XPUSHs(sv_2mortal(newSVpv(pkgname,0)));
! va_start(ap, pkgname);
for(ctr=0; ctr<argc; ctr++) {
p = va_arg(ap, SV*);
--- 104,108 ----
XPUSHs(sv_2mortal(newSVpv(pkgname,0)));
! va_start(ap, argc);
for(ctr=0; ctr<argc; ctr++) {
p = va_arg(ap, SV*);
***************
*** 129,133 ****
if(SvTRUE(ERRSV)) {
- STRLEN n_a;
fprintf(stderr,"Perl Exception - bn_new_object()\n");
return NULL;
--- 129,132 ----
***************
*** 140,144 ****
bn_set_attribute(SV *pkg, const char *method, SV *value)
{
- SV* attribute_ref;
dSP;
--- 139,142 ----
|
|
From: Bob T. <bt...@us...> - 2003-10-08 04:35:36
|
Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14708/src
Modified Files:
alertlist.c btrap.c
Log Message:
Made some changes to allow the command line tools to ignore not having a config file.
Index: alertlist.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/alertlist.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** alertlist.c 8 Oct 2003 03:15:02 -0000 1.10
--- alertlist.c 8 Oct 2003 04:35:32 -0000 1.11
***************
*** 62,73 ****
if((rc = load_config()) == ERROR) {
! printf("Error loading configuration file.\n");
! exit(EXIT_FAILURE);
! }
! if((rc = cfg_helper(FIND, "Port", temp)) == ERROR) {
! printf("Configuraton file does not specify a Port and I'm not going to guess.\n");
! exit(EXIT_FAILURE);
} else {
! port = atoi(temp);
}
--- 62,77 ----
if((rc = load_config()) == ERROR) {
! if(!have_destination && !have_source) {
! printf("Error loading configuration file.\n");
! exit(EXIT_FAILURE);
! }
! port = 9021;
} else {
! if((rc = cfg_helper(FIND, "Port", temp)) == ERROR) {
! printf("Configuraton file does not specify a Port and I'm not going to guess.\n");
! exit(EXIT_FAILURE);
! } else {
! port = atoi(temp);
! }
}
Index: btrap.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/btrap.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** btrap.c 8 Oct 2003 02:59:12 -0000 1.19
--- btrap.c 8 Oct 2003 04:35:32 -0000 1.20
***************
*** 59,70 ****
if((rc = load_config()) == ERROR) {
! printf("Error loading configuration file.\n");
! exit(EXIT_FAILURE);
! }
! if((rc = cfg_helper(FIND, "Port", temp)) == ERROR) {
! printf("Configuration file does not specify a Port and I'm not going to guess.\n");
! exit(EXIT_FAILURE);
} else {
! port = atoi(temp);
}
--- 59,74 ----
if((rc = load_config()) == ERROR) {
! if(!have_destination && !have_source) {
! printf("Error loading configuration file.\n");
! exit(EXIT_FAILURE);
! }
! port = 9021; /* guess the default, and pray */
} else {
! if((rc = cfg_helper(FIND, "Port", temp)) == ERROR) {
! printf("Configuration file does not specify a Port and I'm not going to guess.\n");
! exit(EXIT_FAILURE);
! } else {
! port = atoi(temp);
! }
}
|
|
From: Bob T. <bt...@us...> - 2003-10-08 04:16:44
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv12629/autom4te.cache
Modified Files:
requests
Log Message:
This is actually working on win32/cygwin, go figure.
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** requests 8 Oct 2003 03:53:53 -0000 1.18
--- requests 8 Oct 2003 04:16:37 -0000 1.19
***************
*** 107,110 ****
--- 107,214 ----
'AC_CHECK_FUNCS' => 1
}
+ ], 'Request' ),
+ bless( [
+ '1',
+ 1,
+ [
+ '/usr/autotool/devel/share/autoconf'
+ ],
+ [
+ '/usr/autotool/devel/share/autoconf/autoconf/autoconf.m4f',
+ 'aclocal.m4',
+ 'configure.ac'
+ ],
+ {
+ '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,
+ 'AC_FUNC_STRNLEN' => 1,
+ 'AC_PROG_CXX' => 1,
+ 'AC_PATH_X' => 1,
+ 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
+ 'AC_PROG_AWK' => 1,
+ 'AC_HEADER_STDC' => 1,
+ 'AC_HEADER_MAJOR' => 1,
+ 'AC_FUNC_ERROR_AT_LINE' => 1,
+ 'AC_PROG_GCC_TRADITIONAL' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_FUNC_MBRTOWC' => 1,
+ 'AC_STRUCT_ST_BLOCKS' => 1,
+ 'AC_TYPE_SIGNAL' => 1,
+ 'AC_TYPE_UID_T' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
+ 'AC_PROG_MAKE_SET' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ '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,
+ 'AC_STRUCT_TIMEZONE' => 1,
+ 'AC_FUNC_CHOWN' => 1,
+ 'AC_SUBST' => 1,
+ 'AC_FUNC_ALLOCA' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ 'AC_FUNC_GETPGRP' => 1,
+ 'AC_PROG_RANLIB' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_FUNC_SETPGRP' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
+ 'AC_FUNC_MMAP' => 1,
+ 'AC_FUNC_REALLOC' => 1,
+ 'AC_TYPE_SIZE_T' => 1,
+ 'AC_CHECK_TYPES' => 1,
+ 'AC_CHECK_MEMBERS' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AC_FUNC_UTIME_NULL' => 1,
+ 'AC_FUNC_SELECT_ARGTYPES' => 1,
+ 'AC_FUNC_STRFTIME' => 1,
+ 'AC_HEADER_STAT' => 1,
+ '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,
+ 'AC_FUNC_SETVBUF_REVERSED' => 1,
+ 'AC_PROG_INSTALL' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
+ 'AC_FUNC_MALLOC' => 1,
+ 'AC_FUNC_GETGROUPS' => 1,
+ 'AC_FUNC_GETLOADAVG' => 1,
+ 'AH_OUTPUT' => 1,
+ '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,
+ 'AC_CHECK_FUNCS' => 1
+ }
], 'Request' )
);
|
|
From: Bob T. <bt...@us...> - 2003-10-08 04:16:44
|
Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv12629
Modified Files:
configure configure.ac
Log Message:
This is actually working on win32/cygwin, go figure.
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -r1.61 -r1.62
*** configure 8 Oct 2003 03:53:53 -0000 1.61
--- configure 8 Oct 2003 04:16:37 -0000 1.62
***************
*** 3241,3248 ****
CONF_LIBNSL=yes
!
! case $target in
! *cygwin)
! LIBS=-lcygipc
;;
*linux*)
--- 3241,3248 ----
CONF_LIBNSL=yes
! echo $host_os
! case $host_os in
! *cyg*)
! CONF_LIBS=-lcygipc
;;
*linux*)
***************
*** 5830,5834 ****
--- 5830,5836 ----
fi
+
LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
+ LIBS="$LIBS $CONF_LIBS"
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
CFLAGS=`echo "$CFLAGS" | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** configure.ac 8 Oct 2003 03:53:53 -0000 1.9
--- configure.ac 8 Oct 2003 04:16:37 -0000 1.10
***************
*** 26,33 ****
CONF_LIBNSL=yes
!
! case $target in
! *cygwin)
! LIBS=-lcygipc
;;
*linux*)
--- 26,33 ----
CONF_LIBNSL=yes
! echo $host_os
! case $host_os in
! *cyg*)
! CONF_LIBS=-lcygipc
;;
*linux*)
***************
*** 169,173 ****
--- 169,175 ----
fi
+
LIBS=`echo $LIBS | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
+ LIBS="$LIBS $CONF_LIBS"
CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
CFLAGS=`echo "$CFLAGS" | $trpath ' ' '\n' | $sortpath | $uniqpath | $trpath '\n' ' '`
|
|
From: Bob T. <bt...@us...> - 2003-10-08 04:16:44
|
Update of /cvsroot/benson/benson3/src In directory sc8-pr-cvs1:/tmp/cvs-serv12629/src Modified Files: utils.c Log Message: This is actually working on win32/cygwin, go figure. Index: utils.c =================================================================== RCS file: /cvsroot/benson/benson3/src/utils.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** utils.c 8 Oct 2003 02:59:12 -0000 1.16 --- utils.c 8 Oct 2003 04:16:37 -0000 1.17 *************** *** 6,9 **** --- 6,13 ---- */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + #include <benson/benson.h> #include <benson/ipc.h> *************** *** 86,89 **** --- 90,95 ---- } + #ifndef CANT_BUILD_SERVER + int ibn_semget(key_t key, int nsems, int semflg) *************** *** 163,166 **** --- 169,174 ---- return GOOD; } + + #endif /* CANT_BUILD_SERVER */ |
|
From: Bob T. <bt...@us...> - 2003-10-08 03:53:58
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv9557/autom4te.cache
Modified Files:
output.0 requests traces.0
Log Message:
More fixes to help build on cygwin.
Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** output.0 8 Oct 2003 03:52:19 -0000 1.12
--- output.0 8 Oct 2003 03:53:53 -0000 1.13
***************
*** 3245,3248 ****
--- 3245,3249 ----
*cygwin)
LIBS=-lcygipc
+ ;;
*linux*)
CONF_DLFLAGS=-rdynamic
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** requests 8 Oct 2003 03:52:19 -0000 1.17
--- requests 8 Oct 2003 03:53:53 -0000 1.18
***************
*** 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.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** traces.0 8 Oct 2003 03:52:19 -0000 1.11
--- traces.0 8 Oct 2003 03:53:53 -0000 1.12
***************
*** 106,243 ****
#undef HAVE_LIBM])
m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBM])
! m4trace:configure.ac:40: -1- AC_SUBST([CONF_PIC])
! m4trace:configure.ac:44: -1- AC_CHECK_LIB([nsl], [open], [], [], [-lsocket])
! m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:57: -1- AC_DEFINE_TRACE_LITERAL([BENSON_HOME])
! m4trace:configure.ac:57: -1- AH_OUTPUT([BENSON_HOME], [/* "Benson home directory" */
#undef BENSON_HOME])
! m4trace:configure.ac:58: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.ac:58: -1- AH_OUTPUT([PACKAGE], [/* "Benson package name" */
#undef PACKAGE])
! m4trace:configure.ac:59: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.ac:59: -1- AH_OUTPUT([VERSION], [/* "Benson version number" */
#undef VERSION])
! m4trace:configure.ac:81: -1- AC_CHECK_HEADERS([expat.h])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
#undef HAVE_EXPAT_H])
! m4trace:configure.ac:81: -1- AC_HEADER_STDC
! m4trace:configure.ac:81: -1- AC_SUBST([EGREP])
! m4trace:configure.ac:81: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
! m4trace:configure.ac:81: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS])
! m4trace:configure.ac:81: -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:81: -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:81: -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:81: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H])
! m4trace:configure.ac:82: -1- AC_CHECK_HEADERS([openssl/ssl.h])
! m4trace:configure.ac:82: -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:83: -1- AC_CHECK_HEADERS([signal.h])
! m4trace:configure.ac:83: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
#undef HAVE_SIGNAL_H])
! m4trace:configure.ac:84: -1- AC_CHECK_HEADERS([sys/sem.h])
! m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SYS_SEM_H], [/* Define to 1 if you have the <sys/sem.h> header file. */
#undef HAVE_SYS_SEM_H])
! m4trace:configure.ac:85: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:85: -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:86: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:86: -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:87: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H])
! m4trace:configure.ac:88: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
#undef HAVE_DB_H])
! m4trace:configure.ac:89: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
#undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
#undef HAVE_LIBSOCKET])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
#undef HAVE_LIBDL])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
#undef HAVE_LIBDLD])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
#undef HAVE_LIBLD])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:96: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
#undef HAVE_LIBW])
! m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
#undef HAVE_LIBDB])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:99: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
#undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:100: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:100: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
#undef HAVE_LIBSSL])
! m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:101: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:101: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
#undef HAVE_LIBEXPAT])
! m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
! m4trace:configure.ac:106: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
! m4trace:configure.ac:106: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
#undef SUNOS])
! m4trace:configure.ac:110: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:110: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:114: -1- AC_SUBST([LD_SEARCH_FLAG])
! m4trace:configure.ac:115: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:115: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:119: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:125: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:139: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:140: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:141: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:147: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:153: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:176: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:193: -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 \
--- 106,243 ----
#undef HAVE_LIBM])
m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBM])
! m4trace:configure.ac:41: -1- AC_SUBST([CONF_PIC])
! m4trace:configure.ac:45: -1- AC_CHECK_LIB([nsl], [open], [], [], [-lsocket])
! m4trace:configure.ac:45: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:45: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:58: -1- AC_DEFINE_TRACE_LITERAL([BENSON_HOME])
! m4trace:configure.ac:58: -1- AH_OUTPUT([BENSON_HOME], [/* "Benson home directory" */
#undef BENSON_HOME])
! m4trace:configure.ac:59: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.ac:59: -1- AH_OUTPUT([PACKAGE], [/* "Benson package name" */
#undef PACKAGE])
! m4trace:configure.ac:60: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.ac:60: -1- AH_OUTPUT([VERSION], [/* "Benson version number" */
#undef VERSION])
! m4trace:configure.ac:82: -1- AC_CHECK_HEADERS([expat.h])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
#undef HAVE_EXPAT_H])
! m4trace:configure.ac:82: -1- AC_HEADER_STDC
! m4trace:configure.ac:82: -1- AC_SUBST([EGREP])
! m4trace:configure.ac:82: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
! m4trace:configure.ac:82: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS])
! m4trace:configure.ac:82: -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:82: -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:82: -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:82: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H])
! m4trace:configure.ac:83: -1- AC_CHECK_HEADERS([openssl/ssl.h])
! m4trace:configure.ac:83: -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:84: -1- AC_CHECK_HEADERS([signal.h])
! m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
#undef HAVE_SIGNAL_H])
! m4trace:configure.ac:85: -1- AC_CHECK_HEADERS([sys/sem.h])
! m4trace:configure.ac:85: -1- AH_OUTPUT([HAVE_SYS_SEM_H], [/* Define to 1 if you have the <sys/sem.h> header file. */
#undef HAVE_SYS_SEM_H])
! m4trace:configure.ac:86: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:86: -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:87: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:87: -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:88: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H])
! m4trace:configure.ac:89: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
#undef HAVE_DB_H])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
#undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
#undef HAVE_LIBSOCKET])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
#undef HAVE_LIBDL])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
#undef HAVE_LIBDLD])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:96: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
#undef HAVE_LIBLD])
! m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
#undef HAVE_LIBW])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:99: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
#undef HAVE_LIBDB])
! m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:100: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:100: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
#undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:101: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:101: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
#undef HAVE_LIBSSL])
! m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:102: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:102: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
#undef HAVE_LIBEXPAT])
! m4trace:configure.ac:102: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
! m4trace:configure.ac:107: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
! m4trace:configure.ac:107: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
#undef SUNOS])
! m4trace:configure.ac:111: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:111: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:115: -1- AC_SUBST([LD_SEARCH_FLAG])
! m4trace:configure.ac:116: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:116: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:120: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:126: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:140: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:141: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:142: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:148: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:154: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:177: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:194: -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 \
***************
*** 245,248 ****
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:193: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:193: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
--- 245,248 ----
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:194: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:194: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
|
From: Bob T. <bt...@us...> - 2003-10-08 03:53:57
|
Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv9557
Modified Files:
configure configure.ac
Log Message:
More fixes to help build on cygwin.
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -r1.60 -r1.61
*** configure 8 Oct 2003 03:52:19 -0000 1.60
--- configure 8 Oct 2003 03:53:53 -0000 1.61
***************
*** 3245,3248 ****
--- 3245,3249 ----
*cygwin)
LIBS=-lcygipc
+ ;;
*linux*)
CONF_DLFLAGS=-rdynamic
Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** configure.ac 8 Oct 2003 03:52:19 -0000 1.8
--- configure.ac 8 Oct 2003 03:53:53 -0000 1.9
***************
*** 30,33 ****
--- 30,34 ----
*cygwin)
LIBS=-lcygipc
+ ;;
*linux*)
CONF_DLFLAGS=-rdynamic
|
|
From: Bob T. <bt...@us...> - 2003-10-08 03:52:25
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv9125/autom4te.cache
Modified Files:
output.0 requests traces.0
Log Message:
More fixes to help build on cygwin.
Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** output.0 8 Oct 2003 03:34:10 -0000 1.11
--- output.0 8 Oct 2003 03:52:19 -0000 1.12
***************
*** 3243,3246 ****
--- 3243,3248 ----
case $target in
+ *cygwin)
+ LIBS=-lcygipc
*linux*)
CONF_DLFLAGS=-rdynamic
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** requests 8 Oct 2003 02:59:12 -0000 1.16
--- requests 8 Oct 2003 03:52:19 -0000 1.17
***************
*** 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.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** traces.0 8 Oct 2003 03:34:10 -0000 1.10
--- traces.0 8 Oct 2003 03:52:19 -0000 1.11
***************
*** 106,243 ****
#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/sem.h])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_SYS_SEM_H], [/* Define to 1 if you have the <sys/sem.h> header file. */
#undef HAVE_SYS_SEM_H])
! m4trace:configure.ac:83: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:83: -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:84: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:84: -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:85: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:85: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H])
! m4trace:configure.ac:86: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:86: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
#undef HAVE_DB_H])
! m4trace:configure.ac:87: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:88: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:88: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:89: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
#undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
#undef HAVE_LIBSOCKET])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
#undef HAVE_LIBDL])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
#undef HAVE_LIBDLD])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
#undef HAVE_LIBLD])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
#undef HAVE_LIBW])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:96: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
#undef HAVE_LIBDB])
! m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
#undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
#undef HAVE_LIBSSL])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:99: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
#undef HAVE_LIBEXPAT])
! m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
! m4trace:configure.ac:104: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
! m4trace:configure.ac:104: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
#undef SUNOS])
! m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:108: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:112: -1- AC_SUBST([LD_SEARCH_FLAG])
! m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:113: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:117: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:123: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:137: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:138: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:139: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:145: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:151: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:174: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:191: -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 \
--- 106,243 ----
#undef HAVE_LIBM])
m4trace:configure.ac:25: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBM])
! m4trace:configure.ac:40: -1- AC_SUBST([CONF_PIC])
! m4trace:configure.ac:44: -1- AC_CHECK_LIB([nsl], [open], [], [], [-lsocket])
! m4trace:configure.ac:44: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:44: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:57: -1- AC_DEFINE_TRACE_LITERAL([BENSON_HOME])
! m4trace:configure.ac:57: -1- AH_OUTPUT([BENSON_HOME], [/* "Benson home directory" */
#undef BENSON_HOME])
! m4trace:configure.ac:58: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
! m4trace:configure.ac:58: -1- AH_OUTPUT([PACKAGE], [/* "Benson package name" */
#undef PACKAGE])
! m4trace:configure.ac:59: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
! m4trace:configure.ac:59: -1- AH_OUTPUT([VERSION], [/* "Benson version number" */
#undef VERSION])
! m4trace:configure.ac:81: -1- AC_CHECK_HEADERS([expat.h])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
#undef HAVE_EXPAT_H])
! m4trace:configure.ac:81: -1- AC_HEADER_STDC
! m4trace:configure.ac:81: -1- AC_SUBST([EGREP])
! m4trace:configure.ac:81: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
! m4trace:configure.ac:81: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS])
! m4trace:configure.ac:81: -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:81: -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:81: -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:81: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H])
! m4trace:configure.ac:81: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H])
! m4trace:configure.ac:82: -1- AC_CHECK_HEADERS([openssl/ssl.h])
! m4trace:configure.ac:82: -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:83: -1- AC_CHECK_HEADERS([signal.h])
! m4trace:configure.ac:83: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
#undef HAVE_SIGNAL_H])
! m4trace:configure.ac:84: -1- AC_CHECK_HEADERS([sys/sem.h])
! m4trace:configure.ac:84: -1- AH_OUTPUT([HAVE_SYS_SEM_H], [/* Define to 1 if you have the <sys/sem.h> header file. */
#undef HAVE_SYS_SEM_H])
! m4trace:configure.ac:85: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:85: -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:86: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:86: -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:87: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H])
! m4trace:configure.ac:88: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
#undef HAVE_DB_H])
! m4trace:configure.ac:89: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
#undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
#undef HAVE_LIBSOCKET])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
#undef HAVE_LIBDL])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
#undef HAVE_LIBDLD])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
#undef HAVE_LIBLD])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:96: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
#undef HAVE_LIBW])
! m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
#undef HAVE_LIBDB])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:99: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
#undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:100: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:100: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
#undef HAVE_LIBSSL])
! m4trace:configure.ac:100: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:101: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:101: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
#undef HAVE_LIBEXPAT])
! m4trace:configure.ac:101: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
! m4trace:configure.ac:106: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
! m4trace:configure.ac:106: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
#undef SUNOS])
! m4trace:configure.ac:110: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:110: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:114: -1- AC_SUBST([LD_SEARCH_FLAG])
! m4trace:configure.ac:115: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:115: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:119: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:125: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:139: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:140: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:141: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:147: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:153: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:176: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:193: -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 \
***************
*** 245,248 ****
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:191: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:191: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
--- 245,248 ----
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:193: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:193: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
|
From: Bob T. <bt...@us...> - 2003-10-08 03:52:24
|
Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv9125
Modified Files:
configure configure.ac
Log Message:
More fixes to help build on cygwin.
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -r1.59 -r1.60
*** configure 8 Oct 2003 03:34:09 -0000 1.59
--- configure 8 Oct 2003 03:52:19 -0000 1.60
***************
*** 3243,3246 ****
--- 3243,3248 ----
case $target in
+ *cygwin)
+ LIBS=-lcygipc
*linux*)
CONF_DLFLAGS=-rdynamic
Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** configure.ac 8 Oct 2003 02:59:11 -0000 1.7
--- configure.ac 8 Oct 2003 03:52:19 -0000 1.8
***************
*** 28,31 ****
--- 28,33 ----
case $target in
+ *cygwin)
+ LIBS=-lcygipc
*linux*)
CONF_DLFLAGS=-rdynamic
|
|
From: Bob T. <bt...@us...> - 2003-10-08 03:34:17
|
Update of /cvsroot/benson/benson3/src In directory sc8-pr-cvs1:/tmp/cvs-serv6309/src Modified Files: bsm.c psaf_queue.c Log Message: The latest set of fixes, for the windows stuff. Index: bsm.c =================================================================== RCS file: /cvsroot/benson/benson3/src/bsm.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** bsm.c 28 Sep 2003 22:26:28 -0000 1.7 --- bsm.c 8 Oct 2003 03:34:10 -0000 1.8 *************** *** 6,9 **** --- 6,14 ---- */ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + + #ifndef CANT_BUILD_SERVER #include <benson/bsm.h> *************** *** 240,241 **** --- 245,247 ---- return GOOD; } + #endif /* CANT_BUILD_SERVER */ Index: psaf_queue.c =================================================================== RCS file: /cvsroot/benson/benson3/src/psaf_queue.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** psaf_queue.c 28 Sep 2003 22:26:28 -0000 1.6 --- psaf_queue.c 8 Oct 2003 03:34:10 -0000 1.7 *************** *** 1,2 **** --- 1,8 ---- + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + + #ifndef CANT_BUILD_SERVER + #include <benson/psaf_queue.h> *************** *** 106,107 **** --- 112,114 ---- } + #endif /* CANT_BUILD_SERVER */ |
|
From: Bob T. <bt...@us...> - 2003-10-08 03:34:17
|
Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv6309
Modified Files:
aclocal.m4 config.h.in configure
Log Message:
The latest set of fixes, for the windows stuff.
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/benson/benson3/aclocal.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** aclocal.m4 26 Feb 2003 18:24:52 -0000 1.10
--- aclocal.m4 8 Oct 2003 03:34:09 -0000 1.11
***************
*** 14,4473 ****
k
- # Do all the work for Automake. -*- Autoconf -*-
-
- # This macro actually does too much some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-
- # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
- # Free Software Foundation, Inc.
-
[...4431 lines suppressed...]
- # any later version.
-
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- # GNU General Public License for more details.
-
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- # 02111-1307, USA.
-
- AC_PREREQ([2.52])
-
- # serial 6
-
- # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
--- 14,15 ----
Index: config.h.in
===================================================================
RCS file: /cvsroot/benson/benson3/config.h.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** config.h.in 2 Apr 2003 19:21:18 -0000 1.15
--- config.h.in 8 Oct 2003 03:34:09 -0000 1.16
***************
*** 1,3 ****
! /* config.h.in. Generated from configure.in by autoheader. */
/* "Benson home directory" */
--- 1,3 ----
! /* config.h.in. Generated from configure.ac by autoheader. */
/* "Benson home directory" */
***************
*** 7,13 ****
#undef HAVE_DB_H
- /* Define to 1 if you have the <dlfcn.h> header file. */
- #undef HAVE_DLFCN_H
-
/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
--- 7,10 ----
***************
*** 79,82 ****
--- 76,82 ----
#undef HAVE_STRING_H
+ /* Define to 1 if you have the <sys/sem.h> header file. */
+ #undef HAVE_SYS_SEM_H
+
/* Define to 1 if you have the <sys/shm.h> header file. */
#undef HAVE_SYS_SHM_H
***************
*** 91,104 ****
#undef HAVE_UNISTD_H
- /* "Benson library version number" */
- #undef LIBTOOL_VERSION
-
/* "We're running linux" */
#undef LINUX
! /* "Benson network library version" */
! #undef NETWORK_VERSION
!
! /* Name of package */
#undef PACKAGE
--- 91,98 ----
#undef HAVE_UNISTD_H
/* "We're running linux" */
#undef LINUX
! /* "Benson package name" */
#undef PACKAGE
***************
*** 127,140 ****
#undef TARGETOSNAME
! /* Version number of package */
#undef VERSION
! /* Define to 1 if the X Window System is missing or not being used. */
! #undef X_DISPLAY_MISSING
!
! /* Define to empty if `const' does not conform to ANSI C. */
! #undef const
!
! /* Define as `__inline' if that's what the C compiler calls it, or to nothing
! if it is not supported. */
! #undef inline
--- 121,128 ----
#undef TARGETOSNAME
! /* "Benson version number" */
#undef VERSION
! /* Define to 1 if your processor stores words with the most significant byte
! first (like Motorola and SPARC, unlike Intel and VAX). */
! #undef WORDS_BIGENDIAN
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -r1.58 -r1.59
*** configure 8 Oct 2003 02:59:11 -0000 1.58
--- configure 8 Oct 2003 03:34:09 -0000 1.59
***************
*** 6944,6960 ****
rm -f $tmp/config.h
fi
- _am_stamp_count=`expr ${_am_stamp_count-0} + 1`
- echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
- echo X$ac_file |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`/stamp-h$_am_stamp_count
done
_ACEOF
--- 6944,6947 ----
|
|
From: Bob T. <bt...@us...> - 2003-10-08 03:34:17
|
Update of /cvsroot/benson/benson3/include/benson
In directory sc8-pr-cvs1:/tmp/cvs-serv6309/include/benson
Modified Files:
bsm.h ipc.h
Log Message:
The latest set of fixes, for the windows stuff.
Index: bsm.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/bsm.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** bsm.h 29 Sep 2003 17:36:25 -0000 1.10
--- bsm.h 8 Oct 2003 03:34:10 -0000 1.11
***************
*** 11,16 ****
#include <stdio.h>
- #include <sys/shm.h>
- #include <sys/sem.h>
#include <benson/ipc.h>
#include <benson/const.h>
--- 11,14 ----
Index: ipc.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/ipc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ipc.h 8 Oct 2003 02:59:12 -0000 1.2
--- ipc.h 8 Oct 2003 03:34:10 -0000 1.3
***************
*** 2,8 ****
#define __ipc_h
#include <sys/shm.h>
#include <sys/sem.h>
!
typedef union semaphore_union {
--- 2,10 ----
#define __ipc_h
+ #ifdef HAVE_SYS_SEM_H
+
#include <sys/shm.h>
#include <sys/sem.h>
! #include "config.h"
typedef union semaphore_union {
***************
*** 20,23 ****
--- 22,30 ----
int ibn_shmdt(const void *shmaddr);
int ibn_shmctl(int id, int cmd, struct shmid_ds *buff);
+
+ #else
+ #define CANT_BUILD_SERVER
+ #endif
+
#endif /* __ipc_h */
|
|
From: Bob T. <bt...@us...> - 2003-10-08 03:34:17
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv6309/autom4te.cache
Modified Files:
output.0 traces.0
Log Message:
The latest set of fixes, for the windows stuff.
Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** output.0 8 Oct 2003 02:59:11 -0000 1.10
--- output.0 8 Oct 2003 03:34:10 -0000 1.11
***************
*** 6944,6960 ****
rm -f $tmp/config.h
fi
- _am_stamp_count=`expr ${_am_stamp_count-0} + 1`
- echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
- echo X$ac_file |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`/stamp-h$_am_stamp_count
done
_ACEOF
--- 6944,6947 ----
Index: traces.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/traces.0,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** traces.0 8 Oct 2003 02:59:12 -0000 1.9
--- traces.0 8 Oct 2003 03:34:10 -0000 1.10
***************
*** 1,3 ****
- m4trace:aclocal.m4:52: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
m4trace:configure.ac:1: -1- AC_INIT
m4trace:configure.ac:1: -1- m4_pattern_forbid([^_?A[CHUM]_])
--- 1,2 ----
|
|
From: Bob T. <bt...@us...> - 2003-10-08 03:15:06
|
Update of /cvsroot/benson/benson3/src/perl/Benson
In directory sc8-pr-cvs1:/tmp/cvs-serv3889/src/perl/Benson
Modified Files:
Benson.xs Makefile.PL
Log Message:
More changes this may actually work.
Index: Benson.xs
===================================================================
RCS file: /cvsroot/benson/benson3/src/perl/Benson/Benson.xs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Benson.xs 28 Sep 2003 22:26:28 -0000 1.14
--- Benson.xs 8 Oct 2003 03:15:02 -0000 1.15
***************
*** 1,4 ****
--- 1,5 ----
#include <benson/benson.h>
#include <benson/perl_util.h>
+ #include "network/network.h"
#include "XSUB.h"
***************
*** 178,182 ****
char destination[DST_MAXSIZE];
char agent[AGT_MAXSIZE];
! struct benson_alertlist_response *alertlist;
char port_number[10];
int port = 0;
--- 179,183 ----
char destination[DST_MAXSIZE];
char agent[AGT_MAXSIZE];
! struct benson_alertlist_response_v31 *alertlist;
char port_number[10];
int port = 0;
***************
*** 193,200 ****
port = atoi(port_number);
! if((alertlist = bn_alertlist(destination, port, agent, &buffer_size)) == NULL) {
croak("Benson.xs: alert_list: bn_alertlist() failed.");
}
! number_of_alerts = buffer_size / sizeof(struct benson_alertlist_response);
alerts = newAV();
for(ctr=0;ctr<number_of_alerts;ctr++) {
--- 194,201 ----
port = atoi(port_number);
! if((alertlist = (struct benson_alertlist_response_v31 *)bn_alertlist(destination, port, agent, &buffer_size)) == NULL) {
croak("Benson.xs: alert_list: bn_alertlist() failed.");
}
! number_of_alerts = buffer_size / sizeof(struct benson_alertlist_response_v31);
alerts = newAV();
for(ctr=0;ctr<number_of_alerts;ctr++) {
Index: Makefile.PL
===================================================================
RCS file: /cvsroot/benson/benson3/src/perl/Benson/Makefile.PL,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Makefile.PL 28 Sep 2003 22:26:28 -0000 1.11
--- Makefile.PL 8 Oct 2003 03:15:02 -0000 1.12
***************
*** 25,29 ****
'LIBS' => ["-R$prefix/lib/ -L$prefix/lib/ -lbenson"],
'DEFINE' => '',
! 'INC' => "-I$top_srcdir/include/",
'XSPROTOARG' => '-noprototypes',
'INSTALLDIRS' => 'perl',
--- 25,29 ----
'LIBS' => ["-R$prefix/lib/ -L$prefix/lib/ -lbenson"],
'DEFINE' => '',
! 'INC' => "-I$top_srcdir/include/ -I$top_srcdir/src/",
'XSPROTOARG' => '-noprototypes',
'INSTALLDIRS' => 'perl',
|
|
From: Bob T. <bt...@us...> - 2003-10-08 03:15:06
|
Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv3889/src
Modified Files:
alertlist.c cfgctl.c
Log Message:
More changes this may actually work.
Index: alertlist.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/alertlist.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** alertlist.c 8 Oct 2003 02:59:12 -0000 1.9
--- alertlist.c 8 Oct 2003 03:15:02 -0000 1.10
***************
*** 114,118 ****
printf("Destination: %s\n", destination);
}
! if((alertlist = bn_alertlist(destination, port, source, &buffer_size)) == NULL) {
printf("bn_alertlist() failed.\n");
exit(EXIT_FAILURE);
--- 114,118 ----
printf("Destination: %s\n", destination);
}
! if((alertlist = (struct benson_alertlist_response_v31 *)bn_alertlist(destination, port, source, &buffer_size)) == NULL) {
printf("bn_alertlist() failed.\n");
exit(EXIT_FAILURE);
Index: cfgctl.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/cfgctl.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** cfgctl.c 8 Oct 2003 02:59:12 -0000 1.12
--- cfgctl.c 8 Oct 2003 03:15:02 -0000 1.13
***************
*** 216,222 ****
sprintf( ptrdts->dtag, "%s", dtag );
sprintf( ptrdts->dvalue, "%s", dvalue );
! #if (DEBUG==TRUE)
! printf ( "dtag = %s dvalue = %s\n",ptrdts->dtag,ptrdts->dvalue );
! #endif
}
break;
--- 216,222 ----
sprintf( ptrdts->dtag, "%s", dtag );
sprintf( ptrdts->dvalue, "%s", dvalue );
! //#if (DEBUG==TRUE)
! // printf ( "dtag = %s dvalue = %s\n",ptrdts->dtag,ptrdts->dvalue );
! //#endif
}
break;
***************
*** 227,233 ****
if ( feof ( ptrfile ) != 0 )
{
! #if (DEBUG==TRUE)
! printf("load_config successfully loaded new configuration\n");
! #endif
fclose ( ptrfile );
return ( GOOD );
--- 227,233 ----
if ( feof ( ptrfile ) != 0 )
{
! //#if (DEBUG==TRUE)
! // printf("load_config successfully loaded new configuration\n");
! //#endif
fclose ( ptrfile );
return ( GOOD );
|
|
From: Bob T. <bt...@us...> - 2003-10-08 03:15:06
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv3889/src/network
Modified Files:
network.h v31_network_client.c
Log Message:
More changes this may actually work.
Index: network.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** network.h 8 Oct 2003 02:53:53 -0000 1.6
--- network.h 8 Oct 2003 03:15:02 -0000 1.7
***************
*** 17,20 ****
--- 17,21 ----
#define ID_MAXSIZE ID_MAXSIZE_v31
+ #define STA_MAXSIZE STA_MAXSIZE_v31
#define DST_MAXSIZE DST_MAXSIZE_v31
#define AGT_MAXSIZE AGT_MAXSIZE_v31
Index: v31_network_client.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_client.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** v31_network_client.c 8 Oct 2003 02:53:53 -0000 1.4
--- v31_network_client.c 8 Oct 2003 03:15:02 -0000 1.5
***************
*** 63,66 ****
--- 63,67 ----
/* Read the response from the server, atleast the header portion, more should be coming. */
+ rc = fread(&req_hdr, sizeof(bn_req_hdr), 1, connect_ctx.input);
rc = fread(&resp_hdr, sizeof(bnet_resp_v31), 1, connect_ctx.input);
if(rc < 1) {
|
|
From: Bob T. <bt...@us...> - 2003-10-08 02:59:17
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv1669/autom4te.cache
Modified Files:
output.0 requests traces.0
Log Message:
More changes, good lord.
Index: output.0
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/output.0,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** output.0 30 Sep 2003 04:47:18 -0000 1.9
--- output.0 8 Oct 2003 02:59:11 -0000 1.10
***************
*** 4080,4083 ****
--- 4080,4225 ----
+ for ac_header in sys/sem.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ else
+ # Is the header compilable?
+ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+ @%:@include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+
+ # Is the header present?
+ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ @%:@include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+ else
+ ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+ @%:@@%:@ ------------------------------------ @%:@@%:@
+ @%:@@%:@ Report this to bug...@gn.... @%:@@%:@
+ @%:@@%:@ ------------------------------------ @%:@@%:@
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ no:yes )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+ @%:@@%:@ ------------------------------------ @%:@@%:@
+ @%:@@%:@ Report this to bug...@gn.... @%:@@%:@
+ @%:@@%:@ ------------------------------------ @%:@@%:@
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=$ac_header_preproc"
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ @%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
+ done
+
+
for ac_header in sys/shm.h
do
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** requests 30 Sep 2003 04:47:18 -0000 1.15
--- requests 8 Oct 2003 02:59:12 -0000 1.16
***************
*** 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.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** traces.0 30 Sep 2003 04:43:38 -0000 1.8
--- traces.0 8 Oct 2003 02:59:12 -0000 1.9
***************
*** 155,241 ****
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: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 \
--- 155,244 ----
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/sem.h])
! m4trace:configure.ac:82: -1- AH_OUTPUT([HAVE_SYS_SEM_H], [/* Define to 1 if you have the <sys/sem.h> header file. */
! #undef HAVE_SYS_SEM_H])
! m4trace:configure.ac:83: -1- AC_CHECK_HEADERS([sys/shm.h])
! m4trace:configure.ac:83: -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:84: -1- AC_CHECK_HEADERS([sys/stat.h])
! m4trace:configure.ac:84: -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:85: -1- AC_CHECK_HEADERS([errno.h])
! m4trace:configure.ac:85: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H])
! m4trace:configure.ac:86: -1- AC_CHECK_HEADERS([db.h])
! m4trace:configure.ac:86: -1- AH_OUTPUT([HAVE_DB_H], [/* Define to 1 if you have the <db.h> header file. */
#undef HAVE_DB_H])
! m4trace:configure.ac:87: -1- AC_CHECK_LIB([nsl], [open])
! m4trace:configure.ac:87: -1- AH_OUTPUT([HAVE_LIBNSL], [/* Define to 1 if you have the `nsl\' library (-lnsl). */
#undef HAVE_LIBNSL])
! m4trace:configure.ac:87: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNSL])
! m4trace:configure.ac:88: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:88: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:88: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:89: -1- AC_CHECK_LIB([compat], [open])
! m4trace:configure.ac:89: -1- AH_OUTPUT([HAVE_LIBCOMPAT], [/* Define to 1 if you have the `compat\' library (-lcompat). */
#undef HAVE_LIBCOMPAT])
! m4trace:configure.ac:89: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCOMPAT])
! m4trace:configure.ac:90: -1- AC_CHECK_LIB([socket], [open])
! m4trace:configure.ac:90: -1- AH_OUTPUT([HAVE_LIBSOCKET], [/* Define to 1 if you have the `socket\' library (-lsocket). */
#undef HAVE_LIBSOCKET])
! m4trace:configure.ac:90: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSOCKET])
! m4trace:configure.ac:91: -1- AC_CHECK_LIB([dl], [open])
! m4trace:configure.ac:91: -1- AH_OUTPUT([HAVE_LIBDL], [/* Define to 1 if you have the `dl\' library (-ldl). */
#undef HAVE_LIBDL])
! m4trace:configure.ac:91: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDL])
! m4trace:configure.ac:92: -1- AC_CHECK_LIB([dld], [open])
! m4trace:configure.ac:92: -1- AH_OUTPUT([HAVE_LIBDLD], [/* Define to 1 if you have the `dld\' library (-ldld). */
#undef HAVE_LIBDLD])
! m4trace:configure.ac:92: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDLD])
! m4trace:configure.ac:93: -1- AC_CHECK_LIB([ld], [open])
! m4trace:configure.ac:93: -1- AH_OUTPUT([HAVE_LIBLD], [/* Define to 1 if you have the `ld\' library (-lld). */
#undef HAVE_LIBLD])
! m4trace:configure.ac:93: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBLD])
! m4trace:configure.ac:94: -1- AC_CHECK_LIB([w], [open])
! m4trace:configure.ac:94: -1- AH_OUTPUT([HAVE_LIBW], [/* Define to 1 if you have the `w\' library (-lw). */
#undef HAVE_LIBW])
! m4trace:configure.ac:94: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBW])
! m4trace:configure.ac:95: -1- AC_CHECK_LIB([resolv], [open])
! m4trace:configure.ac:95: -1- AH_OUTPUT([HAVE_LIBRESOLV], [/* Define to 1 if you have the `resolv\' library (-lresolv). */
#undef HAVE_LIBRESOLV])
! m4trace:configure.ac:95: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBRESOLV])
! m4trace:configure.ac:96: -1- AC_CHECK_LIB([db], [open])
! m4trace:configure.ac:96: -1- AH_OUTPUT([HAVE_LIBDB], [/* Define to 1 if you have the `db\' library (-ldb). */
#undef HAVE_LIBDB])
! m4trace:configure.ac:96: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDB])
! m4trace:configure.ac:97: -1- AC_CHECK_LIB([crypto], [BN_init])
! m4trace:configure.ac:97: -1- AH_OUTPUT([HAVE_LIBCRYPTO], [/* Define to 1 if you have the `crypto\' library (-lcrypto). */
#undef HAVE_LIBCRYPTO])
! m4trace:configure.ac:97: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCRYPTO])
! m4trace:configure.ac:98: -1- AC_CHECK_LIB([ssl], [SSL_library_init])
! m4trace:configure.ac:98: -1- AH_OUTPUT([HAVE_LIBSSL], [/* Define to 1 if you have the `ssl\' library (-lssl). */
#undef HAVE_LIBSSL])
! m4trace:configure.ac:98: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBSSL])
! m4trace:configure.ac:99: -1- AC_CHECK_LIB([expat], [XML_Parse])
! m4trace:configure.ac:99: -1- AH_OUTPUT([HAVE_LIBEXPAT], [/* Define to 1 if you have the `expat\' library (-lexpat). */
#undef HAVE_LIBEXPAT])
! m4trace:configure.ac:99: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEXPAT])
! m4trace:configure.ac:104: -1- AC_DEFINE_TRACE_LITERAL([SUNOS])
! m4trace:configure.ac:104: -1- AH_OUTPUT([SUNOS], [/* "We\'re running solaris" */
#undef SUNOS])
! m4trace:configure.ac:108: -1- AC_DEFINE_TRACE_LITERAL([LINUX])
! m4trace:configure.ac:108: -1- AH_OUTPUT([LINUX], [/* "We\'re running linux" */
#undef LINUX])
! m4trace:configure.ac:112: -1- AC_SUBST([LD_SEARCH_FLAG])
! m4trace:configure.ac:113: -1- AC_DEFINE_TRACE_LITERAL([TARGETOSNAME])
! m4trace:configure.ac:113: -1- AH_OUTPUT([TARGETOSNAME], [/* "Operating System Name" */
#undef TARGETOSNAME])
! m4trace:configure.ac:117: -1- AC_SUBST([perlpath], [$ac_cv_path_perlpath])
! m4trace:configure.ac:123: -1- AC_SUBST([PERL_CFLAGS])
! m4trace:configure.ac:137: -1- AC_SUBST([PERL_LIBS])
! m4trace:configure.ac:138: -1- AC_SUBST([PERL_LDFLAGS])
! m4trace:configure.ac:139: -1- AC_SUBST([PERL_SLIBS])
! m4trace:configure.ac:145: -1- AC_SUBST([pythonpath], [$ac_cv_path_pythonpath])
! m4trace:configure.ac:151: -1- AC_SUBST([tclpath], [$ac_cv_path_tclpath])
! m4trace:configure.ac:174: -1- AC_SUBST([ALL_LIBS])
! m4trace:configure.ac:191: -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 \
***************
*** 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])
--- 246,249 ----
src/tests/monitors/Makefile src/tests/network/Makefile src/tests/Makefile \
doc/Makefile doc/htdocs/Makefile doc/htdocs/images/Makefile])
! m4trace:configure.ac:191: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
! m4trace:configure.ac:191: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
|
|
From: Bob T. <bt...@us...> - 2003-10-08 02:59:16
|
Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1669/src
Modified Files:
acknowledge.c alertlist.c btrap.c cfgctl.c utils.c
Log Message:
More changes, good lord.
Index: acknowledge.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/acknowledge.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** acknowledge.c 26 Jan 2003 20:55:37 -0000 1.7
--- acknowledge.c 8 Oct 2003 02:59:12 -0000 1.8
***************
*** 7,10 ****
--- 7,11 ----
#include "benson/benson.h"
+ #include "network/network.h"
int main(int argc, char *argv[], char *env[]) {
Index: alertlist.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/alertlist.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** alertlist.c 26 Jan 2003 20:55:38 -0000 1.8
--- alertlist.c 8 Oct 2003 02:59:12 -0000 1.9
***************
*** 7,10 ****
--- 7,11 ----
#include "benson/benson.h"
+ #include "network/network.h"
int main(int argc, char *argv[], char *env[]) {
***************
*** 106,110 ****
if((argc - optind) == 0)
{
! struct benson_alertlist_response *alertlist;
int buffer_size, number_of_alerts, ctr;
index = optind;
--- 107,111 ----
if((argc - optind) == 0)
{
! struct benson_alertlist_response_v31 *alertlist;
int buffer_size, number_of_alerts, ctr;
index = optind;
***************
*** 117,121 ****
exit(EXIT_FAILURE);
}
! number_of_alerts = buffer_size / sizeof(struct benson_alertlist_response);
printf("<xml>\n");
for(ctr=0;ctr<number_of_alerts;ctr++) {
--- 118,122 ----
exit(EXIT_FAILURE);
}
! number_of_alerts = buffer_size / sizeof(struct benson_alertlist_response_v31);
printf("<xml>\n");
for(ctr=0;ctr<number_of_alerts;ctr++) {
Index: btrap.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/btrap.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** btrap.c 28 Sep 2003 22:26:28 -0000 1.18
--- btrap.c 8 Oct 2003 02:59:12 -0000 1.19
***************
*** 7,10 ****
--- 7,11 ----
#include <benson/benson.h>
+ #include "network/network.h"
//#include <benson/perl_util.h>
Index: cfgctl.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/cfgctl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** cfgctl.c 28 Sep 2003 22:26:28 -0000 1.11
--- cfgctl.c 8 Oct 2003 02:59:12 -0000 1.12
***************
*** 8,11 ****
--- 8,13 ----
#include <benson/benson.h>
+ #include <benson/cfgctl.h>
+ #include <benson/const.h>
***************
*** 82,86 ****
extern dts first_dts;
static dts *ptrcurrent, *ptrnext;
! unsigned int found = FALSE;
int Result;
--- 84,88 ----
extern dts first_dts;
static dts *ptrcurrent, *ptrnext;
! unsigned int found = 0;
int Result;
***************
*** 93,97 ****
ptrnext = first_dts.next;
! while (( ptrcurrent->dtag != NULL ) && ( found == FALSE ))
{
Result = strcmp ( ptrin, &(ptrcurrent->dtag[0]) );
--- 95,99 ----
ptrnext = first_dts.next;
! while (( ptrcurrent->dtag != NULL ) && ( found == 0 ))
{
Result = strcmp ( ptrin, &(ptrcurrent->dtag[0]) );
Index: utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/utils.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** utils.c 8 Oct 2003 01:41:51 -0000 1.15
--- utils.c 8 Oct 2003 02:59:12 -0000 1.16
***************
*** 7,11 ****
--- 7,13 ----
#include <benson/benson.h>
+ #include <benson/ipc.h>
#include <benson/const.h>
+ #include "network/network.h"
void safe_insert(char *d, char *s, int maxsize) {
***************
*** 80,84 ****
}
! int ibn_create_identity(bnet_req *alert, char *identity) {
return GOOD;
}
--- 82,86 ----
}
! int ibn_create_identity(bnet_req_v31 *alert, char *identity) {
return GOOD;
}
|
|
From: Bob T. <bt...@us...> - 2003-10-08 02:59:16
|
Update of /cvsroot/benson/benson3/include/benson
In directory sc8-pr-cvs1:/tmp/cvs-serv1669/include/benson
Modified Files:
benson.h database.h ipc.h
Log Message:
More changes, good lord.
Index: benson.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/benson.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** benson.h 8 Oct 2003 01:41:51 -0000 1.24
--- benson.h 8 Oct 2003 02:59:12 -0000 1.25
***************
*** 23,34 ****
#include "benson/ssl.h"
#endif
! #include "benson/network.h"
// #include "benson/perl_util.h"
#include "benson/database.h"
! #include "benson/rules_cfg.h"
! #include "benson/psaf_queue.h"
! #include "benson/bsm.h"
! #include "benson/monitor.h"
! #include "benson/cfgctl.h"
int sequence;
--- 23,34 ----
#include "benson/ssl.h"
#endif
! //#include "benson/network.h"
// #include "benson/perl_util.h"
#include "benson/database.h"
! //#include "benson/rules_cfg.h"
! //#include "benson/psaf_queue.h"
! //#include "benson/bsm.h"
! //#include "benson/monitor.h"
! //#include "benson/cfgctl.h"
int sequence;
Index: database.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/database.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** database.h 8 Oct 2003 01:41:51 -0000 1.5
--- database.h 8 Oct 2003 02:59:12 -0000 1.6
***************
*** 1,3 ****
! #ifdef HAVE_DB_H
#include <sys/types.h>
--- 1,3 ----
! #ifdef HAVE_DBBREAK_H
#include <sys/types.h>
Index: ipc.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/ipc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ipc.h 29 Sep 2003 17:36:25 -0000 1.1
--- ipc.h 8 Oct 2003 02:59:12 -0000 1.2
***************
*** 2,5 ****
--- 2,8 ----
#define __ipc_h
+ #include <sys/shm.h>
+ #include <sys/sem.h>
+
typedef union semaphore_union {
|
|
From: Bob T. <bt...@us...> - 2003-10-08 02:59:16
|
Update of /cvsroot/benson/benson3
In directory sc8-pr-cvs1:/tmp/cvs-serv1669
Modified Files:
configure configure.ac
Log Message:
More changes, good lord.
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** configure 30 Sep 2003 04:47:18 -0000 1.57
--- configure 8 Oct 2003 02:59:11 -0000 1.58
***************
*** 4080,4083 ****
--- 4080,4225 ----
+ for ac_header in sys/sem.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ else
+ # Is the header compilable?
+ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+
+ # Is the header present?
+ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+ else
+ ac_cpp_err=yes
+ fi
+ if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+ echo "${ECHO_T}$ac_header_preproc" >&6
+
+ # So? What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+ ## ------------------------------------ ##
+ ## Report this to bug...@gn.... ##
+ ## ------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ no:yes )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+ echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+ ## ------------------------------------ ##
+ ## Report this to bug...@gn.... ##
+ ## ------------------------------------ ##
+ _ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ eval "$as_ac_Header=$ac_header_preproc"
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+ fi
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+
+ done
+
+
for ac_header in sys/shm.h
do
Index: configure.ac
===================================================================
RCS file: /cvsroot/benson/benson3/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** configure.ac 30 Sep 2003 04:47:18 -0000 1.6
--- configure.ac 8 Oct 2003 02:59:11 -0000 1.7
***************
*** 80,83 ****
--- 80,84 ----
AC_CHECK_HEADERS(openssl/ssl.h)
AC_CHECK_HEADERS(signal.h)
+ AC_CHECK_HEADERS(sys/sem.h)
AC_CHECK_HEADERS(sys/shm.h)
AC_CHECK_HEADERS(sys/stat.h)
|
